diff --git a/Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java b/Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java index d845a4f97bc..003665f52cb 100644 --- a/Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java +++ b/Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java @@ -51,7 +51,7 @@ public class SoldierOfFortune extends CardImpl { this.expansionSetCode = "ALL"; this.subtype.add("Human"); this.subtype.add("Mercenary"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/apocalypse/AnaDisciple.java b/Mage.Sets/src/mage/sets/apocalypse/AnaDisciple.java index 2afc4ab0f80..b8ff5f88a8c 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/AnaDisciple.java +++ b/Mage.Sets/src/mage/sets/apocalypse/AnaDisciple.java @@ -52,7 +52,7 @@ public class AnaDisciple extends CardImpl { this.expansionSetCode = "APC"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/Anavolver.java b/Mage.Sets/src/mage/sets/apocalypse/Anavolver.java index 49b6dc26474..0452fbb018e 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Anavolver.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Anavolver.java @@ -56,7 +56,7 @@ public class Anavolver extends CardImpl { super(ownerId, 75, "Anavolver", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "APC"; this.subtype.add("Volver"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/apocalypse/AngelfireCrusader.java b/Mage.Sets/src/mage/sets/apocalypse/AngelfireCrusader.java index 53a46a364f8..f4477fddd2e 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/AngelfireCrusader.java +++ b/Mage.Sets/src/mage/sets/apocalypse/AngelfireCrusader.java @@ -48,7 +48,7 @@ public class AngelfireCrusader extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); this.subtype.add("Knight"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); diff --git a/Mage.Sets/src/mage/sets/apocalypse/BloodfireColossus.java b/Mage.Sets/src/mage/sets/apocalypse/BloodfireColossus.java index 679bd53c236..bffbbbf21f4 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/BloodfireColossus.java +++ b/Mage.Sets/src/mage/sets/apocalypse/BloodfireColossus.java @@ -51,7 +51,7 @@ public class BloodfireColossus extends CardImpl { super(ownerId, 55, "Bloodfire Colossus", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{6}{R}{R}"); this.expansionSetCode = "APC"; this.subtype.add("Giant"); - this.color.setRed(true); + this.power = new MageInt(6); this.toughness = new MageInt(6); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(6), new ColoredManaCost(ColoredManaSymbol.R)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/BloodfireDwarf.java b/Mage.Sets/src/mage/sets/apocalypse/BloodfireDwarf.java index 06de79a9e3b..90695bf4d49 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/BloodfireDwarf.java +++ b/Mage.Sets/src/mage/sets/apocalypse/BloodfireDwarf.java @@ -61,7 +61,7 @@ public class BloodfireDwarf extends CardImpl { super(ownerId, 56, "Bloodfire Dwarf", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{R}"); this.expansionSetCode = "APC"; this.subtype.add("Dwarf"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new ColoredManaCost(ColoredManaSymbol.R)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/BloodfireKavu.java b/Mage.Sets/src/mage/sets/apocalypse/BloodfireKavu.java index b63a88cd155..ba28b051176 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/BloodfireKavu.java +++ b/Mage.Sets/src/mage/sets/apocalypse/BloodfireKavu.java @@ -52,7 +52,7 @@ public class BloodfireKavu extends CardImpl { super(ownerId, 58, "Bloodfire Kavu", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); this.expansionSetCode = "APC"; this.subtype.add("Kavu"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(2, new FilterCreaturePermanent()), new ColoredManaCost(ColoredManaSymbol.R)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/BogGnarr.java b/Mage.Sets/src/mage/sets/apocalypse/BogGnarr.java index 9d8793638e9..303c2e9131c 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/BogGnarr.java +++ b/Mage.Sets/src/mage/sets/apocalypse/BogGnarr.java @@ -54,7 +54,7 @@ public class BogGnarr extends CardImpl { super(ownerId, 76, "Bog Gnarr", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "APC"; this.subtype.add("Beast"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new BogGnarrTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/apocalypse/CetaDisciple.java b/Mage.Sets/src/mage/sets/apocalypse/CetaDisciple.java index 00c84dcfbf2..c8ae514430e 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/CetaDisciple.java +++ b/Mage.Sets/src/mage/sets/apocalypse/CetaDisciple.java @@ -50,7 +50,7 @@ public class CetaDisciple extends CardImpl { this.expansionSetCode = "APC"; this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/Cetavolver.java b/Mage.Sets/src/mage/sets/apocalypse/Cetavolver.java index 77e6e320d1f..8a040de3b0d 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Cetavolver.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Cetavolver.java @@ -53,7 +53,7 @@ public class Cetavolver extends CardImpl { super(ownerId, 21, "Cetavolver", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "APC"; this.subtype.add("Volver"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/apocalypse/CoastalDrake.java b/Mage.Sets/src/mage/sets/apocalypse/CoastalDrake.java index 93f711e7138..3be0c8808e2 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/CoastalDrake.java +++ b/Mage.Sets/src/mage/sets/apocalypse/CoastalDrake.java @@ -51,7 +51,7 @@ public class CoastalDrake extends CardImpl { super(ownerId, 22, "Coastal Drake", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "APC"; this.subtype.add("Drake"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/apocalypse/DeathGrasp.java b/Mage.Sets/src/mage/sets/apocalypse/DeathGrasp.java index e4923809dc3..5f1b57c319f 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/DeathGrasp.java +++ b/Mage.Sets/src/mage/sets/apocalypse/DeathGrasp.java @@ -47,7 +47,7 @@ public class DeathGrasp extends CardImpl { super(ownerId, 95, "Death Grasp", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{W}{B}"); this.expansionSetCode = "APC"; this.color.setWhite(true); - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addEffect(new GainLifeEffect(new ManacostVariableValue())); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java b/Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java index 75fc8043f44..dfdb8baf3d7 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java +++ b/Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java @@ -50,7 +50,7 @@ public class DegaDisciple extends CardImpl { this.expansionSetCode = "APC"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/Degavolver.java b/Mage.Sets/src/mage/sets/apocalypse/Degavolver.java index 1c1866dbf33..87577042db5 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Degavolver.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Degavolver.java @@ -57,7 +57,7 @@ public class Degavolver extends CardImpl { super(ownerId, 6, "Degavolver", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "APC"; this.subtype.add("Volver"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/apocalypse/DesolationAngel.java b/Mage.Sets/src/mage/sets/apocalypse/DesolationAngel.java index 8791d95cc29..4c32f5136e9 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/DesolationAngel.java +++ b/Mage.Sets/src/mage/sets/apocalypse/DesolationAngel.java @@ -54,7 +54,7 @@ public class DesolationAngel extends CardImpl { super(ownerId, 38, "Desolation Angel", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{B}{B}"); this.expansionSetCode = "APC"; this.subtype.add("Angel"); - this.color.setBlack(true); + this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java b/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java index 9a5fa3e4ad6..8e1b97030e8 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java +++ b/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java @@ -57,7 +57,7 @@ public class DiversionaryTactics extends CardImpl { public DiversionaryTactics(UUID ownerId) { super(ownerId, 7, "Diversionary Tactics", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "APC"; - this.color.setWhite(true); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/apocalypse/EbonyTreefolk.java b/Mage.Sets/src/mage/sets/apocalypse/EbonyTreefolk.java index ffef5afa2e5..f95875ee501 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/EbonyTreefolk.java +++ b/Mage.Sets/src/mage/sets/apocalypse/EbonyTreefolk.java @@ -50,7 +50,7 @@ public class EbonyTreefolk extends CardImpl { this.expansionSetCode = "APC"; this.subtype.add("Treefolk"); this.color.setGreen(true); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{B}{G}"))); diff --git a/Mage.Sets/src/mage/sets/apocalypse/FlowstoneCharger.java b/Mage.Sets/src/mage/sets/apocalypse/FlowstoneCharger.java index f97e852aaa6..b8ccc6bf184 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/FlowstoneCharger.java +++ b/Mage.Sets/src/mage/sets/apocalypse/FlowstoneCharger.java @@ -48,7 +48,7 @@ public class FlowstoneCharger extends CardImpl { this.expansionSetCode = "APC"; this.subtype.add("Beast"); this.color.setRed(true); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(5); this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(3, -3, Duration.EndOfTurn), false)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/GoblinLegionnaire.java b/Mage.Sets/src/mage/sets/apocalypse/GoblinLegionnaire.java index 40878113b3e..fd3d21ed447 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/GoblinLegionnaire.java +++ b/Mage.Sets/src/mage/sets/apocalypse/GoblinLegionnaire.java @@ -52,7 +52,7 @@ public class GoblinLegionnaire extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Soldier"); this.color.setRed(true); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.R)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java b/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java index d6ae6af7f96..02a8f5cf4cb 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java +++ b/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java @@ -55,7 +55,7 @@ public class GoblinTrenches extends CardImpl { super(ownerId, 104, "Goblin Trenches", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{W}"); this.expansionSetCode = "APC"; this.color.setRed(true); - this.color.setWhite(true); + // {2}, Sacrifice a land: Put two 1/1 red and white Goblin Soldier creature tokens onto the battlefield. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoblinTrenchesToken(), 2), new GenericManaCost(2)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/Helionaut.java b/Mage.Sets/src/mage/sets/apocalypse/Helionaut.java index d9a8b39d31e..e8f1b08db79 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Helionaut.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Helionaut.java @@ -49,7 +49,7 @@ public class Helionaut extends CardImpl { this.expansionSetCode = "APC"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/apocalypse/Index.java b/Mage.Sets/src/mage/sets/apocalypse/Index.java index b719d42b5fb..0818ae2a760 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Index.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Index.java @@ -43,7 +43,7 @@ public class Index extends CardImpl { public Index(UUID ownerId) { super(ownerId, 25, "Index", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}"); this.expansionSetCode = "APC"; - this.color.setBlue(true); + // Look at the top five cards of your library, then put them back in any order. this.getSpellAbility().addEffect(new LookLibraryControllerEffect(5)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java b/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java index af34d21748c..930a400e282 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java +++ b/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java @@ -48,7 +48,7 @@ public class JungleBarrier extends CardImpl { this.subtype.add("Plant"); this.subtype.add("Wall"); this.color.setBlue(true); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(6); this.addAbility(DefenderAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/apocalypse/KavuGlider.java b/Mage.Sets/src/mage/sets/apocalypse/KavuGlider.java index a6a2b39a29d..f741fee9f86 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/KavuGlider.java +++ b/Mage.Sets/src/mage/sets/apocalypse/KavuGlider.java @@ -48,7 +48,7 @@ public class KavuGlider extends CardImpl { super(ownerId, 64, "Kavu Glider", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.expansionSetCode = "APC"; this.subtype.add("Kavu"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); diff --git a/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java b/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java index cc847b22f4f..430736b5868 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java @@ -45,7 +45,7 @@ public class LastCaress extends CardImpl { public LastCaress(UUID ownerId) { super(ownerId, 41, "Last Caress", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "APC"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new LoseLifeTargetEffect(1)); this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new GainLifeEffect(1)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/LayOfTheLand.java b/Mage.Sets/src/mage/sets/apocalypse/LayOfTheLand.java index 9c2896e7bea..090b337d2cb 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LayOfTheLand.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LayOfTheLand.java @@ -46,7 +46,7 @@ public class LayOfTheLand extends CardImpl { public LayOfTheLand(UUID ownerId) { super(ownerId, 81, "Lay of the Land", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{G}"); this.expansionSetCode = "APC"; - this.color.setGreen(true); + // Search your library for a basic land card, reveal that card, and put it into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, 1, filter), true)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/LivingAirship.java b/Mage.Sets/src/mage/sets/apocalypse/LivingAirship.java index 8c3c395eac4..8ac7262bcce 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LivingAirship.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LivingAirship.java @@ -48,7 +48,7 @@ public class LivingAirship extends CardImpl { super(ownerId, 28, "Living Airship", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "APC"; this.subtype.add("Metathran"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/apocalypse/LlanowarDead.java b/Mage.Sets/src/mage/sets/apocalypse/LlanowarDead.java index 5d0311c22ea..331cd0c731f 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LlanowarDead.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LlanowarDead.java @@ -46,7 +46,7 @@ public class LlanowarDead extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Elf"); this.color.setGreen(true); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new BlackManaAbility()); diff --git a/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java b/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java index 670b617aea7..4fc8fa111bb 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java +++ b/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java @@ -52,7 +52,7 @@ public class ManaclesOfDecay extends CardImpl { super(ownerId, 14, "Manacles of Decay", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "APC"; this.subtype.add("Aura"); - this.color.setWhite(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java b/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java index 4aa480164e2..a46751aa6e3 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java +++ b/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java @@ -50,7 +50,7 @@ public class MartyrsTomb extends CardImpl { super(ownerId, 110, "Martyrs' Tomb", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{B}"); this.expansionSetCode = "APC"; this.color.setBlack(true); - this.color.setWhite(true); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new PayLifeCost(2)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/apocalypse/MournfulZombie.java b/Mage.Sets/src/mage/sets/apocalypse/MournfulZombie.java index 1d3e770f8ff..dbc7df9601d 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/MournfulZombie.java +++ b/Mage.Sets/src/mage/sets/apocalypse/MournfulZombie.java @@ -52,7 +52,7 @@ public class MournfulZombie extends CardImpl { super(ownerId, 43, "Mournful Zombie", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "APC"; this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.W)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/MysticSnake.java b/Mage.Sets/src/mage/sets/apocalypse/MysticSnake.java index 60c5193e096..7ee51198697 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/MysticSnake.java +++ b/Mage.Sets/src/mage/sets/apocalypse/MysticSnake.java @@ -49,7 +49,7 @@ public class MysticSnake extends CardImpl { this.expansionSetCode = "APC"; this.subtype.add("Snake"); this.color.setBlue(true); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/apocalypse/NecraDisciple.java b/Mage.Sets/src/mage/sets/apocalypse/NecraDisciple.java index 6734ef4ae03..ddcf36f7c9b 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/NecraDisciple.java +++ b/Mage.Sets/src/mage/sets/apocalypse/NecraDisciple.java @@ -51,7 +51,7 @@ public class NecraDisciple extends CardImpl { this.expansionSetCode = "APC"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability firstAbility = new AnyColorManaAbility(new ColoredManaCost(ColoredManaSymbol.G)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java b/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java index 0b37352b01c..4c963c9228d 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java +++ b/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java @@ -51,7 +51,7 @@ public class OvergrownEstate extends CardImpl { this.expansionSetCode = "APC"; this.color.setGreen(true); this.color.setBlack(true); - this.color.setWhite(true); + // Sacrifice a land: You gain 3 life. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); diff --git a/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java b/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java index 6ff23a2fbd3..47b77735739 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java +++ b/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java @@ -46,7 +46,7 @@ public class PenumbraBobcat extends CardImpl { super(ownerId, 82, "Penumbra Bobcat", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "APC"; this.subtype.add("Cat"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new PenumbraBobcatToken(), 1), false)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java b/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java index 8135f866a49..2390724abfc 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java +++ b/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java @@ -46,7 +46,7 @@ public class PenumbraKavu extends CardImpl { super(ownerId, 83, "Penumbra Kavu", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "APC"; this.subtype.add("Kavu"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new PenumbraKavuToken(), 1), false)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/PhyrexianArena.java b/Mage.Sets/src/mage/sets/apocalypse/PhyrexianArena.java index e5918041f35..bb21eb8c14d 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/PhyrexianArena.java +++ b/Mage.Sets/src/mage/sets/apocalypse/PhyrexianArena.java @@ -47,7 +47,7 @@ public class PhyrexianArena extends CardImpl { public PhyrexianArena(UUID ownerId) { super(ownerId, 47, "Phyrexian Arena", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}"); this.expansionSetCode = "APC"; - this.color.setBlack(true); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardSourceControllerEffect(1), TargetController.YOU, false); ability.addEffect(new LoseLifeSourceControllerEffect(1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/apocalypse/PhyrexianGargantua.java b/Mage.Sets/src/mage/sets/apocalypse/PhyrexianGargantua.java index b2f5adf68ad..8e5af866bb6 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/PhyrexianGargantua.java +++ b/Mage.Sets/src/mage/sets/apocalypse/PhyrexianGargantua.java @@ -48,7 +48,7 @@ public class PhyrexianGargantua extends CardImpl { super(ownerId, 48, "Phyrexian Gargantua", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{B}{B}"); this.expansionSetCode = "APC"; this.subtype.add("Horror"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); Ability ability = new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(2), false); diff --git a/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java b/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java index 35ae5f3a0b5..74d0e0bb9c1 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java +++ b/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java @@ -65,7 +65,7 @@ public class QuagmireDruid extends CardImpl { this.expansionSetCode = "APC"; this.subtype.add("Zombie"); this.subtype.add("Druid"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/apocalypse/RakaDisciple.java b/Mage.Sets/src/mage/sets/apocalypse/RakaDisciple.java index ab8781f61b1..e00c3fbc07e 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/RakaDisciple.java +++ b/Mage.Sets/src/mage/sets/apocalypse/RakaDisciple.java @@ -52,7 +52,7 @@ public class RakaDisciple extends CardImpl { this.expansionSetCode = "APC"; this.subtype.add("Minotaur"); this.subtype.add("Wizard"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/RazorfinHunter.java b/Mage.Sets/src/mage/sets/apocalypse/RazorfinHunter.java index a384a81bc29..7f8b01d4751 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/RazorfinHunter.java +++ b/Mage.Sets/src/mage/sets/apocalypse/RazorfinHunter.java @@ -52,7 +52,7 @@ public class RazorfinHunter extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Goblin"); this.color.setRed(true); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java b/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java index 3732f2849aa..542e2f26b56 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java +++ b/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java @@ -54,7 +54,7 @@ public class SavageGorilla extends CardImpl { super(ownerId, 85, "Savage Gorilla", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "APC"; this.subtype.add("Ape"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-3, -3, Duration.EndOfTurn), new ManaCostsImpl("{U}{B}")); diff --git a/Mage.Sets/src/mage/sets/apocalypse/Smash.java b/Mage.Sets/src/mage/sets/apocalypse/Smash.java index 427b21b9f2d..255670b260a 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Smash.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Smash.java @@ -47,7 +47,7 @@ public class Smash extends CardImpl { public Smash(UUID ownerId) { super(ownerId, 69, "Smash", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "APC"; - this.color.setRed(true); + // Destroy target artifact. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java b/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java index b33a118d7f8..9cada98f203 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java +++ b/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java @@ -44,7 +44,7 @@ public class TemporalSpring extends CardImpl { super(ownerId, 125, "Temporal Spring", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}{U}"); this.expansionSetCode = "APC"; this.color.setBlue(true); - this.color.setGreen(true); + // Put target permanent on top of its owner's library. this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java b/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java index 1493a402516..d16ffecadab 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java +++ b/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java @@ -49,7 +49,7 @@ public class TranquilPath extends CardImpl { public TranquilPath(UUID ownerId) { super(ownerId, 89, "Tranquil Path", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{G}"); this.expansionSetCode = "APC"; - this.color.setGreen(true); + // Destroy all enchantments. this.getSpellAbility().addEffect(new TranquilPathEffect()); diff --git a/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java b/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java index 64da14c3614..643b2ac67b4 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java @@ -45,7 +45,7 @@ public class Vindicate extends CardImpl { super(ownerId, 126, "Vindicate", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{W}{B}"); this.expansionSetCode = "APC"; this.color.setWhite(true); - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent()); } diff --git a/Mage.Sets/src/mage/sets/magic2015/FrostLynx.java b/Mage.Sets/src/mage/sets/magic2015/FrostLynx.java index 4a81dc9fb7e..8c851b73475 100644 --- a/Mage.Sets/src/mage/sets/magic2015/FrostLynx.java +++ b/Mage.Sets/src/mage/sets/magic2015/FrostLynx.java @@ -59,7 +59,6 @@ public class FrostLynx extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Cat"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/GarrukApexPredator.java b/Mage.Sets/src/mage/sets/magic2015/GarrukApexPredator.java index a328f4e5bd9..b9426713347 100644 --- a/Mage.Sets/src/mage/sets/magic2015/GarrukApexPredator.java +++ b/Mage.Sets/src/mage/sets/magic2015/GarrukApexPredator.java @@ -80,8 +80,6 @@ public class GarrukApexPredator extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Garruk"); - this.color.setGreen(true); - this.color.setBlack(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(5)), false)); diff --git a/Mage.Sets/src/mage/sets/magic2015/GeistOfTheMoors.java b/Mage.Sets/src/mage/sets/magic2015/GeistOfTheMoors.java index 13a62116232..af3f60b9820 100644 --- a/Mage.Sets/src/mage/sets/magic2015/GeistOfTheMoors.java +++ b/Mage.Sets/src/mage/sets/magic2015/GeistOfTheMoors.java @@ -45,7 +45,6 @@ public class GeistOfTheMoors extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2015/GeneratorServant.java b/Mage.Sets/src/mage/sets/magic2015/GeneratorServant.java index d25998010ec..1bda0be0091 100644 --- a/Mage.Sets/src/mage/sets/magic2015/GeneratorServant.java +++ b/Mage.Sets/src/mage/sets/magic2015/GeneratorServant.java @@ -67,7 +67,6 @@ public class GeneratorServant extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2015/GenesisHydra.java b/Mage.Sets/src/mage/sets/magic2015/GenesisHydra.java index b96d572bd2a..b6ff9b77b9f 100644 --- a/Mage.Sets/src/mage/sets/magic2015/GenesisHydra.java +++ b/Mage.Sets/src/mage/sets/magic2015/GenesisHydra.java @@ -73,7 +73,6 @@ public class GenesisHydra extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(0); - this.color.setGreen(true); // When you cast Genesis Hydra, reveal the top X cards of your library. You may put a nonland permanent card with converted mana cost X or less from among them onto the battlefield. Then shuffle the rest into your library. this.addAbility(new CastSourceTriggeredAbility(new GenesisHydraPutOntoBattlefieldEffect(), false)); diff --git a/Mage.Sets/src/mage/sets/magic2015/GlacialCrasher.java b/Mage.Sets/src/mage/sets/magic2015/GlacialCrasher.java index 4e2da6e8b91..92013b094b4 100644 --- a/Mage.Sets/src/mage/sets/magic2015/GlacialCrasher.java +++ b/Mage.Sets/src/mage/sets/magic2015/GlacialCrasher.java @@ -54,7 +54,6 @@ public class GlacialCrasher extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2015/GoblinKaboomist.java b/Mage.Sets/src/mage/sets/magic2015/GoblinKaboomist.java index 4fbec70089c..a468fd1d1dc 100644 --- a/Mage.Sets/src/mage/sets/magic2015/GoblinKaboomist.java +++ b/Mage.Sets/src/mage/sets/magic2015/GoblinKaboomist.java @@ -65,7 +65,6 @@ public class GoblinKaboomist extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java b/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java index 9a1b7bd3908..98442e2a751 100644 --- a/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java +++ b/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java @@ -75,7 +75,6 @@ public class GoblinRabblemaster extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/Hammerhand.java b/Mage.Sets/src/mage/sets/magic2015/Hammerhand.java index 714a3812f9a..88763239ad0 100644 --- a/Mage.Sets/src/mage/sets/magic2015/Hammerhand.java +++ b/Mage.Sets/src/mage/sets/magic2015/Hammerhand.java @@ -59,7 +59,6 @@ public class Hammerhand extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2015/HeliodsPilgrim.java b/Mage.Sets/src/mage/sets/magic2015/HeliodsPilgrim.java index 626af4bbbf2..71b1625f2d3 100644 --- a/Mage.Sets/src/mage/sets/magic2015/HeliodsPilgrim.java +++ b/Mage.Sets/src/mage/sets/magic2015/HeliodsPilgrim.java @@ -58,7 +58,6 @@ public class HeliodsPilgrim extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/HornetNest.java b/Mage.Sets/src/mage/sets/magic2015/HornetNest.java index dea38df9508..9457b5d36d4 100644 --- a/Mage.Sets/src/mage/sets/magic2015/HornetNest.java +++ b/Mage.Sets/src/mage/sets/magic2015/HornetNest.java @@ -56,7 +56,6 @@ public class HornetNest extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/HuntersAmbush.java b/Mage.Sets/src/mage/sets/magic2015/HuntersAmbush.java index 37ee24dedcb..ae5e705de8e 100644 --- a/Mage.Sets/src/mage/sets/magic2015/HuntersAmbush.java +++ b/Mage.Sets/src/mage/sets/magic2015/HuntersAmbush.java @@ -54,7 +54,6 @@ public class HuntersAmbush extends CardImpl { super(ownerId, 180, "Hunter's Ambush", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "M15"; - this.color.setGreen(true); // Prevent all combat damage that would be dealt by nongreen creatures this turn. this.getSpellAbility().addEffect(new PreventAllDamageByAllEffect(filter, Duration.EndOfTurn, true)); diff --git a/Mage.Sets/src/mage/sets/magic2015/HushwingGryff.java b/Mage.Sets/src/mage/sets/magic2015/HushwingGryff.java index 4d4a3bb4755..1fe61e0b698 100644 --- a/Mage.Sets/src/mage/sets/magic2015/HushwingGryff.java +++ b/Mage.Sets/src/mage/sets/magic2015/HushwingGryff.java @@ -57,7 +57,6 @@ public class HushwingGryff extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Hippogriff"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2015/InGarruksWake.java b/Mage.Sets/src/mage/sets/magic2015/InGarruksWake.java index 7609cf4973e..2f48479397b 100644 --- a/Mage.Sets/src/mage/sets/magic2015/InGarruksWake.java +++ b/Mage.Sets/src/mage/sets/magic2015/InGarruksWake.java @@ -53,7 +53,6 @@ public class InGarruksWake extends CardImpl { super(ownerId, 100, "In Garruk's Wake", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{7}{B}{B}"); this.expansionSetCode = "M15"; - this.color.setBlack(true); // Destroy all creatures you don't control and all planeswalkers you don't control. this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/magic2015/IndulgentTormentor.java b/Mage.Sets/src/mage/sets/magic2015/IndulgentTormentor.java index 51626b34fd0..47b279a96e3 100644 --- a/Mage.Sets/src/mage/sets/magic2015/IndulgentTormentor.java +++ b/Mage.Sets/src/mage/sets/magic2015/IndulgentTormentor.java @@ -57,7 +57,6 @@ public class IndulgentTormentor extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Demon"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2015/InfernoFist.java b/Mage.Sets/src/mage/sets/magic2015/InfernoFist.java index ab7c69baf97..fcb0a30dc1b 100644 --- a/Mage.Sets/src/mage/sets/magic2015/InfernoFist.java +++ b/Mage.Sets/src/mage/sets/magic2015/InfernoFist.java @@ -57,7 +57,6 @@ public class InfernoFist extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature you control TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2015/InvasiveSpecies.java b/Mage.Sets/src/mage/sets/magic2015/InvasiveSpecies.java index 82e592a4b62..7272cb4ffe9 100644 --- a/Mage.Sets/src/mage/sets/magic2015/InvasiveSpecies.java +++ b/Mage.Sets/src/mage/sets/magic2015/InvasiveSpecies.java @@ -55,7 +55,6 @@ public class InvasiveSpecies extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2015/JaceTheLivingGuildpact.java b/Mage.Sets/src/mage/sets/magic2015/JaceTheLivingGuildpact.java index 9b569009aac..964c2310133 100644 --- a/Mage.Sets/src/mage/sets/magic2015/JaceTheLivingGuildpact.java +++ b/Mage.Sets/src/mage/sets/magic2015/JaceTheLivingGuildpact.java @@ -69,7 +69,6 @@ public class JaceTheLivingGuildpact extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Jace"); - this.color.setBlue(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(5)), false)); diff --git a/Mage.Sets/src/mage/sets/magic2015/JaliraMasterPolymorphist.java b/Mage.Sets/src/mage/sets/magic2015/JaliraMasterPolymorphist.java index 089edf281c6..a9cd3d3260d 100644 --- a/Mage.Sets/src/mage/sets/magic2015/JaliraMasterPolymorphist.java +++ b/Mage.Sets/src/mage/sets/magic2015/JaliraMasterPolymorphist.java @@ -72,7 +72,6 @@ public class JaliraMasterPolymorphist extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/KalonianTwingrove.java b/Mage.Sets/src/mage/sets/magic2015/KalonianTwingrove.java index 29dce5c50f1..e9373f7368f 100644 --- a/Mage.Sets/src/mage/sets/magic2015/KalonianTwingrove.java +++ b/Mage.Sets/src/mage/sets/magic2015/KalonianTwingrove.java @@ -64,7 +64,6 @@ public class KalonianTwingrove extends CardImpl { this.subtype.add("Treefolk"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/magic2015/KrenkosEnforcer.java b/Mage.Sets/src/mage/sets/magic2015/KrenkosEnforcer.java index 23b20e98f4e..a5167200a91 100644 --- a/Mage.Sets/src/mage/sets/magic2015/KrenkosEnforcer.java +++ b/Mage.Sets/src/mage/sets/magic2015/KrenkosEnforcer.java @@ -46,7 +46,6 @@ public class KrenkosEnforcer extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/KurkeshOnakkeAncient.java b/Mage.Sets/src/mage/sets/magic2015/KurkeshOnakkeAncient.java index 2cb5ba363da..f662144a930 100644 --- a/Mage.Sets/src/mage/sets/magic2015/KurkeshOnakkeAncient.java +++ b/Mage.Sets/src/mage/sets/magic2015/KurkeshOnakkeAncient.java @@ -62,7 +62,6 @@ public class KurkeshOnakkeAncient extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Spirit"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2015/LeechingSliver.java b/Mage.Sets/src/mage/sets/magic2015/LeechingSliver.java index 3dfb904d959..32bb2c61750 100644 --- a/Mage.Sets/src/mage/sets/magic2015/LeechingSliver.java +++ b/Mage.Sets/src/mage/sets/magic2015/LeechingSliver.java @@ -54,7 +54,6 @@ public class LeechingSliver extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Sliver"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2015/LifesLegacy.java b/Mage.Sets/src/mage/sets/magic2015/LifesLegacy.java index 77d7e1b265d..f8c0845d883 100644 --- a/Mage.Sets/src/mage/sets/magic2015/LifesLegacy.java +++ b/Mage.Sets/src/mage/sets/magic2015/LifesLegacy.java @@ -51,7 +51,6 @@ public class LifesLegacy extends CardImpl { super(ownerId, 183, "Life's Legacy", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "M15"; - this.color.setGreen(true); // As an additional cost to cast Life's Legacy, sacrifice a creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(new FilterControlledCreaturePermanent("a creature")))); diff --git a/Mage.Sets/src/mage/sets/magic2015/LivingTotem.java b/Mage.Sets/src/mage/sets/magic2015/LivingTotem.java index d52ca11eebe..2293f31dc42 100644 --- a/Mage.Sets/src/mage/sets/magic2015/LivingTotem.java +++ b/Mage.Sets/src/mage/sets/magic2015/LivingTotem.java @@ -59,7 +59,6 @@ public class LivingTotem extends CardImpl { this.subtype.add("Plant"); this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2015/MarkedByHonor.java b/Mage.Sets/src/mage/sets/magic2015/MarkedByHonor.java index e368bfae889..cef3ea0b19d 100644 --- a/Mage.Sets/src/mage/sets/magic2015/MarkedByHonor.java +++ b/Mage.Sets/src/mage/sets/magic2015/MarkedByHonor.java @@ -57,7 +57,6 @@ public class MarkedByHonor extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2015/MasterOfPredicaments.java b/Mage.Sets/src/mage/sets/magic2015/MasterOfPredicaments.java index f43dc4a2d71..07ca8b4566b 100644 --- a/Mage.Sets/src/mage/sets/magic2015/MasterOfPredicaments.java +++ b/Mage.Sets/src/mage/sets/magic2015/MasterOfPredicaments.java @@ -55,7 +55,6 @@ public class MasterOfPredicaments extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Sphinx"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2015/MeditationPuzzle.java b/Mage.Sets/src/mage/sets/magic2015/MeditationPuzzle.java index f7f0e1c931c..8625fe82fb1 100644 --- a/Mage.Sets/src/mage/sets/magic2015/MeditationPuzzle.java +++ b/Mage.Sets/src/mage/sets/magic2015/MeditationPuzzle.java @@ -44,7 +44,6 @@ public class MeditationPuzzle extends CardImpl { super(ownerId, 19, "Meditation Puzzle", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}{W}"); this.expansionSetCode = "M15"; - this.color.setWhite(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2015/MightMakesRight.java b/Mage.Sets/src/mage/sets/magic2015/MightMakesRight.java index f13f58fdda7..3f3406e2e78 100644 --- a/Mage.Sets/src/mage/sets/magic2015/MightMakesRight.java +++ b/Mage.Sets/src/mage/sets/magic2015/MightMakesRight.java @@ -68,7 +68,6 @@ public class MightMakesRight extends CardImpl { super(ownerId, 156, "Might Makes Right", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{5}{R}"); this.expansionSetCode = "M15"; - this.color.setRed(true); // At the beginning of combat on your turn, if you control each creature on the battlefield with the greatest power, gain control // of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn. diff --git a/Mage.Sets/src/mage/sets/magic2015/MilitaryIntelligence.java b/Mage.Sets/src/mage/sets/magic2015/MilitaryIntelligence.java index 769f142be9d..2ae4449ff7f 100644 --- a/Mage.Sets/src/mage/sets/magic2015/MilitaryIntelligence.java +++ b/Mage.Sets/src/mage/sets/magic2015/MilitaryIntelligence.java @@ -48,7 +48,6 @@ public class MilitaryIntelligence extends CardImpl { super(ownerId, 69, "Military Intelligence", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "M15"; - this.color.setBlue(true); // Whenever you attack with two or more creatures, draw a card. this.addAbility(new MilitaryIntelligenceTriggeredAbility(new DrawCardSourceControllerEffect(1))); diff --git a/Mage.Sets/src/mage/sets/magic2015/MinersBane.java b/Mage.Sets/src/mage/sets/magic2015/MinersBane.java index e5829edfebc..a86be20c496 100644 --- a/Mage.Sets/src/mage/sets/magic2015/MinersBane.java +++ b/Mage.Sets/src/mage/sets/magic2015/MinersBane.java @@ -53,7 +53,6 @@ public class MinersBane extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2015/NecromancersAssistant.java b/Mage.Sets/src/mage/sets/magic2015/NecromancersAssistant.java index 61e2ebec528..785353d1943 100644 --- a/Mage.Sets/src/mage/sets/magic2015/NecromancersAssistant.java +++ b/Mage.Sets/src/mage/sets/magic2015/NecromancersAssistant.java @@ -46,7 +46,6 @@ public class NecromancersAssistant extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2015/NecromancersStockpile.java b/Mage.Sets/src/mage/sets/magic2015/NecromancersStockpile.java index f34fd9c053b..c3f5a323e46 100644 --- a/Mage.Sets/src/mage/sets/magic2015/NecromancersStockpile.java +++ b/Mage.Sets/src/mage/sets/magic2015/NecromancersStockpile.java @@ -60,7 +60,6 @@ public class NecromancersStockpile extends CardImpl { super(ownerId, 108, "Necromancer's Stockpile", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "M15"; - this.color.setBlack(true); // {1}{B}, Discard a creature card: Draw a card. // If the discarded card was a Zombie card, put a 2/2 black Zombie creature token onto the battlefield tapped. diff --git a/Mage.Sets/src/mage/sets/magic2015/NetcasterSpider.java b/Mage.Sets/src/mage/sets/magic2015/NetcasterSpider.java index 363128cf66c..9e906d5e41b 100644 --- a/Mage.Sets/src/mage/sets/magic2015/NetcasterSpider.java +++ b/Mage.Sets/src/mage/sets/magic2015/NetcasterSpider.java @@ -54,7 +54,6 @@ public class NetcasterSpider extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Spider"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2015/NightfireGiant.java b/Mage.Sets/src/mage/sets/magic2015/NightfireGiant.java index cf8bcc1c6b7..eb1b320a00e 100644 --- a/Mage.Sets/src/mage/sets/magic2015/NightfireGiant.java +++ b/Mage.Sets/src/mage/sets/magic2015/NightfireGiant.java @@ -62,7 +62,6 @@ public class NightfireGiant extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Giant"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2015/NimbusOfTheIsles.java b/Mage.Sets/src/mage/sets/magic2015/NimbusOfTheIsles.java index 88242260d9f..fae4c437450 100644 --- a/Mage.Sets/src/mage/sets/magic2015/NimbusOfTheIsles.java +++ b/Mage.Sets/src/mage/sets/magic2015/NimbusOfTheIsles.java @@ -45,7 +45,6 @@ public class NimbusOfTheIsles extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2015/NissaWorldwaker.java b/Mage.Sets/src/mage/sets/magic2015/NissaWorldwaker.java index 3338a8c713b..3c5177de393 100644 --- a/Mage.Sets/src/mage/sets/magic2015/NissaWorldwaker.java +++ b/Mage.Sets/src/mage/sets/magic2015/NissaWorldwaker.java @@ -79,7 +79,6 @@ public class NissaWorldwaker extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Nissa"); - this.color.setGreen(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), false)); diff --git a/Mage.Sets/src/mage/sets/magic2015/NissasExpedition.java b/Mage.Sets/src/mage/sets/magic2015/NissasExpedition.java index 14dcecc20e6..440776cb08f 100644 --- a/Mage.Sets/src/mage/sets/magic2015/NissasExpedition.java +++ b/Mage.Sets/src/mage/sets/magic2015/NissasExpedition.java @@ -46,7 +46,6 @@ public class NissasExpedition extends CardImpl { super(ownerId, 188, "Nissa's Expedition", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{G}"); this.expansionSetCode = "M15"; - this.color.setGreen(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2015/ObNixilisUnshackled.java b/Mage.Sets/src/mage/sets/magic2015/ObNixilisUnshackled.java index e05e59d137d..fd7afe9f5c3 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ObNixilisUnshackled.java +++ b/Mage.Sets/src/mage/sets/magic2015/ObNixilisUnshackled.java @@ -61,7 +61,6 @@ public class ObNixilisUnshackled extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Demon"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2015/ParagonOfEternalWilds.java b/Mage.Sets/src/mage/sets/magic2015/ParagonOfEternalWilds.java index 838dcd57310..9259233a12c 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ParagonOfEternalWilds.java +++ b/Mage.Sets/src/mage/sets/magic2015/ParagonOfEternalWilds.java @@ -73,7 +73,6 @@ public class ParagonOfEternalWilds extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/ParagonOfFierceDefiance.java b/Mage.Sets/src/mage/sets/magic2015/ParagonOfFierceDefiance.java index 26695fa77c6..9e760a90437 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ParagonOfFierceDefiance.java +++ b/Mage.Sets/src/mage/sets/magic2015/ParagonOfFierceDefiance.java @@ -70,7 +70,6 @@ public class ParagonOfFierceDefiance extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/ParagonOfGatheringMists.java b/Mage.Sets/src/mage/sets/magic2015/ParagonOfGatheringMists.java index 90b8125126b..80e114a6f6e 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ParagonOfGatheringMists.java +++ b/Mage.Sets/src/mage/sets/magic2015/ParagonOfGatheringMists.java @@ -73,7 +73,6 @@ public class ParagonOfGatheringMists extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/ParagonOfNewDawns.java b/Mage.Sets/src/mage/sets/magic2015/ParagonOfNewDawns.java index 6bd2919aa76..3609c288913 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ParagonOfNewDawns.java +++ b/Mage.Sets/src/mage/sets/magic2015/ParagonOfNewDawns.java @@ -73,7 +73,6 @@ public class ParagonOfNewDawns extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/ParagonOfOpenGraves.java b/Mage.Sets/src/mage/sets/magic2015/ParagonOfOpenGraves.java index e1f0fa4727c..95c7a33ade1 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ParagonOfOpenGraves.java +++ b/Mage.Sets/src/mage/sets/magic2015/ParagonOfOpenGraves.java @@ -70,7 +70,6 @@ public class ParagonOfOpenGraves extends CardImpl { this.subtype.add("Skeleton"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/Phytotitan.java b/Mage.Sets/src/mage/sets/magic2015/Phytotitan.java index 54098ff3478..d339ddbfc2e 100644 --- a/Mage.Sets/src/mage/sets/magic2015/Phytotitan.java +++ b/Mage.Sets/src/mage/sets/magic2015/Phytotitan.java @@ -55,7 +55,6 @@ public class Phytotitan extends CardImpl { this.subtype.add("Plant"); this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(7); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/PillarOfLight.java b/Mage.Sets/src/mage/sets/magic2015/PillarOfLight.java index b4dfcf7965c..e065b2246b4 100644 --- a/Mage.Sets/src/mage/sets/magic2015/PillarOfLight.java +++ b/Mage.Sets/src/mage/sets/magic2015/PillarOfLight.java @@ -53,7 +53,6 @@ public class PillarOfLight extends CardImpl { super(ownerId, 24, "Pillar of Light", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "M15"; - this.color.setWhite(true); // Exile target creature with toughness 4 or greater. this.getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2015/PolymorphistsJest.java b/Mage.Sets/src/mage/sets/magic2015/PolymorphistsJest.java index 8fa985c4f65..44c582583e5 100644 --- a/Mage.Sets/src/mage/sets/magic2015/PolymorphistsJest.java +++ b/Mage.Sets/src/mage/sets/magic2015/PolymorphistsJest.java @@ -55,7 +55,6 @@ public class PolymorphistsJest extends CardImpl { super(ownerId, 75, "Polymorphist's Jest", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{U}{U}"); this.expansionSetCode = "M15"; - this.color.setBlue(true); // Until end of turn, each creature target player controls loses all abilities and becomes a blue Frog with base power and toughness 1/1. this.getSpellAbility().addEffect(new PolymorphistsJestEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2015/Quickling.java b/Mage.Sets/src/mage/sets/magic2015/Quickling.java index ec85face6d8..b508d869fd9 100644 --- a/Mage.Sets/src/mage/sets/magic2015/Quickling.java +++ b/Mage.Sets/src/mage/sets/magic2015/Quickling.java @@ -59,7 +59,6 @@ public class Quickling extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/ReclamationSage.java b/Mage.Sets/src/mage/sets/magic2015/ReclamationSage.java index 1e44d413024..503f3f204ec 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ReclamationSage.java +++ b/Mage.Sets/src/mage/sets/magic2015/ReclamationSage.java @@ -50,7 +50,6 @@ public class ReclamationSage extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2015/ResearchAssistant.java b/Mage.Sets/src/mage/sets/magic2015/ResearchAssistant.java index 994aa35a98e..7456948573a 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ResearchAssistant.java +++ b/Mage.Sets/src/mage/sets/magic2015/ResearchAssistant.java @@ -51,7 +51,6 @@ public class ResearchAssistant extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2015/ResoluteArchangel.java b/Mage.Sets/src/mage/sets/magic2015/ResoluteArchangel.java index 7183976d38d..0760c841441 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ResoluteArchangel.java +++ b/Mage.Sets/src/mage/sets/magic2015/ResoluteArchangel.java @@ -53,7 +53,6 @@ public class ResoluteArchangel extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2015/RotfeasterMaggot.java b/Mage.Sets/src/mage/sets/magic2015/RotfeasterMaggot.java index 81c652c69f6..a56217b619b 100644 --- a/Mage.Sets/src/mage/sets/magic2015/RotfeasterMaggot.java +++ b/Mage.Sets/src/mage/sets/magic2015/RotfeasterMaggot.java @@ -54,7 +54,6 @@ public class RotfeasterMaggot extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Insect"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2015/SanctifiedCharge.java b/Mage.Sets/src/mage/sets/magic2015/SanctifiedCharge.java index 1133858d719..085c0f42a44 100644 --- a/Mage.Sets/src/mage/sets/magic2015/SanctifiedCharge.java +++ b/Mage.Sets/src/mage/sets/magic2015/SanctifiedCharge.java @@ -56,7 +56,6 @@ public class SanctifiedCharge extends CardImpl { super(ownerId, 30, "Sanctified Charge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{W}"); this.expansionSetCode = "M15"; - this.color.setWhite(true); // Creatures you control get +2/+1 until end of turn. White creatures you control also gain first strike until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(2, 1, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/magic2015/SeraphOfTheMasses.java b/Mage.Sets/src/mage/sets/magic2015/SeraphOfTheMasses.java index 3d9e97e8c80..7730ceb04cb 100644 --- a/Mage.Sets/src/mage/sets/magic2015/SeraphOfTheMasses.java +++ b/Mage.Sets/src/mage/sets/magic2015/SeraphOfTheMasses.java @@ -54,7 +54,6 @@ public class SeraphOfTheMasses extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/magic2015/ShadowcloakVampire.java b/Mage.Sets/src/mage/sets/magic2015/ShadowcloakVampire.java index e6205f4bf26..52037d3bbd9 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ShadowcloakVampire.java +++ b/Mage.Sets/src/mage/sets/magic2015/ShadowcloakVampire.java @@ -50,7 +50,6 @@ public class ShadowcloakVampire extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Vampire"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2015/ShamanOfSpring.java b/Mage.Sets/src/mage/sets/magic2015/ShamanOfSpring.java index a4901e68353..273c7bd072f 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ShamanOfSpring.java +++ b/Mage.Sets/src/mage/sets/magic2015/ShamanOfSpring.java @@ -47,7 +47,6 @@ public class ShamanOfSpring extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/SiegeDragon.java b/Mage.Sets/src/mage/sets/magic2015/SiegeDragon.java index e9f865ac39c..2b8f9282c24 100644 --- a/Mage.Sets/src/mage/sets/magic2015/SiegeDragon.java +++ b/Mage.Sets/src/mage/sets/magic2015/SiegeDragon.java @@ -70,7 +70,6 @@ public class SiegeDragon extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2015/SliverHivelord.java b/Mage.Sets/src/mage/sets/magic2015/SliverHivelord.java index db9e1a3874e..0b7e1b49108 100644 --- a/Mage.Sets/src/mage/sets/magic2015/SliverHivelord.java +++ b/Mage.Sets/src/mage/sets/magic2015/SliverHivelord.java @@ -52,11 +52,6 @@ public class SliverHivelord extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Sliver"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setGreen(true); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2015/SoulOfInnistrad.java b/Mage.Sets/src/mage/sets/magic2015/SoulOfInnistrad.java index c6bfc62f756..5c62247a4cc 100644 --- a/Mage.Sets/src/mage/sets/magic2015/SoulOfInnistrad.java +++ b/Mage.Sets/src/mage/sets/magic2015/SoulOfInnistrad.java @@ -53,7 +53,6 @@ public class SoulOfInnistrad extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Avatar"); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/magic2015/SoulOfRavnica.java b/Mage.Sets/src/mage/sets/magic2015/SoulOfRavnica.java index 8ff066ec45d..f6c4344da3b 100644 --- a/Mage.Sets/src/mage/sets/magic2015/SoulOfRavnica.java +++ b/Mage.Sets/src/mage/sets/magic2015/SoulOfRavnica.java @@ -57,7 +57,6 @@ public class SoulOfRavnica extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Avatar"); - this.color.setBlue(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/magic2015/SoulOfShandalar.java b/Mage.Sets/src/mage/sets/magic2015/SoulOfShandalar.java index b48d5aea6a0..7c26bd21618 100644 --- a/Mage.Sets/src/mage/sets/magic2015/SoulOfShandalar.java +++ b/Mage.Sets/src/mage/sets/magic2015/SoulOfShandalar.java @@ -62,7 +62,6 @@ public class SoulOfShandalar extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Avatar"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/magic2015/SoulOfTheros.java b/Mage.Sets/src/mage/sets/magic2015/SoulOfTheros.java index fa17d7da6c6..eadb9209453 100644 --- a/Mage.Sets/src/mage/sets/magic2015/SoulOfTheros.java +++ b/Mage.Sets/src/mage/sets/magic2015/SoulOfTheros.java @@ -57,7 +57,6 @@ public class SoulOfTheros extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Avatar"); - this.color.setWhite(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/magic2015/SoulOfZendikar.java b/Mage.Sets/src/mage/sets/magic2015/SoulOfZendikar.java index 63116d1099f..7c09f0eb7c4 100644 --- a/Mage.Sets/src/mage/sets/magic2015/SoulOfZendikar.java +++ b/Mage.Sets/src/mage/sets/magic2015/SoulOfZendikar.java @@ -52,7 +52,6 @@ public class SoulOfZendikar extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Avatar"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/magic2015/SpectraWard.java b/Mage.Sets/src/mage/sets/magic2015/SpectraWard.java index 389bd74c799..045c9abd760 100644 --- a/Mage.Sets/src/mage/sets/magic2015/SpectraWard.java +++ b/Mage.Sets/src/mage/sets/magic2015/SpectraWard.java @@ -71,7 +71,6 @@ public class SpectraWard extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2015/SpiritBonds.java b/Mage.Sets/src/mage/sets/magic2015/SpiritBonds.java index d07e103417e..49b7beefda8 100644 --- a/Mage.Sets/src/mage/sets/magic2015/SpiritBonds.java +++ b/Mage.Sets/src/mage/sets/magic2015/SpiritBonds.java @@ -72,7 +72,6 @@ public class SpiritBonds extends CardImpl { super(ownerId, 37, "Spirit Bonds", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "M15"; - this.color.setWhite(true); // Whenever a nontoken creature enters the battlefield under your control, you may pay {W}. If you do, but a 1/1 white Spirit creature token with flying into play. this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DoIfCostPaid(new CreateTokenEffect(new SpiritWhiteToken("M15")), new ManaCostsImpl("{W}")), filterNontoken, false)); diff --git a/Mage.Sets/src/mage/sets/magic2015/StainTheMind.java b/Mage.Sets/src/mage/sets/magic2015/StainTheMind.java index f0188618782..5ba81b75e9e 100644 --- a/Mage.Sets/src/mage/sets/magic2015/StainTheMind.java +++ b/Mage.Sets/src/mage/sets/magic2015/StainTheMind.java @@ -54,7 +54,6 @@ public class StainTheMind extends CardImpl { super(ownerId, 117, "Stain the Mind", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{B}"); this.expansionSetCode = "M15"; - this.color.setBlack(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2015/StatuteOfDenial.java b/Mage.Sets/src/mage/sets/magic2015/StatuteOfDenial.java index fdb45e8d656..17d8b33aebf 100644 --- a/Mage.Sets/src/mage/sets/magic2015/StatuteOfDenial.java +++ b/Mage.Sets/src/mage/sets/magic2015/StatuteOfDenial.java @@ -57,7 +57,6 @@ public class StatuteOfDenial extends CardImpl { super(ownerId, 79, "Statute of Denial", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); this.expansionSetCode = "M15"; - this.color.setBlue(true); // Counter target spell. If you control a blue creature, draw a card, then discard a card. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2015/StokeTheFlames.java b/Mage.Sets/src/mage/sets/magic2015/StokeTheFlames.java index 09f55f1d542..f284d721d82 100644 --- a/Mage.Sets/src/mage/sets/magic2015/StokeTheFlames.java +++ b/Mage.Sets/src/mage/sets/magic2015/StokeTheFlames.java @@ -45,7 +45,6 @@ public class StokeTheFlames extends CardImpl { super(ownerId, 164, "Stoke the Flames", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{R}{R}"); this.expansionSetCode = "M15"; - this.color.setRed(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2015/SunbladeElf.java b/Mage.Sets/src/mage/sets/magic2015/SunbladeElf.java index f953ee8a512..ff9e95671c4 100644 --- a/Mage.Sets/src/mage/sets/magic2015/SunbladeElf.java +++ b/Mage.Sets/src/mage/sets/magic2015/SunbladeElf.java @@ -61,7 +61,6 @@ public class SunbladeElf extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2015/SungracePegasus.java b/Mage.Sets/src/mage/sets/magic2015/SungracePegasus.java index ae672ebeece..8cae819dac1 100644 --- a/Mage.Sets/src/mage/sets/magic2015/SungracePegasus.java +++ b/Mage.Sets/src/mage/sets/magic2015/SungracePegasus.java @@ -46,7 +46,6 @@ public class SungracePegasus extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Pegasus"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/TriplicateSpirits.java b/Mage.Sets/src/mage/sets/magic2015/TriplicateSpirits.java index 66d739df592..3ce72caa483 100644 --- a/Mage.Sets/src/mage/sets/magic2015/TriplicateSpirits.java +++ b/Mage.Sets/src/mage/sets/magic2015/TriplicateSpirits.java @@ -45,7 +45,6 @@ public class TriplicateSpirits extends CardImpl { super(ownerId, 40, "Triplicate Spirits", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{W}{W}"); this.expansionSetCode = "M15"; - this.color.setWhite(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2015/Ulcerate.java b/Mage.Sets/src/mage/sets/magic2015/Ulcerate.java index af800bb3162..2f83d96a104 100644 --- a/Mage.Sets/src/mage/sets/magic2015/Ulcerate.java +++ b/Mage.Sets/src/mage/sets/magic2015/Ulcerate.java @@ -46,7 +46,6 @@ public class Ulcerate extends CardImpl { super(ownerId, 119, "Ulcerate", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "M15"; - this.color.setBlack(true); // Target creature gets -3/-3 until end of turn. You lose 3 life. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/magic2015/UndergrowthScavenger.java b/Mage.Sets/src/mage/sets/magic2015/UndergrowthScavenger.java index 845f2091db4..3c9d9f1ff12 100644 --- a/Mage.Sets/src/mage/sets/magic2015/UndergrowthScavenger.java +++ b/Mage.Sets/src/mage/sets/magic2015/UndergrowthScavenger.java @@ -51,7 +51,6 @@ public class UndergrowthScavenger extends CardImpl { this.subtype.add("Fungus"); this.subtype.add("Horror"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/magic2015/UnmakeTheGraves.java b/Mage.Sets/src/mage/sets/magic2015/UnmakeTheGraves.java index 79e6a9f37f5..2e88d92f707 100644 --- a/Mage.Sets/src/mage/sets/magic2015/UnmakeTheGraves.java +++ b/Mage.Sets/src/mage/sets/magic2015/UnmakeTheGraves.java @@ -46,7 +46,6 @@ public class UnmakeTheGraves extends CardImpl { super(ownerId, 120, "Unmake the Graves", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{B}"); this.expansionSetCode = "M15"; - this.color.setBlack(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2015/VenomSliver.java b/Mage.Sets/src/mage/sets/magic2015/VenomSliver.java index f3769d803dd..557f75915c5 100644 --- a/Mage.Sets/src/mage/sets/magic2015/VenomSliver.java +++ b/Mage.Sets/src/mage/sets/magic2015/VenomSliver.java @@ -50,7 +50,6 @@ public class VenomSliver extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Sliver"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2015/Vineweft.java b/Mage.Sets/src/mage/sets/magic2015/Vineweft.java index 524b6a72249..63d36a061d5 100644 --- a/Mage.Sets/src/mage/sets/magic2015/Vineweft.java +++ b/Mage.Sets/src/mage/sets/magic2015/Vineweft.java @@ -56,7 +56,6 @@ public class Vineweft extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2015/VoidSnare.java b/Mage.Sets/src/mage/sets/magic2015/VoidSnare.java index 86910dafa38..b297c67e209 100644 --- a/Mage.Sets/src/mage/sets/magic2015/VoidSnare.java +++ b/Mage.Sets/src/mage/sets/magic2015/VoidSnare.java @@ -44,7 +44,6 @@ public class VoidSnare extends CardImpl { super(ownerId, 82, "Void Snare", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}"); this.expansionSetCode = "M15"; - this.color.setBlue(true); // Return target nonland permanent to its owner's hand. this.getSpellAbility().addTarget(new TargetNonlandPermanent()); diff --git a/Mage.Sets/src/mage/sets/magic2015/WallOfLimbs.java b/Mage.Sets/src/mage/sets/magic2015/WallOfLimbs.java index 388d89b18ba..887c5263a62 100644 --- a/Mage.Sets/src/mage/sets/magic2015/WallOfLimbs.java +++ b/Mage.Sets/src/mage/sets/magic2015/WallOfLimbs.java @@ -60,7 +60,6 @@ public class WallOfLimbs extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Wall"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2015/WardenOfTheBeyond.java b/Mage.Sets/src/mage/sets/magic2015/WardenOfTheBeyond.java index 283bcb6586f..75a64998970 100644 --- a/Mage.Sets/src/mage/sets/magic2015/WardenOfTheBeyond.java +++ b/Mage.Sets/src/mage/sets/magic2015/WardenOfTheBeyond.java @@ -56,7 +56,6 @@ public class WardenOfTheBeyond extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/WasteNot.java b/Mage.Sets/src/mage/sets/magic2015/WasteNot.java index e147990eb17..a04546e38b4 100644 --- a/Mage.Sets/src/mage/sets/magic2015/WasteNot.java +++ b/Mage.Sets/src/mage/sets/magic2015/WasteNot.java @@ -52,7 +52,6 @@ public class WasteNot extends CardImpl { super(ownerId, 122, "Waste Not", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "M15"; - this.color.setBlack(true); // Whenever an opponent discards a creature card, put a 2/2 black Zombie creature token onto the battlefield. this.addAbility(new WasteNotCreatureTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2015/WitchsFamiliar.java b/Mage.Sets/src/mage/sets/magic2015/WitchsFamiliar.java index 2fc6ff8c5aa..22b73096e18 100644 --- a/Mage.Sets/src/mage/sets/magic2015/WitchsFamiliar.java +++ b/Mage.Sets/src/mage/sets/magic2015/WitchsFamiliar.java @@ -44,7 +44,6 @@ public class WitchsFamiliar extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Frog"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/magic2015/XathridSlyblade.java b/Mage.Sets/src/mage/sets/magic2015/XathridSlyblade.java index cca5641e423..30e5d945b47 100644 --- a/Mage.Sets/src/mage/sets/magic2015/XathridSlyblade.java +++ b/Mage.Sets/src/mage/sets/magic2015/XathridSlyblade.java @@ -56,7 +56,6 @@ public class XathridSlyblade extends CardImpl { this.subtype.add("Human"); this.subtype.add("Assassin"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2015/YisanTheWandererBard.java b/Mage.Sets/src/mage/sets/magic2015/YisanTheWandererBard.java index 3d578f69384..c5c6d4568e9 100644 --- a/Mage.Sets/src/mage/sets/magic2015/YisanTheWandererBard.java +++ b/Mage.Sets/src/mage/sets/magic2015/YisanTheWandererBard.java @@ -65,7 +65,6 @@ public class YisanTheWandererBard extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/BogSmugglers.java b/Mage.Sets/src/mage/sets/mercadianmasques/BogSmugglers.java index 4c333fcf63f..0838ce2c37a 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/BogSmugglers.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/BogSmugglers.java @@ -46,7 +46,6 @@ public class BogSmugglers extends CardImpl { this.subtype.add("Human"); this.subtype.add("Mercenary"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CausticWasps.java b/Mage.Sets/src/mage/sets/mercadianmasques/CausticWasps.java index fd83ec1cc81..f8db6c978b8 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CausticWasps.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CausticWasps.java @@ -58,7 +58,6 @@ public class CausticWasps extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CaveIn.java b/Mage.Sets/src/mage/sets/mercadianmasques/CaveIn.java index 76e663d5ada..b4597eb043e 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CaveIn.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CaveIn.java @@ -51,7 +51,6 @@ public class CaveIn extends CardImpl { super(ownerId, 180, "Cave-In", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); this.expansionSetCode = "MMQ"; - this.color.setRed(true); // You may exile a red card from your hand rather than pay Cave-In's mana cost. FilterOwnedCard filter = new FilterOwnedCard("a red card from your hand"); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/ChoArrimBruiser.java b/Mage.Sets/src/mage/sets/mercadianmasques/ChoArrimBruiser.java index 2ded265e7fc..db9c249add1 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/ChoArrimBruiser.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/ChoArrimBruiser.java @@ -49,7 +49,6 @@ public class ChoArrimBruiser extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Rebel"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CollectiveUnconscious.java b/Mage.Sets/src/mage/sets/mercadianmasques/CollectiveUnconscious.java index f0ab0a9875a..b9511942b91 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CollectiveUnconscious.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CollectiveUnconscious.java @@ -45,7 +45,6 @@ public class CollectiveUnconscious extends CardImpl { super(ownerId, 236, "Collective Unconscious", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{G}{G}"); this.expansionSetCode = "MMQ"; - this.color.setGreen(true); // Draw a card for each creature you control. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()))); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Crash.java b/Mage.Sets/src/mage/sets/mercadianmasques/Crash.java index 307944272b5..f5b8df71a81 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Crash.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Crash.java @@ -61,7 +61,6 @@ public class Crash extends CardImpl { super(ownerId, 186, "Crash", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "MMQ"; - this.color.setRed(true); // You may sacrifice a Mountain rather than pay Crash's mana cost. this.addAbility(new AlternativeCostSourceAbility(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, alternativeCostFilter, true)))); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/DartingMerfolk.java b/Mage.Sets/src/mage/sets/mercadianmasques/DartingMerfolk.java index fb8d17c228b..29ed1a0462b 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/DartingMerfolk.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/DartingMerfolk.java @@ -48,7 +48,6 @@ public class DartingMerfolk extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Merfolk"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Dawnstrider.java b/Mage.Sets/src/mage/sets/mercadianmasques/Dawnstrider.java index 28e9625edf8..5c2aac7b339 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Dawnstrider.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Dawnstrider.java @@ -54,7 +54,6 @@ public class Dawnstrider extends CardImpl { this.subtype.add("Dryad"); this.subtype.add("Spellshaper"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/DeadlyInsect.java b/Mage.Sets/src/mage/sets/mercadianmasques/DeadlyInsect.java index 1abe9d2f0c7..e613e6f890a 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/DeadlyInsect.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/DeadlyInsect.java @@ -45,7 +45,6 @@ public class DeadlyInsect extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/DeepwoodGhoul.java b/Mage.Sets/src/mage/sets/mercadianmasques/DeepwoodGhoul.java index 8683dcfcd2a..2aec08bebf5 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/DeepwoodGhoul.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/DeepwoodGhoul.java @@ -49,7 +49,6 @@ public class DeepwoodGhoul extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/FoodChain.java b/Mage.Sets/src/mage/sets/mercadianmasques/FoodChain.java index 7e30d30bfa3..d740c07e86d 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/FoodChain.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/FoodChain.java @@ -58,7 +58,6 @@ public class FoodChain extends CardImpl { super(ownerId, 246, "Food Chain", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "MMQ"; - this.color.setGreen(true); // Exile a creature you control: Add X mana of any one color to your mana pool, where X is the exiled creature's converted mana cost plus one. Spend this mana only to cast creature spells. Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new FoodChainManaEffect(), new ExileTargetCost(new TargetControlledCreaturePermanent(1, 1, new FilterControlledCreaturePermanent("a creature you control"), true))); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/FreshVolunteers.java b/Mage.Sets/src/mage/sets/mercadianmasques/FreshVolunteers.java index 00d6d461284..6020a2e7199 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/FreshVolunteers.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/FreshVolunteers.java @@ -45,7 +45,6 @@ public class FreshVolunteers extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/GerrardsIrregulars.java b/Mage.Sets/src/mage/sets/mercadianmasques/GerrardsIrregulars.java index 297109f52b2..12f4fdd781f 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/GerrardsIrregulars.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/GerrardsIrregulars.java @@ -47,7 +47,6 @@ public class GerrardsIrregulars extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/HornedTroll.java b/Mage.Sets/src/mage/sets/mercadianmasques/HornedTroll.java index 45d2811af5d..25578d40b69 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/HornedTroll.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/HornedTroll.java @@ -49,7 +49,6 @@ public class HornedTroll extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Troll"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/JhovallQueen.java b/Mage.Sets/src/mage/sets/mercadianmasques/JhovallQueen.java index 3d1f0d41cdd..d0ad8b73be8 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/JhovallQueen.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/JhovallQueen.java @@ -46,7 +46,6 @@ public class JhovallQueen extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Rebel"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/JhovallRider.java b/Mage.Sets/src/mage/sets/mercadianmasques/JhovallRider.java index fb48a4179e6..edec413095e 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/JhovallRider.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/JhovallRider.java @@ -46,7 +46,6 @@ public class JhovallRider extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/LandGrant.java b/Mage.Sets/src/mage/sets/mercadianmasques/LandGrant.java index e564ba24ae8..5f369b7827b 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/LandGrant.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/LandGrant.java @@ -58,7 +58,6 @@ public class LandGrant extends CardImpl { super(ownerId, 255, "Land Grant", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "MMQ"; - this.color.setGreen(true); // If you have no land cards in hand, you may reveal your hand rather than pay Land Grant's mana cost. this.addAbility(new AlternativeCostSourceAbility(new LandGrantReavealCost(), new LandGrantCondition(), diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java b/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java index cfa470ae823..4cd2a9a7d15 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java @@ -52,7 +52,6 @@ public class Larceny extends CardImpl { super(ownerId, 143, "Larceny", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{B}"); this.expansionSetCode = "MMQ"; - this.color.setBlack(true); // Whenever a creature you control deals combat damage to a player, that player discards a card. this.addAbility(new LarcenyTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/LightningHounds.java b/Mage.Sets/src/mage/sets/mercadianmasques/LightningHounds.java index 1a4d7d61efc..b13d69628d4 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/LightningHounds.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/LightningHounds.java @@ -45,7 +45,6 @@ public class LightningHounds extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Hound"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Lunge.java b/Mage.Sets/src/mage/sets/mercadianmasques/Lunge.java index 85139507c71..0ab0a3ce8c3 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Lunge.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Lunge.java @@ -47,7 +47,6 @@ public class Lunge extends CardImpl { super(ownerId, 203, "Lunge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "MMQ"; - this.color.setRed(true); // Lunge deals 2 damage to target creature and 2 damage to target player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Misdirection.java b/Mage.Sets/src/mage/sets/mercadianmasques/Misdirection.java index e4c643ad783..092c9a97f51 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Misdirection.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Misdirection.java @@ -60,7 +60,6 @@ public class Misdirection extends CardImpl { super(ownerId, 87, "Misdirection", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); this.expansionSetCode = "MMQ"; - this.color.setBlue(true); // You may exile a blue card from your hand rather than pay Misdirection's mana cost. FilterOwnedCard filterCardInHand = new FilterOwnedCard("a blue card from your hand"); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/MisshapenFiend.java b/Mage.Sets/src/mage/sets/mercadianmasques/MisshapenFiend.java index a8d6f713292..790fd8e835d 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/MisshapenFiend.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/MisshapenFiend.java @@ -46,7 +46,6 @@ public class MisshapenFiend extends CardImpl { this.subtype.add("Horror"); this.subtype.add("Mercenary"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Muzzle.java b/Mage.Sets/src/mage/sets/mercadianmasques/Muzzle.java index e95f93e4ad1..d95f1accb53 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Muzzle.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Muzzle.java @@ -53,7 +53,6 @@ public class Muzzle extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/NetherSpirit.java b/Mage.Sets/src/mage/sets/mercadianmasques/NetherSpirit.java index 246b165fcb8..25fed1974c5 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/NetherSpirit.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/NetherSpirit.java @@ -56,7 +56,6 @@ public class NetherSpirit extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/NoblePurpose.java b/Mage.Sets/src/mage/sets/mercadianmasques/NoblePurpose.java index a8bbada2414..8cc87540cf4 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/NoblePurpose.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/NoblePurpose.java @@ -49,7 +49,6 @@ public class NoblePurpose extends CardImpl { super(ownerId, 32, "Noble Purpose", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}{W}"); this.expansionSetCode = "MMQ"; - this.color.setWhite(true); // Whenever a creature you control deals combat damage, you gain that much life. this.addAbility(new NoblePurposeTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Pulverize.java b/Mage.Sets/src/mage/sets/mercadianmasques/Pulverize.java index 42ae20754d5..f07e8343c95 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Pulverize.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Pulverize.java @@ -54,7 +54,6 @@ public class Pulverize extends CardImpl { super(ownerId, 207, "Pulverize", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{R}{R}"); this.expansionSetCode = "MMQ"; - this.color.setRed(true); // You may sacrifice two Mountains rather than pay Pulverize's mana cost. this.addAbility(new AlternativeCostSourceAbility(new SacrificeTargetCost(new TargetControlledPermanent(2, 2, filter, true)))); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/SeverSoul.java b/Mage.Sets/src/mage/sets/mercadianmasques/SeverSoul.java index 0c45656444c..0842f349395 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/SeverSoul.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/SeverSoul.java @@ -62,7 +62,6 @@ public class SeverSoul extends CardImpl { super(ownerId, 159, "Sever Soul", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "MMQ"; - this.color.setBlack(true); // Destroy target nonblack creature. It can't be regenerated. this.getSpellAbility().addTarget(new TargetCreaturePermanent(nonBlackCreature)); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/ShockTroops.java b/Mage.Sets/src/mage/sets/mercadianmasques/ShockTroops.java index 11acd29a7a2..458fe5b5943 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/ShockTroops.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/ShockTroops.java @@ -52,7 +52,6 @@ public class ShockTroops extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Sizzle.java b/Mage.Sets/src/mage/sets/mercadianmasques/Sizzle.java index b3dfc37bd76..570749af693 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Sizzle.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Sizzle.java @@ -47,7 +47,6 @@ public class Sizzle extends CardImpl { super(ownerId, 213, "Sizzle", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "MMQ"; - this.color.setRed(true); // Sizzle deals 3 damage to each opponent. this.getSpellAbility().addEffect(new DamagePlayersEffect(3, TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/SnuffOut.java b/Mage.Sets/src/mage/sets/mercadianmasques/SnuffOut.java index 544bd5b175a..cc63635e859 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/SnuffOut.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/SnuffOut.java @@ -62,7 +62,6 @@ public class SnuffOut extends CardImpl { super(ownerId, 162, "Snuff Out", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{B}"); this.expansionSetCode = "MMQ"; - this.color.setBlack(true); // If you control a Swamp, you may pay 4 life rather than pay Snuff Out's mana cost. this.addAbility(new AlternativeCostSourceAbility( diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Soothsaying.java b/Mage.Sets/src/mage/sets/mercadianmasques/Soothsaying.java index 41cd8ef93c7..d0ea2c230ba 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Soothsaying.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Soothsaying.java @@ -49,7 +49,6 @@ public class Soothsaying extends CardImpl { super(ownerId, 104, "Soothsaying", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{U}"); this.expansionSetCode = "MMQ"; - this.color.setBlue(true); // {3}{U}{U}: Shuffle your library. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShuffleLibrarySourceEffect(), new ManaCostsImpl<>("{3}{U}{U}"))); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Statecraft.java b/Mage.Sets/src/mage/sets/mercadianmasques/Statecraft.java index 2581feb1915..81a706afcbc 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Statecraft.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Statecraft.java @@ -51,7 +51,6 @@ public class Statecraft extends CardImpl { super(ownerId, 106, "Statecraft", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); this.expansionSetCode = "MMQ"; - this.color.setBlue(true); // Prevent all combat damage that would be dealt to and dealt by creatures you control. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new StatecraftPreventionEffect())); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/TaskForce.java b/Mage.Sets/src/mage/sets/mercadianmasques/TaskForce.java index ce6f9280377..43ec5bba601 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/TaskForce.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/TaskForce.java @@ -49,7 +49,6 @@ public class TaskForce extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/TwoHeadedDragon.java b/Mage.Sets/src/mage/sets/mercadianmasques/TwoHeadedDragon.java index 497ca2afad1..c5f7f0fcfa2 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/TwoHeadedDragon.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/TwoHeadedDragon.java @@ -53,7 +53,6 @@ public class TwoHeadedDragon extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Unmask.java b/Mage.Sets/src/mage/sets/mercadianmasques/Unmask.java index e9d1691e221..14be95e97a2 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Unmask.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Unmask.java @@ -61,7 +61,6 @@ public class Unmask extends CardImpl { super(ownerId, 168, "Unmask", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "MMQ"; - this.color.setBlack(true); // You may exile a black card from your hand rather than pay Unmask's mana cost. this.addAbility(new AlternativeCostSourceAbility(new ExileFromHandCost(new TargetCardInHand(filter)))); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/VineTrellis.java b/Mage.Sets/src/mage/sets/mercadianmasques/VineTrellis.java index 92829fd4c5d..bf2cb2402b5 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/VineTrellis.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/VineTrellis.java @@ -47,7 +47,6 @@ public class VineTrellis extends CardImpl { this.subtype.add("Plant"); this.subtype.add("Wall"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/WaterfrontBouncer.java b/Mage.Sets/src/mage/sets/mercadianmasques/WaterfrontBouncer.java index 616a168ff29..9eb0a36cdc8 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/WaterfrontBouncer.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/WaterfrontBouncer.java @@ -56,7 +56,6 @@ public class WaterfrontBouncer extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Spellshaper"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/WildJhovall.java b/Mage.Sets/src/mage/sets/mercadianmasques/WildJhovall.java index 17579339ec9..fd3abfed5e1 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/WildJhovall.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/WildJhovall.java @@ -44,7 +44,6 @@ public class WildJhovall extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Cat"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/mirage/AbyssalHunter.java b/Mage.Sets/src/mage/sets/mirage/AbyssalHunter.java index c50f397935f..b46358e92a0 100644 --- a/Mage.Sets/src/mage/sets/mirage/AbyssalHunter.java +++ b/Mage.Sets/src/mage/sets/mirage/AbyssalHunter.java @@ -55,7 +55,6 @@ public class AbyssalHunter extends CardImpl { this.subtype.add("Human"); this.subtype.add("Assassin"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirage/Afterlife.java b/Mage.Sets/src/mage/sets/mirage/Afterlife.java index e39f109d4fd..8c636422ca0 100644 --- a/Mage.Sets/src/mage/sets/mirage/Afterlife.java +++ b/Mage.Sets/src/mage/sets/mirage/Afterlife.java @@ -52,7 +52,6 @@ public class Afterlife extends CardImpl { super(ownerId, 205, "Afterlife", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "MIR"; - this.color.setWhite(true); // Destroy target creature. It can't be regenerated. Its controller puts a // 1/1 white Spirit creature token with flying onto the battlefield. diff --git a/Mage.Sets/src/mage/sets/mirage/Agility.java b/Mage.Sets/src/mage/sets/mirage/Agility.java index 8a465917f68..3b38694e17c 100644 --- a/Mage.Sets/src/mage/sets/mirage/Agility.java +++ b/Mage.Sets/src/mage/sets/mirage/Agility.java @@ -52,7 +52,6 @@ public class Agility extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/mirage/AshenPowder.java b/Mage.Sets/src/mage/sets/mirage/AshenPowder.java index 46ed8c60d0d..7ecd7040f26 100644 --- a/Mage.Sets/src/mage/sets/mirage/AshenPowder.java +++ b/Mage.Sets/src/mage/sets/mirage/AshenPowder.java @@ -45,7 +45,6 @@ public class AshenPowder extends CardImpl { super(ownerId, 2, "Ashen Powder", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{B}{B}"); this.expansionSetCode = "MIR"; - this.color.setBlack(true); // Put target creature card from an opponent's graveyard onto the battlefield under your control. this.getSpellAbility().addTarget(new TargetCardInOpponentsGraveyard(new FilterCreatureCard("creature card from an opponent's graveyard"))); diff --git a/Mage.Sets/src/mage/sets/mirage/AsmiraHolyAvenger.java b/Mage.Sets/src/mage/sets/mirage/AsmiraHolyAvenger.java index 82e7c8f7bed..fa27b529689 100644 --- a/Mage.Sets/src/mage/sets/mirage/AsmiraHolyAvenger.java +++ b/Mage.Sets/src/mage/sets/mirage/AsmiraHolyAvenger.java @@ -62,8 +62,6 @@ public class AsmiraHolyAvenger extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/mirage/BayFalcon.java b/Mage.Sets/src/mage/sets/mirage/BayFalcon.java index e5901264cb7..e8d6cc13d68 100644 --- a/Mage.Sets/src/mage/sets/mirage/BayFalcon.java +++ b/Mage.Sets/src/mage/sets/mirage/BayFalcon.java @@ -46,7 +46,6 @@ public class BayFalcon extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirage/BlightedShaman.java b/Mage.Sets/src/mage/sets/mirage/BlightedShaman.java index 4ab4464d4be..14e453f2083 100644 --- a/Mage.Sets/src/mage/sets/mirage/BlightedShaman.java +++ b/Mage.Sets/src/mage/sets/mirage/BlightedShaman.java @@ -65,7 +65,6 @@ public class BlightedShaman extends CardImpl { this.subtype.add("Cleric"); this.subtype.add("Shaman"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirage/BlisteringBarrier.java b/Mage.Sets/src/mage/sets/mirage/BlisteringBarrier.java index f0cb6afd95b..9c19020974f 100644 --- a/Mage.Sets/src/mage/sets/mirage/BlisteringBarrier.java +++ b/Mage.Sets/src/mage/sets/mirage/BlisteringBarrier.java @@ -45,7 +45,6 @@ public class BlisteringBarrier extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Wall"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirage/BurningShieldAskari.java b/Mage.Sets/src/mage/sets/mirage/BurningShieldAskari.java index 4d969f0170e..60a7ce69ebd 100644 --- a/Mage.Sets/src/mage/sets/mirage/BurningShieldAskari.java +++ b/Mage.Sets/src/mage/sets/mirage/BurningShieldAskari.java @@ -53,7 +53,6 @@ public class BurningShieldAskari extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirage/CrashOfRhinos.java b/Mage.Sets/src/mage/sets/mirage/CrashOfRhinos.java index 9583502c956..ab2855c8391 100644 --- a/Mage.Sets/src/mage/sets/mirage/CrashOfRhinos.java +++ b/Mage.Sets/src/mage/sets/mirage/CrashOfRhinos.java @@ -45,7 +45,6 @@ public class CrashOfRhinos extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Rhino"); - this.color.setGreen(true); this.power = new MageInt(8); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mirage/EkunduGriffin.java b/Mage.Sets/src/mage/sets/mirage/EkunduGriffin.java index c10851a6f85..d7cec7a3a77 100644 --- a/Mage.Sets/src/mage/sets/mirage/EkunduGriffin.java +++ b/Mage.Sets/src/mage/sets/mirage/EkunduGriffin.java @@ -46,7 +46,6 @@ public class EkunduGriffin extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Griffin"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirage/EnlightenedTutor.java b/Mage.Sets/src/mage/sets/mirage/EnlightenedTutor.java index 1c56acec20f..d94e6c38627 100644 --- a/Mage.Sets/src/mage/sets/mirage/EnlightenedTutor.java +++ b/Mage.Sets/src/mage/sets/mirage/EnlightenedTutor.java @@ -54,7 +54,6 @@ public class EnlightenedTutor extends CardImpl { super(ownerId, 218, "Enlightened Tutor", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "MIR"; - this.color.setWhite(true); // Search your library for an artifact or enchantment card and reveal that card. Shuffle your library, then put the card on top of it. this.getSpellAbility().addEffect(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(filter), true, true)); diff --git a/Mage.Sets/src/mage/sets/mirage/EtherealChampion.java b/Mage.Sets/src/mage/sets/mirage/EtherealChampion.java index bb7bf0dbcfd..7323eb4cb12 100644 --- a/Mage.Sets/src/mage/sets/mirage/EtherealChampion.java +++ b/Mage.Sets/src/mage/sets/mirage/EtherealChampion.java @@ -50,7 +50,6 @@ public class EtherealChampion extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Avatar"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mirage/FallowEarth.java b/Mage.Sets/src/mage/sets/mirage/FallowEarth.java index 02ea0069b4e..d0adde607d4 100644 --- a/Mage.Sets/src/mage/sets/mirage/FallowEarth.java +++ b/Mage.Sets/src/mage/sets/mirage/FallowEarth.java @@ -44,7 +44,6 @@ public class FallowEarth extends CardImpl { super(ownerId, 112, "Fallow Earth", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "MIR"; - this.color.setGreen(true); // Put target land on top of its owner's library. this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/mirage/FemerefKnight.java b/Mage.Sets/src/mage/sets/mirage/FemerefKnight.java index 011ec0d1aaf..557014758f4 100644 --- a/Mage.Sets/src/mage/sets/mirage/FemerefKnight.java +++ b/Mage.Sets/src/mage/sets/mirage/FemerefKnight.java @@ -53,7 +53,6 @@ public class FemerefKnight extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirage/FemerefScouts.java b/Mage.Sets/src/mage/sets/mirage/FemerefScouts.java index ba5d358623d..2e00852bab4 100644 --- a/Mage.Sets/src/mage/sets/mirage/FemerefScouts.java +++ b/Mage.Sets/src/mage/sets/mirage/FemerefScouts.java @@ -45,7 +45,6 @@ public class FemerefScouts extends CardImpl { this.subtype.add("Human"); this.subtype.add("Scout"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/mirage/FeralShadow.java b/Mage.Sets/src/mage/sets/mirage/FeralShadow.java index 79a6b139588..9210bed9f8b 100644 --- a/Mage.Sets/src/mage/sets/mirage/FeralShadow.java +++ b/Mage.Sets/src/mage/sets/mirage/FeralShadow.java @@ -45,7 +45,6 @@ public class FeralShadow extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Nightstalker"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirage/Flash.java b/Mage.Sets/src/mage/sets/mirage/Flash.java index def6f0ddf61..01c899fc554 100644 --- a/Mage.Sets/src/mage/sets/mirage/Flash.java +++ b/Mage.Sets/src/mage/sets/mirage/Flash.java @@ -55,7 +55,6 @@ public class Flash extends CardImpl { super(ownerId, 66, "Flash", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "MIR"; - this.color.setBlue(true); // You may put a creature card from your hand onto the battlefield. If you do, sacrifice it unless you pay its mana cost reduced by up to {2}. this.getSpellAbility().addEffect(new FlashEffect()); diff --git a/Mage.Sets/src/mage/sets/mirage/Foratog.java b/Mage.Sets/src/mage/sets/mirage/Foratog.java index 227e0fb9f9d..113bcc517e4 100644 --- a/Mage.Sets/src/mage/sets/mirage/Foratog.java +++ b/Mage.Sets/src/mage/sets/mirage/Foratog.java @@ -59,7 +59,6 @@ public class Foratog extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Atog"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirage/ForbiddenCrypt.java b/Mage.Sets/src/mage/sets/mirage/ForbiddenCrypt.java index 84f2652dbae..321f592e935 100644 --- a/Mage.Sets/src/mage/sets/mirage/ForbiddenCrypt.java +++ b/Mage.Sets/src/mage/sets/mirage/ForbiddenCrypt.java @@ -57,7 +57,6 @@ public class ForbiddenCrypt extends CardImpl { super(ownerId, 22, "Forbidden Crypt", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{B}"); this.expansionSetCode = "MIR"; - this.color.setBlack(true); // If you would draw a card, return a card from your graveyard to your hand instead. If you can't, you lose the game. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ForbiddenCryptDrawCardReplacementEffect())); diff --git a/Mage.Sets/src/mage/sets/mirage/GiantMantis.java b/Mage.Sets/src/mage/sets/mirage/GiantMantis.java index c99540a7fac..e92855aa96f 100644 --- a/Mage.Sets/src/mage/sets/mirage/GiantMantis.java +++ b/Mage.Sets/src/mage/sets/mirage/GiantMantis.java @@ -45,7 +45,6 @@ public class GiantMantis extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mirage/GravebaneZombie.java b/Mage.Sets/src/mage/sets/mirage/GravebaneZombie.java index 89ea03d3a77..210d3155ffb 100644 --- a/Mage.Sets/src/mage/sets/mirage/GravebaneZombie.java +++ b/Mage.Sets/src/mage/sets/mirage/GravebaneZombie.java @@ -55,7 +55,6 @@ public class GravebaneZombie extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirage/HammerOfBogardan.java b/Mage.Sets/src/mage/sets/mirage/HammerOfBogardan.java index 3d4555e69ae..43bce3d67f7 100644 --- a/Mage.Sets/src/mage/sets/mirage/HammerOfBogardan.java +++ b/Mage.Sets/src/mage/sets/mirage/HammerOfBogardan.java @@ -52,7 +52,6 @@ public class HammerOfBogardan extends CardImpl { super(ownerId, 181, "Hammer of Bogardan", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); this.expansionSetCode = "MIR"; - this.color.setRed(true); // Hammer of Bogardan deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/mirage/HarmattanEfreet.java b/Mage.Sets/src/mage/sets/mirage/HarmattanEfreet.java index 5f210105f0f..7a8e66610ad 100644 --- a/Mage.Sets/src/mage/sets/mirage/HarmattanEfreet.java +++ b/Mage.Sets/src/mage/sets/mirage/HarmattanEfreet.java @@ -51,7 +51,6 @@ public class HarmattanEfreet extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Efreet"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirage/IllicitAuction.java b/Mage.Sets/src/mage/sets/mirage/IllicitAuction.java index 8b96e6155df..88f7483736c 100644 --- a/Mage.Sets/src/mage/sets/mirage/IllicitAuction.java +++ b/Mage.Sets/src/mage/sets/mirage/IllicitAuction.java @@ -51,7 +51,6 @@ public class IllicitAuction extends CardImpl { super(ownerId, 183, "Illicit Auction", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); this.expansionSetCode = "MIR"; - this.color.setRed(true); // Each player may bid life for control of target creature. You start the bidding with a bid of 0. In turn order, each player may top the high bid. The bidding ends if the high bid stands. The high bidder loses life equal to the high bid and gains control of the creature. this.getSpellAbility().addEffect(new IllicitAuctionEffect()); diff --git a/Mage.Sets/src/mage/sets/mirage/IronTuskElephant.java b/Mage.Sets/src/mage/sets/mirage/IronTuskElephant.java index 2cb0cd1672c..9e70f657e9b 100644 --- a/Mage.Sets/src/mage/sets/mirage/IronTuskElephant.java +++ b/Mage.Sets/src/mage/sets/mirage/IronTuskElephant.java @@ -45,7 +45,6 @@ public class IronTuskElephant extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Elephant"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/mirage/JolraelsCentaur.java b/Mage.Sets/src/mage/sets/mirage/JolraelsCentaur.java index 621f76db3b9..c2df1fc0b10 100644 --- a/Mage.Sets/src/mage/sets/mirage/JolraelsCentaur.java +++ b/Mage.Sets/src/mage/sets/mirage/JolraelsCentaur.java @@ -47,7 +47,6 @@ public class JolraelsCentaur extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Archer"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirage/MerfolkRaiders.java b/Mage.Sets/src/mage/sets/mirage/MerfolkRaiders.java index bfa6a3e8b30..d1300f2e004 100644 --- a/Mage.Sets/src/mage/sets/mirage/MerfolkRaiders.java +++ b/Mage.Sets/src/mage/sets/mirage/MerfolkRaiders.java @@ -47,7 +47,6 @@ public class MerfolkRaiders extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/mirage/MtendaHerder.java b/Mage.Sets/src/mage/sets/mirage/MtendaHerder.java index 54e7a3a681b..6e3105fc47d 100644 --- a/Mage.Sets/src/mage/sets/mirage/MtendaHerder.java +++ b/Mage.Sets/src/mage/sets/mirage/MtendaHerder.java @@ -46,7 +46,6 @@ public class MtendaHerder extends CardImpl { this.subtype.add("Human"); this.subtype.add("Scout"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirage/MysticalTutor.java b/Mage.Sets/src/mage/sets/mirage/MysticalTutor.java index ef4ee7b6d78..2281842e017 100644 --- a/Mage.Sets/src/mage/sets/mirage/MysticalTutor.java +++ b/Mage.Sets/src/mage/sets/mirage/MysticalTutor.java @@ -54,7 +54,6 @@ public class MysticalTutor extends CardImpl { super(ownerId, 80, "Mystical Tutor", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "MIR"; - this.color.setBlue(true); // Search your library for an instant or sorcery card and reveal that card. Shuffle your library, then put the card on top of it. this.getSpellAbility().addEffect(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(filter), true, true)); diff --git a/Mage.Sets/src/mage/sets/mirage/PainfulMemories.java b/Mage.Sets/src/mage/sets/mirage/PainfulMemories.java index a2f84c17ab7..590ff980988 100644 --- a/Mage.Sets/src/mage/sets/mirage/PainfulMemories.java +++ b/Mage.Sets/src/mage/sets/mirage/PainfulMemories.java @@ -52,7 +52,6 @@ public class PainfulMemories extends CardImpl { super(ownerId, 31, "Painful Memories", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "MIR"; - this.color.setBlack(true); // Look at target opponent's hand and choose a card from it. Put that card on top of that player's library. this.getSpellAbility().addEffect(new PainfulMemoriesEffect()); diff --git a/Mage.Sets/src/mage/sets/mirage/PearlDragon.java b/Mage.Sets/src/mage/sets/mirage/PearlDragon.java index eac9ee8e70e..ace32dec59f 100644 --- a/Mage.Sets/src/mage/sets/mirage/PearlDragon.java +++ b/Mage.Sets/src/mage/sets/mirage/PearlDragon.java @@ -50,7 +50,6 @@ public class PearlDragon extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Dragon"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mirage/PsychicTransfer.java b/Mage.Sets/src/mage/sets/mirage/PsychicTransfer.java index b0635938307..e466c1fc265 100644 --- a/Mage.Sets/src/mage/sets/mirage/PsychicTransfer.java +++ b/Mage.Sets/src/mage/sets/mirage/PsychicTransfer.java @@ -48,7 +48,6 @@ public class PsychicTransfer extends CardImpl { super(ownerId, 85, "Psychic Transfer", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{U}"); this.expansionSetCode = "MIR"; - this.color.setBlue(true); // If the difference between your life total and target player's life total is 5 or less, exchange life totals with that player. this.getSpellAbility().addEffect(new PsychicTransferEffect()); diff --git a/Mage.Sets/src/mage/sets/mirage/RestlessDead.java b/Mage.Sets/src/mage/sets/mirage/RestlessDead.java index ef2df1a51a5..fd92399f860 100644 --- a/Mage.Sets/src/mage/sets/mirage/RestlessDead.java +++ b/Mage.Sets/src/mage/sets/mirage/RestlessDead.java @@ -48,7 +48,6 @@ public class RestlessDead extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Skeleton"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirage/RockBasilisk.java b/Mage.Sets/src/mage/sets/mirage/RockBasilisk.java index fcf917cd3d3..6bed4e6f21d 100644 --- a/Mage.Sets/src/mage/sets/mirage/RockBasilisk.java +++ b/Mage.Sets/src/mage/sets/mirage/RockBasilisk.java @@ -55,8 +55,6 @@ public class RockBasilisk extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Basilisk"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/mirage/SacredMesa.java b/Mage.Sets/src/mage/sets/mirage/SacredMesa.java index e04406c23b1..825bdbc7be6 100644 --- a/Mage.Sets/src/mage/sets/mirage/SacredMesa.java +++ b/Mage.Sets/src/mage/sets/mirage/SacredMesa.java @@ -61,7 +61,6 @@ public class SacredMesa extends CardImpl { super(ownerId, 241, "Sacred Mesa", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "MIR"; - this.color.setWhite(true); // At the beginning of your upkeep, sacrifice Sacred Mesa unless you sacrifice a Pegasus. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new SacrificeTargetCost(new TargetControlledPermanent(filter))), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/mirage/SandbarCrocodile.java b/Mage.Sets/src/mage/sets/mirage/SandbarCrocodile.java index 7912b8959ab..5000b4d6dd5 100644 --- a/Mage.Sets/src/mage/sets/mirage/SandbarCrocodile.java +++ b/Mage.Sets/src/mage/sets/mirage/SandbarCrocodile.java @@ -45,7 +45,6 @@ public class SandbarCrocodile extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Crocodile"); - this.color.setBlue(true); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/mirage/SeaScryer.java b/Mage.Sets/src/mage/sets/mirage/SeaScryer.java index fc28a040420..4740adc93f1 100644 --- a/Mage.Sets/src/mage/sets/mirage/SeaScryer.java +++ b/Mage.Sets/src/mage/sets/mirage/SeaScryer.java @@ -53,7 +53,6 @@ public class SeaScryer extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirage/SearingSpearAskari.java b/Mage.Sets/src/mage/sets/mirage/SearingSpearAskari.java index 0c98a1a4e54..565af36a72f 100644 --- a/Mage.Sets/src/mage/sets/mirage/SearingSpearAskari.java +++ b/Mage.Sets/src/mage/sets/mirage/SearingSpearAskari.java @@ -54,7 +54,6 @@ public class SearingSpearAskari extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirage/ShallowGrave.java b/Mage.Sets/src/mage/sets/mirage/ShallowGrave.java index 08189134019..b2e00d17bb5 100644 --- a/Mage.Sets/src/mage/sets/mirage/ShallowGrave.java +++ b/Mage.Sets/src/mage/sets/mirage/ShallowGrave.java @@ -57,7 +57,6 @@ public class ShallowGrave extends CardImpl { super(ownerId, 39, "Shallow Grave", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "MIR"; - this.color.setBlack(true); // Return the top creature card of your graveyard to the battlefield. That creature gains haste until end of turn. Exile it at the beginning of the next end step. this.getSpellAbility().addEffect(new ShallowGraveEffect()); diff --git a/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java b/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java index c9d1806d1f9..77d3f317acb 100644 --- a/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java +++ b/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java @@ -65,7 +65,6 @@ public class SpiritOfTheNight extends CardImpl { this.subtype.add("Demon"); this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/mirage/TalruumMinotaur.java b/Mage.Sets/src/mage/sets/mirage/TalruumMinotaur.java index d6eb15f6315..56c964123f5 100644 --- a/Mage.Sets/src/mage/sets/mirage/TalruumMinotaur.java +++ b/Mage.Sets/src/mage/sets/mirage/TalruumMinotaur.java @@ -46,7 +46,6 @@ public class TalruumMinotaur extends CardImpl { this.subtype.add("Minotaur"); this.subtype.add("Berserker"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/mirage/TeferisDrake.java b/Mage.Sets/src/mage/sets/mirage/TeferisDrake.java index b17ddb43522..f8cefe2d15e 100644 --- a/Mage.Sets/src/mage/sets/mirage/TeferisDrake.java +++ b/Mage.Sets/src/mage/sets/mirage/TeferisDrake.java @@ -46,7 +46,6 @@ public class TeferisDrake extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirage/UnseenWalker.java b/Mage.Sets/src/mage/sets/mirage/UnseenWalker.java index 169c4cb8e8c..79df8370f6a 100644 --- a/Mage.Sets/src/mage/sets/mirage/UnseenWalker.java +++ b/Mage.Sets/src/mage/sets/mirage/UnseenWalker.java @@ -52,7 +52,6 @@ public class UnseenWalker extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Dryad"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirage/UnyaroGriffin.java b/Mage.Sets/src/mage/sets/mirage/UnyaroGriffin.java index dee84cfa852..7db0280a78a 100644 --- a/Mage.Sets/src/mage/sets/mirage/UnyaroGriffin.java +++ b/Mage.Sets/src/mage/sets/mirage/UnyaroGriffin.java @@ -64,7 +64,6 @@ public class UnyaroGriffin extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Griffin"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirage/ViashinoWarrior.java b/Mage.Sets/src/mage/sets/mirage/ViashinoWarrior.java index 42269bca405..cc8a92e3a1e 100644 --- a/Mage.Sets/src/mage/sets/mirage/ViashinoWarrior.java +++ b/Mage.Sets/src/mage/sets/mirage/ViashinoWarrior.java @@ -45,7 +45,6 @@ public class ViashinoWarrior extends CardImpl { this.subtype.add("Viashino"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/mirage/WaitingInTheWeeds.java b/Mage.Sets/src/mage/sets/mirage/WaitingInTheWeeds.java index 7b7422072ae..5bde63fc273 100644 --- a/Mage.Sets/src/mage/sets/mirage/WaitingInTheWeeds.java +++ b/Mage.Sets/src/mage/sets/mirage/WaitingInTheWeeds.java @@ -54,7 +54,6 @@ public class WaitingInTheWeeds extends CardImpl { super(ownerId, 150, "Waiting in the Weeds", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{G}{G}"); this.expansionSetCode = "MIR"; - this.color.setGreen(true); // Each player puts a 1/1 green Cat creature token onto the battlefield for each untapped Forest he or she controls. this.getSpellAbility().addEffect(new WaitingInTheWeedsEffect()); diff --git a/Mage.Sets/src/mage/sets/mirage/WildElephant.java b/Mage.Sets/src/mage/sets/mirage/WildElephant.java index eef7dbdd113..45927dd1332 100644 --- a/Mage.Sets/src/mage/sets/mirage/WildElephant.java +++ b/Mage.Sets/src/mage/sets/mirage/WildElephant.java @@ -45,7 +45,6 @@ public class WildElephant extends CardImpl { this.expansionSetCode = "MIR"; this.subtype.add("Elephant"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/mirage/WorldlyTutor.java b/Mage.Sets/src/mage/sets/mirage/WorldlyTutor.java index 058e80fa95b..99cd0ed7653 100644 --- a/Mage.Sets/src/mage/sets/mirage/WorldlyTutor.java +++ b/Mage.Sets/src/mage/sets/mirage/WorldlyTutor.java @@ -45,7 +45,6 @@ public class WorldlyTutor extends CardImpl { super(ownerId, 153, "Worldly Tutor", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "MIR"; - this.color.setGreen(true); // Search your library for a creature card and reveal that card. Shuffle your library, then put the card on top of it. this.getSpellAbility().addEffect(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(new FilterCreatureCard()), true, true)); diff --git a/Mage.Sets/src/mage/sets/mirage/ZhalfirinKnight.java b/Mage.Sets/src/mage/sets/mirage/ZhalfirinKnight.java index cf138008d13..bdaa70f9c77 100644 --- a/Mage.Sets/src/mage/sets/mirage/ZhalfirinKnight.java +++ b/Mage.Sets/src/mage/sets/mirage/ZhalfirinKnight.java @@ -53,7 +53,6 @@ public class ZhalfirinKnight extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirrodin/AssertAuthority.java b/Mage.Sets/src/mage/sets/mirrodin/AssertAuthority.java index 627b2f9359c..a392b15f731 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AssertAuthority.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AssertAuthority.java @@ -46,7 +46,6 @@ public class AssertAuthority extends CardImpl { super(ownerId, 30, "Assert Authority", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{5}{U}{U}"); this.expansionSetCode = "MRD"; - this.color.setBlue(true); // Affinity for artifacts this.addAbility(new AffinityForArtifactsAbility()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java b/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java index abb6a44d1af..cc710102337 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java @@ -54,7 +54,6 @@ public class AuriokBladewarden extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirrodin/DiscipleOfTheVault.java b/Mage.Sets/src/mage/sets/mirrodin/DiscipleOfTheVault.java index 987c7821ab2..223f4b99aae 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/DiscipleOfTheVault.java +++ b/Mage.Sets/src/mage/sets/mirrodin/DiscipleOfTheVault.java @@ -52,7 +52,6 @@ public class DiscipleOfTheVault extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirrodin/DrossProwler.java b/Mage.Sets/src/mage/sets/mirrodin/DrossProwler.java index d45bb48cfc4..060d0a0484a 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/DrossProwler.java +++ b/Mage.Sets/src/mage/sets/mirrodin/DrossProwler.java @@ -45,7 +45,6 @@ public class DrossProwler extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirrodin/FangrenHunter.java b/Mage.Sets/src/mage/sets/mirrodin/FangrenHunter.java index 0c8611df26b..fcda78ed975 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/FangrenHunter.java +++ b/Mage.Sets/src/mage/sets/mirrodin/FangrenHunter.java @@ -45,7 +45,6 @@ public class FangrenHunter extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java b/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java index 0d44115836e..9fb75bfa18d 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java +++ b/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java @@ -53,7 +53,6 @@ public class FieryGambit extends CardImpl { super(ownerId, 90, "Fiery Gambit", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "MRD"; - this.color.setRed(true); // Flip a coin until you lose a flip or choose to stop flipping. If you lose a flip, Fiery Gambit has no effect. If you win one or more flips, Fiery Gambit deals 3 damage to target creature. If you win two or more flips, Fiery Gambit deals 6 damage to each opponent. If you win three or more flips, draw nine cards and untap all lands you control. this.getSpellAbility().addEffect(new FieryGambitEffect()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/GoblinStriker.java b/Mage.Sets/src/mage/sets/mirrodin/GoblinStriker.java index c09a3a4c2d9..51ad002083e 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/GoblinStriker.java +++ b/Mage.Sets/src/mage/sets/mirrodin/GoblinStriker.java @@ -47,7 +47,6 @@ public class GoblinStriker extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Berserker"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninElder.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninElder.java index 82738e1c05f..c790c360d7e 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LeoninElder.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninElder.java @@ -49,7 +49,6 @@ public class LeoninElder extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninSkyhunter.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninSkyhunter.java index c7cd76c647f..2f58b879d29 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LeoninSkyhunter.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninSkyhunter.java @@ -47,7 +47,6 @@ public class LeoninSkyhunter extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoxodonPunisher.java b/Mage.Sets/src/mage/sets/mirrodin/LoxodonPunisher.java index ea93a802a74..edc5fbb0893 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LoxodonPunisher.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LoxodonPunisher.java @@ -51,7 +51,6 @@ public class LoxodonPunisher extends CardImpl { this.subtype.add("Elephant"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirrodin/MoltenRain.java b/Mage.Sets/src/mage/sets/mirrodin/MoltenRain.java index f0e606727aa..bdcac25004e 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/MoltenRain.java +++ b/Mage.Sets/src/mage/sets/mirrodin/MoltenRain.java @@ -51,7 +51,6 @@ public class MoltenRain extends CardImpl { super(ownerId, 101, "Molten Rain", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); this.expansionSetCode = "MRD"; - this.color.setRed(true); // Destroy target land. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/NecrogenMists.java b/Mage.Sets/src/mage/sets/mirrodin/NecrogenMists.java index e59bfed0058..a6881b17569 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NecrogenMists.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NecrogenMists.java @@ -46,7 +46,6 @@ public class NecrogenMists extends CardImpl { super(ownerId, 69, "Necrogen Mists", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "MRD"; - this.color.setBlack(true); // At the beginning of each player's upkeep, that player discards a card. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DiscardTargetEffect(1), TargetController.ANY, false)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java b/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java index aa75666453b..57a57fb340b 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java @@ -62,7 +62,6 @@ public class NimShambler extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new StaticValue(0), Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/mirrodin/PlatedSlagwurm.java b/Mage.Sets/src/mage/sets/mirrodin/PlatedSlagwurm.java index 7954b85dde4..1e7509f184d 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/PlatedSlagwurm.java +++ b/Mage.Sets/src/mage/sets/mirrodin/PlatedSlagwurm.java @@ -45,7 +45,6 @@ public class PlatedSlagwurm extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(8); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/sets/mirrodin/RustmouthOgre.java b/Mage.Sets/src/mage/sets/mirrodin/RustmouthOgre.java index b49b93b28bd..3f3361791f5 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/RustmouthOgre.java +++ b/Mage.Sets/src/mage/sets/mirrodin/RustmouthOgre.java @@ -53,7 +53,6 @@ public class RustmouthOgre extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Ogre"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java b/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java index 9f293f791de..141503c8ef7 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java @@ -50,7 +50,6 @@ public class SecondSunrise extends CardImpl { super(ownerId, 20, "Second Sunrise", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{W}{W}"); this.expansionSetCode = "MRD"; - this.color.setWhite(true); // Each player returns to the battlefield all artifact, creature, enchantment, and land cards in his or her graveyard that were put there from the battlefield this turn. this.getSpellAbility().addEffect(new SecondSunriseEffect()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java b/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java index 0884eba8ad7..c9dda788ef9 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java @@ -54,7 +54,6 @@ public class ShrapnelBlast extends CardImpl { super(ownerId, 106, "Shrapnel Blast", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "MRD"; - this.color.setRed(true); this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, filter, true))); this.getSpellAbility().addEffect(new DamageTargetEffect(5)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/SomberHoverguard.java b/Mage.Sets/src/mage/sets/mirrodin/SomberHoverguard.java index d8c7f85e985..2cbd88cb148 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SomberHoverguard.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SomberHoverguard.java @@ -46,7 +46,6 @@ public class SomberHoverguard extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Drone"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirrodin/SpikeshotGoblin.java b/Mage.Sets/src/mage/sets/mirrodin/SpikeshotGoblin.java index 389aec2e086..58929dcb715 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SpikeshotGoblin.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SpikeshotGoblin.java @@ -54,7 +54,6 @@ public class SpikeshotGoblin extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java b/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java index bd1eb4da7b3..f2017a43afa 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java @@ -53,7 +53,6 @@ public class SpoilsOfTheVault extends CardImpl { super(ownerId, 78, "Spoils of the Vault", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "MRD"; - this.color.setBlack(true); // Name a card. Reveal cards from the top of your library until you reveal the named card, then put that card into your hand. Exile all other cards revealed this way, and you lose 1 life for each of the exiled cards. this.getSpellAbility().addEffect(new NameACardEffect(NameACardEffect.TypeOfName.ALL)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/VedalkenArchmage.java b/Mage.Sets/src/mage/sets/mirrodin/VedalkenArchmage.java index 3055d33265e..d4eb18b145b 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/VedalkenArchmage.java +++ b/Mage.Sets/src/mage/sets/mirrodin/VedalkenArchmage.java @@ -56,7 +56,6 @@ public class VedalkenArchmage extends CardImpl { this.subtype.add("Vedalken"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirrodin/ViridianJoiner.java b/Mage.Sets/src/mage/sets/mirrodin/ViridianJoiner.java index c1563fc2adf..c9e71165d4a 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ViridianJoiner.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ViridianJoiner.java @@ -48,7 +48,6 @@ public class ViridianJoiner extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirrodin/WrenchMind.java b/Mage.Sets/src/mage/sets/mirrodin/WrenchMind.java index 958dc8b6b0a..e03f202fee8 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/WrenchMind.java +++ b/Mage.Sets/src/mage/sets/mirrodin/WrenchMind.java @@ -50,7 +50,6 @@ public class WrenchMind extends CardImpl { super(ownerId, 84, "Wrench Mind", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}{B}"); this.expansionSetCode = "MRD"; - this.color.setBlack(true); // Target player discards two cards unless he or she discards an artifact card. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ChokingFumes.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ChokingFumes.java index 98eadf3f4cc..fd701f9c5d9 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ChokingFumes.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ChokingFumes.java @@ -47,7 +47,6 @@ public class ChokingFumes extends CardImpl { super(ownerId, 4, "Choking Fumes", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "MBS"; - this.color.setWhite(true); this.getSpellAbility().addEffect(new AddCountersAllEffect(CounterType.M1M1.createInstance(), filter)); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ConcussiveBolt.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ConcussiveBolt.java index 404c235c00e..7a9facd4640 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ConcussiveBolt.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ConcussiveBolt.java @@ -52,7 +52,6 @@ public class ConcussiveBolt extends CardImpl { super(ownerId, 60, "Concussive Bolt", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); this.expansionSetCode = "MBS"; - this.color.setRed(true); // Concussive Bolt deals 4 damage to target player. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Crush.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Crush.java index 38fd31ddc1b..bee2587248e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Crush.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Crush.java @@ -53,7 +53,6 @@ public class Crush extends CardImpl { super(ownerId, 61, "Crush", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "MBS"; - this.color.setRed(true); this.getSpellAbility().addTarget(new TargetArtifactPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/DistantMemories.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/DistantMemories.java index 3798873d38e..aa0efa15012 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/DistantMemories.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/DistantMemories.java @@ -51,7 +51,6 @@ public class DistantMemories extends CardImpl { super(ownerId, 24, "Distant Memories", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{U}{U}"); this.expansionSetCode = "MBS"; - this.color.setBlue(true); this.getSpellAbility().addEffect(new DistantMemoriesEffect()); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/FangrenMarauder.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/FangrenMarauder.java index 330751aec62..cd9b5447c1f 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/FangrenMarauder.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/FangrenMarauder.java @@ -48,7 +48,6 @@ public class FangrenMarauder extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java index b43c879d259..b70a943d99e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java @@ -47,7 +47,6 @@ public class FranticSalvage extends CardImpl { super(ownerId, 6, "Frantic Salvage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "MBS"; - this.color.setWhite(true); this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Galvanoth.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Galvanoth.java index 1b422fe9153..bd36a38bb6e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Galvanoth.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Galvanoth.java @@ -54,7 +54,6 @@ public class Galvanoth extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Gnathosaur.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Gnathosaur.java index 34d2cb81028..69115a01f3b 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Gnathosaur.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Gnathosaur.java @@ -60,7 +60,6 @@ public class Gnathosaur extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Lizard"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoreVassal.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoreVassal.java index 5ed79b2f346..984517c5f8e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoreVassal.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoreVassal.java @@ -51,7 +51,6 @@ public class GoreVassal extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Hound"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java index ace62d94dbf..ef3159e90c3 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java @@ -52,7 +52,6 @@ public class IntoTheCore extends CardImpl { super(ownerId, 67, "Into the Core", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{R}{R}"); this.expansionSetCode = "MBS"; - this.color.setRed(true); this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/KembasLegion.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/KembasLegion.java index 2e014a74620..b6d67478ed2 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/KembasLegion.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/KembasLegion.java @@ -57,7 +57,6 @@ public class KembasLegion extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaFlamefiend.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaFlamefiend.java index 667316013b3..5a3868f5542 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaFlamefiend.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaFlamefiend.java @@ -51,7 +51,6 @@ public class KuldothaFlamefiend extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeadTheStampede.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeadTheStampede.java index fe05c9abab4..8c97b11411d 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeadTheStampede.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeadTheStampede.java @@ -50,7 +50,6 @@ public class LeadTheStampede extends CardImpl { super(ownerId, 82, "Lead the Stampede", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "MBS"; - this.color.setGreen(true); // Look at the top five cards of your library. You may reveal any number of creature cards from among them and put the revealed cards into your hand. Put the rest on the bottom of your library in any order. this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect(5, 5, filter, true)); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MetallicMastery.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MetallicMastery.java index 7b2f94fd2d6..1792b0444b6 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MetallicMastery.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MetallicMastery.java @@ -56,7 +56,6 @@ public class MetallicMastery extends CardImpl { super(ownerId, 71, "Metallic Mastery", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "MBS"; - this.color.setRed(true); this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranSpy.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranSpy.java index 889ed6c9045..8fb52da3e43 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranSpy.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranSpy.java @@ -51,7 +51,6 @@ public class MirranSpy extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Drone"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MitoticManipulation.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MitoticManipulation.java index 9722673a51f..142686364c4 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MitoticManipulation.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MitoticManipulation.java @@ -57,7 +57,6 @@ public class MitoticManipulation extends CardImpl { super(ownerId, 27, "Mitotic Manipulation", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{U}{U}"); this.expansionSetCode = "MBS"; - this.color.setBlue(true); this.getSpellAbility().addEffect(new MitoticManipulationEffect()); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MorbidPlunder.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MorbidPlunder.java index 77d1a176a60..72f4f47d293 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MorbidPlunder.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MorbidPlunder.java @@ -45,7 +45,6 @@ public class MorbidPlunder extends CardImpl { super(ownerId, 47, "Morbid Plunder", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}{B}"); this.expansionSetCode = "MBS"; - this.color.setBlack(true); // Return up to two target creature cards from your graveyard to your hand. this.getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/NeurokCommando.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/NeurokCommando.java index 3bfe8f2bced..d665ec63c5b 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/NeurokCommando.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/NeurokCommando.java @@ -48,7 +48,6 @@ public class NeurokCommando extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/QuicksilverGeyser.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/QuicksilverGeyser.java index 0c1100588bf..ed99d1804e8 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/QuicksilverGeyser.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/QuicksilverGeyser.java @@ -44,7 +44,6 @@ public class QuicksilverGeyser extends CardImpl { super(ownerId, 30, "Quicksilver Geyser", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{U}"); this.expansionSetCode = "MBS"; - this.color.setBlue(true); // Return up to two target nonland permanents to their owners' hands. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/RotWolf.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/RotWolf.java index deef7efb60b..b5e08eb9f56 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/RotWolf.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/RotWolf.java @@ -47,7 +47,6 @@ public class RotWolf extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Wolf"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SepticRats.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SepticRats.java index eca7c74cc5e..9dfa604a43a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SepticRats.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SepticRats.java @@ -54,7 +54,6 @@ public class SepticRats extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Rat"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SteelSabotage.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SteelSabotage.java index b57e4344ef8..701966d1efa 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SteelSabotage.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SteelSabotage.java @@ -55,7 +55,6 @@ public class SteelSabotage extends CardImpl { super(ownerId, 33, "Steel Sabotage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "MBS"; - this.color.setBlue(true); // Choose one - Counter target artifact spell; or return target artifact to its owner's hand. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ThrunTheLastTroll.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ThrunTheLastTroll.java index fe92b131b4b..c5b3c01e4b0 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ThrunTheLastTroll.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ThrunTheLastTroll.java @@ -54,7 +54,6 @@ public class ThrunTheLastTroll extends CardImpl { this.subtype.add("Troll"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenAnatomist.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenAnatomist.java index 215b826cd3c..53df31256ed 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenAnatomist.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenAnatomist.java @@ -55,7 +55,6 @@ public class VedalkenAnatomist extends CardImpl { this.subtype.add("Vedalken"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java index b5382f5910b..a653caa7835 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java @@ -57,7 +57,6 @@ public class VirulentWound extends CardImpl { super(ownerId, 57, "Virulent Wound", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "MBS"; - this.color.setBlack(true); // Put a -1/-1 counter on target creature. this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.M1M1.createInstance(), Outcome.UnboostCreature)); diff --git a/Mage.Sets/src/mage/sets/modernmasters/AuntiesSnitch.java b/Mage.Sets/src/mage/sets/modernmasters/AuntiesSnitch.java index bbafedf2dd7..ac211f2a112 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/AuntiesSnitch.java +++ b/Mage.Sets/src/mage/sets/modernmasters/AuntiesSnitch.java @@ -59,7 +59,6 @@ public class AuntiesSnitch extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/modernmasters/AuriokSalvagers.java b/Mage.Sets/src/mage/sets/modernmasters/AuriokSalvagers.java index 3ba61e38fec..292509daaa5 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/AuriokSalvagers.java +++ b/Mage.Sets/src/mage/sets/modernmasters/AuriokSalvagers.java @@ -59,7 +59,6 @@ public class AuriokSalvagers extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/modernmasters/BlindSpotGiant.java b/Mage.Sets/src/mage/sets/modernmasters/BlindSpotGiant.java index 9f2a4cbbee8..57af102c272 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/BlindSpotGiant.java +++ b/Mage.Sets/src/mage/sets/modernmasters/BlindSpotGiant.java @@ -55,7 +55,6 @@ public class BlindSpotGiant extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/modernmasters/BoundInSilence.java b/Mage.Sets/src/mage/sets/modernmasters/BoundInSilence.java index 4e29641ed60..e08ce2f9a81 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/BoundInSilence.java +++ b/Mage.Sets/src/mage/sets/modernmasters/BoundInSilence.java @@ -51,7 +51,6 @@ public class BoundInSilence extends CardImpl { this.subtype.add("Rebel"); this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/modernmasters/CrushUnderfoot.java b/Mage.Sets/src/mage/sets/modernmasters/CrushUnderfoot.java index 7d669bae2fd..102e5f235c5 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/CrushUnderfoot.java +++ b/Mage.Sets/src/mage/sets/modernmasters/CrushUnderfoot.java @@ -55,7 +55,6 @@ public class CrushUnderfoot extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Giant"); - this.color.setRed(true); // Choose a Giant creature you control. It deals damage equal to its power to target creature. this.getSpellAbility().addEffect(new CrushUnderfootEffect()); diff --git a/Mage.Sets/src/mage/sets/modernmasters/DampenThought.java b/Mage.Sets/src/mage/sets/modernmasters/DampenThought.java index 4f57f9f24ee..4c095712fec 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/DampenThought.java +++ b/Mage.Sets/src/mage/sets/modernmasters/DampenThought.java @@ -46,7 +46,6 @@ public class DampenThought extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Arcane"); - this.color.setBlue(true); // Target player puts the top four cards of his or her library into his or her graveyard. this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(4)); diff --git a/Mage.Sets/src/mage/sets/modernmasters/DeathCloud.java b/Mage.Sets/src/mage/sets/modernmasters/DeathCloud.java index b68b78f027b..a3c7332d80f 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/DeathCloud.java +++ b/Mage.Sets/src/mage/sets/modernmasters/DeathCloud.java @@ -50,7 +50,6 @@ public class DeathCloud extends CardImpl { super(ownerId, 76, "Death Cloud", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{B}{B}{B}"); this.expansionSetCode = "MMA"; - this.color.setBlack(true); // Each player loses X life, discards X cards, sacrifices X creatures, then sacrifices X lands. DynamicValue xValue = new ManacostVariableValue(); diff --git a/Mage.Sets/src/mage/sets/modernmasters/DeathRattle.java b/Mage.Sets/src/mage/sets/modernmasters/DeathRattle.java index 7800f6323cc..c7af23bf836 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/DeathRattle.java +++ b/Mage.Sets/src/mage/sets/modernmasters/DeathRattle.java @@ -54,7 +54,6 @@ public class DeathRattle extends CardImpl { super(ownerId, 78, "Death Rattle", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{5}{B}"); this.expansionSetCode = "MMA"; - this.color.setBlack(true); // Delve this.addAbility(new DelveAbility()); diff --git a/Mage.Sets/src/mage/sets/modernmasters/DeepcavernImp.java b/Mage.Sets/src/mage/sets/modernmasters/DeepcavernImp.java index 506654728bf..df5a3bdd347 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/DeepcavernImp.java +++ b/Mage.Sets/src/mage/sets/modernmasters/DeepcavernImp.java @@ -49,7 +49,6 @@ public class DeepcavernImp extends CardImpl { this.subtype.add("Imp"); this.subtype.add("Rebel"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/modernmasters/DesperateRitual.java b/Mage.Sets/src/mage/sets/modernmasters/DesperateRitual.java index 28bdd5a48c8..c3da260b041 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/DesperateRitual.java +++ b/Mage.Sets/src/mage/sets/modernmasters/DesperateRitual.java @@ -46,7 +46,6 @@ public class DesperateRitual extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Arcane"); - this.color.setRed(true); // Add {R}{R}{R} to your mana pool. this.getSpellAbility().addEffect(new BasicManaEffect(new Mana(3, 0, 0, 0, 0, 0, 0))); diff --git a/Mage.Sets/src/mage/sets/modernmasters/DreamspoilerWitches.java b/Mage.Sets/src/mage/sets/modernmasters/DreamspoilerWitches.java index fb75545ea00..c20d6f7aade 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/DreamspoilerWitches.java +++ b/Mage.Sets/src/mage/sets/modernmasters/DreamspoilerWitches.java @@ -53,7 +53,6 @@ public class DreamspoilerWitches extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/modernmasters/EarwigSquad.java b/Mage.Sets/src/mage/sets/modernmasters/EarwigSquad.java index f86939e0143..f27ad78a1cb 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/EarwigSquad.java +++ b/Mage.Sets/src/mage/sets/modernmasters/EarwigSquad.java @@ -60,7 +60,6 @@ public class EarwigSquad extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/modernmasters/EchoingCourage.java b/Mage.Sets/src/mage/sets/modernmasters/EchoingCourage.java index 65f53560ec3..42622deb821 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/EchoingCourage.java +++ b/Mage.Sets/src/mage/sets/modernmasters/EchoingCourage.java @@ -54,7 +54,6 @@ public class EchoingCourage extends CardImpl { super(ownerId, 143, "Echoing Courage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "MMA"; - this.color.setGreen(true); // Target creature and all other creatures with the same name as that creature get +2/+2 until end of turn. this.getSpellAbility().addEffect(new EchoingCourageEffect()); diff --git a/Mage.Sets/src/mage/sets/modernmasters/FeudkillersVerdict.java b/Mage.Sets/src/mage/sets/modernmasters/FeudkillersVerdict.java index fa94741ff17..3f6900ce398 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/FeudkillersVerdict.java +++ b/Mage.Sets/src/mage/sets/modernmasters/FeudkillersVerdict.java @@ -51,7 +51,6 @@ public class FeudkillersVerdict extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Giant"); - this.color.setWhite(true); // You gain 10 life. Then if you have more life than an opponent, put a 5/5 white Giant Warrior creature token onto the battlefield. this.getSpellAbility().addEffect(new FeudkillersVerdictEffect()); diff --git a/Mage.Sets/src/mage/sets/modernmasters/GlacialRay.java b/Mage.Sets/src/mage/sets/modernmasters/GlacialRay.java index 8d322303219..bc8382999bf 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/GlacialRay.java +++ b/Mage.Sets/src/mage/sets/modernmasters/GlacialRay.java @@ -46,7 +46,6 @@ public class GlacialRay extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Arcane"); - this.color.setRed(true); // Glacial Ray deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/modernmasters/GrandArbiterAugustinIV.java b/Mage.Sets/src/mage/sets/modernmasters/GrandArbiterAugustinIV.java index 007c87d6e61..93dc434f90e 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/GrandArbiterAugustinIV.java +++ b/Mage.Sets/src/mage/sets/modernmasters/GrandArbiterAugustinIV.java @@ -67,8 +67,6 @@ public class GrandArbiterAugustinIV extends CardImpl { this.subtype.add("Human"); this.subtype.add("Advisor"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/modernmasters/GrinningIgnus.java b/Mage.Sets/src/mage/sets/modernmasters/GrinningIgnus.java index ccb37b24f77..540e8f9e988 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/GrinningIgnus.java +++ b/Mage.Sets/src/mage/sets/modernmasters/GrinningIgnus.java @@ -50,7 +50,6 @@ public class GrinningIgnus extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/modernmasters/Imperiosaur.java b/Mage.Sets/src/mage/sets/modernmasters/Imperiosaur.java index 47702bf09b1..152d880888c 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/Imperiosaur.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Imperiosaur.java @@ -53,7 +53,6 @@ public class Imperiosaur extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Lizard"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/modernmasters/IncrementalGrowth.java b/Mage.Sets/src/mage/sets/modernmasters/IncrementalGrowth.java index 0cbc44fd1ec..3eccc7bed57 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/IncrementalGrowth.java +++ b/Mage.Sets/src/mage/sets/modernmasters/IncrementalGrowth.java @@ -50,7 +50,6 @@ public class IncrementalGrowth extends CardImpl { super(ownerId, 149, "Incremental Growth", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); this.expansionSetCode = "MMA"; - this.color.setGreen(true); // Put a +1/+1 counter on target creature, two +1/+1 counters on another target creature, and three +1/+1 counters on a third target creature. this.getSpellAbility().addEffect(new IncrementalGrowthEffect()); diff --git a/Mage.Sets/src/mage/sets/modernmasters/JhoiraOfTheGhitu.java b/Mage.Sets/src/mage/sets/modernmasters/JhoiraOfTheGhitu.java index 5e3b939447b..eeca81c9290 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/JhoiraOfTheGhitu.java +++ b/Mage.Sets/src/mage/sets/modernmasters/JhoiraOfTheGhitu.java @@ -65,8 +65,6 @@ public class JhoiraOfTheGhitu extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setRed(true); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/modernmasters/LogicKnot.java b/Mage.Sets/src/mage/sets/modernmasters/LogicKnot.java index b467019c857..401019b6de8 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/LogicKnot.java +++ b/Mage.Sets/src/mage/sets/modernmasters/LogicKnot.java @@ -46,7 +46,6 @@ public class LogicKnot extends CardImpl { super(ownerId, 51, "Logic Knot", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{X}{U}{U}"); this.expansionSetCode = "MMA"; - this.color.setBlue(true); // Delve this.addAbility(new DelveAbility()); diff --git a/Mage.Sets/src/mage/sets/modernmasters/MaskedAdmirers.java b/Mage.Sets/src/mage/sets/modernmasters/MaskedAdmirers.java index 373627cc7e9..bd512cdc89c 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/MaskedAdmirers.java +++ b/Mage.Sets/src/mage/sets/modernmasters/MaskedAdmirers.java @@ -60,7 +60,6 @@ public class MaskedAdmirers extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/modernmasters/MoltenDisaster.java b/Mage.Sets/src/mage/sets/modernmasters/MoltenDisaster.java index bd58c90546f..a128aceb257 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/MoltenDisaster.java +++ b/Mage.Sets/src/mage/sets/modernmasters/MoltenDisaster.java @@ -60,7 +60,6 @@ public class MoltenDisaster extends CardImpl { super(ownerId, 123, "Molten Disaster", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{R}{R}"); this.expansionSetCode = "MMA"; - this.color.setRed(true); // If Molten Disaster was kicked, it has split second. Ability ability = new SimpleStaticAbility(Zone.STACK, new MoltenDisasterSplitSecondEffect()); diff --git a/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java b/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java index 54ddfdf5978..a512035d829 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java @@ -56,7 +56,6 @@ public class Peppersmoke extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Faerie"); - this.color.setBlack(true); // Target creature gets -1/-1 until end of turn. If you control a Faerie, draw a card. this.getSpellAbility().addEffect(new BoostTargetEffect(-1,-1,Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/modernmasters/PetalsOfInsight.java b/Mage.Sets/src/mage/sets/modernmasters/PetalsOfInsight.java index 3161450de25..5c80d722a0f 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/PetalsOfInsight.java +++ b/Mage.Sets/src/mage/sets/modernmasters/PetalsOfInsight.java @@ -52,7 +52,6 @@ public class PetalsOfInsight extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Arcane"); - this.color.setBlue(true); // Look at the top three cards of your library. You may put those cards on the bottom of your library in any order. If you do, return Petals of Insight to its owner's hand. Otherwise, draw three cards. this.getSpellAbility().addEffect(new PetalsOfInsightEffect()); diff --git a/Mage.Sets/src/mage/sets/modernmasters/ReachOfBranches.java b/Mage.Sets/src/mage/sets/modernmasters/ReachOfBranches.java index 75ea1f4cc5f..43c3e2833aa 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/ReachOfBranches.java +++ b/Mage.Sets/src/mage/sets/modernmasters/ReachOfBranches.java @@ -59,7 +59,6 @@ public class ReachOfBranches extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Treefolk"); - this.color.setGreen(true); // Put a 2/5 green Treefolk Shaman creature token onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new TreefolkShamanToken())); diff --git a/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java b/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java index 8af03ab1605..d903c91b4d8 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java +++ b/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java @@ -80,7 +80,6 @@ public class RiftElemental extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/modernmasters/Riftsweeper.java b/Mage.Sets/src/mage/sets/modernmasters/Riftsweeper.java index 1e0a8933ef9..04994b60d4c 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/Riftsweeper.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Riftsweeper.java @@ -62,7 +62,6 @@ public class Riftsweeper extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/modernmasters/RudeAwakening.java b/Mage.Sets/src/mage/sets/modernmasters/RudeAwakening.java index e02566390b3..bdefd7115e8 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/RudeAwakening.java +++ b/Mage.Sets/src/mage/sets/modernmasters/RudeAwakening.java @@ -51,7 +51,6 @@ public class RudeAwakening extends CardImpl { super(ownerId, 160, "Rude Awakening", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{G}"); this.expansionSetCode = "MMA"; - this.color.setGreen(true); // Choose one - this.getSpellAbility().getModes().setMinModes(1); diff --git a/Mage.Sets/src/mage/sets/modernmasters/SporolothAncient.java b/Mage.Sets/src/mage/sets/modernmasters/SporolothAncient.java index 45ff27117c8..8dfbf8992cf 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/SporolothAncient.java +++ b/Mage.Sets/src/mage/sets/modernmasters/SporolothAncient.java @@ -58,7 +58,6 @@ public class SporolothAncient extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Fungus"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/modernmasters/StirThePride.java b/Mage.Sets/src/mage/sets/modernmasters/StirThePride.java index 55dc52d5b2a..0355c392b3d 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/StirThePride.java +++ b/Mage.Sets/src/mage/sets/modernmasters/StirThePride.java @@ -49,7 +49,6 @@ public class StirThePride extends CardImpl { super(ownerId, 30, "Stir the Pride", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{W}"); this.expansionSetCode = "MMA"; - this.color.setWhite(true); // Choose one - this.getSpellAbility().getModes().setMinModes(1); diff --git a/Mage.Sets/src/mage/sets/modernmasters/StonehewerGiant.java b/Mage.Sets/src/mage/sets/modernmasters/StonehewerGiant.java index 45c5f79ea9c..4529b1346ef 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/StonehewerGiant.java +++ b/Mage.Sets/src/mage/sets/modernmasters/StonehewerGiant.java @@ -62,7 +62,6 @@ public class StonehewerGiant extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/modernmasters/TakePossession.java b/Mage.Sets/src/mage/sets/modernmasters/TakePossession.java index e119bd2d39f..692ba6a7933 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/TakePossession.java +++ b/Mage.Sets/src/mage/sets/modernmasters/TakePossession.java @@ -53,7 +53,6 @@ public class TakePossession extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Aura"); - this.color.setBlue(true); // Split second this.addAbility(new SplitSecondAbility()); diff --git a/Mage.Sets/src/mage/sets/modernmasters/TestOfFaith.java b/Mage.Sets/src/mage/sets/modernmasters/TestOfFaith.java index 35a576a7a97..4baaf12bab9 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/TestOfFaith.java +++ b/Mage.Sets/src/mage/sets/modernmasters/TestOfFaith.java @@ -50,7 +50,6 @@ public class TestOfFaith extends CardImpl { super(ownerId, 33, "Test of Faith", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "MMA"; - this.color.setWhite(true); // Prevent the next 3 damage that would be dealt to target creature this turn, and put a +1/+1 counter on that creature for each 1 damage prevented this way. this.getSpellAbility().addEffect(new TestOfFaithPreventDamageTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/modernmasters/ThievingSprite.java b/Mage.Sets/src/mage/sets/modernmasters/ThievingSprite.java index aef0fcbdaab..845d1557142 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/ThievingSprite.java +++ b/Mage.Sets/src/mage/sets/modernmasters/ThievingSprite.java @@ -62,7 +62,6 @@ public class ThievingSprite extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/modernmasters/ThundercloudShaman.java b/Mage.Sets/src/mage/sets/modernmasters/ThundercloudShaman.java index 4c2a95f0e14..6443366286b 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/ThundercloudShaman.java +++ b/Mage.Sets/src/mage/sets/modernmasters/ThundercloudShaman.java @@ -62,7 +62,6 @@ public class ThundercloudShaman extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/modernmasters/Tombstalker.java b/Mage.Sets/src/mage/sets/modernmasters/Tombstalker.java index e2a80ca413e..cbeeb44451c 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/Tombstalker.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Tombstalker.java @@ -47,7 +47,6 @@ public class Tombstalker extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Demon"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java b/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java index 2f179b2690e..cc72de228cd 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java +++ b/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java @@ -58,8 +58,6 @@ public class TrygonPredator extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Beast"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/modernmasters/WarrenPilferers.java b/Mage.Sets/src/mage/sets/modernmasters/WarrenPilferers.java index 4a8e87743ff..83798408946 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/WarrenPilferers.java +++ b/Mage.Sets/src/mage/sets/modernmasters/WarrenPilferers.java @@ -61,7 +61,6 @@ public class WarrenPilferers extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/modernmasters/WarrenWeirding.java b/Mage.Sets/src/mage/sets/modernmasters/WarrenWeirding.java index aadfcfda732..8a294fd70a3 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/WarrenWeirding.java +++ b/Mage.Sets/src/mage/sets/modernmasters/WarrenWeirding.java @@ -64,7 +64,6 @@ public class WarrenWeirding extends CardImpl { this.expansionSetCode = "MMA"; this.subtype.add("Goblin"); - this.color.setBlack(true); // Target player sacrifices a creature. If a Goblin is sacrificed this way, that player puts two 1/1 black Goblin Rogue creature tokens onto the battlefield, and those tokens gain haste until end of turn. this.getSpellAbility().addEffect(new WarrenWeirdingEffect()); diff --git a/Mage.Sets/src/mage/sets/morningtide/BallyrushBanneret.java b/Mage.Sets/src/mage/sets/morningtide/BallyrushBanneret.java index b8b3a605f68..234fc5056ed 100644 --- a/Mage.Sets/src/mage/sets/morningtide/BallyrushBanneret.java +++ b/Mage.Sets/src/mage/sets/morningtide/BallyrushBanneret.java @@ -59,7 +59,6 @@ public class BallyrushBanneret extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/morningtide/BoskBanneret.java b/Mage.Sets/src/mage/sets/morningtide/BoskBanneret.java index 0ba0da8b9a5..bc3dcf3379a 100644 --- a/Mage.Sets/src/mage/sets/morningtide/BoskBanneret.java +++ b/Mage.Sets/src/mage/sets/morningtide/BoskBanneret.java @@ -59,7 +59,6 @@ public class BoskBanneret extends CardImpl { this.subtype.add("Treefolk"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/morningtide/BrighthearthBanneret.java b/Mage.Sets/src/mage/sets/morningtide/BrighthearthBanneret.java index 943980a7d47..e404891c77d 100644 --- a/Mage.Sets/src/mage/sets/morningtide/BrighthearthBanneret.java +++ b/Mage.Sets/src/mage/sets/morningtide/BrighthearthBanneret.java @@ -61,7 +61,6 @@ public class BrighthearthBanneret extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/morningtide/CountrysideCrusher.java b/Mage.Sets/src/mage/sets/morningtide/CountrysideCrusher.java index 98099465d21..ff36da3be68 100644 --- a/Mage.Sets/src/mage/sets/morningtide/CountrysideCrusher.java +++ b/Mage.Sets/src/mage/sets/morningtide/CountrysideCrusher.java @@ -62,7 +62,6 @@ public class CountrysideCrusher extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/morningtide/CreamOfTheCrop.java b/Mage.Sets/src/mage/sets/morningtide/CreamOfTheCrop.java index 6e34491fb93..9fb9da49fd7 100644 --- a/Mage.Sets/src/mage/sets/morningtide/CreamOfTheCrop.java +++ b/Mage.Sets/src/mage/sets/morningtide/CreamOfTheCrop.java @@ -58,7 +58,6 @@ public class CreamOfTheCrop extends CardImpl { super(ownerId, 117, "Cream of the Crop", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "MOR"; - this.color.setGreen(true); // Whenever a creature enters the battlefield under your control, you may look at the top X cards of your library, where X is that creature's power. If you do, put one of those cards on top of your library and the rest on the bottom of your library in any order. this.addAbility(new EntersBattlefieldControlledTriggeredAbility( diff --git a/Mage.Sets/src/mage/sets/morningtide/DailyRegimen.java b/Mage.Sets/src/mage/sets/morningtide/DailyRegimen.java index f5d69cd8d39..b9acdb8e9e8 100644 --- a/Mage.Sets/src/mage/sets/morningtide/DailyRegimen.java +++ b/Mage.Sets/src/mage/sets/morningtide/DailyRegimen.java @@ -54,7 +54,6 @@ public class DailyRegimen extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/morningtide/Deglamer.java b/Mage.Sets/src/mage/sets/morningtide/Deglamer.java index de624cde0d5..4c1007a4917 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Deglamer.java +++ b/Mage.Sets/src/mage/sets/morningtide/Deglamer.java @@ -59,7 +59,6 @@ public class Deglamer extends CardImpl { super(ownerId, 118, "Deglamer", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "MOR"; - this.color.setGreen(true); // Choose target artifact or enchantment. Its owner shuffles it into his or her library. this.getSpellAbility().addEffect(new DeglamerShuffleIntoLibraryEffect()); diff --git a/Mage.Sets/src/mage/sets/morningtide/DistantMelody.java b/Mage.Sets/src/mage/sets/morningtide/DistantMelody.java index dd12a7f5927..2c4c17f745b 100644 --- a/Mage.Sets/src/mage/sets/morningtide/DistantMelody.java +++ b/Mage.Sets/src/mage/sets/morningtide/DistantMelody.java @@ -54,7 +54,6 @@ public class DistantMelody extends CardImpl { super(ownerId, 32, "Distant Melody", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "MOR"; - this.color.setBlue(true); // Choose a creature type. Draw a card for each permanent you control of that type. this.getSpellAbility().addEffect(new DistantMelodyEffect()); diff --git a/Mage.Sets/src/mage/sets/morningtide/ElvishWarrior.java b/Mage.Sets/src/mage/sets/morningtide/ElvishWarrior.java index 76e2dd1662d..7b40a69b0fd 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ElvishWarrior.java +++ b/Mage.Sets/src/mage/sets/morningtide/ElvishWarrior.java @@ -45,7 +45,6 @@ public class ElvishWarrior extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/morningtide/FrogtosserBanneret.java b/Mage.Sets/src/mage/sets/morningtide/FrogtosserBanneret.java index 633e47c5f33..d8a05993337 100644 --- a/Mage.Sets/src/mage/sets/morningtide/FrogtosserBanneret.java +++ b/Mage.Sets/src/mage/sets/morningtide/FrogtosserBanneret.java @@ -60,7 +60,6 @@ public class FrogtosserBanneret extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java b/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java index e951b02d6a7..92e5ee86a55 100644 --- a/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java +++ b/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java @@ -71,7 +71,6 @@ public class GiltLeafArchdruid extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java b/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java index 92a7c8c84a7..ed4882fe4ce 100644 --- a/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java +++ b/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java @@ -64,7 +64,6 @@ public class GreatbowDoyen extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Archer"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/morningtide/IndomitableAncients.java b/Mage.Sets/src/mage/sets/morningtide/IndomitableAncients.java index 52f60371561..c85b08e5034 100644 --- a/Mage.Sets/src/mage/sets/morningtide/IndomitableAncients.java +++ b/Mage.Sets/src/mage/sets/morningtide/IndomitableAncients.java @@ -45,7 +45,6 @@ public class IndomitableAncients extends CardImpl { this.subtype.add("Treefolk"); this.subtype.add("Warrior"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(10); } diff --git a/Mage.Sets/src/mage/sets/morningtide/InkDissolver.java b/Mage.Sets/src/mage/sets/morningtide/InkDissolver.java index 75b7a1393ef..fa9a5788f68 100644 --- a/Mage.Sets/src/mage/sets/morningtide/InkDissolver.java +++ b/Mage.Sets/src/mage/sets/morningtide/InkDissolver.java @@ -48,7 +48,6 @@ public class InkDissolver extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/morningtide/KithkinZephyrnaut.java b/Mage.Sets/src/mage/sets/morningtide/KithkinZephyrnaut.java index 70466112d8b..9c2fb036852 100644 --- a/Mage.Sets/src/mage/sets/morningtide/KithkinZephyrnaut.java +++ b/Mage.Sets/src/mage/sets/morningtide/KithkinZephyrnaut.java @@ -52,7 +52,6 @@ public class KithkinZephyrnaut extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/morningtide/LeafCrownedElder.java b/Mage.Sets/src/mage/sets/morningtide/LeafCrownedElder.java index 52a7174e1fe..3280ed71a29 100644 --- a/Mage.Sets/src/mage/sets/morningtide/LeafCrownedElder.java +++ b/Mage.Sets/src/mage/sets/morningtide/LeafCrownedElder.java @@ -52,7 +52,6 @@ public class LeafCrownedElder extends CardImpl { this.subtype.add("Treefolk"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/morningtide/Meadowboon.java b/Mage.Sets/src/mage/sets/morningtide/Meadowboon.java index 8f7b03353ff..4f3cfa2ca47 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Meadowboon.java +++ b/Mage.Sets/src/mage/sets/morningtide/Meadowboon.java @@ -56,7 +56,6 @@ public class Meadowboon extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Elemental"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/morningtide/MudbuttonClanger.java b/Mage.Sets/src/mage/sets/morningtide/MudbuttonClanger.java index 13b289536ed..3ca4567211e 100644 --- a/Mage.Sets/src/mage/sets/morningtide/MudbuttonClanger.java +++ b/Mage.Sets/src/mage/sets/morningtide/MudbuttonClanger.java @@ -48,7 +48,6 @@ public class MudbuttonClanger extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/morningtide/Nevermaker.java b/Mage.Sets/src/mage/sets/morningtide/Nevermaker.java index fc98eb12652..514eab6741b 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Nevermaker.java +++ b/Mage.Sets/src/mage/sets/morningtide/Nevermaker.java @@ -52,7 +52,6 @@ public class Nevermaker extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/morningtide/NightshadeSchemers.java b/Mage.Sets/src/mage/sets/morningtide/NightshadeSchemers.java index 2bb8df0e768..fac884821e1 100644 --- a/Mage.Sets/src/mage/sets/morningtide/NightshadeSchemers.java +++ b/Mage.Sets/src/mage/sets/morningtide/NightshadeSchemers.java @@ -48,7 +48,6 @@ public class NightshadeSchemers extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/morningtide/NogginWhack.java b/Mage.Sets/src/mage/sets/morningtide/NogginWhack.java index 5d42d2713fe..967793035b1 100644 --- a/Mage.Sets/src/mage/sets/morningtide/NogginWhack.java +++ b/Mage.Sets/src/mage/sets/morningtide/NogginWhack.java @@ -59,7 +59,6 @@ public class NogginWhack extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Rogue"); - this.color.setBlack(true); // Prowl {1}{B} this.addAbility(new ProwlAbility(this, "{1}{B}")); diff --git a/Mage.Sets/src/mage/sets/morningtide/Offalsnout.java b/Mage.Sets/src/mage/sets/morningtide/Offalsnout.java index c0716c1aaf8..d4396f6383b 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Offalsnout.java +++ b/Mage.Sets/src/mage/sets/morningtide/Offalsnout.java @@ -51,7 +51,6 @@ public class Offalsnout extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Elemental"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/morningtide/PreeminentCaptain.java b/Mage.Sets/src/mage/sets/morningtide/PreeminentCaptain.java index 251224557d9..95cac98d2bb 100644 --- a/Mage.Sets/src/mage/sets/morningtide/PreeminentCaptain.java +++ b/Mage.Sets/src/mage/sets/morningtide/PreeminentCaptain.java @@ -59,7 +59,6 @@ public class PreeminentCaptain extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/morningtide/PricklyBoggart.java b/Mage.Sets/src/mage/sets/morningtide/PricklyBoggart.java index 915c39c448b..52d7bdd88d3 100644 --- a/Mage.Sets/src/mage/sets/morningtide/PricklyBoggart.java +++ b/Mage.Sets/src/mage/sets/morningtide/PricklyBoggart.java @@ -46,7 +46,6 @@ public class PricklyBoggart extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/morningtide/PyroclastConsul.java b/Mage.Sets/src/mage/sets/morningtide/PyroclastConsul.java index 70c2e621651..be601e451a4 100644 --- a/Mage.Sets/src/mage/sets/morningtide/PyroclastConsul.java +++ b/Mage.Sets/src/mage/sets/morningtide/PyroclastConsul.java @@ -48,7 +48,6 @@ public class PyroclastConsul extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/morningtide/RageForger.java b/Mage.Sets/src/mage/sets/morningtide/RageForger.java index 3871fe576b3..c1a42fac273 100644 --- a/Mage.Sets/src/mage/sets/morningtide/RageForger.java +++ b/Mage.Sets/src/mage/sets/morningtide/RageForger.java @@ -73,7 +73,6 @@ public class RageForger extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/morningtide/ReleaseTheAnts.java b/Mage.Sets/src/mage/sets/morningtide/ReleaseTheAnts.java index d7310ac153e..7110fc5a246 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ReleaseTheAnts.java +++ b/Mage.Sets/src/mage/sets/morningtide/ReleaseTheAnts.java @@ -45,7 +45,6 @@ public class ReleaseTheAnts extends CardImpl { super(ownerId, 98, "Release the Ants", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "MOR"; - this.color.setRed(true); // Release the Ants deals 1 damage to target creature or player. Clash with an opponent. If you win, return Release the Ants to its owner's hand. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/morningtide/Reveillark.java b/Mage.Sets/src/mage/sets/morningtide/Reveillark.java index 8f23402a933..cd2e49d8b32 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Reveillark.java +++ b/Mage.Sets/src/mage/sets/morningtide/Reveillark.java @@ -58,7 +58,6 @@ public class Reveillark extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Elemental"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java b/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java index 6cea8992ee2..f1c69c592e4 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java +++ b/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java @@ -56,7 +56,6 @@ public class Scapeshift extends CardImpl { super(ownerId, 136, "Scapeshift", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{G}{G}"); this.expansionSetCode = "MOR"; - this.color.setGreen(true); // Sacrifice any number of lands. Search your library for that many land cards, put them onto the battlefield tapped, then shuffle your library. this.getSpellAbility().addEffect(new ScapeshiftEffect()); diff --git a/Mage.Sets/src/mage/sets/morningtide/SensationGorger.java b/Mage.Sets/src/mage/sets/morningtide/SensationGorger.java index 16e4b4a15c8..de1d1c54fc1 100644 --- a/Mage.Sets/src/mage/sets/morningtide/SensationGorger.java +++ b/Mage.Sets/src/mage/sets/morningtide/SensationGorger.java @@ -49,7 +49,6 @@ public class SensationGorger extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/morningtide/Slithermuse.java b/Mage.Sets/src/mage/sets/morningtide/Slithermuse.java index 7bd3003bf1d..a4a260c2f22 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Slithermuse.java +++ b/Mage.Sets/src/mage/sets/morningtide/Slithermuse.java @@ -54,7 +54,6 @@ public class Slithermuse extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/morningtide/SqueakingPieGrubfellows.java b/Mage.Sets/src/mage/sets/morningtide/SqueakingPieGrubfellows.java index fbb7203d306..619bf5064ea 100644 --- a/Mage.Sets/src/mage/sets/morningtide/SqueakingPieGrubfellows.java +++ b/Mage.Sets/src/mage/sets/morningtide/SqueakingPieGrubfellows.java @@ -49,7 +49,6 @@ public class SqueakingPieGrubfellows extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/morningtide/StonybrookBanneret.java b/Mage.Sets/src/mage/sets/morningtide/StonybrookBanneret.java index 50203acecca..8ef4524ddd1 100644 --- a/Mage.Sets/src/mage/sets/morningtide/StonybrookBanneret.java +++ b/Mage.Sets/src/mage/sets/morningtide/StonybrookBanneret.java @@ -60,7 +60,6 @@ public class StonybrookBanneret extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/morningtide/ThievesFortune.java b/Mage.Sets/src/mage/sets/morningtide/ThievesFortune.java index 0ddc3cb006a..6105e66f57e 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ThievesFortune.java +++ b/Mage.Sets/src/mage/sets/morningtide/ThievesFortune.java @@ -48,7 +48,6 @@ public class ThievesFortune extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Rogue"); - this.color.setBlue(true); // Prowl {U} this.addAbility(new ProwlAbility(this, "{U}")); diff --git a/Mage.Sets/src/mage/sets/morningtide/TitansRevenge.java b/Mage.Sets/src/mage/sets/morningtide/TitansRevenge.java index dbd6914a7fe..6848e6455bf 100644 --- a/Mage.Sets/src/mage/sets/morningtide/TitansRevenge.java +++ b/Mage.Sets/src/mage/sets/morningtide/TitansRevenge.java @@ -46,7 +46,6 @@ public class TitansRevenge extends CardImpl { super(ownerId, 110, "Titan's Revenge", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{R}{R}"); this.expansionSetCode = "MOR"; - this.color.setRed(true); // Titan's Revenge deals X damage to target creature or player. Clash with an opponent. If you win, return Titan's Revenge to its owner's hand. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); diff --git a/Mage.Sets/src/mage/sets/morningtide/UnstoppableAsh.java b/Mage.Sets/src/mage/sets/morningtide/UnstoppableAsh.java index d90534b0641..aa60c72fdea 100644 --- a/Mage.Sets/src/mage/sets/morningtide/UnstoppableAsh.java +++ b/Mage.Sets/src/mage/sets/morningtide/UnstoppableAsh.java @@ -61,7 +61,6 @@ public class UnstoppableAsh extends CardImpl { this.subtype.add("Treefolk"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/morningtide/VendilionClique.java b/Mage.Sets/src/mage/sets/morningtide/VendilionClique.java index 6c7336aa2b7..8a69fe999c5 100644 --- a/Mage.Sets/src/mage/sets/morningtide/VendilionClique.java +++ b/Mage.Sets/src/mage/sets/morningtide/VendilionClique.java @@ -61,7 +61,6 @@ public class VendilionClique extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/morningtide/WalkerOfTheGrove.java b/Mage.Sets/src/mage/sets/morningtide/WalkerOfTheGrove.java index a5d832e80b8..568c166d9b9 100644 --- a/Mage.Sets/src/mage/sets/morningtide/WalkerOfTheGrove.java +++ b/Mage.Sets/src/mage/sets/morningtide/WalkerOfTheGrove.java @@ -48,7 +48,6 @@ public class WalkerOfTheGrove extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/morningtide/WanderingGraybeard.java b/Mage.Sets/src/mage/sets/morningtide/WanderingGraybeard.java index f7e540ef56d..bcef96b3258 100644 --- a/Mage.Sets/src/mage/sets/morningtide/WanderingGraybeard.java +++ b/Mage.Sets/src/mage/sets/morningtide/WanderingGraybeard.java @@ -47,7 +47,6 @@ public class WanderingGraybeard extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Wizard"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/morningtide/WaterspoutWeavers.java b/Mage.Sets/src/mage/sets/morningtide/WaterspoutWeavers.java index d90876ab0e1..67f4bc79e22 100644 --- a/Mage.Sets/src/mage/sets/morningtide/WaterspoutWeavers.java +++ b/Mage.Sets/src/mage/sets/morningtide/WaterspoutWeavers.java @@ -53,7 +53,6 @@ public class WaterspoutWeavers extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/morningtide/WinnowerPatrol.java b/Mage.Sets/src/mage/sets/morningtide/WinnowerPatrol.java index 2b89e4ef2a7..79b4d374b21 100644 --- a/Mage.Sets/src/mage/sets/morningtide/WinnowerPatrol.java +++ b/Mage.Sets/src/mage/sets/morningtide/WinnowerPatrol.java @@ -50,7 +50,6 @@ public class WinnowerPatrol extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/morningtide/WolfSkullShaman.java b/Mage.Sets/src/mage/sets/morningtide/WolfSkullShaman.java index b1639bacb6f..9ec6bf22082 100644 --- a/Mage.Sets/src/mage/sets/morningtide/WolfSkullShaman.java +++ b/Mage.Sets/src/mage/sets/morningtide/WolfSkullShaman.java @@ -48,7 +48,6 @@ public class WolfSkullShaman extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/nemesis/AccumulatedKnowledge.java b/Mage.Sets/src/mage/sets/nemesis/AccumulatedKnowledge.java index 24268520045..8d8b8dddffd 100644 --- a/Mage.Sets/src/mage/sets/nemesis/AccumulatedKnowledge.java +++ b/Mage.Sets/src/mage/sets/nemesis/AccumulatedKnowledge.java @@ -53,7 +53,6 @@ public class AccumulatedKnowledge extends CardImpl { super(ownerId, 26, "Accumulated Knowledge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "NMS"; - this.color.setBlue(true); // Draw a card, then draw cards equal to the number of cards named Accumulated Knowledge in all graveyards. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/nemesis/Blastoderm.java b/Mage.Sets/src/mage/sets/nemesis/Blastoderm.java index 205d0f00f5d..874c09879a2 100644 --- a/Mage.Sets/src/mage/sets/nemesis/Blastoderm.java +++ b/Mage.Sets/src/mage/sets/nemesis/Blastoderm.java @@ -46,7 +46,6 @@ public class Blastoderm extends CardImpl { this.expansionSetCode = "NMS"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/nemesis/BlindingAngel.java b/Mage.Sets/src/mage/sets/nemesis/BlindingAngel.java index d221cc40875..10e801ab5d3 100644 --- a/Mage.Sets/src/mage/sets/nemesis/BlindingAngel.java +++ b/Mage.Sets/src/mage/sets/nemesis/BlindingAngel.java @@ -55,7 +55,6 @@ public class BlindingAngel extends CardImpl { this.expansionSetCode = "NMS"; this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/nemesis/CarrionWall.java b/Mage.Sets/src/mage/sets/nemesis/CarrionWall.java index a260a278a6b..d2c5bdedf08 100644 --- a/Mage.Sets/src/mage/sets/nemesis/CarrionWall.java +++ b/Mage.Sets/src/mage/sets/nemesis/CarrionWall.java @@ -50,7 +50,6 @@ public class CarrionWall extends CardImpl { this.expansionSetCode = "NMS"; this.subtype.add("Wall"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/nemesis/Daze.java b/Mage.Sets/src/mage/sets/nemesis/Daze.java index ce25c610350..97c36c4585a 100644 --- a/Mage.Sets/src/mage/sets/nemesis/Daze.java +++ b/Mage.Sets/src/mage/sets/nemesis/Daze.java @@ -58,7 +58,6 @@ public class Daze extends CardImpl { super(ownerId, 30, "Daze", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "NMS"; - this.color.setBlue(true); // You may return an Island you control to its owner's hand rather than pay Daze's mana cost. this.addAbility(new AlternativeCostSourceAbility(new ReturnToHandTargetCost(new TargetControlledPermanent(filter)))); diff --git a/Mage.Sets/src/mage/sets/nemesis/DeathPitOffering.java b/Mage.Sets/src/mage/sets/nemesis/DeathPitOffering.java index c1789264135..4c652654527 100644 --- a/Mage.Sets/src/mage/sets/nemesis/DeathPitOffering.java +++ b/Mage.Sets/src/mage/sets/nemesis/DeathPitOffering.java @@ -62,7 +62,6 @@ public class DeathPitOffering extends CardImpl { super(ownerId, 56, "Death Pit Offering", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "NMS"; - this.color.setBlack(true); // When Death Pit Offering enters the battlefield, sacrifice all creatures you control. this.addAbility(new EntersBattlefieldTriggeredAbility(new DeathPitOfferingEffect())); diff --git a/Mage.Sets/src/mage/sets/nemesis/FlameRift.java b/Mage.Sets/src/mage/sets/nemesis/FlameRift.java index 5cea74220ed..c299be79555 100644 --- a/Mage.Sets/src/mage/sets/nemesis/FlameRift.java +++ b/Mage.Sets/src/mage/sets/nemesis/FlameRift.java @@ -44,7 +44,6 @@ public class FlameRift extends CardImpl { super(ownerId, 80, "Flame Rift", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "NMS"; - this.color.setRed(true); // Flame Rift deals 4 damage to each player. this.getSpellAbility().addEffect(new DamagePlayersEffect(4, TargetController.ANY)); diff --git a/Mage.Sets/src/mage/sets/nemesis/Massacre.java b/Mage.Sets/src/mage/sets/nemesis/Massacre.java index 7adf6f49bf8..ded7f68f0d6 100644 --- a/Mage.Sets/src/mage/sets/nemesis/Massacre.java +++ b/Mage.Sets/src/mage/sets/nemesis/Massacre.java @@ -59,7 +59,6 @@ public class Massacre extends CardImpl { super(ownerId, 58, "Massacre", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{B}{B}"); this.expansionSetCode = "NMS"; - this.color.setBlack(true); // If an opponent controls a Plains and you control a Swamp, you may cast Massacre without paying its mana cost. Condition condition = new CompoundCondition("If an opponent controls a Plains and you control a Swamp", diff --git a/Mage.Sets/src/mage/sets/nemesis/MindSlash.java b/Mage.Sets/src/mage/sets/nemesis/MindSlash.java index 40b2f453c85..7b7ffa2419b 100644 --- a/Mage.Sets/src/mage/sets/nemesis/MindSlash.java +++ b/Mage.Sets/src/mage/sets/nemesis/MindSlash.java @@ -51,7 +51,6 @@ public class MindSlash extends CardImpl { super(ownerId, 59, "Mind Slash", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}"); this.expansionSetCode = "NMS"; - this.color.setBlack(true); // {B}, Sacrifice a creature: Target opponent reveals his or her hand. You choose a card from it. // That player discards that card. Activate this ability only any time you could cast a sorcery. diff --git a/Mage.Sets/src/mage/sets/nemesis/OraclesAttendants.java b/Mage.Sets/src/mage/sets/nemesis/OraclesAttendants.java index 378b9fbad3e..a7f5e850f65 100644 --- a/Mage.Sets/src/mage/sets/nemesis/OraclesAttendants.java +++ b/Mage.Sets/src/mage/sets/nemesis/OraclesAttendants.java @@ -58,7 +58,6 @@ public class OraclesAttendants extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/nemesis/ParallaxTide.java b/Mage.Sets/src/mage/sets/nemesis/ParallaxTide.java index cca958df928..5627c104dab 100644 --- a/Mage.Sets/src/mage/sets/nemesis/ParallaxTide.java +++ b/Mage.Sets/src/mage/sets/nemesis/ParallaxTide.java @@ -53,7 +53,6 @@ public class ParallaxTide extends CardImpl { super(ownerId, 37, "Parallax Tide", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}"); this.expansionSetCode = "NMS"; - this.color.setBlue(true); // Fading 5 this.addAbility(new FadingAbility(5, this)); diff --git a/Mage.Sets/src/mage/sets/nemesis/ParallaxWave.java b/Mage.Sets/src/mage/sets/nemesis/ParallaxWave.java index 3e902629d87..6b1311d8f0e 100644 --- a/Mage.Sets/src/mage/sets/nemesis/ParallaxWave.java +++ b/Mage.Sets/src/mage/sets/nemesis/ParallaxWave.java @@ -60,7 +60,6 @@ public class ParallaxWave extends CardImpl { super(ownerId, 17, "Parallax Wave", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "NMS"; - this.color.setWhite(true); // Fading 5 this.addAbility(new FadingAbility(5, this)); diff --git a/Mage.Sets/src/mage/sets/nemesis/ReverentSilence.java b/Mage.Sets/src/mage/sets/nemesis/ReverentSilence.java index 468f367f5e6..5d214e3bdae 100644 --- a/Mage.Sets/src/mage/sets/nemesis/ReverentSilence.java +++ b/Mage.Sets/src/mage/sets/nemesis/ReverentSilence.java @@ -55,7 +55,6 @@ public class ReverentSilence extends CardImpl { super(ownerId, 111, "Reverent Silence", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "NMS"; - this.color.setGreen(true); // If you control a Forest, rather than pay Reverent Silence's mana cost, you may have each other player gain 6 life. this.addAbility(new AlternativeCostSourceAbility(new GainLifePlayersCost(6), new PermanentsOnTheBattlefieldCondition(filter))); diff --git a/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java b/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java index ee6a4bb5a80..b4ba95f23ff 100644 --- a/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java +++ b/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java @@ -60,7 +60,6 @@ public class SealOfCleansing extends CardImpl { super(ownerId, 18, "Seal of Cleansing", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "NMS"; - this.color.setWhite(true); // Sacrifice Seal of Cleansing: Destroy target artifact or enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/nemesis/SealOfFire.java b/Mage.Sets/src/mage/sets/nemesis/SealOfFire.java index ccbb80f4feb..e867a589e01 100644 --- a/Mage.Sets/src/mage/sets/nemesis/SealOfFire.java +++ b/Mage.Sets/src/mage/sets/nemesis/SealOfFire.java @@ -49,7 +49,6 @@ public class SealOfFire extends CardImpl { super(ownerId, 98, "Seal of Fire", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{R}"); this.expansionSetCode = "NMS"; - this.color.setRed(true); // Sacrifice Seal of Fire: Seal of Fire deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/nemesis/SealOfRemoval.java b/Mage.Sets/src/mage/sets/nemesis/SealOfRemoval.java index cbe1e1e0cd0..926bd62ce33 100644 --- a/Mage.Sets/src/mage/sets/nemesis/SealOfRemoval.java +++ b/Mage.Sets/src/mage/sets/nemesis/SealOfRemoval.java @@ -50,7 +50,6 @@ public class SealOfRemoval extends CardImpl { super(ownerId, 42, "Seal of Removal", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{U}"); this.expansionSetCode = "NMS"; - this.color.setBlue(true); // Sacrifice Seal of Removal: Return target creature to its owner's hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/nemesis/SealOfStrength.java b/Mage.Sets/src/mage/sets/nemesis/SealOfStrength.java index 25391b18744..846d7a5b8f3 100644 --- a/Mage.Sets/src/mage/sets/nemesis/SealOfStrength.java +++ b/Mage.Sets/src/mage/sets/nemesis/SealOfStrength.java @@ -50,7 +50,6 @@ public class SealOfStrength extends CardImpl { super(ownerId, 115, "Seal of Strength", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "NMS"; - this.color.setGreen(true); // Sacrifice Seal of Strength: Target creature gets +3/+3 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/nemesis/SkyshroudClaim.java b/Mage.Sets/src/mage/sets/nemesis/SkyshroudClaim.java index 641e6328378..8215a601091 100644 --- a/Mage.Sets/src/mage/sets/nemesis/SkyshroudClaim.java +++ b/Mage.Sets/src/mage/sets/nemesis/SkyshroudClaim.java @@ -50,7 +50,6 @@ public class SkyshroudClaim extends CardImpl { super(ownerId, 117, "Skyshroud Claim", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "NMS"; - this.color.setGreen(true); // Search your library for up to two Forest cards and put them onto the battlefield. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, filter ), false)); diff --git a/Mage.Sets/src/mage/sets/nemesis/SkyshroudCutter.java b/Mage.Sets/src/mage/sets/nemesis/SkyshroudCutter.java index e31ee11733a..5efee618d25 100644 --- a/Mage.Sets/src/mage/sets/nemesis/SkyshroudCutter.java +++ b/Mage.Sets/src/mage/sets/nemesis/SkyshroudCutter.java @@ -55,7 +55,6 @@ public class SkyshroudCutter extends CardImpl { this.expansionSetCode = "NMS"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/nemesis/SkyshroudPoacher.java b/Mage.Sets/src/mage/sets/nemesis/SkyshroudPoacher.java index 58c82b22e1e..d4fbb5d71be 100644 --- a/Mage.Sets/src/mage/sets/nemesis/SkyshroudPoacher.java +++ b/Mage.Sets/src/mage/sets/nemesis/SkyshroudPoacher.java @@ -60,7 +60,6 @@ public class SkyshroudPoacher extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/nemesis/SneakyHomunculus.java b/Mage.Sets/src/mage/sets/nemesis/SneakyHomunculus.java index 6416f1dac88..35ab78e728f 100644 --- a/Mage.Sets/src/mage/sets/nemesis/SneakyHomunculus.java +++ b/Mage.Sets/src/mage/sets/nemesis/SneakyHomunculus.java @@ -59,7 +59,6 @@ public class SneakyHomunculus extends CardImpl { this.subtype.add("Homunculus"); this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/nemesis/Submerge.java b/Mage.Sets/src/mage/sets/nemesis/Submerge.java index 550759243cc..fee9b77b3e1 100644 --- a/Mage.Sets/src/mage/sets/nemesis/Submerge.java +++ b/Mage.Sets/src/mage/sets/nemesis/Submerge.java @@ -59,7 +59,6 @@ public class Submerge extends CardImpl { super(ownerId, 48, "Submerge", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{U}"); this.expansionSetCode = "NMS"; - this.color.setBlue(true); // If an opponent controls a Forest and you control an Island, you may cast Submerge without paying its mana cost. Condition condition = new CompoundCondition("If an opponent controls a Forest and you control an Island", diff --git a/Mage.Sets/src/mage/sets/nemesis/ViciousHunger.java b/Mage.Sets/src/mage/sets/nemesis/ViciousHunger.java index 5430ce69ac4..0109150cad8 100644 --- a/Mage.Sets/src/mage/sets/nemesis/ViciousHunger.java +++ b/Mage.Sets/src/mage/sets/nemesis/ViciousHunger.java @@ -45,7 +45,6 @@ public class ViciousHunger extends CardImpl { super(ownerId, 74, "Vicious Hunger", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}{B}"); this.expansionSetCode = "NMS"; - this.color.setBlack(true); // Vicious Hunger deals 2 damage to target creature and you gain 2 life. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression.java b/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression.java index 9f019c46386..81351c34185 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression.java @@ -48,7 +48,6 @@ public class ActOfAggression extends CardImpl { super(ownerId, 78, "Act of Aggression", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{RP}{RP}"); this.expansionSetCode = "NPH"; - this.color.setRed(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java b/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java index 2160b78e3cf..005b5ca05ec 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java @@ -46,7 +46,6 @@ public class ArgentMutation extends CardImpl { super(ownerId, 27, "Argent Mutation", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "NPH"; - this.color.setBlue(true); this.getSpellAbility().addEffect(new AddCardTypeTargetEffect(CardType.ARTIFACT, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java index af2f6b9a93b..10810e3a16e 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java @@ -54,7 +54,6 @@ public class ArmWithAEther extends CardImpl { super(ownerId, 28, "Arm with AEther", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "NPH"; - this.color.setBlue(true); // Until end of turn, creatures you control gain "Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand." Effect effect = new GainAbilityControlledEffect(new ArmWithAEtherTriggeredAbility(), Duration.EndOfTurn, new FilterCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Artillerize.java b/Mage.Sets/src/mage/sets/newphyrexia/Artillerize.java index b1383e5ce14..0271c845d2b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Artillerize.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Artillerize.java @@ -57,7 +57,6 @@ public class Artillerize extends CardImpl { super(ownerId, 79, "Artillerize", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{R}"); this.expansionSetCode = "NPH"; - this.color.setRed(true); this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/AuriokSurvivors.java b/Mage.Sets/src/mage/sets/newphyrexia/AuriokSurvivors.java index 2bde27797ee..7137d9740eb 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/AuriokSurvivors.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/AuriokSurvivors.java @@ -62,7 +62,6 @@ public class AuriokSurvivors extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BeastWithin.java b/Mage.Sets/src/mage/sets/newphyrexia/BeastWithin.java index 0d12bd9951b..bbdaed7f86a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BeastWithin.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BeastWithin.java @@ -52,7 +52,6 @@ public class BeastWithin extends CardImpl { super(ownerId, 103, "Beast Within", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "NPH"; - this.color.setGreen(true); this.getSpellAbility().addTarget(new TargetPermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java b/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java index 2b02d1f5895..03790814187 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java @@ -61,7 +61,6 @@ public class BirthingPod extends CardImpl { super(ownerId, 104, "Birthing Pod", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}{GP}"); this.expansionSetCode = "NPH"; - this.color.setGreen(true); // {1}{GP}, {tap}, Sacrifice a creature: Search your library for a creature card with converted mana cost equal to 1 plus the sacrificed creature's converted mana cost, put that card onto the battlefield, then shuffle your library. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new BirthingPodEffect(), new ManaCostsImpl("{1}{GP}")); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BlightedAgent.java b/Mage.Sets/src/mage/sets/newphyrexia/BlightedAgent.java index c9a807aa3d2..ae8f70c36d1 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BlightedAgent.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BlightedAgent.java @@ -47,7 +47,6 @@ public class BlightedAgent extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java b/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java index 15b6e72e370..f1608622608 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java @@ -60,7 +60,6 @@ public class BlindZealot extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java b/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java index f21af66ebf1..f56abbc78c1 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java @@ -62,7 +62,6 @@ public class BludgeonBrawl extends CardImpl { super(ownerId, 80, "Bludgeon Brawl", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "NPH"; - this.color.setRed(true); // Each noncreature, non-Equipment artifact is an Equipment with equip {X} and "Equipped creature gets +X/+0," where X is that artifact's converted mana cost. this.addAbility(new BludgeonBrawlAbility()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java index fccccbbec50..9c516b48f16 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java @@ -68,7 +68,6 @@ public class BrutalizerExarch extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Cleric"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/CaressOfPhyrexia.java b/Mage.Sets/src/mage/sets/newphyrexia/CaressOfPhyrexia.java index eccae4934d3..faf894a162e 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/CaressOfPhyrexia.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/CaressOfPhyrexia.java @@ -46,7 +46,6 @@ public class CaressOfPhyrexia extends CardImpl { super(ownerId, 53, "Caress of Phyrexia", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "NPH"; - this.color.setBlack(true); this.getSpellAbility().addEffect(new DrawCardTargetEffect(3)); this.getSpellAbility().addEffect(new LoseLifeTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java b/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java index 6b9ded4e10b..a83a14594d9 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java @@ -54,7 +54,6 @@ public class CathedralMembrane extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Wall"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java index c8b6d622ca1..c68d2b0bd97 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java @@ -59,7 +59,6 @@ public class ChancellorOfTheAnnex extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheDross.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheDross.java index 1582fad1bad..41747b07803 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheDross.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheDross.java @@ -55,7 +55,6 @@ public class ChancellorOfTheDross extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Vampire"); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheForge.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheForge.java index 07f925dd076..dcd832f67ad 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheForge.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheForge.java @@ -64,7 +64,6 @@ public class ChancellorOfTheForge extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Giant"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java index d6c9b30e396..d8fe63fd22a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java @@ -71,7 +71,6 @@ public class ChancellorOfTheSpires extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Sphinx"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/CorrosiveGale.java b/Mage.Sets/src/mage/sets/newphyrexia/CorrosiveGale.java index a15a39af159..e49464dd764 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/CorrosiveGale.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/CorrosiveGale.java @@ -54,7 +54,6 @@ public class CorrosiveGale extends CardImpl { this.expansionSetCode = "NPH"; - this.color.setGreen(true); this.getSpellAbility().addEffect(new DamageAllEffect(new ManacostVariableValue(), filter)); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/CorruptedResolve.java b/Mage.Sets/src/mage/sets/newphyrexia/CorruptedResolve.java index 388224333d6..a4adc9ba396 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/CorruptedResolve.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/CorruptedResolve.java @@ -51,7 +51,6 @@ public class CorruptedResolve extends CardImpl { super(ownerId, 32, "Corrupted Resolve", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "NPH"; - this.color.setBlue(true); // Counter target spell if its controller is poisoned. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DeathHoodCobra.java b/Mage.Sets/src/mage/sets/newphyrexia/DeathHoodCobra.java index bbd498b58f7..df146342034 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DeathHoodCobra.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DeathHoodCobra.java @@ -51,7 +51,6 @@ public class DeathHoodCobra extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Snake"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java index 98a6a462fec..85e3f9bb550 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java @@ -61,7 +61,6 @@ public class DeceiverExarch extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Cleric"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DefensiveStance.java b/Mage.Sets/src/mage/sets/newphyrexia/DefensiveStance.java index 5e41c8febe5..9476dda669c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DefensiveStance.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DefensiveStance.java @@ -52,7 +52,6 @@ public class DefensiveStance extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Aura"); - this.color.setBlue(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java b/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java index c6a532f13c9..745938370b5 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java @@ -51,7 +51,6 @@ public class DementiaBat extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Bat"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Despise.java b/Mage.Sets/src/mage/sets/newphyrexia/Despise.java index 2e5ccce5684..2c4bdd89b99 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Despise.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Despise.java @@ -55,7 +55,6 @@ public class Despise extends CardImpl { super(ownerId, 56, "Despise", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "NPH"; - this.color.setBlack(true); // Target opponent reveals his or her hand. You choose a creature or planeswalker card from it. That player discards that card. this.getSpellAbility().addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DueRespect.java b/Mage.Sets/src/mage/sets/newphyrexia/DueRespect.java index 8330114f217..b39778b6064 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DueRespect.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DueRespect.java @@ -50,7 +50,6 @@ public class DueRespect extends CardImpl { super(ownerId, 8, "Due Respect", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "NPH"; - this.color.setWhite(true); // Permanents enter the battlefield tapped this turn. this.getSpellAbility().addEffect(new DueRespectEffect()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/EntomberExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/EntomberExarch.java index fc3acf27e11..147f62f486d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/EntomberExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/EntomberExarch.java @@ -62,7 +62,6 @@ public class EntomberExarch extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Cleric"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/EvilPresence.java b/Mage.Sets/src/mage/sets/newphyrexia/EvilPresence.java index 754afab6d09..ddf4289b61b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/EvilPresence.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/EvilPresence.java @@ -51,7 +51,6 @@ public class EvilPresence extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Aura"); - this.color.setBlack(true); TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java b/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java index d3b42ea3e86..6e59b3509e4 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java @@ -60,7 +60,6 @@ public class ExclusionRitual extends CardImpl { super(ownerId, 10, "Exclusion Ritual", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{W}{W}"); this.expansionSetCode = "NPH"; - this.color.setWhite(true); // Imprint - When Exclusion Ritual enters the battlefield, exile target nonland permanent. Ability ability = new EntersBattlefieldTriggeredAbility(new ExclusionRitualImprintEffect(), false); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/FallenFerromancer.java b/Mage.Sets/src/mage/sets/newphyrexia/FallenFerromancer.java index f08587325fc..3214d236871 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/FallenFerromancer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/FallenFerromancer.java @@ -51,7 +51,6 @@ public class FallenFerromancer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/FlamebornViron.java b/Mage.Sets/src/mage/sets/newphyrexia/FlamebornViron.java index d0ec3892364..d32f9145f6a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/FlamebornViron.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/FlamebornViron.java @@ -44,7 +44,6 @@ public class FlamebornViron extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Insect"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java b/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java index 6c352248ab1..be47aded54c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java @@ -57,7 +57,6 @@ public class FreshMeat extends CardImpl { super(ownerId, 109, "Fresh Meat", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{G}"); this.expansionSetCode = "NPH"; - this.color.setGreen(true); this.getSpellAbility().addWatcher(new FreshMeatWatcher()); this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken(), new FreshMeatDynamicValue())); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/FurnaceScamp.java b/Mage.Sets/src/mage/sets/newphyrexia/FurnaceScamp.java index 4109e09db9a..c2726716bcd 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/FurnaceScamp.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/FurnaceScamp.java @@ -49,7 +49,6 @@ public class FurnaceScamp extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Geosurge.java b/Mage.Sets/src/mage/sets/newphyrexia/Geosurge.java index d25427cd5d5..75dff85c67a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Geosurge.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Geosurge.java @@ -51,7 +51,6 @@ public class Geosurge extends CardImpl { super(ownerId, 85, "Geosurge", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{R}{R}{R}{R}"); this.expansionSetCode = "NPH"; - this.color.setRed(true); this.getSpellAbility().addEffect(new BasicManaEffect(new GeosurgeConditionalMana())); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GlissasScorn.java b/Mage.Sets/src/mage/sets/newphyrexia/GlissasScorn.java index 591268a08e8..6d5a0793fd3 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GlissasScorn.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GlissasScorn.java @@ -45,7 +45,6 @@ public class GlissasScorn extends CardImpl { super(ownerId, 110, "Glissa's Scorn", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "NPH"; - this.color.setGreen(true); // Destroy target artifact. Its controller loses 1 life. this.getSpellAbility().addTarget(new TargetArtifactPermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GlistenerElf.java b/Mage.Sets/src/mage/sets/newphyrexia/GlistenerElf.java index b4f673a8841..edf0979d076 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GlistenerElf.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GlistenerElf.java @@ -46,7 +46,6 @@ public class GlistenerElf extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GrimAffliction.java b/Mage.Sets/src/mage/sets/newphyrexia/GrimAffliction.java index 3165f8f1c19..3f3db09a26a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GrimAffliction.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GrimAffliction.java @@ -46,7 +46,6 @@ public class GrimAffliction extends CardImpl { super(ownerId, 63, "Grim Affliction", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "NPH"; - this.color.setBlack(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.M1M1.createInstance())); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GutShot.java b/Mage.Sets/src/mage/sets/newphyrexia/GutShot.java index 402a023638c..d9556814ef4 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GutShot.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GutShot.java @@ -44,7 +44,6 @@ public class GutShot extends CardImpl { super(ownerId, 86, "Gut Shot", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{RP}"); this.expansionSetCode = "NPH"; - this.color.setRed(true); this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java b/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java index fa04c269fd2..89a794b1043 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java @@ -55,7 +55,6 @@ public class IchorExplosion extends CardImpl { super(ownerId, 64, "Ichor Explosion", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{5}{B}{B}"); this.expansionSetCode = "NPH"; - this.color.setBlack(true); // As an additional cost to cast Ichor Explosion, sacrifice a creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ImpalerShrike.java b/Mage.Sets/src/mage/sets/newphyrexia/ImpalerShrike.java index f378d150faf..d73dbccad2b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ImpalerShrike.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ImpalerShrike.java @@ -50,7 +50,6 @@ public class ImpalerShrike extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java b/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java index 701118001ce..a4d08f27ef6 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java @@ -58,7 +58,6 @@ public class InvaderParasite extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Insect"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/JinGitaxiasCoreAugur.java b/Mage.Sets/src/mage/sets/newphyrexia/JinGitaxiasCoreAugur.java index b0c0cd4b628..a3664f93c79 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/JinGitaxiasCoreAugur.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/JinGitaxiasCoreAugur.java @@ -51,7 +51,6 @@ public class JinGitaxiasCoreAugur extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Praetor"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/JorKadeenThePrevailer.java b/Mage.Sets/src/mage/sets/newphyrexia/JorKadeenThePrevailer.java index 9ecc8fb18ba..21f99cccb17 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/JorKadeenThePrevailer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/JorKadeenThePrevailer.java @@ -56,8 +56,6 @@ public class JorKadeenThePrevailer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/LeechingBite.java b/Mage.Sets/src/mage/sets/newphyrexia/LeechingBite.java index 6c9ffb173f2..7ab4a6277b2 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/LeechingBite.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/LeechingBite.java @@ -51,7 +51,6 @@ public class LeechingBite extends CardImpl { super(ownerId, 113, "Leeching Bite", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "NPH"; - this.color.setGreen(true); this.getSpellAbility().addEffect(new LeechingBiteEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(2)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java b/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java index a608fd8b9a7..c5a13f6cc66 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java @@ -55,7 +55,6 @@ public class LifesFinale extends CardImpl { super(ownerId, 65, "Life's Finale", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{B}{B}"); this.expansionSetCode = "NPH"; - this.color.setBlack(true); this.getSpellAbility().addEffect(new LifesFinaleEffect()); this.getSpellAbility().addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/LoxodonConvert.java b/Mage.Sets/src/mage/sets/newphyrexia/LoxodonConvert.java index 949c252e3d2..71e77e8d664 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/LoxodonConvert.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/LoxodonConvert.java @@ -45,7 +45,6 @@ public class LoxodonConvert extends CardImpl { this.subtype.add("Elephant"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MarrowShards.java b/Mage.Sets/src/mage/sets/newphyrexia/MarrowShards.java index f2bd354c437..675030934da 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MarrowShards.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MarrowShards.java @@ -44,7 +44,6 @@ public class MarrowShards extends CardImpl { super(ownerId, 15, "Marrow Shards", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{WP}"); this.expansionSetCode = "NPH"; - this.color.setWhite(true); this.getSpellAbility().addEffect(new DamageAllEffect(1, new FilterAttackingCreature())); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MasterSplicer.java b/Mage.Sets/src/mage/sets/newphyrexia/MasterSplicer.java index 3b00cd5d77b..25d074d14d6 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MasterSplicer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MasterSplicer.java @@ -60,7 +60,6 @@ public class MasterSplicer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Artificer"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MaulSplicer.java b/Mage.Sets/src/mage/sets/newphyrexia/MaulSplicer.java index 95118876ac5..032799a9258 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MaulSplicer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MaulSplicer.java @@ -63,7 +63,6 @@ public class MaulSplicer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Artificer"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java b/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java index 52e832b8737..3a0284d28e0 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java @@ -45,7 +45,6 @@ public class Mindculling extends CardImpl { super(ownerId, 39, "Mindculling", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{5}{U}"); this.expansionSetCode = "NPH"; - this.color.setBlue(true); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); this.getSpellAbility().addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MoltensteelDragon.java b/Mage.Sets/src/mage/sets/newphyrexia/MoltensteelDragon.java index 78cec8b4089..7a7199cf973 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MoltensteelDragon.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MoltensteelDragon.java @@ -50,7 +50,6 @@ public class MoltensteelDragon extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java b/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java index c612e8d7cf9..aed573e5174 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java @@ -55,7 +55,6 @@ public class MortisDogs extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Hound"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MycosynthFiend.java b/Mage.Sets/src/mage/sets/newphyrexia/MycosynthFiend.java index a3d986c9758..34d83e7519a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MycosynthFiend.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MycosynthFiend.java @@ -49,7 +49,6 @@ public class MycosynthFiend extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Horror"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java b/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java index 7348f6e24a6..6adb55f68ea 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java @@ -68,7 +68,6 @@ public class NumbingDose extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant artifact or creature TargetPermanent auraTarget = new TargetPermanent(filter); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/OgreMenial.java b/Mage.Sets/src/mage/sets/newphyrexia/OgreMenial.java index 8a073600b94..59c6fe2fc2c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/OgreMenial.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/OgreMenial.java @@ -50,7 +50,6 @@ public class OgreMenial extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Ogre"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(4); // Infect (This creature deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.) diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ParasiticImplant.java b/Mage.Sets/src/mage/sets/newphyrexia/ParasiticImplant.java index 38de176613a..bad19733ddc 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ParasiticImplant.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ParasiticImplant.java @@ -57,7 +57,6 @@ public class ParasiticImplant extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Aura"); - this.color.setBlack(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java index a9f80f6c4b3..f204d40458c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java @@ -68,7 +68,6 @@ public class PhyrexianIngester extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Beast"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianObliterator.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianObliterator.java index 98772ee1d5e..1ad441cca6d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianObliterator.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianObliterator.java @@ -55,7 +55,6 @@ public class PhyrexianObliterator extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java index 450345eda8f..15022f15509 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java @@ -58,7 +58,6 @@ public class PhyrexianSwarmlord extends CardImpl { this.subtype.add("Insect"); this.subtype.add("Horror"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianUnlife.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianUnlife.java index 3f71b261a20..eedd8bc52eb 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianUnlife.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianUnlife.java @@ -58,7 +58,6 @@ public class PhyrexianUnlife extends CardImpl { super(ownerId, 18, "Phyrexian Unlife", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "NPH"; - this.color.setWhite(true); // You don't lose the game for having 0 or less life. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontLoseByZeroOrLessLifeEffect(Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PithDriller.java b/Mage.Sets/src/mage/sets/newphyrexia/PithDriller.java index 4ed93a0acd1..ffdb882b38c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PithDriller.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PithDriller.java @@ -48,7 +48,6 @@ public class PithDriller extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PorcelainLegionnaire.java b/Mage.Sets/src/mage/sets/newphyrexia/PorcelainLegionnaire.java index 421b2655518..5e2a33cb841 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PorcelainLegionnaire.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PorcelainLegionnaire.java @@ -45,7 +45,6 @@ public class PorcelainLegionnaire extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java b/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java index 544113d9c9b..eebfcb13119 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java @@ -59,7 +59,6 @@ public class PraetorsGrasp extends CardImpl { super(ownerId, 71, "Praetor's Grasp", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{B}{B}"); this.expansionSetCode = "NPH"; - this.color.setBlack(true); // Search target opponent's library for a card and exile it face down. Then that player shuffles his or her library. You may look at and play that card for as long as it remains exiled. this.getSpellAbility().addEffect(new PraetorsGraspEffect()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PriestOfUrabrask.java b/Mage.Sets/src/mage/sets/newphyrexia/PriestOfUrabrask.java index 0190fc2286b..22f0eb04030 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PriestOfUrabrask.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PriestOfUrabrask.java @@ -48,7 +48,6 @@ public class PriestOfUrabrask extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PsychicBarrier.java b/Mage.Sets/src/mage/sets/newphyrexia/PsychicBarrier.java index a5b31c4c2c9..0697228426c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PsychicBarrier.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PsychicBarrier.java @@ -53,7 +53,6 @@ public class PsychicBarrier extends CardImpl { super(ownerId, 43, "Psychic Barrier", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}{U}"); this.expansionSetCode = "NPH"; - this.color.setBlue(true); // Counter target creature spell. Its controller loses 1 life. this.getSpellAbility().addTarget(new TargetSpell(filter)); this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PsychicSurgery.java b/Mage.Sets/src/mage/sets/newphyrexia/PsychicSurgery.java index 792dc4f0364..cbe7316723a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PsychicSurgery.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PsychicSurgery.java @@ -55,7 +55,6 @@ public class PsychicSurgery extends CardImpl { super(ownerId, 44, "Psychic Surgery", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "NPH"; - this.color.setBlue(true); this.addAbility(new PsychicSurgeryTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/RageExtractor.java b/Mage.Sets/src/mage/sets/newphyrexia/RageExtractor.java index f72b03b85b1..4cb2367ce79 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/RageExtractor.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/RageExtractor.java @@ -53,7 +53,6 @@ public class RageExtractor extends CardImpl { super(ownerId, 91, "Rage Extractor", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{4}{RP}"); this.expansionSetCode = "NPH"; - this.color.setRed(true); this.addAbility(new RageExtractorTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/RazorSwine.java b/Mage.Sets/src/mage/sets/newphyrexia/RazorSwine.java index 055265994fd..e8da225c5e8 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/RazorSwine.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/RazorSwine.java @@ -46,7 +46,6 @@ public class RazorSwine extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Boar"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ReaperOfSheoldred.java b/Mage.Sets/src/mage/sets/newphyrexia/ReaperOfSheoldred.java index 9c9fc977a82..d4fb7ce5d23 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ReaperOfSheoldred.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ReaperOfSheoldred.java @@ -54,7 +54,6 @@ public class ReaperOfSheoldred extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/RememberTheFallen.java b/Mage.Sets/src/mage/sets/newphyrexia/RememberTheFallen.java index f2faff6288c..05141fd3342 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/RememberTheFallen.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/RememberTheFallen.java @@ -58,7 +58,6 @@ public class RememberTheFallen extends CardImpl { super(ownerId, 21, "Remember the Fallen", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{W}"); this.expansionSetCode = "NPH"; - this.color.setWhite(true); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filterCreature)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/RottedHystrix.java b/Mage.Sets/src/mage/sets/newphyrexia/RottedHystrix.java index f8413f25f98..3d930c3e8ce 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/RottedHystrix.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/RottedHystrix.java @@ -44,7 +44,6 @@ public class RottedHystrix extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(6); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ScrapyardSalvo.java b/Mage.Sets/src/mage/sets/newphyrexia/ScrapyardSalvo.java index 1e94cc2978b..8e9eb0ceb4d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ScrapyardSalvo.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ScrapyardSalvo.java @@ -48,7 +48,6 @@ public class ScrapyardSalvo extends CardImpl { super(ownerId, 94, "Scrapyard Salvo", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); this.expansionSetCode = "NPH"; - this.color.setRed(true); this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DamageTargetEffect(new CardsInControllerGraveyardCount(filter))); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SensorSplicer.java b/Mage.Sets/src/mage/sets/newphyrexia/SensorSplicer.java index 47bdf110b65..e0bdbc916ca 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SensorSplicer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SensorSplicer.java @@ -62,7 +62,6 @@ public class SensorSplicer extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Artificer"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShriekRaptor.java b/Mage.Sets/src/mage/sets/newphyrexia/ShriekRaptor.java index 4e251e4c176..c97dbe90706 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShriekRaptor.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShriekRaptor.java @@ -46,7 +46,6 @@ public class ShriekRaptor extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Bird"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SlagFiend.java b/Mage.Sets/src/mage/sets/newphyrexia/SlagFiend.java index d59b742541a..93f74545a2a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SlagFiend.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SlagFiend.java @@ -51,7 +51,6 @@ public class SlagFiend extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Construct"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SlashPanther.java b/Mage.Sets/src/mage/sets/newphyrexia/SlashPanther.java index aa4d8025e1d..7170672282f 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SlashPanther.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SlashPanther.java @@ -45,7 +45,6 @@ public class SlashPanther extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Cat"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Spinebiter.java b/Mage.Sets/src/mage/sets/newphyrexia/Spinebiter.java index d5c281c22fb..c81a1eb8dfd 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Spinebiter.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Spinebiter.java @@ -46,7 +46,6 @@ public class Spinebiter extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SpinedThopter.java b/Mage.Sets/src/mage/sets/newphyrexia/SpinedThopter.java index 22d4ec63066..dc667f65a7b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SpinedThopter.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SpinedThopter.java @@ -45,7 +45,6 @@ public class SpinedThopter extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Thopter"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SpireMonitor.java b/Mage.Sets/src/mage/sets/newphyrexia/SpireMonitor.java index d0a92dbfb27..826680a6f1c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SpireMonitor.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SpireMonitor.java @@ -46,7 +46,6 @@ public class SpireMonitor extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/TezzeretsGambit.java b/Mage.Sets/src/mage/sets/newphyrexia/TezzeretsGambit.java index 9aee2fc3021..3a84c12f362 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/TezzeretsGambit.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/TezzeretsGambit.java @@ -44,7 +44,6 @@ public class TezzeretsGambit extends CardImpl { super(ownerId, 47, "Tezzeret's Gambit", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{UP}"); this.expansionSetCode = "NPH"; - this.color.setBlue(true); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); this.getSpellAbility().addEffect(new ProliferateEffect()); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ThunderingTanadon.java b/Mage.Sets/src/mage/sets/newphyrexia/ThunderingTanadon.java index 1c5f2112d13..77cbdb809ec 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ThunderingTanadon.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ThunderingTanadon.java @@ -45,7 +45,6 @@ public class ThunderingTanadon extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ToxicNim.java b/Mage.Sets/src/mage/sets/newphyrexia/ToxicNim.java index db20916a792..e1d25f9ba7a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ToxicNim.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ToxicNim.java @@ -49,7 +49,6 @@ public class ToxicNim extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/TriumphOfTheHordes.java b/Mage.Sets/src/mage/sets/newphyrexia/TriumphOfTheHordes.java index fe7bf1a6e00..28197c51428 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/TriumphOfTheHordes.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/TriumphOfTheHordes.java @@ -47,7 +47,6 @@ public class TriumphOfTheHordes extends CardImpl { super(ownerId, 123, "Triumph of the Hordes", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}{G}"); this.expansionSetCode = "NPH"; - this.color.setGreen(true); this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/UrabraskTheHidden.java b/Mage.Sets/src/mage/sets/newphyrexia/UrabraskTheHidden.java index f896c507584..31fbda858a9 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/UrabraskTheHidden.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/UrabraskTheHidden.java @@ -55,7 +55,6 @@ public class UrabraskTheHidden extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Praetor"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VaultSkirge.java b/Mage.Sets/src/mage/sets/newphyrexia/VaultSkirge.java index 1f0917457ae..a129207dcc0 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VaultSkirge.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VaultSkirge.java @@ -46,7 +46,6 @@ public class VaultSkirge extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Imp"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java b/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java index dddc9ffcb7e..16ae4a37e7e 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java @@ -56,7 +56,6 @@ public class VictoriousDestruction extends CardImpl { super(ownerId, 99, "Victorious Destruction", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{R}"); this.expansionSetCode = "NPH"; - this.color.setRed(true); // Destroy target artifact or land. Its controller loses 1 life. this.getSpellAbility().addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ViralDrake.java b/Mage.Sets/src/mage/sets/newphyrexia/ViralDrake.java index d4877d47596..88a2a392bc5 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ViralDrake.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ViralDrake.java @@ -50,7 +50,6 @@ public class ViralDrake extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ViridianHarvest.java b/Mage.Sets/src/mage/sets/newphyrexia/ViridianHarvest.java index 7f7598e436f..c0db0d49add 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ViridianHarvest.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ViridianHarvest.java @@ -52,7 +52,6 @@ public class ViridianHarvest extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Aura"); - this.color.setGreen(true); TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java b/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java index 4350eb594b8..251e9e2f4a2 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java @@ -67,7 +67,6 @@ public class VitalSplicer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Artificer"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VoltCharge.java b/Mage.Sets/src/mage/sets/newphyrexia/VoltCharge.java index 0a087c1c2c2..57b84fd2778 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VoltCharge.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VoltCharge.java @@ -45,7 +45,6 @@ public class VoltCharge extends CardImpl { super(ownerId, 100, "Volt Charge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "NPH"; - this.color.setRed(true); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java b/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java index 5410ca5ce5f..c89f8dafe3c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java @@ -58,7 +58,6 @@ public class VorinclexVoiceOfHunger extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Praetor"); - this.color.setGreen(true); this.power = new MageInt(7); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VulshokRefugee.java b/Mage.Sets/src/mage/sets/newphyrexia/VulshokRefugee.java index b3caf6e56bd..56b7ca5ac61 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VulshokRefugee.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VulshokRefugee.java @@ -55,7 +55,6 @@ public class VulshokRefugee extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/WarReport.java b/Mage.Sets/src/mage/sets/newphyrexia/WarReport.java index f187ebf00fe..d907e89ae1e 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/WarReport.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/WarReport.java @@ -50,7 +50,6 @@ public class WarReport extends CardImpl { super(ownerId, 26, "War Report", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "NPH"; - this.color.setWhite(true); this.getSpellAbility().addEffect(new WarReportEffect()); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Whipflare.java b/Mage.Sets/src/mage/sets/newphyrexia/Whipflare.java index aef845fb4d6..20a11bbdbc3 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Whipflare.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Whipflare.java @@ -52,7 +52,6 @@ public class Whipflare extends CardImpl { super(ownerId, 102, "Whipflare", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "NPH"; - this.color.setRed(true); // Whipflare deals 2 damage to each nonartifact creature. this.getSpellAbility().addEffect(new DamageAllEffect(2, filter)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/WhisperingSpecter.java b/Mage.Sets/src/mage/sets/newphyrexia/WhisperingSpecter.java index a1e69c68c4a..003b5795d4b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/WhisperingSpecter.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/WhisperingSpecter.java @@ -55,7 +55,6 @@ public class WhisperingSpecter extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Specter"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/WingSplicer.java b/Mage.Sets/src/mage/sets/newphyrexia/WingSplicer.java index 2436baf233b..417ad19da78 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/WingSplicer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/WingSplicer.java @@ -63,7 +63,6 @@ public class WingSplicer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Artificer"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Xenograft.java b/Mage.Sets/src/mage/sets/newphyrexia/Xenograft.java index 74020d1cd4e..88692fb2d1d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Xenograft.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Xenograft.java @@ -60,7 +60,6 @@ public class Xenograft extends CardImpl { super(ownerId, 51, "Xenograft", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}"); this.expansionSetCode = "NPH"; - this.color.setBlue(true); // As Xenograft enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new XenograftEffect())); diff --git a/Mage.Sets/src/mage/sets/ninthedition/AnabaShaman.java b/Mage.Sets/src/mage/sets/ninthedition/AnabaShaman.java index 100399502b3..40ad7100342 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/AnabaShaman.java +++ b/Mage.Sets/src/mage/sets/ninthedition/AnabaShaman.java @@ -53,7 +53,6 @@ public class AnabaShaman extends CardImpl { this.subtype.add("Minotaur"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ninthedition/Anarchist.java b/Mage.Sets/src/mage/sets/ninthedition/Anarchist.java index a71ec8c962c..3b2d37de3c5 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Anarchist.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Anarchist.java @@ -56,7 +56,6 @@ public class Anarchist extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ninthedition/AvenFlock.java b/Mage.Sets/src/mage/sets/ninthedition/AvenFlock.java index 819d997b2b1..1f31aa6d84c 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/AvenFlock.java +++ b/Mage.Sets/src/mage/sets/ninthedition/AvenFlock.java @@ -52,7 +52,6 @@ public class AvenFlock extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ninthedition/AvenWindreader.java b/Mage.Sets/src/mage/sets/ninthedition/AvenWindreader.java index 68ec9f0be92..1c4b2d5ec6c 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/AvenWindreader.java +++ b/Mage.Sets/src/mage/sets/ninthedition/AvenWindreader.java @@ -57,7 +57,6 @@ public class AvenWindreader extends CardImpl { this.subtype.add("Soldier"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ninthedition/BalduvianBarbarians.java b/Mage.Sets/src/mage/sets/ninthedition/BalduvianBarbarians.java index 5556da8cc14..a7469642ea4 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/BalduvianBarbarians.java +++ b/Mage.Sets/src/mage/sets/ninthedition/BalduvianBarbarians.java @@ -45,7 +45,6 @@ public class BalduvianBarbarians extends CardImpl { this.subtype.add("Human"); this.subtype.add("Barbarian"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/BattleOfWits.java b/Mage.Sets/src/mage/sets/ninthedition/BattleOfWits.java index fde72aa0d4e..16a7b73d087 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/BattleOfWits.java +++ b/Mage.Sets/src/mage/sets/ninthedition/BattleOfWits.java @@ -51,7 +51,6 @@ public class BattleOfWits extends CardImpl { super(ownerId, 65, "Battle of Wits", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}{U}"); this.expansionSetCode = "9ED"; - this.color.setBlue(true); // At the beginning of your upkeep, if you have 200 or more cards in your library, you win the game. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new WinGameSourceControllerEffect(), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/ninthedition/BlessedOrator.java b/Mage.Sets/src/mage/sets/ninthedition/BlessedOrator.java index fcff8dddcc5..bb3dc2142dd 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/BlessedOrator.java +++ b/Mage.Sets/src/mage/sets/ninthedition/BlessedOrator.java @@ -49,7 +49,6 @@ public class BlessedOrator extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ninthedition/BlinkingSpirit.java b/Mage.Sets/src/mage/sets/ninthedition/BlinkingSpirit.java index 37d0d9388d4..99337ef939c 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/BlinkingSpirit.java +++ b/Mage.Sets/src/mage/sets/ninthedition/BlinkingSpirit.java @@ -49,7 +49,6 @@ public class BlinkingSpirit extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ninthedition/BloodMoon.java b/Mage.Sets/src/mage/sets/ninthedition/BloodMoon.java index 9429000035d..c374adde742 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/BloodMoon.java +++ b/Mage.Sets/src/mage/sets/ninthedition/BloodMoon.java @@ -56,7 +56,6 @@ public class BloodMoon extends CardImpl { super(ownerId, 176, "Blood Moon", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "9ED"; - this.color.setRed(true); // Nonbasic lands are Mountains. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BloodMoonEffect())); diff --git a/Mage.Sets/src/mage/sets/ninthedition/Chastise.java b/Mage.Sets/src/mage/sets/ninthedition/Chastise.java index 87c026071b7..d5e4632a629 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Chastise.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Chastise.java @@ -51,7 +51,6 @@ public class Chastise extends CardImpl { super(ownerId, 9, "Chastise", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "9ED"; - this.color.setWhite(true); // Destroy target attacking creature. You gain life equal to its power. this.getSpellAbility().addTarget(new TargetAttackingCreature()); diff --git a/Mage.Sets/src/mage/sets/ninthedition/Cowardice.java b/Mage.Sets/src/mage/sets/ninthedition/Cowardice.java index 625c6ccf022..8df3fd58fb5 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Cowardice.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Cowardice.java @@ -51,7 +51,6 @@ public class Cowardice extends CardImpl { super(ownerId, 70, "Cowardice", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}{U}"); this.expansionSetCode = "9ED"; - this.color.setBlue(true); // Whenever a creature becomes the target of a spell or ability, return that creature to its owner's hand. this.addAbility(new CowardiceTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/ninthedition/CrossbowInfantry.java b/Mage.Sets/src/mage/sets/ninthedition/CrossbowInfantry.java index cd9d24a7ea6..5e8a387387d 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/CrossbowInfantry.java +++ b/Mage.Sets/src/mage/sets/ninthedition/CrossbowInfantry.java @@ -53,7 +53,6 @@ public class CrossbowInfantry extends CardImpl { this.subtype.add("Soldier"); this.subtype.add("Archer"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ninthedition/DaringApprentice.java b/Mage.Sets/src/mage/sets/ninthedition/DaringApprentice.java index 555040f1412..016c8adf7b3 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/DaringApprentice.java +++ b/Mage.Sets/src/mage/sets/ninthedition/DaringApprentice.java @@ -53,7 +53,6 @@ public class DaringApprentice extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ninthedition/Deathgazer.java b/Mage.Sets/src/mage/sets/ninthedition/Deathgazer.java index 0ddc534bb45..fa3a2db0fee 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Deathgazer.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Deathgazer.java @@ -53,7 +53,6 @@ public class Deathgazer extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Lizard"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ninthedition/ElvishBard.java b/Mage.Sets/src/mage/sets/ninthedition/ElvishBard.java index 452337a74c5..0e43cf0db8e 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/ElvishBard.java +++ b/Mage.Sets/src/mage/sets/ninthedition/ElvishBard.java @@ -48,7 +48,6 @@ public class ElvishBard extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ninthedition/Enrage.java b/Mage.Sets/src/mage/sets/ninthedition/Enrage.java index ab955260a45..dff44bb449b 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Enrage.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Enrage.java @@ -48,7 +48,6 @@ public class Enrage extends CardImpl { super(ownerId, 180, "Enrage", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{R}"); this.expansionSetCode = "9ED"; - this.color.setRed(true); // Target creature gets +X/+0 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(new ManacostVariableValue(), new StaticValue(0), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/ninthedition/Execute.java b/Mage.Sets/src/mage/sets/ninthedition/Execute.java index 7cdd5c21bf8..547977c5734 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Execute.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Execute.java @@ -53,7 +53,6 @@ public class Execute extends CardImpl { super(ownerId, 128, "Execute", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "9ED"; - this.color.setBlack(true); // Destroy target white creature. It can't be regenerated. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/ninthedition/FleetingImage.java b/Mage.Sets/src/mage/sets/ninthedition/FleetingImage.java index fd72efba623..c47b41aaeaf 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/FleetingImage.java +++ b/Mage.Sets/src/mage/sets/ninthedition/FleetingImage.java @@ -49,7 +49,6 @@ public class FleetingImage extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ninthedition/FootSoldiers.java b/Mage.Sets/src/mage/sets/ninthedition/FootSoldiers.java index 6938dd4142e..55c29a1225b 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/FootSoldiers.java +++ b/Mage.Sets/src/mage/sets/ninthedition/FootSoldiers.java @@ -45,7 +45,6 @@ public class FootSoldiers extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/GiantCockroach.java b/Mage.Sets/src/mage/sets/ninthedition/GiantCockroach.java index 618876544e6..ff6a12d7b68 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/GiantCockroach.java +++ b/Mage.Sets/src/mage/sets/ninthedition/GiantCockroach.java @@ -44,7 +44,6 @@ public class GiantCockroach extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Insect"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/GoblinChariot.java b/Mage.Sets/src/mage/sets/ninthedition/GoblinChariot.java index 7314be0b16d..7b1a64701ed 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/GoblinChariot.java +++ b/Mage.Sets/src/mage/sets/ninthedition/GoblinChariot.java @@ -46,7 +46,6 @@ public class GoblinChariot extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ninthedition/GravePact.java b/Mage.Sets/src/mage/sets/ninthedition/GravePact.java index 962db273c30..502ff727012 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/GravePact.java +++ b/Mage.Sets/src/mage/sets/ninthedition/GravePact.java @@ -54,7 +54,6 @@ public class GravePact extends CardImpl { super(ownerId, 135, "Grave Pact", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}{B}"); this.expansionSetCode = "9ED"; - this.color.setBlack(true); // Whenever a creature you control dies, each other player sacrifices a creature. this.addAbility(new GravePactTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/ninthedition/GreaterGood.java b/Mage.Sets/src/mage/sets/ninthedition/GreaterGood.java index e2297e48ff7..bf6252e13a6 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/GreaterGood.java +++ b/Mage.Sets/src/mage/sets/ninthedition/GreaterGood.java @@ -52,7 +52,6 @@ public class GreaterGood extends CardImpl { super(ownerId, 245, "Greater Good", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); this.expansionSetCode = "9ED"; - this.color.setGreen(true); // Sacrifice a creature: Draw cards equal to the sacrificed creature's power, then discard three cards. Effect effect = new DrawCardSourceControllerEffect(new SacrificeCostCreaturesPower()); diff --git a/Mage.Sets/src/mage/sets/ninthedition/GuerrillaTactics.java b/Mage.Sets/src/mage/sets/ninthedition/GuerrillaTactics.java index 3b59555505c..093240dfd8a 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/GuerrillaTactics.java +++ b/Mage.Sets/src/mage/sets/ninthedition/GuerrillaTactics.java @@ -51,7 +51,6 @@ public class GuerrillaTactics extends CardImpl { super(ownerId, 196, "Guerrilla Tactics", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "9ED"; - this.color.setRed(true); // Guerrilla Tactics deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/ninthedition/HuntedWumpus.java b/Mage.Sets/src/mage/sets/ninthedition/HuntedWumpus.java index 40a1dece1fc..6de884915ac 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/HuntedWumpus.java +++ b/Mage.Sets/src/mage/sets/ninthedition/HuntedWumpus.java @@ -54,7 +54,6 @@ public class HuntedWumpus extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/ninthedition/IvoryMask.java b/Mage.Sets/src/mage/sets/ninthedition/IvoryMask.java index 1beef9d04e9..291b613ed49 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/IvoryMask.java +++ b/Mage.Sets/src/mage/sets/ninthedition/IvoryMask.java @@ -47,7 +47,6 @@ public class IvoryMask extends CardImpl { super(ownerId, 23, "Ivory Mask", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "9ED"; - this.color.setWhite(true); // You have shroud. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(ShroudAbility.getInstance()))); diff --git a/Mage.Sets/src/mage/sets/ninthedition/KingCheetah.java b/Mage.Sets/src/mage/sets/ninthedition/KingCheetah.java index 8e30347f18b..bf4d4396e2c 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/KingCheetah.java +++ b/Mage.Sets/src/mage/sets/ninthedition/KingCheetah.java @@ -45,7 +45,6 @@ public class KingCheetah extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Cat"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ninthedition/LlanowarBehemoth.java b/Mage.Sets/src/mage/sets/ninthedition/LlanowarBehemoth.java index bddbb0fb9ac..a942c66d1b5 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/LlanowarBehemoth.java +++ b/Mage.Sets/src/mage/sets/ninthedition/LlanowarBehemoth.java @@ -59,7 +59,6 @@ public class LlanowarBehemoth extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ninthedition/Magnivore.java b/Mage.Sets/src/mage/sets/ninthedition/Magnivore.java index 2b2862ae714..f1414a98ca6 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Magnivore.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Magnivore.java @@ -58,7 +58,6 @@ public class Magnivore extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Lhurgoyf"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/ninthedition/Maro.java b/Mage.Sets/src/mage/sets/ninthedition/Maro.java index b3df8cdbcc9..0df782fc21b 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Maro.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Maro.java @@ -50,7 +50,6 @@ public class Maro extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/ninthedition/MasterHealer.java b/Mage.Sets/src/mage/sets/ninthedition/MasterHealer.java index 6e49e2cb291..278cb1f151e 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/MasterHealer.java +++ b/Mage.Sets/src/mage/sets/ninthedition/MasterHealer.java @@ -53,7 +53,6 @@ public class MasterHealer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ninthedition/Mindslicer.java b/Mage.Sets/src/mage/sets/ninthedition/Mindslicer.java index d8a315b3a9c..c4b2e760271 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Mindslicer.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Mindslicer.java @@ -46,7 +46,6 @@ public class Mindslicer extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ninthedition/NaturalAffinity.java b/Mage.Sets/src/mage/sets/ninthedition/NaturalAffinity.java index 20902af0ea3..c5a7804b97c 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/NaturalAffinity.java +++ b/Mage.Sets/src/mage/sets/ninthedition/NaturalAffinity.java @@ -55,7 +55,6 @@ public class NaturalAffinity extends CardImpl { super(ownerId, 256, "Natural Affinity", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "9ED"; - this.color.setGreen(true); // All lands become 2/2 creatures until end of turn. They're still lands. this.getSpellAbility().addEffect(new BecomesCreatureAllEffect()); diff --git a/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java b/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java index b517da06487..5ad27996eb5 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java @@ -63,7 +63,6 @@ public class Nekrataal extends CardImpl { this.subtype.add("Human"); this.subtype.add("Assassin"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ninthedition/NorwoodRanger.java b/Mage.Sets/src/mage/sets/ninthedition/NorwoodRanger.java index fed922ece3c..b14ca7857e7 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/NorwoodRanger.java +++ b/Mage.Sets/src/mage/sets/ninthedition/NorwoodRanger.java @@ -45,7 +45,6 @@ public class NorwoodRanger extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Scout"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/OgreTaskmaster.java b/Mage.Sets/src/mage/sets/ninthedition/OgreTaskmaster.java index 561327356e7..8181ca4a4bf 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/OgreTaskmaster.java +++ b/Mage.Sets/src/mage/sets/ninthedition/OgreTaskmaster.java @@ -45,7 +45,6 @@ public class OgreTaskmaster extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Ogre"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ninthedition/PaladinEnVec.java b/Mage.Sets/src/mage/sets/ninthedition/PaladinEnVec.java index 2f4342b5bc2..dedf9647e06 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/PaladinEnVec.java +++ b/Mage.Sets/src/mage/sets/ninthedition/PaladinEnVec.java @@ -56,7 +56,6 @@ public class PaladinEnVec extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ninthedition/PeaceOfMind.java b/Mage.Sets/src/mage/sets/ninthedition/PeaceOfMind.java index 4d4a854b354..32b2b8e55e1 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/PeaceOfMind.java +++ b/Mage.Sets/src/mage/sets/ninthedition/PeaceOfMind.java @@ -49,7 +49,6 @@ public class PeaceOfMind extends CardImpl { super(ownerId, 33, "Peace of Mind", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "9ED"; - this.color.setWhite(true); // {W}, Discard a card: You gain 3 life. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new ManaCostsImpl("{W}")); diff --git a/Mage.Sets/src/mage/sets/ninthedition/RazortoothRats.java b/Mage.Sets/src/mage/sets/ninthedition/RazortoothRats.java index be04f760391..f8d95343eb8 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/RazortoothRats.java +++ b/Mage.Sets/src/mage/sets/ninthedition/RazortoothRats.java @@ -45,7 +45,6 @@ public class RazortoothRats extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Rat"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ninthedition/RiverBear.java b/Mage.Sets/src/mage/sets/ninthedition/RiverBear.java index bb065c04652..3bbfe288587 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/RiverBear.java +++ b/Mage.Sets/src/mage/sets/ninthedition/RiverBear.java @@ -45,7 +45,6 @@ public class RiverBear extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Bear"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ninthedition/SacredNectar.java b/Mage.Sets/src/mage/sets/ninthedition/SacredNectar.java index dbc7a959c6d..2aab17065da 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/SacredNectar.java +++ b/Mage.Sets/src/mage/sets/ninthedition/SacredNectar.java @@ -43,7 +43,6 @@ public class SacredNectar extends CardImpl { super(ownerId, 38, "Sacred Nectar", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{W}"); this.expansionSetCode = "9ED"; - this.color.setWhite(true); // You gain 4 life. this.getSpellAbility().addEffect(new GainLifeEffect(4)); diff --git a/Mage.Sets/src/mage/sets/ninthedition/ScaledWurm.java b/Mage.Sets/src/mage/sets/ninthedition/ScaledWurm.java index af48bd9cddf..93a3734b4c1 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/ScaledWurm.java +++ b/Mage.Sets/src/mage/sets/ninthedition/ScaledWurm.java @@ -44,7 +44,6 @@ public class ScaledWurm extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(7); this.toughness = new MageInt(6); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/SeedbornMuse.java b/Mage.Sets/src/mage/sets/ninthedition/SeedbornMuse.java index 3302dad00e0..35ab8e86409 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/SeedbornMuse.java +++ b/Mage.Sets/src/mage/sets/ninthedition/SeedbornMuse.java @@ -48,7 +48,6 @@ public class SeedbornMuse extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ninthedition/SerrasBlessing.java b/Mage.Sets/src/mage/sets/ninthedition/SerrasBlessing.java index 68f849265ab..3e44beee068 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/SerrasBlessing.java +++ b/Mage.Sets/src/mage/sets/ninthedition/SerrasBlessing.java @@ -48,7 +48,6 @@ public class SerrasBlessing extends CardImpl { super(ownerId, 44, "Serra's Blessing", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "9ED"; - this.color.setWhite(true); // Creatures you control have vigilance. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); diff --git a/Mage.Sets/src/mage/sets/ninthedition/Slay.java b/Mage.Sets/src/mage/sets/ninthedition/Slay.java index 3558775ba37..b706abacfa3 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Slay.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Slay.java @@ -53,7 +53,6 @@ public class Slay extends CardImpl { super(ownerId, 163, "Slay", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "9ED"; - this.color.setBlack(true); // Destroy target green creature. It can't be regenerated. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/ninthedition/SleightOfHand.java b/Mage.Sets/src/mage/sets/ninthedition/SleightOfHand.java index 270ffa2fd20..5ad14d21a6f 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/SleightOfHand.java +++ b/Mage.Sets/src/mage/sets/ninthedition/SleightOfHand.java @@ -46,7 +46,6 @@ public class SleightOfHand extends CardImpl { super(ownerId, 99, "Sleight of Hand", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}"); this.expansionSetCode = "9ED"; - this.color.setBlue(true); // Look at the top two cards of your library. Put one of them into your hand and the other on the bottom of your library. this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect(new StaticValue(2), false, new StaticValue(1), new FilterCard(), Zone.LIBRARY, false, false)); diff --git a/Mage.Sets/src/mage/sets/ninthedition/StormCrow.java b/Mage.Sets/src/mage/sets/ninthedition/StormCrow.java index 2f0b61f20bf..67fc0329a1d 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/StormCrow.java +++ b/Mage.Sets/src/mage/sets/ninthedition/StormCrow.java @@ -45,7 +45,6 @@ public class StormCrow extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ninthedition/SummerBloom.java b/Mage.Sets/src/mage/sets/ninthedition/SummerBloom.java index 9bd8441e4a3..04ac82f4593 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/SummerBloom.java +++ b/Mage.Sets/src/mage/sets/ninthedition/SummerBloom.java @@ -45,7 +45,6 @@ public class SummerBloom extends CardImpl { super(ownerId, 273, "Summer Bloom", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "9ED"; - this.color.setGreen(true); // You may play up to three additional lands this turn. this.getSpellAbility().addEffect(new PlayAdditionalLandsControllerEffect(3, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/ninthedition/SwarmOfRats.java b/Mage.Sets/src/mage/sets/ninthedition/SwarmOfRats.java index 2b977c4f004..f9e4da7da65 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/SwarmOfRats.java +++ b/Mage.Sets/src/mage/sets/ninthedition/SwarmOfRats.java @@ -57,7 +57,6 @@ public class SwarmOfRats extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Rat"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ninthedition/TemporalAdept.java b/Mage.Sets/src/mage/sets/ninthedition/TemporalAdept.java index b870d35314e..d50af3bf9d0 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/TemporalAdept.java +++ b/Mage.Sets/src/mage/sets/ninthedition/TemporalAdept.java @@ -53,7 +53,6 @@ public class TemporalAdept extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ninthedition/ThievingMagpie.java b/Mage.Sets/src/mage/sets/ninthedition/ThievingMagpie.java index b000c4b5c7d..e77fb511118 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/ThievingMagpie.java +++ b/Mage.Sets/src/mage/sets/ninthedition/ThievingMagpie.java @@ -47,7 +47,6 @@ public class ThievingMagpie extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ninthedition/ThoughtCourier.java b/Mage.Sets/src/mage/sets/ninthedition/ThoughtCourier.java index 16f51910b27..e49755285d5 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/ThoughtCourier.java +++ b/Mage.Sets/src/mage/sets/ninthedition/ThoughtCourier.java @@ -49,7 +49,6 @@ public class ThoughtCourier extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ninthedition/TidalKraken.java b/Mage.Sets/src/mage/sets/ninthedition/TidalKraken.java index 3df333d9af8..d034a15d960 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/TidalKraken.java +++ b/Mage.Sets/src/mage/sets/ninthedition/TidalKraken.java @@ -45,7 +45,6 @@ public class TidalKraken extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Kraken"); - this.color.setBlue(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/ninthedition/TradeRoutes.java b/Mage.Sets/src/mage/sets/ninthedition/TradeRoutes.java index 0cb2316d541..86d80a89ce4 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/TradeRoutes.java +++ b/Mage.Sets/src/mage/sets/ninthedition/TradeRoutes.java @@ -64,7 +64,6 @@ public class TradeRoutes extends CardImpl { super(ownerId, 108, "Trade Routes", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "9ED"; - this.color.setBlue(true); // {1}: Return target land you control to its owner's hand. Effect returnToHand = new ReturnToHandTargetEffect(); diff --git a/Mage.Sets/src/mage/sets/ninthedition/TreasureTrove.java b/Mage.Sets/src/mage/sets/ninthedition/TreasureTrove.java index 5ef55daa537..9e921b1af57 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/TreasureTrove.java +++ b/Mage.Sets/src/mage/sets/ninthedition/TreasureTrove.java @@ -47,7 +47,6 @@ public class TreasureTrove extends CardImpl { super(ownerId, 110, "Treasure Trove", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}"); this.expansionSetCode = "9ED"; - this.color.setBlue(true); // {2}{U}{U}: Draw a card. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{2}{U}{U}"))); diff --git a/Mage.Sets/src/mage/sets/ninthedition/TreeMonkey.java b/Mage.Sets/src/mage/sets/ninthedition/TreeMonkey.java index d3d8a8ebde9..e08f0a997c4 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/TreeMonkey.java +++ b/Mage.Sets/src/mage/sets/ninthedition/TreeMonkey.java @@ -45,7 +45,6 @@ public class TreeMonkey extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Ape"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ninthedition/VeteranCavalier.java b/Mage.Sets/src/mage/sets/ninthedition/VeteranCavalier.java index 5fb220bd81c..44c8a40f1f1 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/VeteranCavalier.java +++ b/Mage.Sets/src/mage/sets/ninthedition/VeteranCavalier.java @@ -46,7 +46,6 @@ public class VeteranCavalier extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ninthedition/ViashinoSandstalker.java b/Mage.Sets/src/mage/sets/ninthedition/ViashinoSandstalker.java index 774ce7a1212..15daeb33623 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/ViashinoSandstalker.java +++ b/Mage.Sets/src/mage/sets/ninthedition/ViashinoSandstalker.java @@ -54,7 +54,6 @@ public class ViashinoSandstalker extends CardImpl { this.subtype.add("Viashino"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ninthedition/VolcanicHammer.java b/Mage.Sets/src/mage/sets/ninthedition/VolcanicHammer.java index 55474202a24..7188e90c98d 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/VolcanicHammer.java +++ b/Mage.Sets/src/mage/sets/ninthedition/VolcanicHammer.java @@ -44,7 +44,6 @@ public class VolcanicHammer extends CardImpl { super(ownerId, 226, "Volcanic Hammer", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "9ED"; - this.color.setRed(true); // Volcanic Hammer deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/ninthedition/WanderguardSentry.java b/Mage.Sets/src/mage/sets/ninthedition/WanderguardSentry.java index 59d0cdd1af1..e0e33069cdf 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/WanderguardSentry.java +++ b/Mage.Sets/src/mage/sets/ninthedition/WanderguardSentry.java @@ -49,7 +49,6 @@ public class WanderguardSentry extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Drone"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ninthedition/WoodElves.java b/Mage.Sets/src/mage/sets/ninthedition/WoodElves.java index e96d87b7eb5..04a88c5f506 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/WoodElves.java +++ b/Mage.Sets/src/mage/sets/ninthedition/WoodElves.java @@ -55,7 +55,6 @@ public class WoodElves extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Scout"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ninthedition/ZodiacMonkey.java b/Mage.Sets/src/mage/sets/ninthedition/ZodiacMonkey.java index 6e4a45c9de7..45623834709 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/ZodiacMonkey.java +++ b/Mage.Sets/src/mage/sets/ninthedition/ZodiacMonkey.java @@ -45,7 +45,6 @@ public class ZodiacMonkey extends CardImpl { this.expansionSetCode = "9ED"; this.subtype.add("Ape"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ninthedition/Zombify.java b/Mage.Sets/src/mage/sets/ninthedition/Zombify.java index 05a1656d6e0..24e6b6b697c 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Zombify.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Zombify.java @@ -45,7 +45,6 @@ public class Zombify extends CardImpl { super(ownerId, 171, "Zombify", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "9ED"; - this.color.setBlack(true); // Return target creature card from your graveyard to the battlefield. this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java b/Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java index fa4bcf8f5c3..0a14568ad49 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java +++ b/Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java @@ -59,7 +59,6 @@ public class AEtherBurst extends CardImpl { super(ownerId, 60, "AEther Burst", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "ODY"; - this.color.setBlue(true); // Return up to X target creatures to their owners' hands, where X is one plus the number of cards named AEther Burst in all graveyards as you cast AEther Burst. this.getSpellAbility().addEffect(new DynamicReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/AboshanCephalidEmperor.java b/Mage.Sets/src/mage/sets/odyssey/AboshanCephalidEmperor.java index 85cf250c777..d0f4f904268 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AboshanCephalidEmperor.java +++ b/Mage.Sets/src/mage/sets/odyssey/AboshanCephalidEmperor.java @@ -68,7 +68,6 @@ static { this.supertype.add("Legendary"); this.subtype.add("Cephalid"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/AboshansDesire.java b/Mage.Sets/src/mage/sets/odyssey/AboshansDesire.java index cb5165270dd..442e6facd3f 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AboshansDesire.java +++ b/Mage.Sets/src/mage/sets/odyssey/AboshansDesire.java @@ -58,7 +58,6 @@ public class AboshansDesire extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/odyssey/AcceptableLosses.java b/Mage.Sets/src/mage/sets/odyssey/AcceptableLosses.java index 5596c2730b7..1487c45a573 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AcceptableLosses.java +++ b/Mage.Sets/src/mage/sets/odyssey/AcceptableLosses.java @@ -46,7 +46,6 @@ public class AcceptableLosses extends CardImpl { super(ownerId, 172, "Acceptable Losses", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // As an additional cost to cast Acceptable Losses, discard a card at random. this.getSpellAbility().addCost(new DiscardTargetCost(new TargetCardInHand(), true)); diff --git a/Mage.Sets/src/mage/sets/odyssey/AegisOfHonor.java b/Mage.Sets/src/mage/sets/odyssey/AegisOfHonor.java index a0adf6d86ff..becd3df993e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AegisOfHonor.java +++ b/Mage.Sets/src/mage/sets/odyssey/AegisOfHonor.java @@ -58,7 +58,6 @@ public class AegisOfHonor extends CardImpl{ super(ownerId, 1, "Aegis of Honor", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{W}"); this.expansionSetCode = "ODY"; - this.color.setWhite(true); // {1}: The next time an instant or sorcery spell would deal damage to you this //turn, that spell deals that damage to its controller instead. diff --git a/Mage.Sets/src/mage/sets/odyssey/Amugaba.java b/Mage.Sets/src/mage/sets/odyssey/Amugaba.java index 6441a6f4d8f..05a63569ad8 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Amugaba.java +++ b/Mage.Sets/src/mage/sets/odyssey/Amugaba.java @@ -53,7 +53,6 @@ public class Amugaba extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/odyssey/AncestralTribute.java b/Mage.Sets/src/mage/sets/odyssey/AncestralTribute.java index bd2dd722648..457cfb03fd3 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AncestralTribute.java +++ b/Mage.Sets/src/mage/sets/odyssey/AncestralTribute.java @@ -49,7 +49,6 @@ public class AncestralTribute extends CardImpl { super(ownerId, 2, "Ancestral Tribute", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{W}{W}"); this.expansionSetCode = "ODY"; - this.color.setWhite(true); // You gain 2 life for each card in your graveyard. this.getSpellAbility().addEffect(new GainLifeEffect((new CardsInControllerGraveyardCount(new FilterCard(), 2)))); diff --git a/Mage.Sets/src/mage/sets/odyssey/AshenFirebeast.java b/Mage.Sets/src/mage/sets/odyssey/AshenFirebeast.java index 4a225c393fb..6e9f9c3db28 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AshenFirebeast.java +++ b/Mage.Sets/src/mage/sets/odyssey/AshenFirebeast.java @@ -58,7 +58,6 @@ public class AshenFirebeast extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/odyssey/Atogatog.java b/Mage.Sets/src/mage/sets/odyssey/Atogatog.java index 966e9018f92..e015e458cf4 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Atogatog.java +++ b/Mage.Sets/src/mage/sets/odyssey/Atogatog.java @@ -64,11 +64,6 @@ public class Atogatog extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Atog"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setGreen(true); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/odyssey/AvenArcher.java b/Mage.Sets/src/mage/sets/odyssey/AvenArcher.java index 02eeaae8e2c..405ca67fcb0 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AvenArcher.java +++ b/Mage.Sets/src/mage/sets/odyssey/AvenArcher.java @@ -54,7 +54,6 @@ public class AvenArcher extends CardImpl { this.subtype.add("Soldier"); this.subtype.add("Archer"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/AvenSmokeweaver.java b/Mage.Sets/src/mage/sets/odyssey/AvenSmokeweaver.java index c2ac09a4224..7a22a2442ec 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AvenSmokeweaver.java +++ b/Mage.Sets/src/mage/sets/odyssey/AvenSmokeweaver.java @@ -56,7 +56,6 @@ public class AvenSmokeweaver extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/BalancingAct.java b/Mage.Sets/src/mage/sets/odyssey/BalancingAct.java index 7de9903fe71..f399fc67871 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BalancingAct.java +++ b/Mage.Sets/src/mage/sets/odyssey/BalancingAct.java @@ -55,7 +55,6 @@ public class BalancingAct extends CardImpl { super(ownerId, 10, "Balancing Act", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{W}{W}"); this.expansionSetCode = "ODY"; - this.color.setWhite(true); // Each player chooses a number of permanents he or she controls equal to the number of permanents controlled by the player who controls the fewest, then sacrifices the rest. Each player discards cards the same way. this.getSpellAbility().addEffect(new BalancingActEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/BalshanBeguiler.java b/Mage.Sets/src/mage/sets/odyssey/BalshanBeguiler.java index 60024d88b5d..77c3aa7de3a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BalshanBeguiler.java +++ b/Mage.Sets/src/mage/sets/odyssey/BalshanBeguiler.java @@ -56,7 +56,6 @@ public class BalshanBeguiler extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/BalshanGriffin.java b/Mage.Sets/src/mage/sets/odyssey/BalshanGriffin.java index 2b4e5d4f237..02662a1d3bc 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BalshanGriffin.java +++ b/Mage.Sets/src/mage/sets/odyssey/BalshanGriffin.java @@ -53,7 +53,6 @@ public class BalshanGriffin extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Griffin"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/BarbarianLunatic.java b/Mage.Sets/src/mage/sets/odyssey/BarbarianLunatic.java index 8f5a6dae15b..8f23f8accc7 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BarbarianLunatic.java +++ b/Mage.Sets/src/mage/sets/odyssey/BarbarianLunatic.java @@ -52,7 +52,6 @@ public class BarbarianLunatic extends CardImpl { this.subtype.add("Human"); this.subtype.add("Barbarian"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/BashToBits.java b/Mage.Sets/src/mage/sets/odyssey/BashToBits.java index e0f8fb10b11..47ce3e93a7e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BashToBits.java +++ b/Mage.Sets/src/mage/sets/odyssey/BashToBits.java @@ -48,7 +48,6 @@ public class BashToBits extends CardImpl { super(ownerId, 176, "Bash to Bits", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Destroy target artifact. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/BattleStrain.java b/Mage.Sets/src/mage/sets/odyssey/BattleStrain.java index 9b01cb60302..4f11353d94a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BattleStrain.java +++ b/Mage.Sets/src/mage/sets/odyssey/BattleStrain.java @@ -49,7 +49,6 @@ public class BattleStrain extends CardImpl { super(ownerId, 177, "Battle Strain", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Whenever a creature blocks, Battle Strain deals 1 damage to that creature's controller. this.addAbility(new BattleStrainTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/odyssey/Bearscape.java b/Mage.Sets/src/mage/sets/odyssey/Bearscape.java index 71c4b5712a5..ba7d1b1c393 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Bearscape.java +++ b/Mage.Sets/src/mage/sets/odyssey/Bearscape.java @@ -52,7 +52,6 @@ public class Bearscape extends CardImpl { super(ownerId, 229, "Bearscape", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}{G}"); this.expansionSetCode = "ODY"; - this.color.setGreen(true); // {1}{G}, Exile two cards from your graveyard: Put a 2/2 green Bear creature token onto the battlefield. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new BearToken()), new ManaCostsImpl("{1}{G}")); diff --git a/Mage.Sets/src/mage/sets/odyssey/BeastAttack.java b/Mage.Sets/src/mage/sets/odyssey/BeastAttack.java index 54534378f6e..d0b535fcdd1 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BeastAttack.java +++ b/Mage.Sets/src/mage/sets/odyssey/BeastAttack.java @@ -49,7 +49,6 @@ public class BeastAttack extends CardImpl { super(ownerId, 230, "Beast Attack", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{G}{G}{G}"); this.expansionSetCode = "ODY"; - this.color.setGreen(true); // Put a 4/4 green Beast creature token onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken_44())); diff --git a/Mage.Sets/src/mage/sets/odyssey/BelovedChaplain.java b/Mage.Sets/src/mage/sets/odyssey/BelovedChaplain.java index d8fd1110478..b2d3b189dca 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BelovedChaplain.java +++ b/Mage.Sets/src/mage/sets/odyssey/BelovedChaplain.java @@ -54,7 +54,6 @@ public class BelovedChaplain extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/BlazingSalvo.java b/Mage.Sets/src/mage/sets/odyssey/BlazingSalvo.java index d0e7f183757..86d3a3b3885 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BlazingSalvo.java +++ b/Mage.Sets/src/mage/sets/odyssey/BlazingSalvo.java @@ -49,7 +49,6 @@ public class BlazingSalvo extends CardImpl { super(ownerId, 178, "Blazing Salvo", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Blazing Salvo deals 3 damage to target creature unless that creature's controller has Blazing Salvo deal 5 damage to him or her. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/odyssey/Bloodcurdler.java b/Mage.Sets/src/mage/sets/odyssey/Bloodcurdler.java index 2aeb9805224..d8caa1fcb2c 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Bloodcurdler.java +++ b/Mage.Sets/src/mage/sets/odyssey/Bloodcurdler.java @@ -60,7 +60,6 @@ public class Bloodcurdler extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/BombSquad.java b/Mage.Sets/src/mage/sets/odyssey/BombSquad.java index ab2e3ff8e79..ece09b89c1a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BombSquad.java +++ b/Mage.Sets/src/mage/sets/odyssey/BombSquad.java @@ -72,7 +72,6 @@ public class BombSquad extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Dwarf"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/BraidsCabalMinion.java b/Mage.Sets/src/mage/sets/odyssey/BraidsCabalMinion.java index 51386271e83..efafb8f586c 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BraidsCabalMinion.java +++ b/Mage.Sets/src/mage/sets/odyssey/BraidsCabalMinion.java @@ -62,7 +62,6 @@ public class BraidsCabalMinion extends CardImpl { this.subtype.add("Human"); this.subtype.add("Minion"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/BurningSands.java b/Mage.Sets/src/mage/sets/odyssey/BurningSands.java index 7ae2db4247a..de47ee28336 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BurningSands.java +++ b/Mage.Sets/src/mage/sets/odyssey/BurningSands.java @@ -52,7 +52,6 @@ public class BurningSands extends CardImpl { super(ownerId, 180, "Burning Sands", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Whenever a creature dies, that creature's controller sacrifices a land. this.addAbility(new DiesCreatureTriggeredAbility(new SacrificeEffect(filter, 1, "that creature's controller"), false, false, true)); diff --git a/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java b/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java index cf5a4ccdace..7d3dac197f4 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java +++ b/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java @@ -64,7 +64,6 @@ public class CabalInquisitor extends CardImpl { this.subtype.add("Human"); this.subtype.add("Minion"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/CabalPatriarch.java b/Mage.Sets/src/mage/sets/odyssey/CabalPatriarch.java index a3fe25864b8..3d4f31e0cb5 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CabalPatriarch.java +++ b/Mage.Sets/src/mage/sets/odyssey/CabalPatriarch.java @@ -59,7 +59,6 @@ public class CabalPatriarch extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/odyssey/Cantivore.java b/Mage.Sets/src/mage/sets/odyssey/Cantivore.java index 6670be5c928..75fbb3499ca 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Cantivore.java +++ b/Mage.Sets/src/mage/sets/odyssey/Cantivore.java @@ -59,7 +59,6 @@ public class Cantivore extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Lhurgoyf"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/odyssey/CarefulStudy.java b/Mage.Sets/src/mage/sets/odyssey/CarefulStudy.java index 057ecfcf86b..cc5b3f746df 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CarefulStudy.java +++ b/Mage.Sets/src/mage/sets/odyssey/CarefulStudy.java @@ -42,7 +42,6 @@ public class CarefulStudy extends CardImpl { super(ownerId, 70, "Careful Study", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}"); this.expansionSetCode = "ODY"; - this.color.setBlue(true); // Draw two cards, then discard two cards. this.getSpellAbility().addEffect(new DrawDiscardControllerEffect(2,2)); diff --git a/Mage.Sets/src/mage/sets/odyssey/CausticTar.java b/Mage.Sets/src/mage/sets/odyssey/CausticTar.java index cb935b9346b..c81520cacc5 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CausticTar.java +++ b/Mage.Sets/src/mage/sets/odyssey/CausticTar.java @@ -58,7 +58,6 @@ public class CausticTar extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java b/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java index b06db7653d6..46fb361deca 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java +++ b/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java @@ -55,7 +55,6 @@ public class CeaseFire extends CardImpl { super(ownerId, 14, "Cease-Fire", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "ODY"; - this.color.setWhite(true); // Target player can't cast creature spells this turn. this.getSpellAbility().addEffect(new CeaseFireEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/CephalidBroker.java b/Mage.Sets/src/mage/sets/odyssey/CephalidBroker.java index 6a01fa787ec..ee1ba7321a2 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CephalidBroker.java +++ b/Mage.Sets/src/mage/sets/odyssey/CephalidBroker.java @@ -55,7 +55,6 @@ public class CephalidBroker extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Cephalid"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/CephalidLooter.java b/Mage.Sets/src/mage/sets/odyssey/CephalidLooter.java index 475012e07ed..dacc1e5269e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CephalidLooter.java +++ b/Mage.Sets/src/mage/sets/odyssey/CephalidLooter.java @@ -51,7 +51,6 @@ public class CephalidLooter extends CardImpl { this.subtype.add("Cephalid"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/CephalidRetainer.java b/Mage.Sets/src/mage/sets/odyssey/CephalidRetainer.java index acdb5f8bec8..1835682fc04 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CephalidRetainer.java +++ b/Mage.Sets/src/mage/sets/odyssey/CephalidRetainer.java @@ -60,7 +60,6 @@ public class CephalidRetainer extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Cephalid"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/CephalidScout.java b/Mage.Sets/src/mage/sets/odyssey/CephalidScout.java index 9644fb1e216..e4b6111db13 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CephalidScout.java +++ b/Mage.Sets/src/mage/sets/odyssey/CephalidScout.java @@ -55,7 +55,6 @@ public class CephalidScout extends CardImpl { this.subtype.add("Wizard"); this.subtype.add("Scout"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/Chainflinger.java b/Mage.Sets/src/mage/sets/odyssey/Chainflinger.java index 336ab0efc6b..32384719b61 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Chainflinger.java +++ b/Mage.Sets/src/mage/sets/odyssey/Chainflinger.java @@ -53,7 +53,6 @@ public class Chainflinger extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/ChamberOfManipulation.java b/Mage.Sets/src/mage/sets/odyssey/ChamberOfManipulation.java index f11b554c410..4954f1cc903 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ChamberOfManipulation.java +++ b/Mage.Sets/src/mage/sets/odyssey/ChamberOfManipulation.java @@ -61,7 +61,6 @@ public class ChamberOfManipulation extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/odyssey/ChatterOfTheSquirrel.java b/Mage.Sets/src/mage/sets/odyssey/ChatterOfTheSquirrel.java index 25658c4a4f1..2b324d883f1 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ChatterOfTheSquirrel.java +++ b/Mage.Sets/src/mage/sets/odyssey/ChatterOfTheSquirrel.java @@ -47,7 +47,6 @@ public class ChatterOfTheSquirrel extends CardImpl { super(ownerId, 233, "Chatter of the Squirrel", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{G}"); this.expansionSetCode = "ODY"; - this.color.setGreen(true); // Put a 1/1 green Squirrel creature token onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new SquirrelToken())); diff --git a/Mage.Sets/src/mage/sets/odyssey/ChildhoodHorror.java b/Mage.Sets/src/mage/sets/odyssey/ChildhoodHorror.java index f3c553a312d..eb8ccf8bd47 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ChildhoodHorror.java +++ b/Mage.Sets/src/mage/sets/odyssey/ChildhoodHorror.java @@ -55,7 +55,6 @@ public class ChildhoodHorror extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/Chlorophant.java b/Mage.Sets/src/mage/sets/odyssey/Chlorophant.java index 0fa8c447a6a..0a276940b4f 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Chlorophant.java +++ b/Mage.Sets/src/mage/sets/odyssey/Chlorophant.java @@ -50,7 +50,6 @@ public class Chlorophant extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/CoffinPurge.java b/Mage.Sets/src/mage/sets/odyssey/CoffinPurge.java index ab0e9a22f65..bb1bd809f89 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CoffinPurge.java +++ b/Mage.Sets/src/mage/sets/odyssey/CoffinPurge.java @@ -48,7 +48,6 @@ public class CoffinPurge extends CardImpl { super(ownerId, 124, "Coffin Purge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "ODY"; - this.color.setBlack(true); // Exile target card from a graveyard. diff --git a/Mage.Sets/src/mage/sets/odyssey/Cognivore.java b/Mage.Sets/src/mage/sets/odyssey/Cognivore.java index 83e20aa4f24..01a92295472 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Cognivore.java +++ b/Mage.Sets/src/mage/sets/odyssey/Cognivore.java @@ -59,7 +59,6 @@ public class Cognivore extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Lhurgoyf"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/odyssey/Concentrate.java b/Mage.Sets/src/mage/sets/odyssey/Concentrate.java index d5b36f1b6df..2c99a821380 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Concentrate.java +++ b/Mage.Sets/src/mage/sets/odyssey/Concentrate.java @@ -43,7 +43,6 @@ public class Concentrate extends CardImpl { super(ownerId, 78, "Concentrate", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}{U}"); this.expansionSetCode = "ODY"; - this.color.setBlue(true); // Draw three cards. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); diff --git a/Mage.Sets/src/mage/sets/odyssey/Confessor.java b/Mage.Sets/src/mage/sets/odyssey/Confessor.java index b84f0540334..a978a0b26c2 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Confessor.java +++ b/Mage.Sets/src/mage/sets/odyssey/Confessor.java @@ -49,7 +49,6 @@ public class Confessor extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/CrashingCentaur.java b/Mage.Sets/src/mage/sets/odyssey/CrashingCentaur.java index 9f4f811b6bb..7cbda61f07a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CrashingCentaur.java +++ b/Mage.Sets/src/mage/sets/odyssey/CrashingCentaur.java @@ -58,7 +58,6 @@ public class CrashingCentaur extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Centaur"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/odyssey/CursedMonstrosity.java b/Mage.Sets/src/mage/sets/odyssey/CursedMonstrosity.java index b62d2f7d000..9a8059a3ec9 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CursedMonstrosity.java +++ b/Mage.Sets/src/mage/sets/odyssey/CursedMonstrosity.java @@ -50,7 +50,6 @@ public class CursedMonstrosity extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/DecayingSoil.java b/Mage.Sets/src/mage/sets/odyssey/DecayingSoil.java index 7d2d80d10e0..4acbfaa5dfd 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DecayingSoil.java +++ b/Mage.Sets/src/mage/sets/odyssey/DecayingSoil.java @@ -75,7 +75,6 @@ public class DecayingSoil extends CardImpl { super(ownerId, 127, "Decaying Soil", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}"); this.expansionSetCode = "ODY"; - this.color.setBlack(true); // At the beginning of your upkeep, exile a card from your graveyard. Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/odyssey/Decimate.java b/Mage.Sets/src/mage/sets/odyssey/Decimate.java index 44ec7bbe2d5..a5f40f11349 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Decimate.java +++ b/Mage.Sets/src/mage/sets/odyssey/Decimate.java @@ -48,8 +48,6 @@ public class Decimate extends CardImpl { super(ownerId, 287, "Decimate", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{R}{G}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); - this.color.setGreen(true); // Destroy target artifact, target creature, target enchantment, and target land. Effect effect = new DestroyTargetEffect(); diff --git a/Mage.Sets/src/mage/sets/odyssey/DedicatedMartyr.java b/Mage.Sets/src/mage/sets/odyssey/DedicatedMartyr.java index 7171d5f8f59..dcedb0c2fd1 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DedicatedMartyr.java +++ b/Mage.Sets/src/mage/sets/odyssey/DedicatedMartyr.java @@ -52,7 +52,6 @@ public class DedicatedMartyr extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/DeepReconnaissance.java b/Mage.Sets/src/mage/sets/odyssey/DeepReconnaissance.java index 256fbaf2c36..ba3c4d69bb4 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DeepReconnaissance.java +++ b/Mage.Sets/src/mage/sets/odyssey/DeepReconnaissance.java @@ -48,7 +48,6 @@ public class DeepReconnaissance extends CardImpl { super(ownerId, 236, "Deep Reconnaissance", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "ODY"; - this.color.setGreen(true); // Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterBasicLandCard()), true, true)); diff --git a/Mage.Sets/src/mage/sets/odyssey/DelayingShield.java b/Mage.Sets/src/mage/sets/odyssey/DelayingShield.java index 25a8e6037bb..132e60bac0f 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DelayingShield.java +++ b/Mage.Sets/src/mage/sets/odyssey/DelayingShield.java @@ -62,7 +62,6 @@ public class DelayingShield extends CardImpl { super(ownerId, 17, "Delaying Shield", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "ODY"; - this.color.setWhite(true); // If damage would be dealt to you, put that many delay counters on Delaying Shield instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DelayingShieldReplacementEffect())); diff --git a/Mage.Sets/src/mage/sets/odyssey/Dematerialize.java b/Mage.Sets/src/mage/sets/odyssey/Dematerialize.java index 7cb3c9edb94..3ec69051d6b 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Dematerialize.java +++ b/Mage.Sets/src/mage/sets/odyssey/Dematerialize.java @@ -47,7 +47,6 @@ public class Dematerialize extends CardImpl { super(ownerId, 81, "Dematerialize", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "ODY"; - this.color.setBlue(true); // Return target permanent to its owner's hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/Demoralize.java b/Mage.Sets/src/mage/sets/odyssey/Demoralize.java index a7c3f2f8546..98fae04e7c4 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Demoralize.java +++ b/Mage.Sets/src/mage/sets/odyssey/Demoralize.java @@ -51,7 +51,6 @@ public class Demoralize extends CardImpl { super(ownerId, 184, "Demoralize", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Each creature can't be blocked this turn except by two or more creatures. this.getSpellAbility().addEffect(new CantBeBlockedByOneAllEffect(2, new FilterCreaturePermanent(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java b/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java index 7e3296d6107..76448e84d95 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java +++ b/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java @@ -64,7 +64,6 @@ public class DevotedCaretaker extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/DiligentFarmhand.java b/Mage.Sets/src/mage/sets/odyssey/DiligentFarmhand.java index 46adc620e8f..fbd76745f53 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DiligentFarmhand.java +++ b/Mage.Sets/src/mage/sets/odyssey/DiligentFarmhand.java @@ -55,7 +55,6 @@ public class DiligentFarmhand extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/DirtyWererat.java b/Mage.Sets/src/mage/sets/odyssey/DirtyWererat.java index 842ffcf8261..49de38d2616 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DirtyWererat.java +++ b/Mage.Sets/src/mage/sets/odyssey/DirtyWererat.java @@ -60,7 +60,6 @@ public class DirtyWererat extends CardImpl { this.subtype.add("Rat"); this.subtype.add("Minion"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/Divert.java b/Mage.Sets/src/mage/sets/odyssey/Divert.java index f0755b8e183..0b23c2942c6 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Divert.java +++ b/Mage.Sets/src/mage/sets/odyssey/Divert.java @@ -51,7 +51,6 @@ public class Divert extends CardImpl { super(ownerId, 82, "Divert", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "ODY"; - this.color.setBlue(true); // Change the target of target spell with a single target unless that spell's controller pays {2}. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/odyssey/DivineSacrament.java b/Mage.Sets/src/mage/sets/odyssey/DivineSacrament.java index fc5b4dc153f..0758743b18d 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DivineSacrament.java +++ b/Mage.Sets/src/mage/sets/odyssey/DivineSacrament.java @@ -58,7 +58,6 @@ public class DivineSacrament extends CardImpl { super(ownerId, 19, "Divine Sacrament", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}{W}"); this.expansionSetCode = "ODY"; - this.color.setWhite(true); // White creatures get +1/+1. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); diff --git a/Mage.Sets/src/mage/sets/odyssey/DoggedHunter.java b/Mage.Sets/src/mage/sets/odyssey/DoggedHunter.java index bfc70a24864..05e03d19723 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DoggedHunter.java +++ b/Mage.Sets/src/mage/sets/odyssey/DoggedHunter.java @@ -58,7 +58,6 @@ public class DoggedHunter extends CardImpl { this.subtype.add("Human"); this.subtype.add("Nomad"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/DruidLyrist.java b/Mage.Sets/src/mage/sets/odyssey/DruidLyrist.java index 77ec6df580f..363b3bb9abc 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DruidLyrist.java +++ b/Mage.Sets/src/mage/sets/odyssey/DruidLyrist.java @@ -55,7 +55,6 @@ public class DruidLyrist extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/DruidsCall.java b/Mage.Sets/src/mage/sets/odyssey/DruidsCall.java index c8eab25cb05..68d02ca94ec 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DruidsCall.java +++ b/Mage.Sets/src/mage/sets/odyssey/DruidsCall.java @@ -59,7 +59,6 @@ public class DruidsCall extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/odyssey/DwarvenGrunt.java b/Mage.Sets/src/mage/sets/odyssey/DwarvenGrunt.java index 5a0556ba6de..021b472790e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DwarvenGrunt.java +++ b/Mage.Sets/src/mage/sets/odyssey/DwarvenGrunt.java @@ -45,7 +45,6 @@ public class DwarvenGrunt extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Dwarf"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/DwarvenStrikeForce.java b/Mage.Sets/src/mage/sets/odyssey/DwarvenStrikeForce.java index ef96938a891..fc72d1da37e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DwarvenStrikeForce.java +++ b/Mage.Sets/src/mage/sets/odyssey/DwarvenStrikeForce.java @@ -54,7 +54,6 @@ public class DwarvenStrikeForce extends CardImpl { this.subtype.add("Dwarf"); this.subtype.add("Berserker"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/EarnestFellowship.java b/Mage.Sets/src/mage/sets/odyssey/EarnestFellowship.java index 30728236463..4014969ef3f 100644 --- a/Mage.Sets/src/mage/sets/odyssey/EarnestFellowship.java +++ b/Mage.Sets/src/mage/sets/odyssey/EarnestFellowship.java @@ -60,7 +60,6 @@ public class EarnestFellowship extends CardImpl { super(ownerId, 21, "Earnest Fellowship", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "ODY"; - this.color.setWhite(true); // Each creature has protection from its colors. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EarnestFellowshipEffect())); diff --git a/Mage.Sets/src/mage/sets/odyssey/EarthRift.java b/Mage.Sets/src/mage/sets/odyssey/EarthRift.java index 914b5ff4f0e..e4d93f78340 100644 --- a/Mage.Sets/src/mage/sets/odyssey/EarthRift.java +++ b/Mage.Sets/src/mage/sets/odyssey/EarthRift.java @@ -47,7 +47,6 @@ public class EarthRift extends CardImpl { super(ownerId, 189, "Earth Rift", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Destroy target land. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/ElephantAmbush.java b/Mage.Sets/src/mage/sets/odyssey/ElephantAmbush.java index 337cc50ea05..faa48d0a53a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ElephantAmbush.java +++ b/Mage.Sets/src/mage/sets/odyssey/ElephantAmbush.java @@ -47,7 +47,6 @@ public class ElephantAmbush extends CardImpl { super(ownerId, 240, "Elephant Ambush", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}{G}"); this.expansionSetCode = "ODY"; - this.color.setGreen(true); // Put a 3/3 green Elephant creature token onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new ElephantToken())); diff --git a/Mage.Sets/src/mage/sets/odyssey/EngulfingFlames.java b/Mage.Sets/src/mage/sets/odyssey/EngulfingFlames.java index 5e97e1bb1b5..b1d9b27f46e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/EngulfingFlames.java +++ b/Mage.Sets/src/mage/sets/odyssey/EngulfingFlames.java @@ -49,7 +49,6 @@ public class EngulfingFlames extends CardImpl { super(ownerId, 191, "Engulfing Flames", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Engulfing Flames deals 1 damage to target creature. It can't be regenerated this turn. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/odyssey/Entomb.java b/Mage.Sets/src/mage/sets/odyssey/Entomb.java index a9fd62bd2b3..66ce41fa05d 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Entomb.java +++ b/Mage.Sets/src/mage/sets/odyssey/Entomb.java @@ -54,7 +54,6 @@ public class Entomb extends CardImpl { super(ownerId, 132, "Entomb", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "ODY"; - this.color.setBlack(true); // Search your library for a card and put that card into your graveyard. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInGraveyard()); diff --git a/Mage.Sets/src/mage/sets/odyssey/EscapeArtist.java b/Mage.Sets/src/mage/sets/odyssey/EscapeArtist.java index 13a1dedf915..9ce5db70f02 100644 --- a/Mage.Sets/src/mage/sets/odyssey/EscapeArtist.java +++ b/Mage.Sets/src/mage/sets/odyssey/EscapeArtist.java @@ -54,7 +54,6 @@ public class EscapeArtist extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/Extract.java b/Mage.Sets/src/mage/sets/odyssey/Extract.java index b3609e4f029..2e2c46f05f6 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Extract.java +++ b/Mage.Sets/src/mage/sets/odyssey/Extract.java @@ -52,7 +52,6 @@ public class Extract extends CardImpl { super(ownerId, 85, "Extract", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{U}"); this.expansionSetCode = "ODY"; - this.color.setBlue(true); // Search target player's library for a card and exile it. Then that player shuffles his or her library. this.getSpellAbility().addEffect(new ExtractEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/FaceOfFear.java b/Mage.Sets/src/mage/sets/odyssey/FaceOfFear.java index a8058511fcc..d40c81cca28 100644 --- a/Mage.Sets/src/mage/sets/odyssey/FaceOfFear.java +++ b/Mage.Sets/src/mage/sets/odyssey/FaceOfFear.java @@ -52,7 +52,6 @@ public class FaceOfFear extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/odyssey/FamishedGhoul.java b/Mage.Sets/src/mage/sets/odyssey/FamishedGhoul.java index 0a37bc19e54..5dd5f924f8a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/FamishedGhoul.java +++ b/Mage.Sets/src/mage/sets/odyssey/FamishedGhoul.java @@ -52,7 +52,6 @@ public class FamishedGhoul extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/FerventDenial.java b/Mage.Sets/src/mage/sets/odyssey/FerventDenial.java index 4d2917db6a0..990232bc94e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/FerventDenial.java +++ b/Mage.Sets/src/mage/sets/odyssey/FerventDenial.java @@ -47,7 +47,6 @@ public class FerventDenial extends CardImpl { super(ownerId, 86, "Fervent Denial", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "ODY"; - this.color.setBlue(true); // Counter target spell. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/FilthyCur.java b/Mage.Sets/src/mage/sets/odyssey/FilthyCur.java index 4384c87b3bf..cf41b23ce12 100644 --- a/Mage.Sets/src/mage/sets/odyssey/FilthyCur.java +++ b/Mage.Sets/src/mage/sets/odyssey/FilthyCur.java @@ -50,7 +50,6 @@ public class FilthyCur extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Hound"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/Firebolt.java b/Mage.Sets/src/mage/sets/odyssey/Firebolt.java index 925f9722575..93acc1b1309 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Firebolt.java +++ b/Mage.Sets/src/mage/sets/odyssey/Firebolt.java @@ -47,7 +47,6 @@ public class Firebolt extends CardImpl { super(ownerId, 193, "Firebolt", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Firebolt deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/odyssey/FledglingImp.java b/Mage.Sets/src/mage/sets/odyssey/FledglingImp.java index 0669daeed80..0a0433167f4 100644 --- a/Mage.Sets/src/mage/sets/odyssey/FledglingImp.java +++ b/Mage.Sets/src/mage/sets/odyssey/FledglingImp.java @@ -52,7 +52,6 @@ public class FledglingImp extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Imp"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/FreneticOgre.java b/Mage.Sets/src/mage/sets/odyssey/FreneticOgre.java index f190b7e92e1..01622098f09 100644 --- a/Mage.Sets/src/mage/sets/odyssey/FreneticOgre.java +++ b/Mage.Sets/src/mage/sets/odyssey/FreneticOgre.java @@ -51,7 +51,6 @@ public class FreneticOgre extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Ogre"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/Frightcrawler.java b/Mage.Sets/src/mage/sets/odyssey/Frightcrawler.java index 9bbc8b80406..3a98e33ba1c 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Frightcrawler.java +++ b/Mage.Sets/src/mage/sets/odyssey/Frightcrawler.java @@ -53,7 +53,6 @@ public class Frightcrawler extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/GhastlyDemise.java b/Mage.Sets/src/mage/sets/odyssey/GhastlyDemise.java index ef3facdb45d..50a0775406f 100644 --- a/Mage.Sets/src/mage/sets/odyssey/GhastlyDemise.java +++ b/Mage.Sets/src/mage/sets/odyssey/GhastlyDemise.java @@ -59,7 +59,6 @@ public class GhastlyDemise extends CardImpl { super(ownerId, 139, "Ghastly Demise", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "ODY"; - this.color.setBlack(true); // Destroy target nonblack creature if its toughness is less than or equal to the number of cards in your graveyard. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/odyssey/GorillaTitan.java b/Mage.Sets/src/mage/sets/odyssey/GorillaTitan.java index 37cad4ac465..40aa7b109fe 100644 --- a/Mage.Sets/src/mage/sets/odyssey/GorillaTitan.java +++ b/Mage.Sets/src/mage/sets/odyssey/GorillaTitan.java @@ -55,7 +55,6 @@ public class GorillaTitan extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Ape"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/odyssey/GracefulAntelope.java b/Mage.Sets/src/mage/sets/odyssey/GracefulAntelope.java index b0c9581cc61..67578285691 100644 --- a/Mage.Sets/src/mage/sets/odyssey/GracefulAntelope.java +++ b/Mage.Sets/src/mage/sets/odyssey/GracefulAntelope.java @@ -51,7 +51,6 @@ public class GracefulAntelope extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Antelope"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/odyssey/Halberdier.java b/Mage.Sets/src/mage/sets/odyssey/Halberdier.java index 65e56e3a6b6..a8820784140 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Halberdier.java +++ b/Mage.Sets/src/mage/sets/odyssey/Halberdier.java @@ -46,7 +46,6 @@ public class Halberdier extends CardImpl { this.subtype.add("Human"); this.subtype.add("Barbarian"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/HallowedHealer.java b/Mage.Sets/src/mage/sets/odyssey/HallowedHealer.java index b413cd393dc..5d6a21c237a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/HallowedHealer.java +++ b/Mage.Sets/src/mage/sets/odyssey/HallowedHealer.java @@ -55,7 +55,6 @@ public class HallowedHealer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/HowlingGale.java b/Mage.Sets/src/mage/sets/odyssey/HowlingGale.java index 7a3a5c83ade..9fd4eb7f40f 100644 --- a/Mage.Sets/src/mage/sets/odyssey/HowlingGale.java +++ b/Mage.Sets/src/mage/sets/odyssey/HowlingGale.java @@ -56,7 +56,6 @@ public class HowlingGale extends CardImpl { super(ownerId, 244, "Howling Gale", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "ODY"; - this.color.setGreen(true); // Howling Gale deals 1 damage to each creature with flying and each player. this.getSpellAbility().addEffect(new DamageAllEffect(1, filter)); diff --git a/Mage.Sets/src/mage/sets/odyssey/ImmobilizingInk.java b/Mage.Sets/src/mage/sets/odyssey/ImmobilizingInk.java index ecb7887e3c4..1998029f418 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ImmobilizingInk.java +++ b/Mage.Sets/src/mage/sets/odyssey/ImmobilizingInk.java @@ -61,7 +61,6 @@ public class ImmobilizingInk extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/odyssey/InfectedVermin.java b/Mage.Sets/src/mage/sets/odyssey/InfectedVermin.java index 1a22359202e..f7542d4aa79 100644 --- a/Mage.Sets/src/mage/sets/odyssey/InfectedVermin.java +++ b/Mage.Sets/src/mage/sets/odyssey/InfectedVermin.java @@ -50,7 +50,6 @@ public class InfectedVermin extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Rat"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/IridescentAngel.java b/Mage.Sets/src/mage/sets/odyssey/IridescentAngel.java index 70c4b184abb..ce72edcbe47 100644 --- a/Mage.Sets/src/mage/sets/odyssey/IridescentAngel.java +++ b/Mage.Sets/src/mage/sets/odyssey/IridescentAngel.java @@ -61,8 +61,6 @@ public class IridescentAngel extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Angel"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/odyssey/KamahlsDesire.java b/Mage.Sets/src/mage/sets/odyssey/KamahlsDesire.java index 0574f5ec3d2..ca69173073c 100644 --- a/Mage.Sets/src/mage/sets/odyssey/KamahlsDesire.java +++ b/Mage.Sets/src/mage/sets/odyssey/KamahlsDesire.java @@ -58,7 +58,6 @@ public class KamahlsDesire extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/odyssey/KarmicJustice.java b/Mage.Sets/src/mage/sets/odyssey/KarmicJustice.java index 12b474837ad..700b591ffa7 100644 --- a/Mage.Sets/src/mage/sets/odyssey/KarmicJustice.java +++ b/Mage.Sets/src/mage/sets/odyssey/KarmicJustice.java @@ -53,7 +53,6 @@ public class KarmicJustice extends CardImpl { super(ownerId, 26, "Karmic Justice", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "ODY"; - this.color.setWhite(true); // Whenever a spell or ability an opponent controls destroys a noncreature permanent you control, you may destroy target permanent that opponent controls. this.addAbility(new KarmicJusticeTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/odyssey/KrosanArcher.java b/Mage.Sets/src/mage/sets/odyssey/KrosanArcher.java index a8f06c5c628..5eaa9ecfa45 100644 --- a/Mage.Sets/src/mage/sets/odyssey/KrosanArcher.java +++ b/Mage.Sets/src/mage/sets/odyssey/KrosanArcher.java @@ -53,7 +53,6 @@ public class KrosanArcher extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Archer"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/KrosanAvenger.java b/Mage.Sets/src/mage/sets/odyssey/KrosanAvenger.java index e692f680574..464cc2650d0 100644 --- a/Mage.Sets/src/mage/sets/odyssey/KrosanAvenger.java +++ b/Mage.Sets/src/mage/sets/odyssey/KrosanAvenger.java @@ -52,7 +52,6 @@ public class KrosanAvenger extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/KrosanBeast.java b/Mage.Sets/src/mage/sets/odyssey/KrosanBeast.java index 3dceddcf884..02404632e9b 100644 --- a/Mage.Sets/src/mage/sets/odyssey/KrosanBeast.java +++ b/Mage.Sets/src/mage/sets/odyssey/KrosanBeast.java @@ -52,7 +52,6 @@ public class KrosanBeast extends CardImpl { this.subtype.add("Squirrel"); this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/LaquatussCreativity.java b/Mage.Sets/src/mage/sets/odyssey/LaquatussCreativity.java index 540fe64ca40..00b90d7e6c8 100644 --- a/Mage.Sets/src/mage/sets/odyssey/LaquatussCreativity.java +++ b/Mage.Sets/src/mage/sets/odyssey/LaquatussCreativity.java @@ -49,7 +49,6 @@ public class LaquatussCreativity extends CardImpl { super(ownerId, 88, "Laquatus's Creativity", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{U}"); this.expansionSetCode = "ODY"; - this.color.setBlue(true); // Target player draws cards equal to the number of cards in his or her hand, then discards that many cards. this.getSpellAbility().addEffect(new LaquatussCreativityEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/LeafDancer.java b/Mage.Sets/src/mage/sets/odyssey/LeafDancer.java index 95f5286c00f..d443d8dfb01 100644 --- a/Mage.Sets/src/mage/sets/odyssey/LeafDancer.java +++ b/Mage.Sets/src/mage/sets/odyssey/LeafDancer.java @@ -45,7 +45,6 @@ public class LeafDancer extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Centaur"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/LieutenantKirtar.java b/Mage.Sets/src/mage/sets/odyssey/LieutenantKirtar.java index b8e41a84b86..4023adf8a07 100644 --- a/Mage.Sets/src/mage/sets/odyssey/LieutenantKirtar.java +++ b/Mage.Sets/src/mage/sets/odyssey/LieutenantKirtar.java @@ -54,7 +54,6 @@ public class LieutenantKirtar extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/Lithatog.java b/Mage.Sets/src/mage/sets/odyssey/Lithatog.java index b17437b5687..55f5212db8e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Lithatog.java +++ b/Mage.Sets/src/mage/sets/odyssey/Lithatog.java @@ -52,8 +52,6 @@ public class Lithatog extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Atog"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/LuminousGuardian.java b/Mage.Sets/src/mage/sets/odyssey/LuminousGuardian.java index 912d0ba1a22..c33d0cb978f 100644 --- a/Mage.Sets/src/mage/sets/odyssey/LuminousGuardian.java +++ b/Mage.Sets/src/mage/sets/odyssey/LuminousGuardian.java @@ -51,7 +51,6 @@ public class LuminousGuardian extends CardImpl { this.subtype.add("Human"); this.subtype.add("Nomad"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/odyssey/MagmaVein.java b/Mage.Sets/src/mage/sets/odyssey/MagmaVein.java index a816f53110c..62818722035 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MagmaVein.java +++ b/Mage.Sets/src/mage/sets/odyssey/MagmaVein.java @@ -63,7 +63,6 @@ public class MagmaVein extends CardImpl { super(ownerId, 203, "Magma Vein", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // {R}, Sacrifice a land: Magma Vein deals 1 damage to each creature without flying. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter1), new ManaCostsImpl("{R}")); diff --git a/Mage.Sets/src/mage/sets/odyssey/MalevolentAwakening.java b/Mage.Sets/src/mage/sets/odyssey/MalevolentAwakening.java index 12a4803a519..e9bd8334176 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MalevolentAwakening.java +++ b/Mage.Sets/src/mage/sets/odyssey/MalevolentAwakening.java @@ -58,7 +58,6 @@ public class MalevolentAwakening extends CardImpl { super(ownerId, 147, "Malevolent Awakening", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}"); this.expansionSetCode = "ODY"; - this.color.setBlack(true); // {1}{B}{B}, Sacrifice a creature: Return target creature card from your graveyard to your hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl("{1}{B}{B}")); diff --git a/Mage.Sets/src/mage/sets/odyssey/MasterApothecary.java b/Mage.Sets/src/mage/sets/odyssey/MasterApothecary.java index d5e958bdc48..6dde79d2ef4 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MasterApothecary.java +++ b/Mage.Sets/src/mage/sets/odyssey/MasterApothecary.java @@ -64,7 +64,6 @@ public class MasterApothecary extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/MetamorphicWurm.java b/Mage.Sets/src/mage/sets/odyssey/MetamorphicWurm.java index 614e7fff4a1..e405fa85ea2 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MetamorphicWurm.java +++ b/Mage.Sets/src/mage/sets/odyssey/MetamorphicWurm.java @@ -52,7 +52,6 @@ public class MetamorphicWurm extends CardImpl { this.subtype.add("Elephant"); this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/MinotaurExplorer.java b/Mage.Sets/src/mage/sets/odyssey/MinotaurExplorer.java index af8b42a17b8..15b0f25f1a0 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MinotaurExplorer.java +++ b/Mage.Sets/src/mage/sets/odyssey/MinotaurExplorer.java @@ -48,7 +48,6 @@ public class MinotaurExplorer extends CardImpl { this.subtype.add("Minotaur"); this.subtype.add("Scout"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/MoltenInfluence.java b/Mage.Sets/src/mage/sets/odyssey/MoltenInfluence.java index 0b42884bdce..bf2cbc6973a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MoltenInfluence.java +++ b/Mage.Sets/src/mage/sets/odyssey/MoltenInfluence.java @@ -59,7 +59,6 @@ public class MoltenInfluence extends CardImpl { super(ownerId, 207, "Molten Influence", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Counter target instant or sorcery spell unless its controller has Molten Influence deal 4 damage to him or her. this.getSpellAbility().addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/sets/odyssey/MomentsPeace.java b/Mage.Sets/src/mage/sets/odyssey/MomentsPeace.java index 4b5a8a0a505..356c6690658 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MomentsPeace.java +++ b/Mage.Sets/src/mage/sets/odyssey/MomentsPeace.java @@ -48,7 +48,6 @@ public class MomentsPeace extends CardImpl { super(ownerId, 251, "Moment's Peace", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "ODY"; - this.color.setGreen(true); // Prevent all combat damage that would be dealt this turn. this.getSpellAbility().addEffect(new PreventAllDamageByAllEffect(Duration.EndOfTurn, true)); diff --git a/Mage.Sets/src/mage/sets/odyssey/MorbidHunger.java b/Mage.Sets/src/mage/sets/odyssey/MorbidHunger.java index a74181425bf..e35d5d4a082 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MorbidHunger.java +++ b/Mage.Sets/src/mage/sets/odyssey/MorbidHunger.java @@ -48,7 +48,6 @@ public class MorbidHunger extends CardImpl { super(ownerId, 150, "Morbid Hunger", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{B}{B}"); this.expansionSetCode = "ODY"; - this.color.setBlack(true); // Morbid Hunger deals 3 damage to target creature or player. You gain 3 life. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/odyssey/MorgueTheft.java b/Mage.Sets/src/mage/sets/odyssey/MorgueTheft.java index d55674aae76..b6d97f9f83e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MorgueTheft.java +++ b/Mage.Sets/src/mage/sets/odyssey/MorgueTheft.java @@ -48,7 +48,6 @@ public class MorgueTheft extends CardImpl { super(ownerId, 151, "Morgue Theft", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "ODY"; - this.color.setBlack(true); // Return target creature card from your graveyard to your hand. this.getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/Mudhole.java b/Mage.Sets/src/mage/sets/odyssey/Mudhole.java index bfd047e923a..7780e60419d 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Mudhole.java +++ b/Mage.Sets/src/mage/sets/odyssey/Mudhole.java @@ -51,7 +51,6 @@ public class Mudhole extends CardImpl { super(ownerId, 208, "Mudhole", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Target player exiles all land cards from his or her graveyard. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/odyssey/MysticCrusader.java b/Mage.Sets/src/mage/sets/odyssey/MysticCrusader.java index edf27eecf4f..b914a851837 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MysticCrusader.java +++ b/Mage.Sets/src/mage/sets/odyssey/MysticCrusader.java @@ -66,7 +66,6 @@ public class MysticCrusader extends CardImpl { this.subtype.add("Nomad"); this.subtype.add("Mystic"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/MysticPenitent.java b/Mage.Sets/src/mage/sets/odyssey/MysticPenitent.java index 03c6e8c2bff..6648625b93a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MysticPenitent.java +++ b/Mage.Sets/src/mage/sets/odyssey/MysticPenitent.java @@ -56,7 +56,6 @@ public class MysticPenitent extends CardImpl { this.subtype.add("Nomad"); this.subtype.add("Mystic"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/MysticVisionary.java b/Mage.Sets/src/mage/sets/odyssey/MysticVisionary.java index c343148db79..4bedbb634db 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MysticVisionary.java +++ b/Mage.Sets/src/mage/sets/odyssey/MysticVisionary.java @@ -53,7 +53,6 @@ public class MysticVisionary extends CardImpl { this.subtype.add("Nomad"); this.subtype.add("Mystic"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/MysticZealot.java b/Mage.Sets/src/mage/sets/odyssey/MysticZealot.java index 0df084d6225..25f028652ef 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MysticZealot.java +++ b/Mage.Sets/src/mage/sets/odyssey/MysticZealot.java @@ -55,7 +55,6 @@ public class MysticZealot extends CardImpl { this.subtype.add("Nomad"); this.subtype.add("Mystic"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/odyssey/NantukoDisciple.java b/Mage.Sets/src/mage/sets/odyssey/NantukoDisciple.java index f99553f4d21..2f0ce0c2dbf 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NantukoDisciple.java +++ b/Mage.Sets/src/mage/sets/odyssey/NantukoDisciple.java @@ -54,7 +54,6 @@ public class NantukoDisciple extends CardImpl { this.subtype.add("Insect"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/NantukoElder.java b/Mage.Sets/src/mage/sets/odyssey/NantukoElder.java index 29fcbd7ecf7..054d1d0fd5f 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NantukoElder.java +++ b/Mage.Sets/src/mage/sets/odyssey/NantukoElder.java @@ -49,7 +49,6 @@ public class NantukoElder extends CardImpl { this.subtype.add("Insect"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/NantukoMentor.java b/Mage.Sets/src/mage/sets/odyssey/NantukoMentor.java index e42177a3c6e..eb8438997f7 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NantukoMentor.java +++ b/Mage.Sets/src/mage/sets/odyssey/NantukoMentor.java @@ -56,7 +56,6 @@ public class NantukoMentor extends CardImpl { this.subtype.add("Insect"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/NeedForSpeed.java b/Mage.Sets/src/mage/sets/odyssey/NeedForSpeed.java index b511d349e27..90e1f5cef30 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NeedForSpeed.java +++ b/Mage.Sets/src/mage/sets/odyssey/NeedForSpeed.java @@ -55,7 +55,6 @@ public class NeedForSpeed extends CardImpl { super(ownerId, 209, "Need for Speed", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Sacrifice a land: Target creature gains haste until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java b/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java index 79f3716f46d..062a6df78bb 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java +++ b/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java @@ -52,7 +52,6 @@ public class NimbleMongoose extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Mongoose"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/NomadDecoy.java b/Mage.Sets/src/mage/sets/odyssey/NomadDecoy.java index b561e0fbcd5..94f051146c7 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NomadDecoy.java +++ b/Mage.Sets/src/mage/sets/odyssey/NomadDecoy.java @@ -56,7 +56,6 @@ public class NomadDecoy extends CardImpl { this.subtype.add("Human"); this.subtype.add("Nomad"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/NutCollector.java b/Mage.Sets/src/mage/sets/odyssey/NutCollector.java index 50e4056b53b..1541dadc35f 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NutCollector.java +++ b/Mage.Sets/src/mage/sets/odyssey/NutCollector.java @@ -63,7 +63,6 @@ public class NutCollector extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/ObstinateFamiliar.java b/Mage.Sets/src/mage/sets/odyssey/ObstinateFamiliar.java index fe04ec1114d..8112ec82712 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ObstinateFamiliar.java +++ b/Mage.Sets/src/mage/sets/odyssey/ObstinateFamiliar.java @@ -54,7 +54,6 @@ public class ObstinateFamiliar extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Lizard"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/OvereagerApprentice.java b/Mage.Sets/src/mage/sets/odyssey/OvereagerApprentice.java index 69dfd865ba3..b7aaa015818 100644 --- a/Mage.Sets/src/mage/sets/odyssey/OvereagerApprentice.java +++ b/Mage.Sets/src/mage/sets/odyssey/OvereagerApprentice.java @@ -52,7 +52,6 @@ public class OvereagerApprentice extends CardImpl { this.subtype.add("Human"); this.subtype.add("Minion"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/PardicMiner.java b/Mage.Sets/src/mage/sets/odyssey/PardicMiner.java index 225c5f9a560..3dcbfb8222b 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PardicMiner.java +++ b/Mage.Sets/src/mage/sets/odyssey/PardicMiner.java @@ -55,7 +55,6 @@ public class PardicMiner extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Dwarf"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/PardicSwordsmith.java b/Mage.Sets/src/mage/sets/odyssey/PardicSwordsmith.java index 032eef3af01..aa374206f02 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PardicSwordsmith.java +++ b/Mage.Sets/src/mage/sets/odyssey/PardicSwordsmith.java @@ -51,7 +51,6 @@ public class PardicSwordsmith extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Dwarf"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/PatriarchsDesire.java b/Mage.Sets/src/mage/sets/odyssey/PatriarchsDesire.java index add259b7193..ff1601181e2 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PatriarchsDesire.java +++ b/Mage.Sets/src/mage/sets/odyssey/PatriarchsDesire.java @@ -53,7 +53,6 @@ public class PatriarchsDesire extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/odyssey/PatrolHound.java b/Mage.Sets/src/mage/sets/odyssey/PatrolHound.java index 19085fe2371..1f15cf907ba 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PatrolHound.java +++ b/Mage.Sets/src/mage/sets/odyssey/PatrolHound.java @@ -50,7 +50,6 @@ public class PatrolHound extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Hound"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/PatronWizard.java b/Mage.Sets/src/mage/sets/odyssey/PatronWizard.java index 750aba01cba..d4d43389b35 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PatronWizard.java +++ b/Mage.Sets/src/mage/sets/odyssey/PatronWizard.java @@ -65,7 +65,6 @@ public class PatronWizard extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/Phantatog.java b/Mage.Sets/src/mage/sets/odyssey/Phantatog.java index b74a45a7806..f0443bed2c9 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Phantatog.java +++ b/Mage.Sets/src/mage/sets/odyssey/Phantatog.java @@ -52,8 +52,6 @@ public class Phantatog extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Atog"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/PiannaNomadCaptain.java b/Mage.Sets/src/mage/sets/odyssey/PiannaNomadCaptain.java index 71993d94e33..7d4b8f57938 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PiannaNomadCaptain.java +++ b/Mage.Sets/src/mage/sets/odyssey/PiannaNomadCaptain.java @@ -57,7 +57,6 @@ public class PiannaNomadCaptain extends CardImpl { this.subtype.add("Human"); this.subtype.add("Nomad"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/PilgrimOfJustice.java b/Mage.Sets/src/mage/sets/odyssey/PilgrimOfJustice.java index df5bcf872d5..2b12901ba28 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PilgrimOfJustice.java +++ b/Mage.Sets/src/mage/sets/odyssey/PilgrimOfJustice.java @@ -67,7 +67,6 @@ public class PilgrimOfJustice extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/PilgrimOfVirtue.java b/Mage.Sets/src/mage/sets/odyssey/PilgrimOfVirtue.java index 3a79b55b82c..0a223a2fa9d 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PilgrimOfVirtue.java +++ b/Mage.Sets/src/mage/sets/odyssey/PilgrimOfVirtue.java @@ -67,7 +67,6 @@ public class PilgrimOfVirtue extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/Predict.java b/Mage.Sets/src/mage/sets/odyssey/Predict.java index cff6e2fb5dc..cee6aa18bcb 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Predict.java +++ b/Mage.Sets/src/mage/sets/odyssey/Predict.java @@ -54,7 +54,6 @@ public class Predict extends CardImpl { super(ownerId, 94, "Predict", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "ODY"; - this.color.setBlue(true); // Name a card, then target player puts the top card of his or her library into his or her graveyard. If that card is the named card, you draw two cards. Otherwise, you draw a card. this.getSpellAbility().addEffect(new NameACardEffect(NameACardEffect.TypeOfName.ALL)); diff --git a/Mage.Sets/src/mage/sets/odyssey/PriceOfGlory.java b/Mage.Sets/src/mage/sets/odyssey/PriceOfGlory.java index 5ce893fce96..3d5b5cfc7c6 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PriceOfGlory.java +++ b/Mage.Sets/src/mage/sets/odyssey/PriceOfGlory.java @@ -52,7 +52,6 @@ public class PriceOfGlory extends CardImpl { super(ownerId, 214, "Price of Glory", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Whenever a player taps a land for mana, if it's not that player's turn, destroy that land. this.addAbility(new PriceOfGloryAbility()); diff --git a/Mage.Sets/src/mage/sets/odyssey/PrimalFrenzy.java b/Mage.Sets/src/mage/sets/odyssey/PrimalFrenzy.java index 8befd7f5018..167afd43a54 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PrimalFrenzy.java +++ b/Mage.Sets/src/mage/sets/odyssey/PrimalFrenzy.java @@ -54,7 +54,6 @@ public class PrimalFrenzy extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/odyssey/PsionicGift.java b/Mage.Sets/src/mage/sets/odyssey/PsionicGift.java index 8ae079b625d..ebb01f8c65d 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PsionicGift.java +++ b/Mage.Sets/src/mage/sets/odyssey/PsionicGift.java @@ -58,7 +58,6 @@ public class PsionicGift extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/odyssey/PulsatingIllusion.java b/Mage.Sets/src/mage/sets/odyssey/PulsatingIllusion.java index 939d6db6c02..a74ab218d8e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PulsatingIllusion.java +++ b/Mage.Sets/src/mage/sets/odyssey/PulsatingIllusion.java @@ -51,7 +51,6 @@ public class PulsatingIllusion extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/RabidElephant.java b/Mage.Sets/src/mage/sets/odyssey/RabidElephant.java index a2caa6c7a0e..d34fc022f7e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/RabidElephant.java +++ b/Mage.Sets/src/mage/sets/odyssey/RabidElephant.java @@ -47,7 +47,6 @@ public class RabidElephant extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Elephant"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/odyssey/RayOfDistortion.java b/Mage.Sets/src/mage/sets/odyssey/RayOfDistortion.java index e01a5e788ca..36233bea58c 100644 --- a/Mage.Sets/src/mage/sets/odyssey/RayOfDistortion.java +++ b/Mage.Sets/src/mage/sets/odyssey/RayOfDistortion.java @@ -56,7 +56,6 @@ public class RayOfDistortion extends CardImpl { super(ownerId, 42, "Ray of Distortion", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "ODY"; - this.color.setWhite(true); // Destroy target artifact or enchantment. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/Recoup.java b/Mage.Sets/src/mage/sets/odyssey/Recoup.java index 5e6c7e427ab..e5227186292 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Recoup.java +++ b/Mage.Sets/src/mage/sets/odyssey/Recoup.java @@ -63,7 +63,6 @@ public class Recoup extends CardImpl { super(ownerId, 216, "Recoup", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Target sorcery card in your graveyard gains flashback until end of turn. The flashback cost is equal to its mana cost. this.getSpellAbility().addEffect(new RecoupEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/Refresh.java b/Mage.Sets/src/mage/sets/odyssey/Refresh.java index 300bc11b9dc..a4094a67a7c 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Refresh.java +++ b/Mage.Sets/src/mage/sets/odyssey/Refresh.java @@ -45,7 +45,6 @@ public class Refresh extends CardImpl { super(ownerId, 264, "Refresh", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "ODY"; - this.color.setGreen(true); // Regenerate target creature. this.getSpellAbility().addEffect(new RegenerateTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/Repel.java b/Mage.Sets/src/mage/sets/odyssey/Repel.java index 066e380be08..aaac9f5f17a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Repel.java +++ b/Mage.Sets/src/mage/sets/odyssey/Repel.java @@ -44,7 +44,6 @@ public class Repel extends CardImpl { super(ownerId, 98, "Repel", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "ODY"; - this.color.setBlue(true); // Put target creature on top of its owner's library. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java b/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java index 74c87a1a4b8..33480b005c4 100644 --- a/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java +++ b/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java @@ -68,7 +68,6 @@ public class RepentantVampire extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Vampire"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/ResilientWanderer.java b/Mage.Sets/src/mage/sets/odyssey/ResilientWanderer.java index 4832a6e9df9..54c5dcc9451 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ResilientWanderer.java +++ b/Mage.Sets/src/mage/sets/odyssey/ResilientWanderer.java @@ -60,7 +60,6 @@ public class ResilientWanderer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Nomad"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/RoarOfTheWurm.java b/Mage.Sets/src/mage/sets/odyssey/RoarOfTheWurm.java index ea5195e0f70..d1ea0a34d69 100644 --- a/Mage.Sets/src/mage/sets/odyssey/RoarOfTheWurm.java +++ b/Mage.Sets/src/mage/sets/odyssey/RoarOfTheWurm.java @@ -48,7 +48,6 @@ public class RoarOfTheWurm extends CardImpl { super(ownerId, 266, "Roar of the Wurm", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{6}{G}"); this.expansionSetCode = "ODY"; - this.color.setGreen(true); // Put a 6/6 green Wurm creature token onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new WurmToken())); diff --git a/Mage.Sets/src/mage/sets/odyssey/RottingGiant.java b/Mage.Sets/src/mage/sets/odyssey/RottingGiant.java index 52a6912ef79..9243984eb6a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/RottingGiant.java +++ b/Mage.Sets/src/mage/sets/odyssey/RottingGiant.java @@ -49,7 +49,6 @@ public class RottingGiant extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Giant"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/SacredRites.java b/Mage.Sets/src/mage/sets/odyssey/SacredRites.java index fcbd9b7b1ed..9b81acc9b99 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SacredRites.java +++ b/Mage.Sets/src/mage/sets/odyssey/SacredRites.java @@ -54,7 +54,6 @@ public class SacredRites extends CardImpl { super(ownerId, 44, "Sacred Rites", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "ODY"; - this.color.setWhite(true); // Discard any number of cards. Creatures you control get +0/+1 until end of turn for each card discarded this way. this.getSpellAbility().addTarget(new TargetCardInHand(0, Integer.MAX_VALUE, new FilterCard())); diff --git a/Mage.Sets/src/mage/sets/odyssey/SadisticHypnotist.java b/Mage.Sets/src/mage/sets/odyssey/SadisticHypnotist.java index cfeb8e15bbc..10dd2c1484d 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SadisticHypnotist.java +++ b/Mage.Sets/src/mage/sets/odyssey/SadisticHypnotist.java @@ -54,7 +54,6 @@ public class SadisticHypnotist extends CardImpl { this.subtype.add("Human"); this.subtype.add("Minion"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/Sarcatog.java b/Mage.Sets/src/mage/sets/odyssey/Sarcatog.java index 4a92eb91bb7..f8a999d1d40 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Sarcatog.java +++ b/Mage.Sets/src/mage/sets/odyssey/Sarcatog.java @@ -54,8 +54,6 @@ public class Sarcatog extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Atog"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/SavageFirecat.java b/Mage.Sets/src/mage/sets/odyssey/SavageFirecat.java index fdeccf8e7e8..4369d8ec24c 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SavageFirecat.java +++ b/Mage.Sets/src/mage/sets/odyssey/SavageFirecat.java @@ -56,7 +56,6 @@ public class SavageFirecat extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Cat"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/odyssey/ScreamsOfTheDamned.java b/Mage.Sets/src/mage/sets/odyssey/ScreamsOfTheDamned.java index 68e3add6129..d13e7893ee5 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ScreamsOfTheDamned.java +++ b/Mage.Sets/src/mage/sets/odyssey/ScreamsOfTheDamned.java @@ -49,7 +49,6 @@ public class ScreamsOfTheDamned extends CardImpl { super(ownerId, 160, "Screams of the Damned", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{B}"); this.expansionSetCode = "ODY"; - this.color.setBlack(true); // {1}{B}, Exile a card from your graveyard: Screams of the Damned deals 1 damage to each creature and each player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl("{1}{B}")); diff --git a/Mage.Sets/src/mage/sets/odyssey/SecondThoughts.java b/Mage.Sets/src/mage/sets/odyssey/SecondThoughts.java index 1dc7c7ec8de..3089882858a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SecondThoughts.java +++ b/Mage.Sets/src/mage/sets/odyssey/SecondThoughts.java @@ -45,7 +45,6 @@ public class SecondThoughts extends CardImpl { super(ownerId, 45, "Second Thoughts", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{W}"); this.expansionSetCode = "ODY"; - this.color.setWhite(true); // Exile target attacking creature. this.getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/SetonKrosanProtector.java b/Mage.Sets/src/mage/sets/odyssey/SetonKrosanProtector.java index 4ca7de0cc2b..71e67602a64 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SetonKrosanProtector.java +++ b/Mage.Sets/src/mage/sets/odyssey/SetonKrosanProtector.java @@ -63,7 +63,6 @@ public class SetonKrosanProtector extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/Shelter.java b/Mage.Sets/src/mage/sets/odyssey/Shelter.java index 228637fc7d8..da7455b430a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Shelter.java +++ b/Mage.Sets/src/mage/sets/odyssey/Shelter.java @@ -46,7 +46,6 @@ public class Shelter extends CardImpl { super(ownerId, 46, "Shelter", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "ODY"; - this.color.setWhite(true); // Target creature you control gains protection from the color of your choice until end of turn. this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/odyssey/ShowerOfCoals.java b/Mage.Sets/src/mage/sets/odyssey/ShowerOfCoals.java index 6ff7e08d7ff..6043783ef79 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ShowerOfCoals.java +++ b/Mage.Sets/src/mage/sets/odyssey/ShowerOfCoals.java @@ -47,7 +47,6 @@ public class ShowerOfCoals extends CardImpl { super(ownerId, 221, "Shower of Coals", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Shower of Coals deals 2 damage to each of up to three target creatures and/or players. // Threshold - Shower of Coals deals 4 damage to each of those creatures and/or players instead if seven or more cards are in your graveyard. diff --git a/Mage.Sets/src/mage/sets/odyssey/SkeletalScrying.java b/Mage.Sets/src/mage/sets/odyssey/SkeletalScrying.java index 76c8a65210d..48eb832d794 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SkeletalScrying.java +++ b/Mage.Sets/src/mage/sets/odyssey/SkeletalScrying.java @@ -56,7 +56,6 @@ public class SkeletalScrying extends CardImpl { super(ownerId, 161, "Skeletal Scrying", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{B}"); this.expansionSetCode = "ODY"; - this.color.setBlack(true); // As an additional cost to cast Skeletal Scrying, exile X cards from your graveyard. Ability ability = new SimpleStaticAbility(Zone.ALL,new SkeletalScryingRuleEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/SkullFracture.java b/Mage.Sets/src/mage/sets/odyssey/SkullFracture.java index 9365eb65cd2..fc752b59b44 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SkullFracture.java +++ b/Mage.Sets/src/mage/sets/odyssey/SkullFracture.java @@ -47,7 +47,6 @@ public class SkullFracture extends CardImpl { super(ownerId, 162, "Skull Fracture", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "ODY"; - this.color.setBlack(true); // Target player discards a card. diff --git a/Mage.Sets/src/mage/sets/odyssey/Skyshooter.java b/Mage.Sets/src/mage/sets/odyssey/Skyshooter.java index 1402f95cc10..46a83e2e1ea 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Skyshooter.java +++ b/Mage.Sets/src/mage/sets/odyssey/Skyshooter.java @@ -61,7 +61,6 @@ public class Skyshooter extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Archer"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/Soulcatcher.java b/Mage.Sets/src/mage/sets/odyssey/Soulcatcher.java index 0a314578a79..386dc7c6374 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Soulcatcher.java +++ b/Mage.Sets/src/mage/sets/odyssey/Soulcatcher.java @@ -57,7 +57,6 @@ public class Soulcatcher extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/SparkMage.java b/Mage.Sets/src/mage/sets/odyssey/SparkMage.java index 1032baf6566..9b4db2dd7ec 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SparkMage.java +++ b/Mage.Sets/src/mage/sets/odyssey/SparkMage.java @@ -55,7 +55,6 @@ public class SparkMage extends CardImpl { this.subtype.add("Dwarf"); this.subtype.add("Wizard"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/Spiritualize.java b/Mage.Sets/src/mage/sets/odyssey/Spiritualize.java index feca1c541e0..f13eb6d123f 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Spiritualize.java +++ b/Mage.Sets/src/mage/sets/odyssey/Spiritualize.java @@ -55,7 +55,6 @@ public class Spiritualize extends CardImpl { super(ownerId, 53, "Spiritualize", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "ODY"; - this.color.setWhite(true); // Until end of turn, whenever target creature deals damage, you gain that much life. this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new SpiritualizeTriggeredAbility())); diff --git a/Mage.Sets/src/mage/sets/odyssey/SpringingTiger.java b/Mage.Sets/src/mage/sets/odyssey/SpringingTiger.java index db45695f529..a386a1624ad 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SpringingTiger.java +++ b/Mage.Sets/src/mage/sets/odyssey/SpringingTiger.java @@ -51,7 +51,6 @@ public class SpringingTiger extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Cat"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/SquirrelMob.java b/Mage.Sets/src/mage/sets/odyssey/SquirrelMob.java index 9163d7ac5ef..2deb6e24483 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SquirrelMob.java +++ b/Mage.Sets/src/mage/sets/odyssey/SquirrelMob.java @@ -55,7 +55,6 @@ public class SquirrelMob extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Squirrel"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/StalkingBloodsucker.java b/Mage.Sets/src/mage/sets/odyssey/StalkingBloodsucker.java index 99789585dbe..b9dd2b6d0a4 100644 --- a/Mage.Sets/src/mage/sets/odyssey/StalkingBloodsucker.java +++ b/Mage.Sets/src/mage/sets/odyssey/StalkingBloodsucker.java @@ -52,7 +52,6 @@ public class StalkingBloodsucker extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Vampire"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/odyssey/Standstill.java b/Mage.Sets/src/mage/sets/odyssey/Standstill.java index ce624226d61..9cc4fa20b2a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Standstill.java +++ b/Mage.Sets/src/mage/sets/odyssey/Standstill.java @@ -52,7 +52,6 @@ public class Standstill extends CardImpl { super(ownerId, 102, "Standstill", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "ODY"; - this.color.setBlue(true); // When a player casts a spell, sacrifice Standstill. If you do, each of that player's opponents draws three cards. this.addAbility(new SpellCastTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/odyssey/TaintedPact.java b/Mage.Sets/src/mage/sets/odyssey/TaintedPact.java index 5753c8c5249..15e8120ff54 100644 --- a/Mage.Sets/src/mage/sets/odyssey/TaintedPact.java +++ b/Mage.Sets/src/mage/sets/odyssey/TaintedPact.java @@ -51,7 +51,6 @@ public class TaintedPact extends CardImpl { super(ownerId, 164, "Tainted Pact", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "ODY"; - this.color.setBlack(true); // Exile the top card of your library. You may put that card into your hand unless it has the same name as another card exiled this way. Repeat this process until you put a card into your hand or you exile two cards with the same name, whichever comes first. this.getSpellAbility().addEffect(new TaintedPactEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/Terravore.java b/Mage.Sets/src/mage/sets/odyssey/Terravore.java index 4397b2dd274..7c2c4a002db 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Terravore.java +++ b/Mage.Sets/src/mage/sets/odyssey/Terravore.java @@ -51,7 +51,6 @@ public class Terravore extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Lhurgoyf"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/odyssey/TestamentOfFaith.java b/Mage.Sets/src/mage/sets/odyssey/TestamentOfFaith.java index 1b0bbb87b33..4b9149507ce 100644 --- a/Mage.Sets/src/mage/sets/odyssey/TestamentOfFaith.java +++ b/Mage.Sets/src/mage/sets/odyssey/TestamentOfFaith.java @@ -58,7 +58,6 @@ public class TestamentOfFaith extends CardImpl { super(ownerId, 55, "Testament of Faith", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}"); this.expansionSetCode = "ODY"; - this.color.setWhite(true); // {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())); diff --git a/Mage.Sets/src/mage/sets/odyssey/Thaumatog.java b/Mage.Sets/src/mage/sets/odyssey/Thaumatog.java index ff898ba8e24..a430dc3beb5 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Thaumatog.java +++ b/Mage.Sets/src/mage/sets/odyssey/Thaumatog.java @@ -52,8 +52,6 @@ public class Thaumatog extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Atog"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/ThermalBlast.java b/Mage.Sets/src/mage/sets/odyssey/ThermalBlast.java index cf04e6fdb1b..f9f2550167a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ThermalBlast.java +++ b/Mage.Sets/src/mage/sets/odyssey/ThermalBlast.java @@ -47,7 +47,6 @@ public class ThermalBlast extends CardImpl { super(ownerId, 224, "Thermal Blast", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Thermal Blast deals 3 damage to target creature. // Threshold - Thermal Blast deals 5 damage to that creature instead if seven or more cards are in your graveyard. diff --git a/Mage.Sets/src/mage/sets/odyssey/ThinkTank.java b/Mage.Sets/src/mage/sets/odyssey/ThinkTank.java index 6f141d099b7..67d6fd8943c 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ThinkTank.java +++ b/Mage.Sets/src/mage/sets/odyssey/ThinkTank.java @@ -55,7 +55,6 @@ public class ThinkTank extends CardImpl { super(ownerId, 104, "Think Tank", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "ODY"; - this.color.setBlue(true); // At the beginning of your upkeep, look at the top card of your library. You may put that card into your graveyard. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new ThinkTankLookLibraryEffect(), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/odyssey/TirelessTribe.java b/Mage.Sets/src/mage/sets/odyssey/TirelessTribe.java index 75a00e1f612..99fa82ae8f5 100644 --- a/Mage.Sets/src/mage/sets/odyssey/TirelessTribe.java +++ b/Mage.Sets/src/mage/sets/odyssey/TirelessTribe.java @@ -51,7 +51,6 @@ public class TirelessTribe extends CardImpl { this.subtype.add("Human"); this.subtype.add("Nomad"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/Tombfire.java b/Mage.Sets/src/mage/sets/odyssey/Tombfire.java index bb5c7df9c65..ff6bcd5fe3e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Tombfire.java +++ b/Mage.Sets/src/mage/sets/odyssey/Tombfire.java @@ -52,7 +52,6 @@ public class Tombfire extends CardImpl { super(ownerId, 165, "Tombfire", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "ODY"; - this.color.setBlack(true); // Target player exiles all cards with flashback from his or her graveyard. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/odyssey/TreetopSentinel.java b/Mage.Sets/src/mage/sets/odyssey/TreetopSentinel.java index f49c18b7bb1..2ae70e6a446 100644 --- a/Mage.Sets/src/mage/sets/odyssey/TreetopSentinel.java +++ b/Mage.Sets/src/mage/sets/odyssey/TreetopSentinel.java @@ -56,7 +56,6 @@ public class TreetopSentinel extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/odyssey/Tremble.java b/Mage.Sets/src/mage/sets/odyssey/Tremble.java index 7a6a096f2ed..297ce98a598 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Tremble.java +++ b/Mage.Sets/src/mage/sets/odyssey/Tremble.java @@ -44,7 +44,6 @@ public class Tremble extends CardImpl { super(ownerId, 225, "Tremble", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Each player sacrifices a land. this.getSpellAbility().addEffect(new SacrificeAllEffect(1, new FilterControlledLandPermanent("land"))); diff --git a/Mage.Sets/src/mage/sets/odyssey/UnifyingTheory.java b/Mage.Sets/src/mage/sets/odyssey/UnifyingTheory.java index 7e1580a32fd..df7da318d11 100644 --- a/Mage.Sets/src/mage/sets/odyssey/UnifyingTheory.java +++ b/Mage.Sets/src/mage/sets/odyssey/UnifyingTheory.java @@ -59,7 +59,6 @@ public class UnifyingTheory extends CardImpl { super(ownerId, 112, "Unifying Theory", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "ODY"; - this.color.setBlue(true); // Whenever a player casts a spell, that player may pay {2}. If the player does, he or she draws a card. this.addAbility(new SpellCastAllTriggeredAbility(new UnifyingTheoryEffect() , new FilterSpell("a spell"), false, true)); diff --git a/Mage.Sets/src/mage/sets/odyssey/Upheaval.java b/Mage.Sets/src/mage/sets/odyssey/Upheaval.java index 3ce53d4d9d9..2c0bc47d269 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Upheaval.java +++ b/Mage.Sets/src/mage/sets/odyssey/Upheaval.java @@ -47,7 +47,6 @@ public class Upheaval extends CardImpl { super(ownerId, 113, "Upheaval", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{U}{U}"); this.expansionSetCode = "ODY"; - this.color.setBlue(true); // Return all permanents to their owners' hands. this.getSpellAbility().addEffect(new ReturnToHandFromBattlefieldAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/odyssey/VolcanicSpray.java b/Mage.Sets/src/mage/sets/odyssey/VolcanicSpray.java index e6987a431e7..9e155f56116 100644 --- a/Mage.Sets/src/mage/sets/odyssey/VolcanicSpray.java +++ b/Mage.Sets/src/mage/sets/odyssey/VolcanicSpray.java @@ -55,7 +55,6 @@ public class VolcanicSpray extends CardImpl { super(ownerId, 226, "Volcanic Spray", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Volcanic Spray deals 1 damage to each creature without flying and each player. this.getSpellAbility().addEffect(new DamageAllEffect(1, filter)); diff --git a/Mage.Sets/src/mage/sets/odyssey/VolleyOfBoulders.java b/Mage.Sets/src/mage/sets/odyssey/VolleyOfBoulders.java index 1c6bbd67281..dcc5f96990d 100644 --- a/Mage.Sets/src/mage/sets/odyssey/VolleyOfBoulders.java +++ b/Mage.Sets/src/mage/sets/odyssey/VolleyOfBoulders.java @@ -47,7 +47,6 @@ public class VolleyOfBoulders extends CardImpl { super(ownerId, 227, "Volley of Boulders", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{8}{R}"); this.expansionSetCode = "ODY"; - this.color.setRed(true); // Volley of Boulders deals 6 damage divided as you choose among any number of target creatures and/or players. this.getSpellAbility().addEffect(new DamageMultiEffect(6)); diff --git a/Mage.Sets/src/mage/sets/odyssey/WaywardAngel.java b/Mage.Sets/src/mage/sets/odyssey/WaywardAngel.java index c4b3c380f66..f73fe6f3e36 100644 --- a/Mage.Sets/src/mage/sets/odyssey/WaywardAngel.java +++ b/Mage.Sets/src/mage/sets/odyssey/WaywardAngel.java @@ -62,7 +62,6 @@ public class WaywardAngel extends CardImpl { this.subtype.add("Angel"); this.subtype.add("Horror"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/odyssey/Werebear.java b/Mage.Sets/src/mage/sets/odyssey/Werebear.java index eeffdfc969d..165d82c9534 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Werebear.java +++ b/Mage.Sets/src/mage/sets/odyssey/Werebear.java @@ -54,7 +54,6 @@ public class Werebear extends CardImpl { this.subtype.add("Bear"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/Whipkeeper.java b/Mage.Sets/src/mage/sets/odyssey/Whipkeeper.java index bb7f2368c6e..56d1531aaca 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Whipkeeper.java +++ b/Mage.Sets/src/mage/sets/odyssey/Whipkeeper.java @@ -53,7 +53,6 @@ public class Whipkeeper extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Dwarf"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/WhisperingShade.java b/Mage.Sets/src/mage/sets/odyssey/WhisperingShade.java index 92336eb278c..7e778d4967d 100644 --- a/Mage.Sets/src/mage/sets/odyssey/WhisperingShade.java +++ b/Mage.Sets/src/mage/sets/odyssey/WhisperingShade.java @@ -50,7 +50,6 @@ public class WhisperingShade extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Shade"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/WildMongrel.java b/Mage.Sets/src/mage/sets/odyssey/WildMongrel.java index a865a8e9f07..34bef98feda 100644 --- a/Mage.Sets/src/mage/sets/odyssey/WildMongrel.java +++ b/Mage.Sets/src/mage/sets/odyssey/WildMongrel.java @@ -60,7 +60,6 @@ public class WildMongrel extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Hound"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/WoodlandDruid.java b/Mage.Sets/src/mage/sets/odyssey/WoodlandDruid.java index f49038bb56b..720dcab53ed 100644 --- a/Mage.Sets/src/mage/sets/odyssey/WoodlandDruid.java +++ b/Mage.Sets/src/mage/sets/odyssey/WoodlandDruid.java @@ -45,7 +45,6 @@ public class WoodlandDruid extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/odyssey/WordsOfWisdom.java b/Mage.Sets/src/mage/sets/odyssey/WordsOfWisdom.java index 8510b2a6197..e0dfe85b015 100644 --- a/Mage.Sets/src/mage/sets/odyssey/WordsOfWisdom.java +++ b/Mage.Sets/src/mage/sets/odyssey/WordsOfWisdom.java @@ -49,7 +49,6 @@ public class WordsOfWisdom extends CardImpl { super(ownerId, 114, "Words of Wisdom", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "ODY"; - this.color.setBlue(true); // You draw two cards, then each other player draws a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); diff --git a/Mage.Sets/src/mage/sets/odyssey/ZombieAssassin.java b/Mage.Sets/src/mage/sets/odyssey/ZombieAssassin.java index f1a76aa3bf5..ee717e384df 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ZombieAssassin.java +++ b/Mage.Sets/src/mage/sets/odyssey/ZombieAssassin.java @@ -67,7 +67,6 @@ public class ZombieAssassin extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Assassin"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/ZombieCannibal.java b/Mage.Sets/src/mage/sets/odyssey/ZombieCannibal.java index 536fec815cd..831acaa2182 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ZombieCannibal.java +++ b/Mage.Sets/src/mage/sets/odyssey/ZombieCannibal.java @@ -54,7 +54,6 @@ public class ZombieCannibal extends CardImpl { this.expansionSetCode = "ODY"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/odyssey/Zoologist.java b/Mage.Sets/src/mage/sets/odyssey/Zoologist.java index 4ecd2d74f4b..f540e179d31 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Zoologist.java +++ b/Mage.Sets/src/mage/sets/odyssey/Zoologist.java @@ -57,7 +57,6 @@ public class Zoologist extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/onslaught/AggravatedAssault.java b/Mage.Sets/src/mage/sets/onslaught/AggravatedAssault.java index 35568b88bdb..979c4bb847a 100644 --- a/Mage.Sets/src/mage/sets/onslaught/AggravatedAssault.java +++ b/Mage.Sets/src/mage/sets/onslaught/AggravatedAssault.java @@ -53,7 +53,6 @@ public class AggravatedAssault extends CardImpl { super(ownerId, 185, "Aggravated Assault", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "ONS"; - this.color.setRed(true); // {3}{R}{R}: Untap all creatures you control. After this main phase, there is an additional combat phase followed by an additional main phase. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new UntapAllControllerEffect(new FilterControlledCreaturePermanent(), "Untap all creatures you control"), new ManaCostsImpl<>("{3}{R}{R}")); diff --git a/Mage.Sets/src/mage/sets/onslaught/AkromasBlessing.java b/Mage.Sets/src/mage/sets/onslaught/AkromasBlessing.java index a1b5e2f4242..bf42de81296 100644 --- a/Mage.Sets/src/mage/sets/onslaught/AkromasBlessing.java +++ b/Mage.Sets/src/mage/sets/onslaught/AkromasBlessing.java @@ -58,7 +58,6 @@ public class AkromasBlessing extends CardImpl { super(ownerId, 1, "Akroma's Blessing", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "ONS"; - this.color.setWhite(true); // Choose a color. Creatures you control gain protection from the chosen color until end of turn. this.getSpellAbility().addEffect(new AkromasBlessingChooseColorEffect()); diff --git a/Mage.Sets/src/mage/sets/onslaught/Annex.java b/Mage.Sets/src/mage/sets/onslaught/Annex.java index 45eac9e4953..d25c9ee9b68 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Annex.java +++ b/Mage.Sets/src/mage/sets/onslaught/Annex.java @@ -52,7 +52,6 @@ public class Annex extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/onslaught/AnuridMurkdiver.java b/Mage.Sets/src/mage/sets/onslaught/AnuridMurkdiver.java index 0787c3051f6..9552d844efe 100644 --- a/Mage.Sets/src/mage/sets/onslaught/AnuridMurkdiver.java +++ b/Mage.Sets/src/mage/sets/onslaught/AnuridMurkdiver.java @@ -47,7 +47,6 @@ public class AnuridMurkdiver extends CardImpl { this.subtype.add("Frog"); this.subtype.add("Beast"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java b/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java index ce33277daf4..8a87cd35a7a 100644 --- a/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java +++ b/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java @@ -54,7 +54,6 @@ public class AstralSlide extends CardImpl { super(ownerId, 4, "Astral Slide", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "ONS"; - this.color.setWhite(true); // Whenever a player cycles a card, you may exile target creature. If you do, return that card to the battlefield under its owner's control at the beginning of the next end step. Ability ability = new CycleAllTriggeredAbility(new AstralSlideEffect(), true); diff --git a/Mage.Sets/src/mage/sets/onslaught/BarkhideMauler.java b/Mage.Sets/src/mage/sets/onslaught/BarkhideMauler.java index dc6e2b92473..489d4c0649b 100644 --- a/Mage.Sets/src/mage/sets/onslaught/BarkhideMauler.java +++ b/Mage.Sets/src/mage/sets/onslaught/BarkhideMauler.java @@ -46,7 +46,6 @@ public class BarkhideMauler extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/onslaught/BirchloreRangers.java b/Mage.Sets/src/mage/sets/onslaught/BirchloreRangers.java index ec6846d5d1f..b37f254008a 100644 --- a/Mage.Sets/src/mage/sets/onslaught/BirchloreRangers.java +++ b/Mage.Sets/src/mage/sets/onslaught/BirchloreRangers.java @@ -61,7 +61,6 @@ public class BirchloreRangers extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/Blackmail.java b/Mage.Sets/src/mage/sets/onslaught/Blackmail.java index 250cc21788b..d0084cc94e0 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Blackmail.java +++ b/Mage.Sets/src/mage/sets/onslaught/Blackmail.java @@ -45,7 +45,6 @@ public class Blackmail extends CardImpl { super(ownerId, 127, "Blackmail", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "ONS"; - this.color.setBlack(true); // Target player reveals three cards from his or her hand and you choose one of them. That player discards that card. this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(TargetController.ANY, 3)); diff --git a/Mage.Sets/src/mage/sets/onslaught/BlisteringFirecat.java b/Mage.Sets/src/mage/sets/onslaught/BlisteringFirecat.java index 1e7a8e21767..78f04e6b9b8 100644 --- a/Mage.Sets/src/mage/sets/onslaught/BlisteringFirecat.java +++ b/Mage.Sets/src/mage/sets/onslaught/BlisteringFirecat.java @@ -52,7 +52,6 @@ public class BlisteringFirecat extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Cat"); - this.color.setRed(true); this.power = new MageInt(7); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java b/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java index ecbf6db3336..71615679996 100644 --- a/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java +++ b/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java @@ -63,7 +63,6 @@ public class CatapultMaster extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/onslaught/ChainOfVapor.java b/Mage.Sets/src/mage/sets/onslaught/ChainOfVapor.java index 4e677aad2cf..4b15f902077 100644 --- a/Mage.Sets/src/mage/sets/onslaught/ChainOfVapor.java +++ b/Mage.Sets/src/mage/sets/onslaught/ChainOfVapor.java @@ -55,7 +55,6 @@ public class ChainOfVapor extends CardImpl { super(ownerId, 73, "Chain of Vapor", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "ONS"; - this.color.setBlue(true); // Return target nonland permanent to its owner's hand. Then that permanent's controller may sacrifice a land. If the player does, he or she may copy this spell and may choose a new target for that copy. this.getSpellAbility().addEffect(new ChainOfVaporEffect()); diff --git a/Mage.Sets/src/mage/sets/onslaught/CoverOfDarkness.java b/Mage.Sets/src/mage/sets/onslaught/CoverOfDarkness.java index 30336dde557..4f274255cea 100644 --- a/Mage.Sets/src/mage/sets/onslaught/CoverOfDarkness.java +++ b/Mage.Sets/src/mage/sets/onslaught/CoverOfDarkness.java @@ -53,7 +53,6 @@ public class CoverOfDarkness extends CardImpl { super(ownerId, 133, "Cover of Darkness", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "ONS"; - this.color.setBlack(true); // As Cover of Darkness enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.AddAbility))); diff --git a/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java b/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java index 273244c9461..153fda85644 100644 --- a/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java +++ b/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java @@ -66,7 +66,6 @@ public class CruelRevival extends CardImpl { super(ownerId, 135, "Cruel Revival", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{B}"); this.expansionSetCode = "ONS"; - this.color.setBlack(true); // Destroy target non-Zombie creature. It can't be regenerated. Return up to one target Zombie card from your graveyard to your hand. this.getSpellAbility().addEffect(new CruelRevivalEffect()); diff --git a/Mage.Sets/src/mage/sets/onslaught/DirgeOfDread.java b/Mage.Sets/src/mage/sets/onslaught/DirgeOfDread.java index 1866f74de9f..653fc7b9652 100644 --- a/Mage.Sets/src/mage/sets/onslaught/DirgeOfDread.java +++ b/Mage.Sets/src/mage/sets/onslaught/DirgeOfDread.java @@ -52,7 +52,6 @@ public class DirgeOfDread extends CardImpl { super(ownerId, 138, "Dirge of Dread", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "ONS"; - this.color.setBlack(true); // All creatures gain fear until end of turn. this.getSpellAbility().addEffect(new GainAbilityAllEffect(FearAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent("All creatures"))); diff --git a/Mage.Sets/src/mage/sets/onslaught/ElvenRiders.java b/Mage.Sets/src/mage/sets/onslaught/ElvenRiders.java index 1dcf0d27c08..adf8229110d 100644 --- a/Mage.Sets/src/mage/sets/onslaught/ElvenRiders.java +++ b/Mage.Sets/src/mage/sets/onslaught/ElvenRiders.java @@ -59,7 +59,6 @@ public class ElvenRiders extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/onslaught/ElvishPioneer.java b/Mage.Sets/src/mage/sets/onslaught/ElvishPioneer.java index da87749507b..510ba22d63d 100644 --- a/Mage.Sets/src/mage/sets/onslaught/ElvishPioneer.java +++ b/Mage.Sets/src/mage/sets/onslaught/ElvishPioneer.java @@ -61,7 +61,6 @@ public class ElvishPioneer extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/ElvishScrapper.java b/Mage.Sets/src/mage/sets/onslaught/ElvishScrapper.java index d83e8848e77..64395c96750 100644 --- a/Mage.Sets/src/mage/sets/onslaught/ElvishScrapper.java +++ b/Mage.Sets/src/mage/sets/onslaught/ElvishScrapper.java @@ -54,7 +54,6 @@ public class ElvishScrapper extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/EnchantresssPresence.java b/Mage.Sets/src/mage/sets/onslaught/EnchantresssPresence.java index 5b20bdae432..1446c286102 100644 --- a/Mage.Sets/src/mage/sets/onslaught/EnchantresssPresence.java +++ b/Mage.Sets/src/mage/sets/onslaught/EnchantresssPresence.java @@ -53,7 +53,6 @@ public class EnchantresssPresence extends CardImpl { super(ownerId, 261, "Enchantress's Presence", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "ONS"; - this.color.setGreen(true); // Whenever you cast an enchantment spell, draw a card. this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardSourceControllerEffect(1), filter, false)); diff --git a/Mage.Sets/src/mage/sets/onslaught/ExaltedAngel.java b/Mage.Sets/src/mage/sets/onslaught/ExaltedAngel.java index 01ceb08d796..3a00989e29f 100644 --- a/Mage.Sets/src/mage/sets/onslaught/ExaltedAngel.java +++ b/Mage.Sets/src/mage/sets/onslaught/ExaltedAngel.java @@ -48,7 +48,6 @@ public class ExaltedAngel extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/onslaught/FalseCure.java b/Mage.Sets/src/mage/sets/onslaught/FalseCure.java index 25cb8b8b3a0..5b5f4cf1221 100644 --- a/Mage.Sets/src/mage/sets/onslaught/FalseCure.java +++ b/Mage.Sets/src/mage/sets/onslaught/FalseCure.java @@ -51,7 +51,6 @@ public class FalseCure extends CardImpl { super(ownerId, 146, "False Cure", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{B}{B}"); this.expansionSetCode = "ONS"; - this.color.setBlack(true); // Until end of turn, whenever a player gains life, that player loses 2 life for each 1 life he or she gained. this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new FalseCureTriggeredAbility())); diff --git a/Mage.Sets/src/mage/sets/onslaught/FutureSight.java b/Mage.Sets/src/mage/sets/onslaught/FutureSight.java index 9263cf36952..0c8dff1f1c6 100644 --- a/Mage.Sets/src/mage/sets/onslaught/FutureSight.java +++ b/Mage.Sets/src/mage/sets/onslaught/FutureSight.java @@ -47,7 +47,6 @@ public class FutureSight extends CardImpl { super(ownerId, 84, "Future Sight", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}{U}"); this.expansionSetCode = "ONS"; - this.color.setBlue(true); // Play with the top card of your library revealed. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); diff --git a/Mage.Sets/src/mage/sets/onslaught/GluttonousZombie.java b/Mage.Sets/src/mage/sets/onslaught/GluttonousZombie.java index 71db5da40e8..e66bee08610 100644 --- a/Mage.Sets/src/mage/sets/onslaught/GluttonousZombie.java +++ b/Mage.Sets/src/mage/sets/onslaught/GluttonousZombie.java @@ -45,7 +45,6 @@ public class GluttonousZombie extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/onslaught/GoblinPiledriver.java b/Mage.Sets/src/mage/sets/onslaught/GoblinPiledriver.java index 248ab966ac6..6d2ffbff2e7 100644 --- a/Mage.Sets/src/mage/sets/onslaught/GoblinPiledriver.java +++ b/Mage.Sets/src/mage/sets/onslaught/GoblinPiledriver.java @@ -66,7 +66,6 @@ public class GoblinPiledriver extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/onslaught/GoblinPyromancer.java b/Mage.Sets/src/mage/sets/onslaught/GoblinPyromancer.java index a78292f3326..90e0305bb1a 100644 --- a/Mage.Sets/src/mage/sets/onslaught/GoblinPyromancer.java +++ b/Mage.Sets/src/mage/sets/onslaught/GoblinPyromancer.java @@ -61,7 +61,6 @@ public class GoblinPyromancer extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Wizard"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/onslaught/GoblinSharpshooter.java b/Mage.Sets/src/mage/sets/onslaught/GoblinSharpshooter.java index f2b1bae75ac..f910d850e09 100644 --- a/Mage.Sets/src/mage/sets/onslaught/GoblinSharpshooter.java +++ b/Mage.Sets/src/mage/sets/onslaught/GoblinSharpshooter.java @@ -54,7 +54,6 @@ public class GoblinSharpshooter extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/GoblinSledder.java b/Mage.Sets/src/mage/sets/onslaught/GoblinSledder.java index 657273dbf31..9df618dbfcb 100644 --- a/Mage.Sets/src/mage/sets/onslaught/GoblinSledder.java +++ b/Mage.Sets/src/mage/sets/onslaught/GoblinSledder.java @@ -60,7 +60,6 @@ public class GoblinSledder extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/GustcloakSentinel.java b/Mage.Sets/src/mage/sets/onslaught/GustcloakSentinel.java index 5415ce7a82b..3d4133826b7 100644 --- a/Mage.Sets/src/mage/sets/onslaught/GustcloakSentinel.java +++ b/Mage.Sets/src/mage/sets/onslaught/GustcloakSentinel.java @@ -50,7 +50,6 @@ public class GustcloakSentinel extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/onslaught/Headhunter.java b/Mage.Sets/src/mage/sets/onslaught/Headhunter.java index 6af87b585ea..12d4d516240 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Headhunter.java +++ b/Mage.Sets/src/mage/sets/onslaught/Headhunter.java @@ -49,7 +49,6 @@ public class Headhunter extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/HeedlessOne.java b/Mage.Sets/src/mage/sets/onslaught/HeedlessOne.java index ff799c92382..6fd87e1ddd7 100644 --- a/Mage.Sets/src/mage/sets/onslaught/HeedlessOne.java +++ b/Mage.Sets/src/mage/sets/onslaught/HeedlessOne.java @@ -59,7 +59,6 @@ public class HeedlessOne extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Avatar"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/onslaught/Hystrodon.java b/Mage.Sets/src/mage/sets/onslaught/Hystrodon.java index 9881e8053fe..8d2b02fbad1 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Hystrodon.java +++ b/Mage.Sets/src/mage/sets/onslaught/Hystrodon.java @@ -49,7 +49,6 @@ public class Hystrodon extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/onslaught/Insurrection.java b/Mage.Sets/src/mage/sets/onslaught/Insurrection.java index 82fa5f2aef2..286563cc6a7 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Insurrection.java +++ b/Mage.Sets/src/mage/sets/onslaught/Insurrection.java @@ -54,7 +54,6 @@ public class Insurrection extends CardImpl { super(ownerId, 213, "Insurrection", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{R}{R}{R}"); this.expansionSetCode = "ONS"; - this.color.setRed(true); // Untap all creatures and gain control of them until end of turn. They gain haste until end of turn. this.getSpellAbility().addEffect(new InsurrectionEffect()); diff --git a/Mage.Sets/src/mage/sets/onslaught/JarethLeonineTitan.java b/Mage.Sets/src/mage/sets/onslaught/JarethLeonineTitan.java index 8218580bbf2..fda2d733ec2 100644 --- a/Mage.Sets/src/mage/sets/onslaught/JarethLeonineTitan.java +++ b/Mage.Sets/src/mage/sets/onslaught/JarethLeonineTitan.java @@ -63,7 +63,6 @@ public class JarethLeonineTitan extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Giant"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/onslaught/KamahlFistOfKrosa.java b/Mage.Sets/src/mage/sets/onslaught/KamahlFistOfKrosa.java index 789899a3b0a..09ba43f4d7c 100644 --- a/Mage.Sets/src/mage/sets/onslaught/KamahlFistOfKrosa.java +++ b/Mage.Sets/src/mage/sets/onslaught/KamahlFistOfKrosa.java @@ -56,7 +56,6 @@ public class KamahlFistOfKrosa extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/onslaught/LeeryFogbeast.java b/Mage.Sets/src/mage/sets/onslaught/LeeryFogbeast.java index 93c44a02598..9e37a65723d 100644 --- a/Mage.Sets/src/mage/sets/onslaught/LeeryFogbeast.java +++ b/Mage.Sets/src/mage/sets/onslaught/LeeryFogbeast.java @@ -48,7 +48,6 @@ public class LeeryFogbeast extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/onslaught/LightningRift.java b/Mage.Sets/src/mage/sets/onslaught/LightningRift.java index c2670a0d1b0..2d0783411f1 100644 --- a/Mage.Sets/src/mage/sets/onslaught/LightningRift.java +++ b/Mage.Sets/src/mage/sets/onslaught/LightningRift.java @@ -48,7 +48,6 @@ public class LightningRift extends CardImpl { super(ownerId, 217, "Lightning Rift", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); this.expansionSetCode = "ONS"; - this.color.setRed(true); // Whenever a player cycles a card, you may pay {1}. If you do, Lightning Rift deals 2 damage to target creature or player. Ability ability = new CycleAllTriggeredAbility(new DoIfCostPaid(new DamageTargetEffect(2), new GenericManaCost(1)), false); diff --git a/Mage.Sets/src/mage/sets/onslaught/Oblation.java b/Mage.Sets/src/mage/sets/onslaught/Oblation.java index 19a85f7cfe9..af44e16f604 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Oblation.java +++ b/Mage.Sets/src/mage/sets/onslaught/Oblation.java @@ -50,7 +50,6 @@ public class Oblation extends CardImpl { super(ownerId, 46, "Oblation", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "ONS"; - this.color.setWhite(true); // The owner of target nonland permanent shuffles it into his or her library, then draws two cards. this.getSpellAbility().addEffect(new OblationEffect()); diff --git a/Mage.Sets/src/mage/sets/onslaught/RavenousBaloth.java b/Mage.Sets/src/mage/sets/onslaught/RavenousBaloth.java index dbc6f645e7e..389759dd4d9 100644 --- a/Mage.Sets/src/mage/sets/onslaught/RavenousBaloth.java +++ b/Mage.Sets/src/mage/sets/onslaught/RavenousBaloth.java @@ -56,7 +56,6 @@ public class RavenousBaloth extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/onslaught/ReadTheRunes.java b/Mage.Sets/src/mage/sets/onslaught/ReadTheRunes.java index ea7e7998ce4..dfdd681d5d4 100644 --- a/Mage.Sets/src/mage/sets/onslaught/ReadTheRunes.java +++ b/Mage.Sets/src/mage/sets/onslaught/ReadTheRunes.java @@ -51,7 +51,6 @@ public class ReadTheRunes extends CardImpl { super(ownerId, 104, "Read the Runes", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{U}"); this.expansionSetCode = "ONS"; - this.color.setBlue(true); // Draw X cards. For each card drawn this way, discard a card unless you sacrifice a permanent. this.getSpellAbility().addEffect(new ReadTheRunesEffect()); diff --git a/Mage.Sets/src/mage/sets/onslaught/RecklessOne.java b/Mage.Sets/src/mage/sets/onslaught/RecklessOne.java index 9c9b2422be9..c79f35586ee 100644 --- a/Mage.Sets/src/mage/sets/onslaught/RecklessOne.java +++ b/Mage.Sets/src/mage/sets/onslaught/RecklessOne.java @@ -59,7 +59,6 @@ public class RecklessOne extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Avatar"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/onslaught/RenewedFaith.java b/Mage.Sets/src/mage/sets/onslaught/RenewedFaith.java index 68932120ef4..c51878d517f 100644 --- a/Mage.Sets/src/mage/sets/onslaught/RenewedFaith.java +++ b/Mage.Sets/src/mage/sets/onslaught/RenewedFaith.java @@ -46,7 +46,6 @@ public class RenewedFaith extends CardImpl { super(ownerId, 50, "Renewed Faith", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "ONS"; - this.color.setWhite(true); // You gain 6 life. this.getSpellAbility().addEffect(new GainLifeEffect(6)); diff --git a/Mage.Sets/src/mage/sets/onslaught/RiptideShapeshifter.java b/Mage.Sets/src/mage/sets/onslaught/RiptideShapeshifter.java index 103ec5196b2..d7f7e5d00b1 100644 --- a/Mage.Sets/src/mage/sets/onslaught/RiptideShapeshifter.java +++ b/Mage.Sets/src/mage/sets/onslaught/RiptideShapeshifter.java @@ -59,7 +59,6 @@ public class RiptideShapeshifter extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Shapeshifter"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/onslaught/SeasClaim.java b/Mage.Sets/src/mage/sets/onslaught/SeasClaim.java index 60ea61d6981..ffb369ad0be 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SeasClaim.java +++ b/Mage.Sets/src/mage/sets/onslaught/SeasClaim.java @@ -53,7 +53,6 @@ public class SeasClaim extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/onslaught/SharedTriumph.java b/Mage.Sets/src/mage/sets/onslaught/SharedTriumph.java index 63ac28c4c0a..bbaf9de2c45 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SharedTriumph.java +++ b/Mage.Sets/src/mage/sets/onslaught/SharedTriumph.java @@ -52,7 +52,6 @@ public class SharedTriumph extends CardImpl { super(ownerId, 53, "Shared Triumph", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "ONS"; - this.color.setWhite(true); // As Shared Triumph enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.BoostCreature))); diff --git a/Mage.Sets/src/mage/sets/onslaught/ShepherdOfRot.java b/Mage.Sets/src/mage/sets/onslaught/ShepherdOfRot.java index 0af08a0bc33..a12611fee1a 100644 --- a/Mage.Sets/src/mage/sets/onslaught/ShepherdOfRot.java +++ b/Mage.Sets/src/mage/sets/onslaught/ShepherdOfRot.java @@ -61,7 +61,6 @@ public class ShepherdOfRot extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Cleric"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/SilentSpecter.java b/Mage.Sets/src/mage/sets/onslaught/SilentSpecter.java index 13aed510893..a99e16dea4b 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SilentSpecter.java +++ b/Mage.Sets/src/mage/sets/onslaught/SilentSpecter.java @@ -49,7 +49,6 @@ public class SilentSpecter extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Specter"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/onslaught/SilklashSpider.java b/Mage.Sets/src/mage/sets/onslaught/SilklashSpider.java index 38d2583c9c6..1c2d1e2e50b 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SilklashSpider.java +++ b/Mage.Sets/src/mage/sets/onslaught/SilklashSpider.java @@ -59,7 +59,6 @@ public class SilklashSpider extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Spider"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/onslaught/SilvosRogueElemental.java b/Mage.Sets/src/mage/sets/onslaught/SilvosRogueElemental.java index 63d009b92e7..56bd043e922 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SilvosRogueElemental.java +++ b/Mage.Sets/src/mage/sets/onslaught/SilvosRogueElemental.java @@ -50,7 +50,6 @@ public class SilvosRogueElemental extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(8); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/onslaught/SkirkProspector.java b/Mage.Sets/src/mage/sets/onslaught/SkirkProspector.java index 76cc122e088..eaaf87a86e1 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SkirkProspector.java +++ b/Mage.Sets/src/mage/sets/onslaught/SkirkProspector.java @@ -59,7 +59,6 @@ public class SkirkProspector extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/SliceAndDice.java b/Mage.Sets/src/mage/sets/onslaught/SliceAndDice.java index 4e8e4d4d67e..1d3507d1dc0 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SliceAndDice.java +++ b/Mage.Sets/src/mage/sets/onslaught/SliceAndDice.java @@ -47,7 +47,6 @@ public class SliceAndDice extends CardImpl { super(ownerId, 232, "Slice and Dice", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{R}{R}"); this.expansionSetCode = "ONS"; - this.color.setRed(true); // Slice and Dice deals 4 damage to each creature. this.getSpellAbility().addEffect(new DamageAllEffect(4, new FilterCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/onslaught/SolarBlast.java b/Mage.Sets/src/mage/sets/onslaught/SolarBlast.java index 728ae578110..0f96204e737 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SolarBlast.java +++ b/Mage.Sets/src/mage/sets/onslaught/SolarBlast.java @@ -48,7 +48,6 @@ public class SolarBlast extends CardImpl { super(ownerId, 234, "Solar Blast", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{R}"); this.expansionSetCode = "ONS"; - this.color.setRed(true); // Solar Blast deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/onslaught/SoullessOne.java b/Mage.Sets/src/mage/sets/onslaught/SoullessOne.java index 06c93d5f5fe..ad8771e5595 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SoullessOne.java +++ b/Mage.Sets/src/mage/sets/onslaught/SoullessOne.java @@ -58,7 +58,6 @@ public class SoullessOne extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Avatar"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/onslaught/Sparksmith.java b/Mage.Sets/src/mage/sets/onslaught/Sparksmith.java index 8f69f90e6bb..1f04612b441 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Sparksmith.java +++ b/Mage.Sets/src/mage/sets/onslaught/Sparksmith.java @@ -60,7 +60,6 @@ public class Sparksmith extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/Starstorm.java b/Mage.Sets/src/mage/sets/onslaught/Starstorm.java index 42271213ff8..c4207796414 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Starstorm.java +++ b/Mage.Sets/src/mage/sets/onslaught/Starstorm.java @@ -47,7 +47,6 @@ public class Starstorm extends CardImpl { super(ownerId, 238, "Starstorm", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{R}{R}"); this.expansionSetCode = "ONS"; - this.color.setRed(true); // Starstorm deals X damage to each creature. this.getSpellAbility().addEffect(new DamageAllEffect(new ManacostVariableValue(), new FilterCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java b/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java index 46b7379d5f7..6ee3d653f17 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java +++ b/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java @@ -73,7 +73,6 @@ public class SupremeInquisitor extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/onslaught/Swat.java b/Mage.Sets/src/mage/sets/onslaught/Swat.java index 6725e0879c4..4ba89974bcf 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Swat.java +++ b/Mage.Sets/src/mage/sets/onslaught/Swat.java @@ -55,7 +55,6 @@ public class Swat extends CardImpl { super(ownerId, 174, "Swat", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}{B}"); this.expansionSetCode = "ONS"; - this.color.setBlack(true); // Destroy target creature with power 2 or less. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/onslaught/SymbioticWurm.java b/Mage.Sets/src/mage/sets/onslaught/SymbioticWurm.java index 3e5d051879a..39cece56caa 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SymbioticWurm.java +++ b/Mage.Sets/src/mage/sets/onslaught/SymbioticWurm.java @@ -47,7 +47,6 @@ public class SymbioticWurm extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/onslaught/SyphonMind.java b/Mage.Sets/src/mage/sets/onslaught/SyphonMind.java index 4a761e22795..bfb5528cffc 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SyphonMind.java +++ b/Mage.Sets/src/mage/sets/onslaught/SyphonMind.java @@ -50,7 +50,6 @@ public class SyphonMind extends CardImpl { super(ownerId, 175, "Syphon Mind", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "ONS"; - this.color.setBlack(true); // Each other player discards a card. You draw a card for each card discarded this way. this.getSpellAbility().addEffect(new SyphonMindEffect()); diff --git a/Mage.Sets/src/mage/sets/onslaught/TauntingElf.java b/Mage.Sets/src/mage/sets/onslaught/TauntingElf.java index f257c96b871..c52bcfde12c 100644 --- a/Mage.Sets/src/mage/sets/onslaught/TauntingElf.java +++ b/Mage.Sets/src/mage/sets/onslaught/TauntingElf.java @@ -47,7 +47,6 @@ public class TauntingElf extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/TrueBeliever.java b/Mage.Sets/src/mage/sets/onslaught/TrueBeliever.java index 4266790e8c5..594975a6b5b 100644 --- a/Mage.Sets/src/mage/sets/onslaught/TrueBeliever.java +++ b/Mage.Sets/src/mage/sets/onslaught/TrueBeliever.java @@ -50,7 +50,6 @@ public class TrueBeliever extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/onslaught/VisaraTheDreadful.java b/Mage.Sets/src/mage/sets/onslaught/VisaraTheDreadful.java index 51f6deda333..7b560120927 100644 --- a/Mage.Sets/src/mage/sets/onslaught/VisaraTheDreadful.java +++ b/Mage.Sets/src/mage/sets/onslaught/VisaraTheDreadful.java @@ -52,7 +52,6 @@ public class VisaraTheDreadful extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Gorgon"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/onslaught/VoiceOfTheWoods.java b/Mage.Sets/src/mage/sets/onslaught/VoiceOfTheWoods.java index 15e03ef87fc..b10c2dfa800 100644 --- a/Mage.Sets/src/mage/sets/onslaught/VoiceOfTheWoods.java +++ b/Mage.Sets/src/mage/sets/onslaught/VoiceOfTheWoods.java @@ -63,7 +63,6 @@ public class VoiceOfTheWoods extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/onslaught/VoidmageProdigy.java b/Mage.Sets/src/mage/sets/onslaught/VoidmageProdigy.java index 8155b4a0f15..5e9c43a478a 100644 --- a/Mage.Sets/src/mage/sets/onslaught/VoidmageProdigy.java +++ b/Mage.Sets/src/mage/sets/onslaught/VoidmageProdigy.java @@ -63,7 +63,6 @@ public class VoidmageProdigy extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/WallOfMulch.java b/Mage.Sets/src/mage/sets/onslaught/WallOfMulch.java index 2e10cb625d4..43a8728fe42 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WallOfMulch.java +++ b/Mage.Sets/src/mage/sets/onslaught/WallOfMulch.java @@ -62,7 +62,6 @@ public class WallOfMulch extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Wall"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/onslaught/WeatheredWayfarer.java b/Mage.Sets/src/mage/sets/onslaught/WeatheredWayfarer.java index c28733ff57e..74c9474f8ea 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WeatheredWayfarer.java +++ b/Mage.Sets/src/mage/sets/onslaught/WeatheredWayfarer.java @@ -59,7 +59,6 @@ public class WeatheredWayfarer extends CardImpl { this.subtype.add("Nomad"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/WeirdHarvest.java b/Mage.Sets/src/mage/sets/onslaught/WeirdHarvest.java index 46df4081df1..0043bd88025 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WeirdHarvest.java +++ b/Mage.Sets/src/mage/sets/onslaught/WeirdHarvest.java @@ -55,7 +55,6 @@ public class WeirdHarvest extends CardImpl { super(ownerId, 299, "Weird Harvest", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{G}{G}"); this.expansionSetCode = "ONS"; - this.color.setGreen(true); // Each player may search his or her library for up to X creature cards, reveal those cards, and put them into his or her hand. Then each player who searched his or her library this way shuffles it. getSpellAbility().addEffect(new WeirdHarvestEffect()); diff --git a/Mage.Sets/src/mage/sets/onslaught/Wellwisher.java b/Mage.Sets/src/mage/sets/onslaught/Wellwisher.java index 38b988b39d5..43851a1fd76 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Wellwisher.java +++ b/Mage.Sets/src/mage/sets/onslaught/Wellwisher.java @@ -57,7 +57,6 @@ public class Wellwisher extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/Whipcorder.java b/Mage.Sets/src/mage/sets/onslaught/Whipcorder.java index 665e72fa1fe..c97ac7611c0 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Whipcorder.java +++ b/Mage.Sets/src/mage/sets/onslaught/Whipcorder.java @@ -54,7 +54,6 @@ public class Whipcorder extends CardImpl { this.subtype.add("Soldier"); this.subtype.add("Rebel"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/onslaught/WirewoodHerald.java b/Mage.Sets/src/mage/sets/onslaught/WirewoodHerald.java index 1cd314d3259..209057bb5e8 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WirewoodHerald.java +++ b/Mage.Sets/src/mage/sets/onslaught/WirewoodHerald.java @@ -55,7 +55,6 @@ public class WirewoodHerald extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/WirewoodSavage.java b/Mage.Sets/src/mage/sets/onslaught/WirewoodSavage.java index 024ef2e3a26..e6935282b58 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WirewoodSavage.java +++ b/Mage.Sets/src/mage/sets/onslaught/WirewoodSavage.java @@ -55,7 +55,6 @@ public class WirewoodSavage extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/onslaught/WordsOfWar.java b/Mage.Sets/src/mage/sets/onslaught/WordsOfWar.java index 068d193d60c..66a775ef726 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WordsOfWar.java +++ b/Mage.Sets/src/mage/sets/onslaught/WordsOfWar.java @@ -55,7 +55,6 @@ public class WordsOfWar extends CardImpl { super(ownerId, 244, "Words of War", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "ONS"; - this.color.setRed(true); // {1}: The next time you would draw a card this turn, Words of War deals 2 damage to target creature or player instead. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WordsOfWarEffect(), new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java b/Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java index ba008b0c0c8..54cac4d5891 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java +++ b/Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java @@ -58,7 +58,6 @@ public class WordsOfWind extends CardImpl { super(ownerId, 122, "Words of Wind", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "ONS"; - this.color.setBlue(true); // {1}: The next time you would draw a card this turn, each player returns a permanent he or she controls to its owner's hand instead. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WordsOfWindEffect(), new ManaCostsImpl("{1}"))); diff --git a/Mage.Sets/src/mage/sets/planarchaos/AvenRiftwatcher.java b/Mage.Sets/src/mage/sets/planarchaos/AvenRiftwatcher.java index 6e807b67715..8cf27f15ec2 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/AvenRiftwatcher.java +++ b/Mage.Sets/src/mage/sets/planarchaos/AvenRiftwatcher.java @@ -54,7 +54,6 @@ public class AvenRiftwatcher extends CardImpl { this.subtype.add("Rebel"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/planarchaos/BatteringSliver.java b/Mage.Sets/src/mage/sets/planarchaos/BatteringSliver.java index 4d9e8451f89..d52aa2499c0 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/BatteringSliver.java +++ b/Mage.Sets/src/mage/sets/planarchaos/BatteringSliver.java @@ -57,7 +57,6 @@ public class BatteringSliver extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Sliver"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/planarchaos/BenalishCommander.java b/Mage.Sets/src/mage/sets/planarchaos/BenalishCommander.java index 523afcb9ba9..b19067af0ba 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/BenalishCommander.java +++ b/Mage.Sets/src/mage/sets/planarchaos/BenalishCommander.java @@ -67,7 +67,6 @@ public class BenalishCommander extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/planarchaos/BigGameHunter.java b/Mage.Sets/src/mage/sets/planarchaos/BigGameHunter.java index 1da708fcfe3..2dc8276d9c8 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/BigGameHunter.java +++ b/Mage.Sets/src/mage/sets/planarchaos/BigGameHunter.java @@ -61,7 +61,6 @@ public class BigGameHunter extends CardImpl { this.subtype.add("Rebel"); this.subtype.add("Assassin"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planarchaos/Blightspeaker.java b/Mage.Sets/src/mage/sets/planarchaos/Blightspeaker.java index 4d9df01148e..280003879e3 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Blightspeaker.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Blightspeaker.java @@ -66,7 +66,6 @@ public class Blightspeaker extends CardImpl { this.subtype.add("Rebel"); this.subtype.add("Cleric"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planarchaos/BloodKnight.java b/Mage.Sets/src/mage/sets/planarchaos/BloodKnight.java index 7cbe965024f..bd5b46c8171 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/BloodKnight.java +++ b/Mage.Sets/src/mage/sets/planarchaos/BloodKnight.java @@ -56,7 +56,6 @@ public class BloodKnight extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planarchaos/BruteForce.java b/Mage.Sets/src/mage/sets/planarchaos/BruteForce.java index 3dde765d654..ccf189f9aa0 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/BruteForce.java +++ b/Mage.Sets/src/mage/sets/planarchaos/BruteForce.java @@ -45,7 +45,6 @@ public class BruteForce extends CardImpl { super(ownerId, 116, "Brute Force", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "PLC"; - this.color.setRed(true); // Target creature gets +3/+3 until end of turn. this.getSpellAbility().getEffects().add(new BoostTargetEffect(3,3, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/planarchaos/Calciderm.java b/Mage.Sets/src/mage/sets/planarchaos/Calciderm.java index cad0fab069f..39865b67a5d 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Calciderm.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Calciderm.java @@ -50,7 +50,6 @@ public class Calciderm extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Beast"); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/planarchaos/CitanulWoodreaders.java b/Mage.Sets/src/mage/sets/planarchaos/CitanulWoodreaders.java index d0bdc66cbc0..46cabcbd5f4 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/CitanulWoodreaders.java +++ b/Mage.Sets/src/mage/sets/planarchaos/CitanulWoodreaders.java @@ -50,7 +50,6 @@ public class CitanulWoodreaders extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/planarchaos/CrovaxAscendantHero.java b/Mage.Sets/src/mage/sets/planarchaos/CrovaxAscendantHero.java index b03328e9c2a..619fa05271e 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/CrovaxAscendantHero.java +++ b/Mage.Sets/src/mage/sets/planarchaos/CrovaxAscendantHero.java @@ -64,7 +64,6 @@ public class CrovaxAscendantHero extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/planarchaos/Damnation.java b/Mage.Sets/src/mage/sets/planarchaos/Damnation.java index 4e4d702b592..b7621063daf 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Damnation.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Damnation.java @@ -44,7 +44,6 @@ public class Damnation extends CardImpl { super(ownerId, 85, "Damnation", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{B}{B}"); this.expansionSetCode = "PLC"; - this.color.setBlack(true); // Destroy all creatures. They can't be regenerated. this.getSpellAbility().addEffect(new DestroyAllEffect(new FilterCreaturePermanent("creatures"), true)); diff --git a/Mage.Sets/src/mage/sets/planarchaos/DarkheartSliver.java b/Mage.Sets/src/mage/sets/planarchaos/DarkheartSliver.java index 5d483d22cbb..777ed5ebb68 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/DarkheartSliver.java +++ b/Mage.Sets/src/mage/sets/planarchaos/DarkheartSliver.java @@ -61,8 +61,6 @@ public class DarkheartSliver extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Sliver"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planarchaos/DawnCharm.java b/Mage.Sets/src/mage/sets/planarchaos/DawnCharm.java index 41c78014cde..f15dcfc3b63 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/DawnCharm.java +++ b/Mage.Sets/src/mage/sets/planarchaos/DawnCharm.java @@ -61,7 +61,6 @@ public class DawnCharm extends CardImpl { super(ownerId, 4, "Dawn Charm", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "PLC"; - this.color.setWhite(true); // Choose one - Prevent all combat damage that would be dealt this turn; or regenerate target creature; or counter target spell that targets you. this.getSpellAbility().addEffect(new PreventAllDamageByAllEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/planarchaos/Detritivore.java b/Mage.Sets/src/mage/sets/planarchaos/Detritivore.java index 54b1ba1e3b7..49abf2bda3e 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Detritivore.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Detritivore.java @@ -66,7 +66,6 @@ public class Detritivore extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Lhurgoyf"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java b/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java index b82916cdb5b..f7ac4e93c3e 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java +++ b/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java @@ -57,7 +57,6 @@ public class ErraticMutation extends CardImpl { super(ownerId, 41, "Erratic Mutation", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "PLC"; - this.color.setBlue(true); // Choose target creature. Reveal cards from the top of your library until you reveal a nonland card. That creature gets +X/-X until end of turn, where X is that card's converted mana cost. Put all cards revealed this way on the bottom of your library in any order. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/planarchaos/EssenceWarden.java b/Mage.Sets/src/mage/sets/planarchaos/EssenceWarden.java index 43d6625f7cb..42ab481eeef 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/EssenceWarden.java +++ b/Mage.Sets/src/mage/sets/planarchaos/EssenceWarden.java @@ -55,7 +55,6 @@ public class EssenceWarden extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planarchaos/FaadiyahSeer.java b/Mage.Sets/src/mage/sets/planarchaos/FaadiyahSeer.java index 206ba794462..442e45894e4 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/FaadiyahSeer.java +++ b/Mage.Sets/src/mage/sets/planarchaos/FaadiyahSeer.java @@ -57,7 +57,6 @@ public class FaadiyahSeer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planarchaos/FatalFrenzy.java b/Mage.Sets/src/mage/sets/planarchaos/FatalFrenzy.java index 0e50c4eb3ce..43ba60a9041 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/FatalFrenzy.java +++ b/Mage.Sets/src/mage/sets/planarchaos/FatalFrenzy.java @@ -57,7 +57,6 @@ public class FatalFrenzy extends CardImpl { super(ownerId, 98, "Fatal Frenzy", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "PLC"; - this.color.setRed(true); // Until end of turn, target creature you control gains trample and gets +X/+0, where X is its power. Sacrifice it at the beginning of the next end step. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/planarchaos/FungalBehemoth.java b/Mage.Sets/src/mage/sets/planarchaos/FungalBehemoth.java index 6a02831a2c1..9ed7ce665b1 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/FungalBehemoth.java +++ b/Mage.Sets/src/mage/sets/planarchaos/FungalBehemoth.java @@ -61,7 +61,6 @@ public class FungalBehemoth extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Fungus"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java b/Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java index 9619ddb5133..f29ab4877c0 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java +++ b/Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java @@ -73,7 +73,6 @@ public class FuryCharm extends CardImpl { super(ownerId, 100, "Fury Charm", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "PLC"; - this.color.setRed(true); // Choose one - this.getSpellAbility().getModes().setMinModes(1); diff --git a/Mage.Sets/src/mage/sets/planarchaos/GaeasAnthem.java b/Mage.Sets/src/mage/sets/planarchaos/GaeasAnthem.java index 311de1f244d..28bb9f83b8c 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/GaeasAnthem.java +++ b/Mage.Sets/src/mage/sets/planarchaos/GaeasAnthem.java @@ -48,7 +48,6 @@ public class GaeasAnthem extends CardImpl { super(ownerId, 147, "Gaea's Anthem", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}{G}"); this.expansionSetCode = "PLC"; - this.color.setGreen(true); // Creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); diff --git a/Mage.Sets/src/mage/sets/planarchaos/GiantDustwasp.java b/Mage.Sets/src/mage/sets/planarchaos/GiantDustwasp.java index 209306b74e4..616dfaf9661 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/GiantDustwasp.java +++ b/Mage.Sets/src/mage/sets/planarchaos/GiantDustwasp.java @@ -47,7 +47,6 @@ public class GiantDustwasp extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/planarchaos/Groundbreaker.java b/Mage.Sets/src/mage/sets/planarchaos/Groundbreaker.java index eb7dfaed76d..70c70dede1c 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Groundbreaker.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Groundbreaker.java @@ -49,7 +49,6 @@ public class Groundbreaker extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planarchaos/HammerheimDeadeye.java b/Mage.Sets/src/mage/sets/planarchaos/HammerheimDeadeye.java index 87c1b41f205..b3fafb9a72a 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/HammerheimDeadeye.java +++ b/Mage.Sets/src/mage/sets/planarchaos/HammerheimDeadeye.java @@ -59,7 +59,6 @@ public class HammerheimDeadeye extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/planarchaos/Harmonize.java b/Mage.Sets/src/mage/sets/planarchaos/Harmonize.java index 7110b6a4e0d..5594739b8ec 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Harmonize.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Harmonize.java @@ -43,7 +43,6 @@ public class Harmonize extends CardImpl { super(ownerId, 149, "Harmonize", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}{G}"); this.expansionSetCode = "PLC"; - this.color.setGreen(true); // Draw three cards. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); diff --git a/Mage.Sets/src/mage/sets/planarchaos/ImpsMischief.java b/Mage.Sets/src/mage/sets/planarchaos/ImpsMischief.java index 725f2e7dac8..ec320d8bf89 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/ImpsMischief.java +++ b/Mage.Sets/src/mage/sets/planarchaos/ImpsMischief.java @@ -58,7 +58,6 @@ public class ImpsMischief extends CardImpl { super(ownerId, 72, "Imp's Mischief", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "PLC"; - this.color.setBlack(true); // Change the target of target spell with a single target. You lose life equal to that spell's converted mana cost. this.getSpellAbility().addEffect(new ChooseNewTargetsTargetEffect(true, true)); diff --git a/Mage.Sets/src/mage/sets/planarchaos/KeenSense.java b/Mage.Sets/src/mage/sets/planarchaos/KeenSense.java index 6ef7cfe7e29..b0df8d63749 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/KeenSense.java +++ b/Mage.Sets/src/mage/sets/planarchaos/KeenSense.java @@ -52,7 +52,6 @@ public class KeenSense extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/planarchaos/KeldonMarauders.java b/Mage.Sets/src/mage/sets/planarchaos/KeldonMarauders.java index f1b3759eda8..d342e0f28d2 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/KeldonMarauders.java +++ b/Mage.Sets/src/mage/sets/planarchaos/KeldonMarauders.java @@ -54,7 +54,6 @@ public class KeldonMarauders extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/planarchaos/ManaTithe.java b/Mage.Sets/src/mage/sets/planarchaos/ManaTithe.java index 9b7fabb3666..2f8d2c14fa8 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/ManaTithe.java +++ b/Mage.Sets/src/mage/sets/planarchaos/ManaTithe.java @@ -45,7 +45,6 @@ public class ManaTithe extends CardImpl { super(ownerId, 25, "Mana Tithe", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "PLC"; - this.color.setWhite(true); // Counter target spell unless its controller pays {1}. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/planarchaos/NecroticSliver.java b/Mage.Sets/src/mage/sets/planarchaos/NecroticSliver.java index 96849e480b3..fdd0104e7de 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/NecroticSliver.java +++ b/Mage.Sets/src/mage/sets/planarchaos/NecroticSliver.java @@ -62,8 +62,6 @@ public class NecroticSliver extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Sliver"); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planarchaos/NeedlepeakSpider.java b/Mage.Sets/src/mage/sets/planarchaos/NeedlepeakSpider.java index ca9c5d60cec..c29140f6e04 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/NeedlepeakSpider.java +++ b/Mage.Sets/src/mage/sets/planarchaos/NeedlepeakSpider.java @@ -45,7 +45,6 @@ public class NeedlepeakSpider extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Spider"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planarchaos/PallidMycoderm.java b/Mage.Sets/src/mage/sets/planarchaos/PallidMycoderm.java index a66e2ff094c..8ed3c7192a6 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/PallidMycoderm.java +++ b/Mage.Sets/src/mage/sets/planarchaos/PallidMycoderm.java @@ -71,7 +71,6 @@ public class PallidMycoderm extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Fungus"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/planarchaos/Phantasmagorian.java b/Mage.Sets/src/mage/sets/planarchaos/Phantasmagorian.java index 4bcfb976c1a..42639488b6c 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Phantasmagorian.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Phantasmagorian.java @@ -59,7 +59,6 @@ public class Phantasmagorian extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/planarchaos/PiracyCharm.java b/Mage.Sets/src/mage/sets/planarchaos/PiracyCharm.java index 8f354117e89..0a061f02596 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/PiracyCharm.java +++ b/Mage.Sets/src/mage/sets/planarchaos/PiracyCharm.java @@ -51,7 +51,6 @@ public class PiracyCharm extends CardImpl { super(ownerId, 58, "Piracy Charm", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "PLC"; - this.color.setBlue(true); // Choose one - Target creature gains islandwalk until end of turn; this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new IslandwalkAbility(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/planarchaos/Pongify.java b/Mage.Sets/src/mage/sets/planarchaos/Pongify.java index c2322a2f42c..180fe5cf796 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Pongify.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Pongify.java @@ -54,7 +54,6 @@ public class Pongify extends CardImpl { super(ownerId, 44, "Pongify", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "PLC"; - this.color.setBlue(true); // Destroy target creature. It can't be regenerated. That creature's controller puts a 3/3 green Ape creature token onto the battlefield. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/planarchaos/PorphyryNodes.java b/Mage.Sets/src/mage/sets/planarchaos/PorphyryNodes.java index 2916df61382..4a1dcf0fdb7 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/PorphyryNodes.java +++ b/Mage.Sets/src/mage/sets/planarchaos/PorphyryNodes.java @@ -61,7 +61,6 @@ public class PorphyryNodes extends CardImpl { super(ownerId, 28, "Porphyry Nodes", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{W}"); this.expansionSetCode = "PLC"; - this.color.setWhite(true); // At the beginning of your upkeep, destroy the creature with the least power. It can't be regenerated. If two or more creatures are tied for least power, you choose one of them. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new PorphyryNodesEffect(), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/planarchaos/PoulticeSliver.java b/Mage.Sets/src/mage/sets/planarchaos/PoulticeSliver.java index 09de0e42d2f..025faa89bcb 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/PoulticeSliver.java +++ b/Mage.Sets/src/mage/sets/planarchaos/PoulticeSliver.java @@ -63,7 +63,6 @@ public class PoulticeSliver extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Sliver"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planarchaos/PouncingWurm.java b/Mage.Sets/src/mage/sets/planarchaos/PouncingWurm.java index 263b1806cc0..0a97f83bd4d 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/PouncingWurm.java +++ b/Mage.Sets/src/mage/sets/planarchaos/PouncingWurm.java @@ -54,7 +54,6 @@ public class PouncingWurm extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/planarchaos/RathiTrapper.java b/Mage.Sets/src/mage/sets/planarchaos/RathiTrapper.java index 9abe8985935..50264fc8381 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/RathiTrapper.java +++ b/Mage.Sets/src/mage/sets/planarchaos/RathiTrapper.java @@ -53,7 +53,6 @@ public class RathiTrapper extends CardImpl { this.subtype.add("Rebel"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planarchaos/RecklessWurm.java b/Mage.Sets/src/mage/sets/planarchaos/RecklessWurm.java index deb10c6b750..ce60e185de8 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/RecklessWurm.java +++ b/Mage.Sets/src/mage/sets/planarchaos/RecklessWurm.java @@ -48,7 +48,6 @@ public class RecklessWurm extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Wurm"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/planarchaos/ReflexSliver.java b/Mage.Sets/src/mage/sets/planarchaos/ReflexSliver.java index 453d7f3b98b..9ed5f684105 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/ReflexSliver.java +++ b/Mage.Sets/src/mage/sets/planarchaos/ReflexSliver.java @@ -57,7 +57,6 @@ public class ReflexSliver extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Sliver"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planarchaos/RoilingHorror.java b/Mage.Sets/src/mage/sets/planarchaos/RoilingHorror.java index fd88c4e27bc..ebb54e10c31 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/RoilingHorror.java +++ b/Mage.Sets/src/mage/sets/planarchaos/RoilingHorror.java @@ -62,7 +62,6 @@ public class RoilingHorror extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/planarchaos/SaltfieldRecluse.java b/Mage.Sets/src/mage/sets/planarchaos/SaltfieldRecluse.java index 919092cf4f5..7c8cd53745d 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/SaltfieldRecluse.java +++ b/Mage.Sets/src/mage/sets/planarchaos/SaltfieldRecluse.java @@ -53,7 +53,6 @@ public class SaltfieldRecluse extends CardImpl { this.subtype.add("Rebel"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java b/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java index 4c7b61b48ed..91d38aa731d 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java +++ b/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java @@ -60,7 +60,6 @@ public class SealOfPrimordium extends CardImpl { super(ownerId, 153, "Seal of Primordium", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "PLC"; - this.color.setGreen(true); // Sacrifice Seal of Primordium: Destroy target artifact or enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/planarchaos/SerraSphinx.java b/Mage.Sets/src/mage/sets/planarchaos/SerraSphinx.java index 4f3deaaa703..24473d70d44 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/SerraSphinx.java +++ b/Mage.Sets/src/mage/sets/planarchaos/SerraSphinx.java @@ -46,7 +46,6 @@ public class SerraSphinx extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Sphinx"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/planarchaos/ShivanMeteor.java b/Mage.Sets/src/mage/sets/planarchaos/ShivanMeteor.java index ee1b7c9aa35..240c3241393 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/ShivanMeteor.java +++ b/Mage.Sets/src/mage/sets/planarchaos/ShivanMeteor.java @@ -47,7 +47,6 @@ public class ShivanMeteor extends CardImpl { super(ownerId, 106, "Shivan Meteor", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); this.expansionSetCode = "PLC"; - this.color.setRed(true); // Shivan Meteor deals 13 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(13)); diff --git a/Mage.Sets/src/mage/sets/planarchaos/SimianSpiritGuide.java b/Mage.Sets/src/mage/sets/planarchaos/SimianSpiritGuide.java index e2cc4ee9f94..104db46db64 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/SimianSpiritGuide.java +++ b/Mage.Sets/src/mage/sets/planarchaos/SimianSpiritGuide.java @@ -55,7 +55,6 @@ public class SimianSpiritGuide extends CardImpl { this.subtype.add("Ape"); this.subtype.add("Spirit"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planarchaos/SinewSliver.java b/Mage.Sets/src/mage/sets/planarchaos/SinewSliver.java index 5ca3806d58a..bc9ed1824e3 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/SinewSliver.java +++ b/Mage.Sets/src/mage/sets/planarchaos/SinewSliver.java @@ -49,7 +49,6 @@ public class SinewSliver extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Sliver"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java b/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java index 5f0de88f4e5..2789a6e1411 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java @@ -59,7 +59,6 @@ public class Stingscourger extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planarchaos/StormfrontRiders.java b/Mage.Sets/src/mage/sets/planarchaos/StormfrontRiders.java index 2b677e3cfb9..13f78771209 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/StormfrontRiders.java +++ b/Mage.Sets/src/mage/sets/planarchaos/StormfrontRiders.java @@ -62,7 +62,6 @@ public class StormfrontRiders extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/planarchaos/SulfurElemental.java b/Mage.Sets/src/mage/sets/planarchaos/SulfurElemental.java index 06624e5773f..bd6a2b76aeb 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/SulfurElemental.java +++ b/Mage.Sets/src/mage/sets/planarchaos/SulfurElemental.java @@ -58,7 +58,6 @@ public class SulfurElemental extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planarchaos/VoidstoneGargoyle.java b/Mage.Sets/src/mage/sets/planarchaos/VoidstoneGargoyle.java index c55118b3909..d222aeb8c4c 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/VoidstoneGargoyle.java +++ b/Mage.Sets/src/mage/sets/planarchaos/VoidstoneGargoyle.java @@ -60,7 +60,6 @@ public class VoidstoneGargoyle extends CardImpl { this.expansionSetCode = "PLC"; this.subtype.add("Gargoyle"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/planechase/BeaconOfUnrest.java b/Mage.Sets/src/mage/sets/planechase/BeaconOfUnrest.java index 685bdda8f93..bdc08ddd7b1 100644 --- a/Mage.Sets/src/mage/sets/planechase/BeaconOfUnrest.java +++ b/Mage.Sets/src/mage/sets/planechase/BeaconOfUnrest.java @@ -56,7 +56,6 @@ public class BeaconOfUnrest extends CardImpl { super(ownerId, 18, "Beacon of Unrest", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "HOP"; - this.color.setBlack(true); // Put target artifact or creature card from a graveyard onto the battlefield under your control. Shuffle Beacon of Unrest into its owner's library. this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/planechase/Blaze.java b/Mage.Sets/src/mage/sets/planechase/Blaze.java index e5c41327f57..23e1a28a1cf 100644 --- a/Mage.Sets/src/mage/sets/planechase/Blaze.java +++ b/Mage.Sets/src/mage/sets/planechase/Blaze.java @@ -45,7 +45,6 @@ public class Blaze extends CardImpl { super(ownerId, 47, "Blaze", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{R}"); this.expansionSetCode = "HOP"; - this.color.setRed(true); // Blaze deals X damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); diff --git a/Mage.Sets/src/mage/sets/planechase/BorosSwiftblade.java b/Mage.Sets/src/mage/sets/planechase/BorosSwiftblade.java index 510c5c3388a..8cc5d49f01d 100644 --- a/Mage.Sets/src/mage/sets/planechase/BorosSwiftblade.java +++ b/Mage.Sets/src/mage/sets/planechase/BorosSwiftblade.java @@ -46,8 +46,6 @@ public class BorosSwiftblade extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planechase/Briarhorn.java b/Mage.Sets/src/mage/sets/planechase/Briarhorn.java index 3f42339a061..1f8fd1f3bbb 100644 --- a/Mage.Sets/src/mage/sets/planechase/Briarhorn.java +++ b/Mage.Sets/src/mage/sets/planechase/Briarhorn.java @@ -51,7 +51,6 @@ public class Briarhorn extends CardImpl { this.expansionSetCode = "HOP"; this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/planechase/Broodstar.java b/Mage.Sets/src/mage/sets/planechase/Broodstar.java index d35b0ff638d..6006488bb50 100644 --- a/Mage.Sets/src/mage/sets/planechase/Broodstar.java +++ b/Mage.Sets/src/mage/sets/planechase/Broodstar.java @@ -59,7 +59,6 @@ public class Broodstar extends CardImpl { this.expansionSetCode = "HOP"; this.subtype.add("Beast"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/planechase/CadaverousKnight.java b/Mage.Sets/src/mage/sets/planechase/CadaverousKnight.java index ff1f9ec33a3..b64aa90c2bd 100644 --- a/Mage.Sets/src/mage/sets/planechase/CadaverousKnight.java +++ b/Mage.Sets/src/mage/sets/planechase/CadaverousKnight.java @@ -51,7 +51,6 @@ public class CadaverousKnight extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Knight"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planechase/CorpseHarvester.java b/Mage.Sets/src/mage/sets/planechase/CorpseHarvester.java index 54b25b48bec..f3cd4d23d95 100644 --- a/Mage.Sets/src/mage/sets/planechase/CorpseHarvester.java +++ b/Mage.Sets/src/mage/sets/planechase/CorpseHarvester.java @@ -71,7 +71,6 @@ public class CorpseHarvester extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/planechase/FlamekinHarbinger.java b/Mage.Sets/src/mage/sets/planechase/FlamekinHarbinger.java index 9e0d0b44a13..86fa6f106c1 100644 --- a/Mage.Sets/src/mage/sets/planechase/FlamekinHarbinger.java +++ b/Mage.Sets/src/mage/sets/planechase/FlamekinHarbinger.java @@ -56,7 +56,6 @@ public class FlamekinHarbinger extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planechase/Helldozer.java b/Mage.Sets/src/mage/sets/planechase/Helldozer.java index d3782741b43..18fe61c91c2 100644 --- a/Mage.Sets/src/mage/sets/planechase/Helldozer.java +++ b/Mage.Sets/src/mage/sets/planechase/Helldozer.java @@ -56,7 +56,6 @@ public class Helldozer extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Giant"); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/planechase/InnocentBlood.java b/Mage.Sets/src/mage/sets/planechase/InnocentBlood.java index 5be9c3177f1..abc4c09d60d 100644 --- a/Mage.Sets/src/mage/sets/planechase/InnocentBlood.java +++ b/Mage.Sets/src/mage/sets/planechase/InnocentBlood.java @@ -45,7 +45,6 @@ public class InnocentBlood extends CardImpl { super(ownerId, 33, "Innocent Blood", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "HOP"; - this.color.setBlack(true); // Each player sacrifices a creature. this.getSpellAbility().addEffect(new SacrificeAllEffect(1, new FilterControlledCreaturePermanent("creature"))); diff --git a/Mage.Sets/src/mage/sets/planechase/IvyElemental.java b/Mage.Sets/src/mage/sets/planechase/IvyElemental.java index 11a7c220910..2895430d7d8 100644 --- a/Mage.Sets/src/mage/sets/planechase/IvyElemental.java +++ b/Mage.Sets/src/mage/sets/planechase/IvyElemental.java @@ -55,7 +55,6 @@ public class IvyElemental extends CardImpl { this.expansionSetCode = "HOP"; this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/planechase/KeldonChampion.java b/Mage.Sets/src/mage/sets/planechase/KeldonChampion.java index bda5ef88824..3d10d850c9c 100644 --- a/Mage.Sets/src/mage/sets/planechase/KeldonChampion.java +++ b/Mage.Sets/src/mage/sets/planechase/KeldonChampion.java @@ -51,7 +51,6 @@ public class KeldonChampion extends CardImpl { this.subtype.add("Human"); this.subtype.add("Barbarian"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planechase/Nefashu.java b/Mage.Sets/src/mage/sets/planechase/Nefashu.java index 026f8346d3e..287ff788c3a 100644 --- a/Mage.Sets/src/mage/sets/planechase/Nefashu.java +++ b/Mage.Sets/src/mage/sets/planechase/Nefashu.java @@ -53,7 +53,6 @@ public class Nefashu extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Mutant"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/planechase/NoxiousGhoul.java b/Mage.Sets/src/mage/sets/planechase/NoxiousGhoul.java index c5b716e8d9c..b45e79fa049 100644 --- a/Mage.Sets/src/mage/sets/planechase/NoxiousGhoul.java +++ b/Mage.Sets/src/mage/sets/planechase/NoxiousGhoul.java @@ -57,7 +57,6 @@ public class NoxiousGhoul extends CardImpl { this.expansionSetCode = "HOP"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java b/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java index 4a3d0fbe78d..720d19460c3 100644 --- a/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java +++ b/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java @@ -60,8 +60,6 @@ public class RaziaBorosArchangel extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Angel"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(6); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/planechase/RecklessCharge.java b/Mage.Sets/src/mage/sets/planechase/RecklessCharge.java index a0443e4e09f..53e18e6f210 100644 --- a/Mage.Sets/src/mage/sets/planechase/RecklessCharge.java +++ b/Mage.Sets/src/mage/sets/planechase/RecklessCharge.java @@ -51,7 +51,6 @@ public class RecklessCharge extends CardImpl { super(ownerId, 61, "Reckless Charge", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "HOP"; - this.color.setRed(true); // Target creature gets +3/+0 and gains haste until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/planechase/RorixBladewing.java b/Mage.Sets/src/mage/sets/planechase/RorixBladewing.java index b168866eb3a..f6fa521ae2e 100644 --- a/Mage.Sets/src/mage/sets/planechase/RorixBladewing.java +++ b/Mage.Sets/src/mage/sets/planechase/RorixBladewing.java @@ -47,7 +47,6 @@ public class RorixBladewing extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/planechase/Smokebraider.java b/Mage.Sets/src/mage/sets/planechase/Smokebraider.java index 95c2fd84695..cfc3c0a14d4 100644 --- a/Mage.Sets/src/mage/sets/planechase/Smokebraider.java +++ b/Mage.Sets/src/mage/sets/planechase/Smokebraider.java @@ -53,7 +53,6 @@ public class Smokebraider extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planechase/TaureanMauler.java b/Mage.Sets/src/mage/sets/planechase/TaureanMauler.java index de28010ddb8..dcfbc2f115b 100644 --- a/Mage.Sets/src/mage/sets/planechase/TaureanMauler.java +++ b/Mage.Sets/src/mage/sets/planechase/TaureanMauler.java @@ -48,7 +48,6 @@ public class TaureanMauler extends CardImpl { this.expansionSetCode = "HOP"; this.subtype.add("Shapeshifter"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planechase/ThirstForKnowledge.java b/Mage.Sets/src/mage/sets/planechase/ThirstForKnowledge.java index c6e6c483446..62d8030910a 100644 --- a/Mage.Sets/src/mage/sets/planechase/ThirstForKnowledge.java +++ b/Mage.Sets/src/mage/sets/planechase/ThirstForKnowledge.java @@ -54,7 +54,6 @@ public class ThirstForKnowledge extends CardImpl { super(ownerId, 14, "Thirst for Knowledge", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "HOP"; - this.color.setBlue(true); // Draw three cards. Then discard two cards unless you discard an artifact card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); diff --git a/Mage.Sets/src/mage/sets/planechase/UndeadWarchief.java b/Mage.Sets/src/mage/sets/planechase/UndeadWarchief.java index 4f3f7691d68..89ca5d36a6b 100644 --- a/Mage.Sets/src/mage/sets/planechase/UndeadWarchief.java +++ b/Mage.Sets/src/mage/sets/planechase/UndeadWarchief.java @@ -61,7 +61,6 @@ public class UndeadWarchief extends CardImpl { this.expansionSetCode = "HOP"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planechase/VedalkenEngineer.java b/Mage.Sets/src/mage/sets/planechase/VedalkenEngineer.java index a41b8f58ada..e3e2447e1ec 100644 --- a/Mage.Sets/src/mage/sets/planechase/VedalkenEngineer.java +++ b/Mage.Sets/src/mage/sets/planechase/VedalkenEngineer.java @@ -60,7 +60,6 @@ public class VedalkenEngineer extends CardImpl { this.subtype.add("Vedalken"); this.subtype.add("Artificer"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planechase/WitheredWretch.java b/Mage.Sets/src/mage/sets/planechase/WitheredWretch.java index 1c7170827c3..453d1b1874d 100644 --- a/Mage.Sets/src/mage/sets/planechase/WitheredWretch.java +++ b/Mage.Sets/src/mage/sets/planechase/WitheredWretch.java @@ -52,7 +52,6 @@ public class WitheredWretch extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Cleric"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planechase2012/FelidarUmbra.java b/Mage.Sets/src/mage/sets/planechase2012/FelidarUmbra.java index 22bc1c0cd51..82ac334664a 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/FelidarUmbra.java +++ b/Mage.Sets/src/mage/sets/planechase2012/FelidarUmbra.java @@ -58,7 +58,6 @@ public class FelidarUmbra extends CardImpl { this.expansionSetCode = "PC2"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/planechase2012/IllusoryAngel.java b/Mage.Sets/src/mage/sets/planechase2012/IllusoryAngel.java index 5fe936c09e9..81f8242dc1e 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/IllusoryAngel.java +++ b/Mage.Sets/src/mage/sets/planechase2012/IllusoryAngel.java @@ -56,7 +56,6 @@ public class IllusoryAngel extends CardImpl { this.subtype.add("Angel"); this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/planechase2012/IndrikUmbra.java b/Mage.Sets/src/mage/sets/planechase2012/IndrikUmbra.java index 5b035a79639..8bd52c20ed1 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/IndrikUmbra.java +++ b/Mage.Sets/src/mage/sets/planechase2012/IndrikUmbra.java @@ -58,8 +58,6 @@ public class IndrikUmbra extends CardImpl { this.expansionSetCode = "PC2"; this.subtype.add("Aura"); - this.color.setGreen(true); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/planechase2012/InkfathomWitch.java b/Mage.Sets/src/mage/sets/planechase2012/InkfathomWitch.java index 47c5998cbf1..9e9d9b12f6d 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/InkfathomWitch.java +++ b/Mage.Sets/src/mage/sets/planechase2012/InkfathomWitch.java @@ -58,8 +58,6 @@ public class InkfathomWitch extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planechase2012/LastStand.java b/Mage.Sets/src/mage/sets/planechase2012/LastStand.java index 5fb13c4d17a..e777332cace 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/LastStand.java +++ b/Mage.Sets/src/mage/sets/planechase2012/LastStand.java @@ -54,11 +54,6 @@ public class LastStand extends CardImpl { super(ownerId, 100, "Last Stand", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{W}{U}{B}{R}{G}"); this.expansionSetCode = "PC2"; - this.color.setRed(true); - this.color.setBlue(true); - this.color.setGreen(true); - this.color.setBlack(true); - this.color.setWhite(true); // Target opponent loses 2 life for each Swamp you control. Last Stand deals damage equal to the number of Mountains you control to target creature. Put a 1/1 green Saproling creature token onto the battlefield for each Forest you control. You gain 2 life for each Plains you control. Draw a card for each Island you control, then discard that many cards. this.getSpellAbility().addEffect(new LastStandEffect()); diff --git a/Mage.Sets/src/mage/sets/planechase2012/MaelstromWanderer.java b/Mage.Sets/src/mage/sets/planechase2012/MaelstromWanderer.java index ba55f85a2a4..a1878ea29ef 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/MaelstromWanderer.java +++ b/Mage.Sets/src/mage/sets/planechase2012/MaelstromWanderer.java @@ -60,9 +60,6 @@ public class MaelstromWanderer extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Elemental"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(7); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java b/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java index 9a85a24a36c..fd242dfa30e 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java +++ b/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java @@ -60,7 +60,6 @@ public class MassMutiny extends CardImpl { super(ownerId, 48, "Mass Mutiny", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); this.expansionSetCode = "PC2"; - this.color.setRed(true); this.getSpellAbility().addEffect(new MassMutinyEffect()); // For each opponent, gain control of up to one target creature that player controls until end of turn. Untap those creatures. They gain haste until end of turn. } diff --git a/Mage.Sets/src/mage/sets/planechase2012/NoggleRansacker.java b/Mage.Sets/src/mage/sets/planechase2012/NoggleRansacker.java index fd5fc50a756..87c151e8026 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/NoggleRansacker.java +++ b/Mage.Sets/src/mage/sets/planechase2012/NoggleRansacker.java @@ -49,8 +49,6 @@ public class NoggleRansacker extends CardImpl { this.subtype.add("Noggle"); this.subtype.add("Rogue"); - this.color.setRed(true); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java b/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java index 7960e96ce9c..6d89ed28723 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java +++ b/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java @@ -64,7 +64,6 @@ public class NullmageAdvocate extends CardImpl { this.subtype.add("Insect"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/planechase2012/PenumbraSpider.java b/Mage.Sets/src/mage/sets/planechase2012/PenumbraSpider.java index 45ed8f3b7b3..f0bae667a4b 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/PenumbraSpider.java +++ b/Mage.Sets/src/mage/sets/planechase2012/PenumbraSpider.java @@ -48,7 +48,6 @@ public class PenumbraSpider extends CardImpl { this.expansionSetCode = "PC2"; this.subtype.add("Spider"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java b/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java index e2897b3b414..d97462eb7e4 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java +++ b/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java @@ -65,8 +65,6 @@ public class PollenbrightWings extends CardImpl { this.expansionSetCode = "PC2"; this.subtype.add("Aura"); - this.color.setGreen(true); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java b/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java index 1876c7401a8..fd4fde99256 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java +++ b/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java @@ -67,7 +67,6 @@ public class QuietDisrepair extends CardImpl { this.expansionSetCode = "PC2"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant artifact or enchantment TargetPermanent auraTarget = new TargetPermanent(filter); diff --git a/Mage.Sets/src/mage/sets/planechase2012/RivalsDuel.java b/Mage.Sets/src/mage/sets/planechase2012/RivalsDuel.java index 90fcfcf87fb..3710301a899 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/RivalsDuel.java +++ b/Mage.Sets/src/mage/sets/planechase2012/RivalsDuel.java @@ -49,7 +49,6 @@ public class RivalsDuel extends CardImpl { super(ownerId, 51, "Rivals' Duel", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "PC2"; - this.color.setRed(true); // Choose two target creatures that share no creature types. Those creatures fight each other. this.getSpellAbility().addTarget(new TargetCreaturePermanentWithDifferentTypes(2)); diff --git a/Mage.Sets/src/mage/sets/planechase2012/SakashimasStudent.java b/Mage.Sets/src/mage/sets/planechase2012/SakashimasStudent.java index 28d4ec8e483..f0a0c1e585d 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/SakashimasStudent.java +++ b/Mage.Sets/src/mage/sets/planechase2012/SakashimasStudent.java @@ -54,7 +54,6 @@ public class SakashimasStudent extends CardImpl { this.subtype.add("Human"); this.subtype.add("Ninja"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/planechase2012/ShardlessAgent.java b/Mage.Sets/src/mage/sets/planechase2012/ShardlessAgent.java index 3ad9561469f..af227b10ea2 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/ShardlessAgent.java +++ b/Mage.Sets/src/mage/sets/planechase2012/ShardlessAgent.java @@ -46,8 +46,6 @@ public class ShardlessAgent extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setGreen(true); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planechase2012/SilentBladeOni.java b/Mage.Sets/src/mage/sets/planechase2012/SilentBladeOni.java index a816e0cb642..3cbde4fce7c 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/SilentBladeOni.java +++ b/Mage.Sets/src/mage/sets/planechase2012/SilentBladeOni.java @@ -60,8 +60,6 @@ public class SilentBladeOni extends CardImpl { this.subtype.add("Demon"); this.subtype.add("Ninja"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/planechase2012/ThreeDreams.java b/Mage.Sets/src/mage/sets/planechase2012/ThreeDreams.java index 3548ac5c70c..52f1f7742b0 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/ThreeDreams.java +++ b/Mage.Sets/src/mage/sets/planechase2012/ThreeDreams.java @@ -49,7 +49,6 @@ public class ThreeDreams extends CardImpl { super(ownerId, 13, "Three Dreams", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{W}"); this.expansionSetCode = "PC2"; - this.color.setWhite(true); // Search your library for up to three Aura cards with different names, reveal them, and put them into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new ThreeDreamsTarget(), true, true)); diff --git a/Mage.Sets/src/mage/sets/planechase2012/ThromokTheInsatiable.java b/Mage.Sets/src/mage/sets/planechase2012/ThromokTheInsatiable.java index b9bbc846ccb..32e53ba4a98 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/ThromokTheInsatiable.java +++ b/Mage.Sets/src/mage/sets/planechase2012/ThromokTheInsatiable.java @@ -47,8 +47,6 @@ public class ThromokTheInsatiable extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Hellion"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/planechase2012/WhirlpoolWarrior.java b/Mage.Sets/src/mage/sets/planechase2012/WhirlpoolWarrior.java index e068da9d60b..475a7fd9634 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/WhirlpoolWarrior.java +++ b/Mage.Sets/src/mage/sets/planechase2012/WhirlpoolWarrior.java @@ -57,7 +57,6 @@ public class WhirlpoolWarrior extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Warrior"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planeshift/ArcticMerfolk.java b/Mage.Sets/src/mage/sets/planeshift/ArcticMerfolk.java index 7af7edac485..b3fe6e4f490 100644 --- a/Mage.Sets/src/mage/sets/planeshift/ArcticMerfolk.java +++ b/Mage.Sets/src/mage/sets/planeshift/ArcticMerfolk.java @@ -52,7 +52,6 @@ public class ArcticMerfolk extends CardImpl { this.expansionSetCode = "PLS"; this.subtype.add("Merfolk"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planeshift/CavernHarpy.java b/Mage.Sets/src/mage/sets/planeshift/CavernHarpy.java index 95b6145b1d2..21b26b0110a 100644 --- a/Mage.Sets/src/mage/sets/planeshift/CavernHarpy.java +++ b/Mage.Sets/src/mage/sets/planeshift/CavernHarpy.java @@ -64,8 +64,6 @@ public class CavernHarpy extends CardImpl { this.subtype.add("Harpy"); this.subtype.add("Beast"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planeshift/DiabolicIntent.java b/Mage.Sets/src/mage/sets/planeshift/DiabolicIntent.java index 061be13828c..996b562a38b 100644 --- a/Mage.Sets/src/mage/sets/planeshift/DiabolicIntent.java +++ b/Mage.Sets/src/mage/sets/planeshift/DiabolicIntent.java @@ -47,7 +47,6 @@ public class DiabolicIntent extends CardImpl { super(ownerId, 42, "Diabolic Intent", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "PLS"; - this.color.setBlack(true); // As an additional cost to cast Diabolic Intent, sacrifice a creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(new FilterControlledCreaturePermanent("a creature")))); diff --git a/Mage.Sets/src/mage/sets/planeshift/GaeasMight.java b/Mage.Sets/src/mage/sets/planeshift/GaeasMight.java index a3054f4d5f2..d0273b9150c 100644 --- a/Mage.Sets/src/mage/sets/planeshift/GaeasMight.java +++ b/Mage.Sets/src/mage/sets/planeshift/GaeasMight.java @@ -47,7 +47,6 @@ public class GaeasMight extends CardImpl { super(ownerId, 81, "Gaea's Might", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "PLS"; - this.color.setGreen(true); // Domain - Target creature gets +1/+1 until end of turn for each basic land type among lands you control. this.getSpellAbility().addEffect(new BoostTargetEffect(new DomainValue(), new DomainValue(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/planeshift/MaggotCarrier.java b/Mage.Sets/src/mage/sets/planeshift/MaggotCarrier.java index 6f8fb0ce29c..7231d1d8130 100644 --- a/Mage.Sets/src/mage/sets/planeshift/MaggotCarrier.java +++ b/Mage.Sets/src/mage/sets/planeshift/MaggotCarrier.java @@ -47,7 +47,6 @@ public class MaggotCarrier extends CardImpl { this.expansionSetCode = "PLS"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planeshift/NemataGroveGuardian.java b/Mage.Sets/src/mage/sets/planeshift/NemataGroveGuardian.java index e6a4e2af364..e1860580a46 100644 --- a/Mage.Sets/src/mage/sets/planeshift/NemataGroveGuardian.java +++ b/Mage.Sets/src/mage/sets/planeshift/NemataGroveGuardian.java @@ -65,7 +65,6 @@ public class NemataGroveGuardian extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Treefolk"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/planeshift/NightscapeFamiliar.java b/Mage.Sets/src/mage/sets/planeshift/NightscapeFamiliar.java index 2606249a922..5a7b3b66470 100644 --- a/Mage.Sets/src/mage/sets/planeshift/NightscapeFamiliar.java +++ b/Mage.Sets/src/mage/sets/planeshift/NightscapeFamiliar.java @@ -62,7 +62,6 @@ public class NightscapeFamiliar extends CardImpl { this.expansionSetCode = "PLS"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planeshift/PhyrexianTyranny.java b/Mage.Sets/src/mage/sets/planeshift/PhyrexianTyranny.java index ae1b4a49fc3..b52321f3e03 100644 --- a/Mage.Sets/src/mage/sets/planeshift/PhyrexianTyranny.java +++ b/Mage.Sets/src/mage/sets/planeshift/PhyrexianTyranny.java @@ -54,9 +54,6 @@ public class PhyrexianTyranny extends CardImpl { super(ownerId, 118, "Phyrexian Tyranny", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{U}{B}{R}"); this.expansionSetCode = "PLS"; - this.color.setBlue(true); - this.color.setRed(true); - this.color.setBlack(true); // Whenever a player draws a card, that player loses 2 life unless he or she pays {2}. this.addAbility(new PhyrexianTyrannyTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/planeshift/RushingRiver.java b/Mage.Sets/src/mage/sets/planeshift/RushingRiver.java index 03fe46ce4c5..ce6d9e7473d 100644 --- a/Mage.Sets/src/mage/sets/planeshift/RushingRiver.java +++ b/Mage.Sets/src/mage/sets/planeshift/RushingRiver.java @@ -57,7 +57,6 @@ public class RushingRiver extends CardImpl { super(ownerId, 30, "Rushing River", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "PLS"; - this.color.setBlue(true); // Kicker-Sacrifice a land. this.addAbility(new KickerAbility(new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent("a land"))))); diff --git a/Mage.Sets/src/mage/sets/planeshift/SunkenHope.java b/Mage.Sets/src/mage/sets/planeshift/SunkenHope.java index 255b4d31e4c..4f161888409 100644 --- a/Mage.Sets/src/mage/sets/planeshift/SunkenHope.java +++ b/Mage.Sets/src/mage/sets/planeshift/SunkenHope.java @@ -55,7 +55,6 @@ public class SunkenHope extends CardImpl { super(ownerId, 37, "Sunken Hope", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}{U}"); this.expansionSetCode = "PLS"; - this.color.setBlue(true); // At the beginning of each player's upkeep, that player returns a creature he or she controls to its owner's hand. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new ReturnToHandEffect(), TargetController.ANY, false, true)); diff --git a/Mage.Sets/src/mage/sets/planeshift/SunscapeFamiliar.java b/Mage.Sets/src/mage/sets/planeshift/SunscapeFamiliar.java index 99df462a023..87a75b591ac 100644 --- a/Mage.Sets/src/mage/sets/planeshift/SunscapeFamiliar.java +++ b/Mage.Sets/src/mage/sets/planeshift/SunscapeFamiliar.java @@ -61,7 +61,6 @@ public class SunscapeFamiliar extends CardImpl { this.expansionSetCode = "PLS"; this.subtype.add("Wall"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/planeshift/ThornscapeFamiliar.java b/Mage.Sets/src/mage/sets/planeshift/ThornscapeFamiliar.java index cc3bb12ddf2..d33d5051ea3 100644 --- a/Mage.Sets/src/mage/sets/planeshift/ThornscapeFamiliar.java +++ b/Mage.Sets/src/mage/sets/planeshift/ThornscapeFamiliar.java @@ -59,7 +59,6 @@ public class ThornscapeFamiliar extends CardImpl { this.expansionSetCode = "PLS"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planeshift/ThunderscapeFamiliar.java b/Mage.Sets/src/mage/sets/planeshift/ThunderscapeFamiliar.java index 94e6c5daac5..946cf445c38 100644 --- a/Mage.Sets/src/mage/sets/planeshift/ThunderscapeFamiliar.java +++ b/Mage.Sets/src/mage/sets/planeshift/ThunderscapeFamiliar.java @@ -60,7 +60,6 @@ public class ThunderscapeFamiliar extends CardImpl { this.expansionSetCode = "PLS"; this.subtype.add("Kavu"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planeshift/UrzasGuilt.java b/Mage.Sets/src/mage/sets/planeshift/UrzasGuilt.java index 535fa0b0783..ae00ec014f8 100644 --- a/Mage.Sets/src/mage/sets/planeshift/UrzasGuilt.java +++ b/Mage.Sets/src/mage/sets/planeshift/UrzasGuilt.java @@ -46,8 +46,6 @@ public class UrzasGuilt extends CardImpl { super(ownerId, 130, "Urza's Guilt", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{U}{B}"); this.expansionSetCode = "PLS"; - this.color.setBlue(true); - this.color.setBlack(true); // Each player draws two cards, then discards three cards, then loses 4 life. this.getSpellAbility().addEffect(new DrawCardAllEffect(2)); diff --git a/Mage.Sets/src/mage/sets/portal/ArrogantVampire.java b/Mage.Sets/src/mage/sets/portal/ArrogantVampire.java index d08b48348bf..0bc23551df5 100644 --- a/Mage.Sets/src/mage/sets/portal/ArrogantVampire.java +++ b/Mage.Sets/src/mage/sets/portal/ArrogantVampire.java @@ -45,7 +45,6 @@ public class ArrogantVampire extends CardImpl { this.expansionSetCode = "POR"; this.subtype.add("Vampire"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portal/BorderGuard.java b/Mage.Sets/src/mage/sets/portal/BorderGuard.java index c851f1ad56a..c22e1700c84 100644 --- a/Mage.Sets/src/mage/sets/portal/BorderGuard.java +++ b/Mage.Sets/src/mage/sets/portal/BorderGuard.java @@ -45,7 +45,6 @@ public class BorderGuard extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/portal/CruelTutor.java b/Mage.Sets/src/mage/sets/portal/CruelTutor.java index bb4793132e9..10aaa11db3a 100644 --- a/Mage.Sets/src/mage/sets/portal/CruelTutor.java +++ b/Mage.Sets/src/mage/sets/portal/CruelTutor.java @@ -47,7 +47,6 @@ public class CruelTutor extends CardImpl { super(ownerId, 9, "Cruel Tutor", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "POR"; - this.color.setBlack(true); // Search your library for a card, then shuffle your library and put that card on top of it. You lose 2 life. TargetCardInLibrary target = new TargetCardInLibrary(); diff --git a/Mage.Sets/src/mage/sets/portal/DesertDrake.java b/Mage.Sets/src/mage/sets/portal/DesertDrake.java index d701350682a..dfcfa4c6e05 100644 --- a/Mage.Sets/src/mage/sets/portal/DesertDrake.java +++ b/Mage.Sets/src/mage/sets/portal/DesertDrake.java @@ -45,7 +45,6 @@ public class DesertDrake extends CardImpl { this.expansionSetCode = "POR"; this.subtype.add("Drake"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portal/Devastation.java b/Mage.Sets/src/mage/sets/portal/Devastation.java index 2058f9eaaed..3d2a776fbb1 100644 --- a/Mage.Sets/src/mage/sets/portal/Devastation.java +++ b/Mage.Sets/src/mage/sets/portal/Devastation.java @@ -51,7 +51,6 @@ public class Devastation extends CardImpl { super(ownerId, 128, "Devastation", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{R}{R}"); this.expansionSetCode = "POR"; - this.color.setRed(true); // Destroy all creatures and lands. this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/portal/DevotedHero.java b/Mage.Sets/src/mage/sets/portal/DevotedHero.java index 5b90100c77d..4826df3b19f 100644 --- a/Mage.Sets/src/mage/sets/portal/DevotedHero.java +++ b/Mage.Sets/src/mage/sets/portal/DevotedHero.java @@ -45,7 +45,6 @@ public class DevotedHero extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/portal/DjinnOfTheLamp.java b/Mage.Sets/src/mage/sets/portal/DjinnOfTheLamp.java index 872daa5ca61..6f774a25fc8 100644 --- a/Mage.Sets/src/mage/sets/portal/DjinnOfTheLamp.java +++ b/Mage.Sets/src/mage/sets/portal/DjinnOfTheLamp.java @@ -45,7 +45,6 @@ public class DjinnOfTheLamp extends CardImpl { this.expansionSetCode = "POR"; this.subtype.add("Djinn"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/portal/EliteCatWarrior.java b/Mage.Sets/src/mage/sets/portal/EliteCatWarrior.java index a44b8fe9747..3c484adc889 100644 --- a/Mage.Sets/src/mage/sets/portal/EliteCatWarrior.java +++ b/Mage.Sets/src/mage/sets/portal/EliteCatWarrior.java @@ -46,7 +46,6 @@ public class EliteCatWarrior extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portal/ElvishRanger.java b/Mage.Sets/src/mage/sets/portal/ElvishRanger.java index aff34e9b138..318ee4d9549 100644 --- a/Mage.Sets/src/mage/sets/portal/ElvishRanger.java +++ b/Mage.Sets/src/mage/sets/portal/ElvishRanger.java @@ -44,7 +44,6 @@ public class ElvishRanger extends CardImpl { this.expansionSetCode = "POR"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/portal/GoblinBully.java b/Mage.Sets/src/mage/sets/portal/GoblinBully.java index 1c43f96602d..83ee529a9d9 100644 --- a/Mage.Sets/src/mage/sets/portal/GoblinBully.java +++ b/Mage.Sets/src/mage/sets/portal/GoblinBully.java @@ -44,7 +44,6 @@ public class GoblinBully extends CardImpl { this.expansionSetCode = "POR"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/portal/HighlandGiant.java b/Mage.Sets/src/mage/sets/portal/HighlandGiant.java index 1ed9fe563a0..72d036eec06 100644 --- a/Mage.Sets/src/mage/sets/portal/HighlandGiant.java +++ b/Mage.Sets/src/mage/sets/portal/HighlandGiant.java @@ -44,7 +44,6 @@ public class HighlandGiant extends CardImpl { this.expansionSetCode = "POR"; this.subtype.add("Giant"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/portal/KeenEyedArchers.java b/Mage.Sets/src/mage/sets/portal/KeenEyedArchers.java index e5dadef5795..866ce74eade 100644 --- a/Mage.Sets/src/mage/sets/portal/KeenEyedArchers.java +++ b/Mage.Sets/src/mage/sets/portal/KeenEyedArchers.java @@ -46,7 +46,6 @@ public class KeenEyedArchers extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Archer"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portal/LizardWarrior.java b/Mage.Sets/src/mage/sets/portal/LizardWarrior.java index 4c512484339..65e4c339c10 100644 --- a/Mage.Sets/src/mage/sets/portal/LizardWarrior.java +++ b/Mage.Sets/src/mage/sets/portal/LizardWarrior.java @@ -45,7 +45,6 @@ public class LizardWarrior extends CardImpl { this.subtype.add("Lizard"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/portal/MinotaurWarrior.java b/Mage.Sets/src/mage/sets/portal/MinotaurWarrior.java index 2ee565c1653..7076dcf6b18 100644 --- a/Mage.Sets/src/mage/sets/portal/MinotaurWarrior.java +++ b/Mage.Sets/src/mage/sets/portal/MinotaurWarrior.java @@ -45,7 +45,6 @@ public class MinotaurWarrior extends CardImpl { this.subtype.add("Minotaur"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/portal/MoonSprite.java b/Mage.Sets/src/mage/sets/portal/MoonSprite.java index d14eb5735e8..7a71f469e8d 100644 --- a/Mage.Sets/src/mage/sets/portal/MoonSprite.java +++ b/Mage.Sets/src/mage/sets/portal/MoonSprite.java @@ -45,7 +45,6 @@ public class MoonSprite extends CardImpl { this.expansionSetCode = "POR"; this.subtype.add("Faerie"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portal/OwlFamiliar.java b/Mage.Sets/src/mage/sets/portal/OwlFamiliar.java index f770794ff09..abdb1ad37c9 100644 --- a/Mage.Sets/src/mage/sets/portal/OwlFamiliar.java +++ b/Mage.Sets/src/mage/sets/portal/OwlFamiliar.java @@ -47,7 +47,6 @@ public class OwlFamiliar extends CardImpl { this.expansionSetCode = "POR"; this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portal/PersonalTutor.java b/Mage.Sets/src/mage/sets/portal/PersonalTutor.java index 4a4683c713e..79cd6867658 100644 --- a/Mage.Sets/src/mage/sets/portal/PersonalTutor.java +++ b/Mage.Sets/src/mage/sets/portal/PersonalTutor.java @@ -50,7 +50,6 @@ public class PersonalTutor extends CardImpl { super(ownerId, 65, "Personal Tutor", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{U}"); this.expansionSetCode = "POR"; - this.color.setBlue(true); // Search your library for a sorcery card and reveal that card. Shuffle your library, then put the card on top of it. this.getSpellAbility().addEffect(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(filter), true, true)); diff --git a/Mage.Sets/src/mage/sets/portal/RagingCougar.java b/Mage.Sets/src/mage/sets/portal/RagingCougar.java index bde6965b149..2e6de09a8b7 100644 --- a/Mage.Sets/src/mage/sets/portal/RagingCougar.java +++ b/Mage.Sets/src/mage/sets/portal/RagingCougar.java @@ -45,7 +45,6 @@ public class RagingCougar extends CardImpl { this.expansionSetCode = "POR"; this.subtype.add("Cat"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portal/RagingMinotaur.java b/Mage.Sets/src/mage/sets/portal/RagingMinotaur.java index f54bce4b9cf..b987c7f812c 100644 --- a/Mage.Sets/src/mage/sets/portal/RagingMinotaur.java +++ b/Mage.Sets/src/mage/sets/portal/RagingMinotaur.java @@ -46,7 +46,6 @@ public class RagingMinotaur extends CardImpl { this.subtype.add("Minotaur"); this.subtype.add("Berserker"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portal/RowanTreefolk.java b/Mage.Sets/src/mage/sets/portal/RowanTreefolk.java index b0d1a2033c7..97b14793dd9 100644 --- a/Mage.Sets/src/mage/sets/portal/RowanTreefolk.java +++ b/Mage.Sets/src/mage/sets/portal/RowanTreefolk.java @@ -44,7 +44,6 @@ public class RowanTreefolk extends CardImpl { this.expansionSetCode = "POR"; this.subtype.add("Treefolk"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/portal/SkeletalCrocodile.java b/Mage.Sets/src/mage/sets/portal/SkeletalCrocodile.java index 8fc7c079c57..7ee026de042 100644 --- a/Mage.Sets/src/mage/sets/portal/SkeletalCrocodile.java +++ b/Mage.Sets/src/mage/sets/portal/SkeletalCrocodile.java @@ -45,7 +45,6 @@ public class SkeletalCrocodile extends CardImpl { this.subtype.add("Crocodile"); this.subtype.add("Skeleton"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/portal/SkeletalSnake.java b/Mage.Sets/src/mage/sets/portal/SkeletalSnake.java index f5939528afb..0aa1790884c 100644 --- a/Mage.Sets/src/mage/sets/portal/SkeletalSnake.java +++ b/Mage.Sets/src/mage/sets/portal/SkeletalSnake.java @@ -45,7 +45,6 @@ public class SkeletalSnake extends CardImpl { this.subtype.add("Snake"); this.subtype.add("Skeleton"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/portal/SpottedGriffin.java b/Mage.Sets/src/mage/sets/portal/SpottedGriffin.java index f4fa78a9436..b2019e75b65 100644 --- a/Mage.Sets/src/mage/sets/portal/SpottedGriffin.java +++ b/Mage.Sets/src/mage/sets/portal/SpottedGriffin.java @@ -45,7 +45,6 @@ public class SpottedGriffin extends CardImpl { this.expansionSetCode = "POR"; this.subtype.add("Griffin"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portal/StarlitAngel.java b/Mage.Sets/src/mage/sets/portal/StarlitAngel.java index 004fadc3e11..ea178db4db5 100644 --- a/Mage.Sets/src/mage/sets/portal/StarlitAngel.java +++ b/Mage.Sets/src/mage/sets/portal/StarlitAngel.java @@ -45,7 +45,6 @@ public class StarlitAngel extends CardImpl { this.expansionSetCode = "POR"; this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/portal/SylvanTutor.java b/Mage.Sets/src/mage/sets/portal/SylvanTutor.java index 32a8c38e986..6eba12460f3 100644 --- a/Mage.Sets/src/mage/sets/portal/SylvanTutor.java +++ b/Mage.Sets/src/mage/sets/portal/SylvanTutor.java @@ -45,7 +45,6 @@ public class SylvanTutor extends CardImpl { super(ownerId, 114, "Sylvan Tutor", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{G}"); this.expansionSetCode = "POR"; - this.color.setGreen(true); // Search your library for a creature card and reveal that card. Shuffle your library, then put the card on top of it. this.getSpellAbility().addEffect(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(new FilterCreatureCard()), true, true)); diff --git a/Mage.Sets/src/mage/sets/portal/VirtuesRuin.java b/Mage.Sets/src/mage/sets/portal/VirtuesRuin.java index 80220ff8b5d..2bd99e8cdcd 100644 --- a/Mage.Sets/src/mage/sets/portal/VirtuesRuin.java +++ b/Mage.Sets/src/mage/sets/portal/VirtuesRuin.java @@ -53,7 +53,6 @@ public class VirtuesRuin extends CardImpl { super(ownerId, 39, "Virtue's Ruin", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "POR"; - this.color.setBlack(true); // Destroy all white creatures. this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/portal/WallOfGranite.java b/Mage.Sets/src/mage/sets/portal/WallOfGranite.java index dcc44360d4b..2a4c86d40b1 100644 --- a/Mage.Sets/src/mage/sets/portal/WallOfGranite.java +++ b/Mage.Sets/src/mage/sets/portal/WallOfGranite.java @@ -45,7 +45,6 @@ public class WallOfGranite extends CardImpl { this.expansionSetCode = "POR"; this.subtype.add("Wall"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/portal/WhiptailWurm.java b/Mage.Sets/src/mage/sets/portal/WhiptailWurm.java index 2ebdb9bdaa5..00a6d4323d4 100644 --- a/Mage.Sets/src/mage/sets/portal/WhiptailWurm.java +++ b/Mage.Sets/src/mage/sets/portal/WhiptailWurm.java @@ -44,7 +44,6 @@ public class WhiptailWurm extends CardImpl { this.expansionSetCode = "POR"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(8); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/portal/WillowDryad.java b/Mage.Sets/src/mage/sets/portal/WillowDryad.java index 45cddc960df..7bcf6d60a96 100644 --- a/Mage.Sets/src/mage/sets/portal/WillowDryad.java +++ b/Mage.Sets/src/mage/sets/portal/WillowDryad.java @@ -45,7 +45,6 @@ public class WillowDryad extends CardImpl { this.expansionSetCode = "POR"; this.subtype.add("Dryad"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AlabornGrenadier.java b/Mage.Sets/src/mage/sets/portalsecondage/AlabornGrenadier.java index 07b32591d26..dc8dd76c527 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AlabornGrenadier.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AlabornGrenadier.java @@ -46,7 +46,6 @@ public class AlabornGrenadier extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AlabornMusketeer.java b/Mage.Sets/src/mage/sets/portalsecondage/AlabornMusketeer.java index f4b2b0052bf..dc7b111dcf3 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AlabornMusketeer.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AlabornMusketeer.java @@ -46,7 +46,6 @@ public class AlabornMusketeer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AlabornTrooper.java b/Mage.Sets/src/mage/sets/portalsecondage/AlabornTrooper.java index da2a053c5f5..6a2d8c98a7d 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AlabornTrooper.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AlabornTrooper.java @@ -45,7 +45,6 @@ public class AlabornTrooper extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/BarbtoothWurm.java b/Mage.Sets/src/mage/sets/portalsecondage/BarbtoothWurm.java index 2b26cf72edc..3a2daf5464a 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/BarbtoothWurm.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/BarbtoothWurm.java @@ -44,7 +44,6 @@ public class BarbtoothWurm extends CardImpl { this.expansionSetCode = "PO2"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/BearCub.java b/Mage.Sets/src/mage/sets/portalsecondage/BearCub.java index d13464b2626..1a7628af4d9 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/BearCub.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/BearCub.java @@ -44,7 +44,6 @@ public class BearCub extends CardImpl { this.expansionSetCode = "PO2"; this.subtype.add("Bear"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/BrimstoneDragon.java b/Mage.Sets/src/mage/sets/portalsecondage/BrimstoneDragon.java index 53a0bb6a859..3841bb6bd4e 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/BrimstoneDragon.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/BrimstoneDragon.java @@ -46,7 +46,6 @@ public class BrimstoneDragon extends CardImpl { this.expansionSetCode = "PO2"; this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/DakmorBat.java b/Mage.Sets/src/mage/sets/portalsecondage/DakmorBat.java index ce7b378cc02..8e9bddca066 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/DakmorBat.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/DakmorBat.java @@ -45,7 +45,6 @@ public class DakmorBat extends CardImpl { this.expansionSetCode = "PO2"; this.subtype.add("Bat"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/DakmorScorpion.java b/Mage.Sets/src/mage/sets/portalsecondage/DakmorScorpion.java index 9bd30e6f985..aa4d911f027 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/DakmorScorpion.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/DakmorScorpion.java @@ -44,7 +44,6 @@ public class DakmorScorpion extends CardImpl { this.expansionSetCode = "PO2"; this.subtype.add("Scorpion"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinCavaliers.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinCavaliers.java index 6fd9719e99d..f5e4de81cf3 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinCavaliers.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinCavaliers.java @@ -44,7 +44,6 @@ public class GoblinCavaliers extends CardImpl { this.expansionSetCode = "PO2"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoldenBear.java b/Mage.Sets/src/mage/sets/portalsecondage/GoldenBear.java index 69890c3dd2b..8b08bde0340 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/GoldenBear.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/GoldenBear.java @@ -44,7 +44,6 @@ public class GoldenBear extends CardImpl { this.expansionSetCode = "PO2"; this.subtype.add("Bear"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Lynx.java b/Mage.Sets/src/mage/sets/portalsecondage/Lynx.java index e97d19339e5..f2f2700725c 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Lynx.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Lynx.java @@ -45,7 +45,6 @@ public class Lynx extends CardImpl { this.expansionSetCode = "PO2"; this.subtype.add("Cat"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/MagmaGiant.java b/Mage.Sets/src/mage/sets/portalsecondage/MagmaGiant.java index 4daf48e3775..f3624fe032a 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/MagmaGiant.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/MagmaGiant.java @@ -47,7 +47,6 @@ public class MagmaGiant extends CardImpl { this.expansionSetCode = "PO2"; this.subtype.add("Giant"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/MoaningSpirit.java b/Mage.Sets/src/mage/sets/portalsecondage/MoaningSpirit.java index fa19d56ef38..20c0bfdd5ee 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/MoaningSpirit.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/MoaningSpirit.java @@ -45,7 +45,6 @@ public class MoaningSpirit extends CardImpl { this.expansionSetCode = "PO2"; this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/MuckRats.java b/Mage.Sets/src/mage/sets/portalsecondage/MuckRats.java index 6664d5d03d2..933dbfdb575 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/MuckRats.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/MuckRats.java @@ -44,7 +44,6 @@ public class MuckRats extends CardImpl { this.expansionSetCode = "PO2"; this.subtype.add("Rat"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodArchers.java b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodArchers.java index ac0346ec4e9..a62b8872bf6 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodArchers.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodArchers.java @@ -46,7 +46,6 @@ public class NorwoodArchers extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Archer"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/ObsidianGiant.java b/Mage.Sets/src/mage/sets/portalsecondage/ObsidianGiant.java index 74ce58e79cd..611aa9b327f 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/ObsidianGiant.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/ObsidianGiant.java @@ -44,7 +44,6 @@ public class ObsidianGiant extends CardImpl { this.expansionSetCode = "PO2"; this.subtype.add("Giant"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/OgreBerserker.java b/Mage.Sets/src/mage/sets/portalsecondage/OgreBerserker.java index 1e67d8dadc5..fd90f734722 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/OgreBerserker.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/OgreBerserker.java @@ -46,7 +46,6 @@ public class OgreBerserker extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Berserker"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/OgreWarrior.java b/Mage.Sets/src/mage/sets/portalsecondage/OgreWarrior.java index 742deb5b7a2..b869fda615c 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/OgreWarrior.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/OgreWarrior.java @@ -45,7 +45,6 @@ public class OgreWarrior extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/PlatedWurm.java b/Mage.Sets/src/mage/sets/portalsecondage/PlatedWurm.java index 5e53e83b23e..c297d3eb2d8 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/PlatedWurm.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/PlatedWurm.java @@ -44,7 +44,6 @@ public class PlatedWurm extends CardImpl { this.expansionSetCode = "PO2"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RaidingNightstalker.java b/Mage.Sets/src/mage/sets/portalsecondage/RaidingNightstalker.java index d74aeb02f82..397eb48889a 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/RaidingNightstalker.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/RaidingNightstalker.java @@ -45,7 +45,6 @@ public class RaidingNightstalker extends CardImpl { this.expansionSetCode = "PO2"; this.subtype.add("Nightstalker"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TalasAirShip.java b/Mage.Sets/src/mage/sets/portalsecondage/TalasAirShip.java index 87b0b6fe4dd..6f3e8d69301 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TalasAirShip.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TalasAirShip.java @@ -46,7 +46,6 @@ public class TalasAirShip extends CardImpl { this.subtype.add("Human"); this.subtype.add("Pirate"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TalasMerchant.java b/Mage.Sets/src/mage/sets/portalsecondage/TalasMerchant.java index 7b5fa0d5119..fbdd3efbaec 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TalasMerchant.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TalasMerchant.java @@ -45,7 +45,6 @@ public class TalasMerchant extends CardImpl { this.subtype.add("Human"); this.subtype.add("Pirate"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TalasScout.java b/Mage.Sets/src/mage/sets/portalsecondage/TalasScout.java index b89958e20a8..dd0d8ff3250 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TalasScout.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TalasScout.java @@ -47,7 +47,6 @@ public class TalasScout extends CardImpl { this.subtype.add("Pirate"); this.subtype.add("Scout"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TemporalManipulation.java b/Mage.Sets/src/mage/sets/portalsecondage/TemporalManipulation.java index 375b71c6319..d7c50beb317 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TemporalManipulation.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TemporalManipulation.java @@ -43,7 +43,6 @@ public class TemporalManipulation extends CardImpl { super(ownerId, 54, "Temporal Manipulation", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}{U}"); this.expansionSetCode = "PO2"; - this.color.setBlue(true); // Take an extra turn after this one. this.getSpellAbility().addEffect(new AddExtraTurnControllerEffect()); } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TrokinHighGuard.java b/Mage.Sets/src/mage/sets/portalsecondage/TrokinHighGuard.java index b12fff4b406..5602a76b8ff 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TrokinHighGuard.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TrokinHighGuard.java @@ -45,7 +45,6 @@ public class TrokinHighGuard extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/WildOx.java b/Mage.Sets/src/mage/sets/portalsecondage/WildOx.java index 95287c8d296..f620411d002 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/WildOx.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/WildOx.java @@ -45,7 +45,6 @@ public class WildOx extends CardImpl { this.expansionSetCode = "PO2"; this.subtype.add("Ox"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/AlertShuInfantry.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/AlertShuInfantry.java index 17ba9b738c5..2791bfb5874 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/AlertShuInfantry.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/AlertShuInfantry.java @@ -46,7 +46,6 @@ public class AlertShuInfantry extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/BarbarianHorde.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/BarbarianHorde.java index f7c4e710351..93bf65c0cf4 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/BarbarianHorde.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/BarbarianHorde.java @@ -46,7 +46,6 @@ public class BarbarianHorde extends CardImpl { this.subtype.add("Barbarian"); this.subtype.add("Soldier"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/BurningOfXinye.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/BurningOfXinye.java index d97c59f05bd..4b31451bf46 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/BurningOfXinye.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/BurningOfXinye.java @@ -54,7 +54,6 @@ public class BurningOfXinye extends CardImpl { super(ownerId, 104, "Burning of Xinye", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{R}{R}"); this.expansionSetCode = "PTK"; - this.color.setRed(true); // You destroy four lands you control, then target opponent destroys four lands he or she controls. Then Burning of Xinye deals 4 damage to each creature. this.getSpellAbility().addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/CaoCaoLordOfWei.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/CaoCaoLordOfWei.java index 34ab96c6959..f6cd07f5369 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/CaoCaoLordOfWei.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/CaoCaoLordOfWei.java @@ -53,7 +53,6 @@ public class CaoCaoLordOfWei extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/CaptureOfJingzhou.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/CaptureOfJingzhou.java index e9f2839c6fd..2ae2aec7319 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/CaptureOfJingzhou.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/CaptureOfJingzhou.java @@ -43,7 +43,6 @@ public class CaptureOfJingzhou extends CardImpl { super(ownerId, 38, "Capture of Jingzhou", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}{U}"); this.expansionSetCode = "PTK"; - this.color.setBlue(true); // Take an extra turn after this one. this.getSpellAbility().addEffect(new AddExtraTurnControllerEffect()); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/DiaochanArtfulBeauty.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/DiaochanArtfulBeauty.java index 11fb377ba85..8beb27092be 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/DiaochanArtfulBeauty.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/DiaochanArtfulBeauty.java @@ -59,7 +59,6 @@ public class DiaochanArtfulBeauty extends CardImpl { this.subtype.add("Human"); this.subtype.add("Advisor"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/Exhaustion.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/Exhaustion.java index 6ff058e0d1a..12ca4274395 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/Exhaustion.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/Exhaustion.java @@ -55,7 +55,6 @@ public class Exhaustion extends CardImpl { super(ownerId, 42, "Exhaustion", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "PTK"; - this.color.setBlue(true); // Creatures and lands target opponent controls don't untap during his or her next untap step. this.getSpellAbility().addEffect(new ExhaustionEffect()); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ForestBear.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ForestBear.java index 4d0c9e27fb7..a7fabc7d03b 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ForestBear.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ForestBear.java @@ -44,7 +44,6 @@ public class ForestBear extends CardImpl { this.expansionSetCode = "PTK"; this.subtype.add("Bear"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ImperialRecruiter.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ImperialRecruiter.java index 47f3666647f..46307732880 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ImperialRecruiter.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ImperialRecruiter.java @@ -57,7 +57,6 @@ public class ImperialRecruiter extends CardImpl { this.subtype.add("Human"); this.subtype.add("Advisor"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ImperialSeal.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ImperialSeal.java index 8dff778a00a..91a51128031 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ImperialSeal.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ImperialSeal.java @@ -45,7 +45,6 @@ public class ImperialSeal extends CardImpl { super(ownerId, 78, "Imperial Seal", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "PTK"; - this.color.setBlack(true); // Search your library for a card, then shuffle your library and put that card on top of it. You lose 2 life. this.getSpellAbility().addEffect(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary())); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/IndependentTroops.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/IndependentTroops.java index 428088fff53..41f8722190a 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/IndependentTroops.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/IndependentTroops.java @@ -45,7 +45,6 @@ public class IndependentTroops extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/LoyalRetainers.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/LoyalRetainers.java index c1bafe8b010..8954f07098c 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/LoyalRetainers.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/LoyalRetainers.java @@ -60,7 +60,6 @@ public class LoyalRetainers extends CardImpl { this.subtype.add("Human"); this.subtype.add("Advisor"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/MengHuosHorde.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/MengHuosHorde.java index 81e80904f18..fdb512c65d8 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/MengHuosHorde.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/MengHuosHorde.java @@ -45,7 +45,6 @@ public class MengHuosHorde extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/MountainBandit.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/MountainBandit.java index 5da37188a3e..c06e3905fc4 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/MountainBandit.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/MountainBandit.java @@ -47,7 +47,6 @@ public class MountainBandit extends CardImpl { this.subtype.add("Soldier"); this.subtype.add("Rogue"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/RavagesOfWar.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/RavagesOfWar.java index 9295a981346..051c2475dc4 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/RavagesOfWar.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/RavagesOfWar.java @@ -44,7 +44,6 @@ public class RavagesOfWar extends CardImpl { super(ownerId, 17, "Ravages of War", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{W}"); this.expansionSetCode = "PTK"; - this.color.setWhite(true); // Destroy all lands. this.getSpellAbility().addEffect(new DestroyAllEffect(new FilterLandPermanent("lands"))); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/RenegadeTroops.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/RenegadeTroops.java index 6daeebe1f62..df3feca754e 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/RenegadeTroops.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/RenegadeTroops.java @@ -46,7 +46,6 @@ public class RenegadeTroops extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/RollingEarthquake.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/RollingEarthquake.java index 21f68cc9627..c3ee0ff8843 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/RollingEarthquake.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/RollingEarthquake.java @@ -54,7 +54,6 @@ public class RollingEarthquake extends CardImpl { super(ownerId, 122, "Rolling Earthquake", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{R}"); this.expansionSetCode = "PTK"; - this.color.setRed(true); // Rolling Earthquake deals X damage to each creature without horsemanship and each player. this.getSpellAbility().addEffect(new DamageEverythingEffect(new ManacostVariableValue(), filter)); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuEliteInfantry.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuEliteInfantry.java index bb201dca275..c4305505337 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuEliteInfantry.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuEliteInfantry.java @@ -45,7 +45,6 @@ public class ShuEliteInfantry extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuFootSoldiers.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuFootSoldiers.java index 9d9406a0473..409532ed0e1 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuFootSoldiers.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuFootSoldiers.java @@ -45,7 +45,6 @@ public class ShuFootSoldiers extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/SouthernElephant.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/SouthernElephant.java index 68c1b41b9ca..b66ea315a24 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/SouthernElephant.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/SouthernElephant.java @@ -44,7 +44,6 @@ public class SouthernElephant extends CardImpl { this.expansionSetCode = "PTK"; this.subtype.add("Elephant"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/StrawSoldiers.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/StrawSoldiers.java index e6c6e70d32e..7836c3d1e59 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/StrawSoldiers.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/StrawSoldiers.java @@ -45,7 +45,6 @@ public class StrawSoldiers extends CardImpl { this.subtype.add("Scarecrow"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/SunQuanLordOfWu.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/SunQuanLordOfWu.java index 4265fe528d7..8eab1ccfe58 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/SunQuanLordOfWu.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/SunQuanLordOfWu.java @@ -52,7 +52,6 @@ public class SunQuanLordOfWu extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/TaoistHermit.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/TaoistHermit.java index 03b6797d8fa..f9f6cabd296 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/TaoistHermit.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/TaoistHermit.java @@ -46,7 +46,6 @@ public class TaoistHermit extends CardImpl { this.subtype.add("Human"); this.subtype.add("Mystic"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ThreeVisits.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ThreeVisits.java index a44356de41c..a1e82b712a3 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ThreeVisits.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ThreeVisits.java @@ -51,7 +51,6 @@ public class ThreeVisits extends CardImpl { super(ownerId, 153, "Three Visits", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "PTK"; - this.color.setGreen(true); // Search your library for a Forest card and put that card onto the battlefield. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter))); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/TrainedJackal.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/TrainedJackal.java index ade56608640..a5b445a5ba8 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/TrainedJackal.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/TrainedJackal.java @@ -44,7 +44,6 @@ public class TrainedJackal extends CardImpl { this.expansionSetCode = "PTK"; this.subtype.add("Hound"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/VolunteerMilitia.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/VolunteerMilitia.java index beb884f9583..406e0090498 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/VolunteerMilitia.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/VolunteerMilitia.java @@ -45,7 +45,6 @@ public class VolunteerMilitia extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/WeiInfantry.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/WeiInfantry.java index 471cdb4798c..a9275a2a2cd 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/WeiInfantry.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/WeiInfantry.java @@ -45,7 +45,6 @@ public class WeiInfantry extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/WuInfantry.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/WuInfantry.java index 56f63f453da..3d72a05ba05 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/WuInfantry.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/WuInfantry.java @@ -45,7 +45,6 @@ public class WuInfantry extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacDog.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacDog.java index 4b94d6498ed..200be0c75f4 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacDog.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacDog.java @@ -45,7 +45,6 @@ public class ZodiacDog extends CardImpl { this.expansionSetCode = "PTK"; this.subtype.add("Hound"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacGoat.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacGoat.java index 29dc4efd7dd..868613d2892 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacGoat.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacGoat.java @@ -45,7 +45,6 @@ public class ZodiacGoat extends CardImpl { this.expansionSetCode = "PTK"; this.subtype.add("Goat"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacHorse.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacHorse.java index 339c6d16c76..63b42b8e853 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacHorse.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacHorse.java @@ -45,7 +45,6 @@ public class ZodiacHorse extends CardImpl { this.expansionSetCode = "PTK"; this.subtype.add("Horse"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacOx.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacOx.java index e4c0db5fb9c..fe45c6bfa0f 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacOx.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacOx.java @@ -45,7 +45,6 @@ public class ZodiacOx extends CardImpl { this.expansionSetCode = "PTK"; this.subtype.add("Ox"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacPig.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacPig.java index 20b913a90b8..035db4d8edf 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacPig.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacPig.java @@ -45,7 +45,6 @@ public class ZodiacPig extends CardImpl { this.expansionSetCode = "PTK"; this.subtype.add("Boar"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacRabbit.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacRabbit.java index 9e332102d0b..37363b2cddd 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacRabbit.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacRabbit.java @@ -45,7 +45,6 @@ public class ZodiacRabbit extends CardImpl { this.expansionSetCode = "PTK"; this.subtype.add("Rabbit"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacRat.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacRat.java index cefb7740593..80d0a8bf9e0 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacRat.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacRat.java @@ -45,7 +45,6 @@ public class ZodiacRat extends CardImpl { this.expansionSetCode = "PTK"; this.subtype.add("Rat"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacRooster.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacRooster.java index 94493d395f5..1d1f64a7308 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacRooster.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacRooster.java @@ -45,7 +45,6 @@ public class ZodiacRooster extends CardImpl { this.expansionSetCode = "PTK"; this.subtype.add("Bird"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacSnake.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacSnake.java index 2d8a1bb3e11..ca8a975273d 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacSnake.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacSnake.java @@ -45,7 +45,6 @@ public class ZodiacSnake extends CardImpl { this.expansionSetCode = "PTK"; this.subtype.add("Snake"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacTiger.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacTiger.java index 08f7222c218..fe9541207b7 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacTiger.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacTiger.java @@ -45,7 +45,6 @@ public class ZodiacTiger extends CardImpl { this.expansionSetCode = "PTK"; this.subtype.add("Cat"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/prophecy/AvatarOfFury.java b/Mage.Sets/src/mage/sets/prophecy/AvatarOfFury.java index 58f94fd07f3..bdbb8046641 100644 --- a/Mage.Sets/src/mage/sets/prophecy/AvatarOfFury.java +++ b/Mage.Sets/src/mage/sets/prophecy/AvatarOfFury.java @@ -58,7 +58,6 @@ public class AvatarOfFury extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Avatar"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/prophecy/CoastalHornclaw.java b/Mage.Sets/src/mage/sets/prophecy/CoastalHornclaw.java index 0b0aa45a88d..61f91021329 100644 --- a/Mage.Sets/src/mage/sets/prophecy/CoastalHornclaw.java +++ b/Mage.Sets/src/mage/sets/prophecy/CoastalHornclaw.java @@ -57,7 +57,6 @@ public class CoastalHornclaw extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/prophecy/Foil.java b/Mage.Sets/src/mage/sets/prophecy/Foil.java index d979c65c970..638a753653e 100644 --- a/Mage.Sets/src/mage/sets/prophecy/Foil.java +++ b/Mage.Sets/src/mage/sets/prophecy/Foil.java @@ -55,7 +55,6 @@ public class Foil extends CardImpl { super(ownerId, 34, "Foil", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); this.expansionSetCode = "PCY"; - this.color.setBlue(true); // You may discard an Island card and another card rather than pay Foil's mana cost. Ability ability = new AlternativeCostSourceAbility(new DiscardTargetCost(new TargetCardInHand(filter))); diff --git a/Mage.Sets/src/mage/sets/prophecy/HazyHomunculus.java b/Mage.Sets/src/mage/sets/prophecy/HazyHomunculus.java index 4c05ce89eae..77bfca0e16c 100644 --- a/Mage.Sets/src/mage/sets/prophecy/HazyHomunculus.java +++ b/Mage.Sets/src/mage/sets/prophecy/HazyHomunculus.java @@ -61,7 +61,6 @@ public class HazyHomunculus extends CardImpl { this.subtype.add("Homunculus"); this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java b/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java index 48a3b536f9b..4b1b8fa29b2 100644 --- a/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java +++ b/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java @@ -51,7 +51,6 @@ public class InfernalGenesis extends CardImpl { super(ownerId, 68, "Infernal Genesis", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{B}{B}"); this.expansionSetCode = "PCY"; - this.color.setBlack(true); // At the beginning of each player's upkeep, that player puts the top card of his or her library into his or her graveyard. Then he or she puts X 1/1 black Minion creature tokens onto the battlefield, where X is that card's converted mana cost. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new InfernalGenesisEffect(), TargetController.ANY, false)); diff --git a/Mage.Sets/src/mage/sets/prophecy/LesserGargadon.java b/Mage.Sets/src/mage/sets/prophecy/LesserGargadon.java index da449eaa780..50897537ca4 100644 --- a/Mage.Sets/src/mage/sets/prophecy/LesserGargadon.java +++ b/Mage.Sets/src/mage/sets/prophecy/LesserGargadon.java @@ -47,7 +47,6 @@ public class LesserGargadon extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/prophecy/LivingTerrain.java b/Mage.Sets/src/mage/sets/prophecy/LivingTerrain.java index 00171544202..2430cec8be6 100644 --- a/Mage.Sets/src/mage/sets/prophecy/LivingTerrain.java +++ b/Mage.Sets/src/mage/sets/prophecy/LivingTerrain.java @@ -53,7 +53,6 @@ public class LivingTerrain extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant land diff --git a/Mage.Sets/src/mage/sets/prophecy/MarshBoa.java b/Mage.Sets/src/mage/sets/prophecy/MarshBoa.java index 1b9f368f625..a966d1d763f 100644 --- a/Mage.Sets/src/mage/sets/prophecy/MarshBoa.java +++ b/Mage.Sets/src/mage/sets/prophecy/MarshBoa.java @@ -45,7 +45,6 @@ public class MarshBoa extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Snake"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/prophecy/MunghaWurm.java b/Mage.Sets/src/mage/sets/prophecy/MunghaWurm.java index 8763729c482..1af0b15ceb0 100644 --- a/Mage.Sets/src/mage/sets/prophecy/MunghaWurm.java +++ b/Mage.Sets/src/mage/sets/prophecy/MunghaWurm.java @@ -53,7 +53,6 @@ public class MunghaWurm extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/prophecy/NakayaShade.java b/Mage.Sets/src/mage/sets/prophecy/NakayaShade.java index 499b2640f76..cca32a40ab8 100644 --- a/Mage.Sets/src/mage/sets/prophecy/NakayaShade.java +++ b/Mage.Sets/src/mage/sets/prophecy/NakayaShade.java @@ -51,7 +51,6 @@ public class NakayaShade extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Shade"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/prophecy/PlagueWind.java b/Mage.Sets/src/mage/sets/prophecy/PlagueWind.java index 8b8a78d1219..1fca6a93d59 100644 --- a/Mage.Sets/src/mage/sets/prophecy/PlagueWind.java +++ b/Mage.Sets/src/mage/sets/prophecy/PlagueWind.java @@ -52,7 +52,6 @@ public class PlagueWind extends CardImpl { super(ownerId, 74, "Plague Wind", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{7}{B}{B}"); this.expansionSetCode = "PCY"; - this.color.setBlack(true); // Destroy all creatures you don't control. They can't be regenerated. this.getSpellAbility().addEffect(new DestroyAllEffect(filter, true)); diff --git a/Mage.Sets/src/mage/sets/prophecy/PygmyRazorback.java b/Mage.Sets/src/mage/sets/prophecy/PygmyRazorback.java index 343ffd45d40..87b9618eead 100644 --- a/Mage.Sets/src/mage/sets/prophecy/PygmyRazorback.java +++ b/Mage.Sets/src/mage/sets/prophecy/PygmyRazorback.java @@ -45,7 +45,6 @@ public class PygmyRazorback extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Boar"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/prophecy/RibCageSpider.java b/Mage.Sets/src/mage/sets/prophecy/RibCageSpider.java index 3a2f1b3596b..7fb85bb5787 100644 --- a/Mage.Sets/src/mage/sets/prophecy/RibCageSpider.java +++ b/Mage.Sets/src/mage/sets/prophecy/RibCageSpider.java @@ -45,7 +45,6 @@ public class RibCageSpider extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Spider"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/prophecy/RidgelineRager.java b/Mage.Sets/src/mage/sets/prophecy/RidgelineRager.java index 5fee6d2a7b1..573c7187ac6 100644 --- a/Mage.Sets/src/mage/sets/prophecy/RidgelineRager.java +++ b/Mage.Sets/src/mage/sets/prophecy/RidgelineRager.java @@ -50,7 +50,6 @@ public class RidgelineRager extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/prophecy/SearingWind.java b/Mage.Sets/src/mage/sets/prophecy/SearingWind.java index 61ac9e7f722..16eab13aa05 100644 --- a/Mage.Sets/src/mage/sets/prophecy/SearingWind.java +++ b/Mage.Sets/src/mage/sets/prophecy/SearingWind.java @@ -44,7 +44,6 @@ public class SearingWind extends CardImpl { super(ownerId, 103, "Searing Wind", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{8}{R}"); this.expansionSetCode = "PCY"; - this.color.setRed(true); // Searing Wind deals 10 damage to target creature or player. this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/prophecy/ShieldDancer.java b/Mage.Sets/src/mage/sets/prophecy/ShieldDancer.java index 34568fe6a8a..c21941250c4 100644 --- a/Mage.Sets/src/mage/sets/prophecy/ShieldDancer.java +++ b/Mage.Sets/src/mage/sets/prophecy/ShieldDancer.java @@ -57,7 +57,6 @@ public class ShieldDancer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/prophecy/SpittingSpider.java b/Mage.Sets/src/mage/sets/prophecy/SpittingSpider.java index db60397c30c..3aca37e80b0 100644 --- a/Mage.Sets/src/mage/sets/prophecy/SpittingSpider.java +++ b/Mage.Sets/src/mage/sets/prophecy/SpittingSpider.java @@ -59,7 +59,6 @@ public class SpittingSpider extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Spider"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/prophecy/SporeFrog.java b/Mage.Sets/src/mage/sets/prophecy/SporeFrog.java index f9a6653c725..cf8835aad7a 100644 --- a/Mage.Sets/src/mage/sets/prophecy/SporeFrog.java +++ b/Mage.Sets/src/mage/sets/prophecy/SporeFrog.java @@ -51,7 +51,6 @@ public class SporeFrog extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Frog"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/prophecy/SquirrelWrangler.java b/Mage.Sets/src/mage/sets/prophecy/SquirrelWrangler.java index 99b90e9f159..e2ffec24582 100644 --- a/Mage.Sets/src/mage/sets/prophecy/SquirrelWrangler.java +++ b/Mage.Sets/src/mage/sets/prophecy/SquirrelWrangler.java @@ -61,7 +61,6 @@ public class SquirrelWrangler extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/prophecy/SwordDancer.java b/Mage.Sets/src/mage/sets/prophecy/SwordDancer.java index bf2a7bb2da0..d965348c80c 100644 --- a/Mage.Sets/src/mage/sets/prophecy/SwordDancer.java +++ b/Mage.Sets/src/mage/sets/prophecy/SwordDancer.java @@ -53,7 +53,6 @@ public class SwordDancer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/prophecy/VerdantField.java b/Mage.Sets/src/mage/sets/prophecy/VerdantField.java index d177a9a75c1..40a4f7f478c 100644 --- a/Mage.Sets/src/mage/sets/prophecy/VerdantField.java +++ b/Mage.Sets/src/mage/sets/prophecy/VerdantField.java @@ -54,7 +54,6 @@ public class VerdantField extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/ravnica/BelltowerSphinx.java b/Mage.Sets/src/mage/sets/ravnica/BelltowerSphinx.java index a16f84596a1..1815f45eda4 100644 --- a/Mage.Sets/src/mage/sets/ravnica/BelltowerSphinx.java +++ b/Mage.Sets/src/mage/sets/ravnica/BelltowerSphinx.java @@ -53,7 +53,6 @@ public class BelltowerSphinx extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Sphinx"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/ravnica/BorosRecruit.java b/Mage.Sets/src/mage/sets/ravnica/BorosRecruit.java index 3b8429bda14..7ea100fe09b 100644 --- a/Mage.Sets/src/mage/sets/ravnica/BorosRecruit.java +++ b/Mage.Sets/src/mage/sets/ravnica/BorosRecruit.java @@ -46,8 +46,6 @@ public class BorosRecruit extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Soldier"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/Caregiver.java b/Mage.Sets/src/mage/sets/ravnica/Caregiver.java index 2ad99c25257..eeff7f7afcb 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Caregiver.java +++ b/Mage.Sets/src/mage/sets/ravnica/Caregiver.java @@ -52,7 +52,6 @@ public class Caregiver extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/CarrionHowler.java b/Mage.Sets/src/mage/sets/ravnica/CarrionHowler.java index d2fa3a8264d..cbdea9b6b41 100644 --- a/Mage.Sets/src/mage/sets/ravnica/CarrionHowler.java +++ b/Mage.Sets/src/mage/sets/ravnica/CarrionHowler.java @@ -51,7 +51,6 @@ public class CarrionHowler extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Wolf"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/CarvenCaryatid.java b/Mage.Sets/src/mage/sets/ravnica/CarvenCaryatid.java index a263ad23aa5..62a3bf74023 100644 --- a/Mage.Sets/src/mage/sets/ravnica/CarvenCaryatid.java +++ b/Mage.Sets/src/mage/sets/ravnica/CarvenCaryatid.java @@ -47,7 +47,6 @@ public class CarvenCaryatid extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/ravnica/CentaurSafeguard.java b/Mage.Sets/src/mage/sets/ravnica/CentaurSafeguard.java index 91e39c86b74..4f523f6f7c6 100644 --- a/Mage.Sets/src/mage/sets/ravnica/CentaurSafeguard.java +++ b/Mage.Sets/src/mage/sets/ravnica/CentaurSafeguard.java @@ -47,8 +47,6 @@ public class CentaurSafeguard extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Warrior"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/Char.java b/Mage.Sets/src/mage/sets/ravnica/Char.java index 1bc231b75a9..d031a75f20e 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Char.java +++ b/Mage.Sets/src/mage/sets/ravnica/Char.java @@ -47,7 +47,6 @@ public class Char extends CardImpl { super(ownerId, 117, "Char", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "RAV"; - this.color.setRed(true); // Char deals 4 damage to target creature or player and 2 damage to you. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); diff --git a/Mage.Sets/src/mage/sets/ravnica/ChordOfCalling.java b/Mage.Sets/src/mage/sets/ravnica/ChordOfCalling.java index c475447bedb..b605b87f8b5 100644 --- a/Mage.Sets/src/mage/sets/ravnica/ChordOfCalling.java +++ b/Mage.Sets/src/mage/sets/ravnica/ChordOfCalling.java @@ -56,7 +56,6 @@ public class ChordOfCalling extends CardImpl { super(ownerId, 156, "Chord of Calling", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{G}{G}{G}"); this.expansionSetCode = "RAV"; - this.color.setGreen(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/ravnica/ClingingDarkness.java b/Mage.Sets/src/mage/sets/ravnica/ClingingDarkness.java index f754fbb080f..2896de38fa4 100644 --- a/Mage.Sets/src/mage/sets/ravnica/ClingingDarkness.java +++ b/Mage.Sets/src/mage/sets/ravnica/ClingingDarkness.java @@ -49,7 +49,6 @@ public class ClingingDarkness extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/ravnica/ClutchOfTheUndercity.java b/Mage.Sets/src/mage/sets/ravnica/ClutchOfTheUndercity.java index 1cb869c6efe..0c0f2447614 100644 --- a/Mage.Sets/src/mage/sets/ravnica/ClutchOfTheUndercity.java +++ b/Mage.Sets/src/mage/sets/ravnica/ClutchOfTheUndercity.java @@ -46,8 +46,6 @@ public class ClutchOfTheUndercity extends CardImpl { super(ownerId, 197, "Clutch of the Undercity", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{U}{B}"); this.expansionSetCode = "RAV"; - this.color.setBlue(true); - this.color.setBlack(true); // Return target permanent to its owner's hand. Its controller loses 3 life. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/ravnica/CompulsiveResearch.java b/Mage.Sets/src/mage/sets/ravnica/CompulsiveResearch.java index a0889671ac8..91b042205ac 100644 --- a/Mage.Sets/src/mage/sets/ravnica/CompulsiveResearch.java +++ b/Mage.Sets/src/mage/sets/ravnica/CompulsiveResearch.java @@ -51,7 +51,6 @@ public class CompulsiveResearch extends CardImpl { super(ownerId, 40, "Compulsive Research", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "RAV"; - this.color.setBlue(true); // Target player draws three cards. Then that player discards two cards unless he or she discards a land card. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/ravnica/CongregationAtDawn.java b/Mage.Sets/src/mage/sets/ravnica/CongregationAtDawn.java index eeb9fdccd5d..c8dca0990b5 100644 --- a/Mage.Sets/src/mage/sets/ravnica/CongregationAtDawn.java +++ b/Mage.Sets/src/mage/sets/ravnica/CongregationAtDawn.java @@ -57,8 +57,6 @@ public class CongregationAtDawn extends CardImpl { super(ownerId, 198, "Congregation at Dawn", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}{G}{W}"); this.expansionSetCode = "RAV"; - this.color.setGreen(true); - this.color.setWhite(true); // Search your library for up to three creature cards and reveal them. Shuffle your library, then put those cards on top of it in any order. this.getSpellAbility().addEffect(new CongregationAtDawnEffect()); diff --git a/Mage.Sets/src/mage/sets/ravnica/ConsultTheNecrosages.java b/Mage.Sets/src/mage/sets/ravnica/ConsultTheNecrosages.java index 8869dfa1d26..ed237f0793f 100644 --- a/Mage.Sets/src/mage/sets/ravnica/ConsultTheNecrosages.java +++ b/Mage.Sets/src/mage/sets/ravnica/ConsultTheNecrosages.java @@ -46,8 +46,6 @@ public class ConsultTheNecrosages extends CardImpl { super(ownerId, 199, "Consult the Necrosages", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{U}{B}"); this.expansionSetCode = "RAV"; - this.color.setBlue(true); - this.color.setBlack(true); // Choose one - Target player draws two cards; or target player discards two cards. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/ravnica/Convolute.java b/Mage.Sets/src/mage/sets/ravnica/Convolute.java index 7afe58b52dd..eff16d18ec5 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Convolute.java +++ b/Mage.Sets/src/mage/sets/ravnica/Convolute.java @@ -45,7 +45,6 @@ public class Convolute extends CardImpl { super(ownerId, 41, "Convolute", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "RAV"; - this.color.setBlue(true); // Counter target spell unless its controller pays {4}. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/ravnica/CopyEnchantment.java b/Mage.Sets/src/mage/sets/ravnica/CopyEnchantment.java index c0c61986c36..f8c469ed658 100644 --- a/Mage.Sets/src/mage/sets/ravnica/CopyEnchantment.java +++ b/Mage.Sets/src/mage/sets/ravnica/CopyEnchantment.java @@ -58,7 +58,6 @@ public class CopyEnchantment extends CardImpl { super(ownerId, 42, "Copy Enchantment", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "RAV"; - this.color.setBlue(true); // You may have Copy Enchantment enter the battlefield as a copy of any enchantment on the battlefield. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new EntersBattlefieldEffect( diff --git a/Mage.Sets/src/mage/sets/ravnica/CourierHawk.java b/Mage.Sets/src/mage/sets/ravnica/CourierHawk.java index 4c61f20efbd..a11c22fb0ea 100644 --- a/Mage.Sets/src/mage/sets/ravnica/CourierHawk.java +++ b/Mage.Sets/src/mage/sets/ravnica/CourierHawk.java @@ -46,7 +46,6 @@ public class CourierHawk extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Bird"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/DarkConfidant.java b/Mage.Sets/src/mage/sets/ravnica/DarkConfidant.java index f27d7a1530b..830ed264fa4 100644 --- a/Mage.Sets/src/mage/sets/ravnica/DarkConfidant.java +++ b/Mage.Sets/src/mage/sets/ravnica/DarkConfidant.java @@ -58,7 +58,6 @@ public class DarkConfidant extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/DarkHeartOfTheWood.java b/Mage.Sets/src/mage/sets/ravnica/DarkHeartOfTheWood.java index 26121b2a89d..50718940499 100644 --- a/Mage.Sets/src/mage/sets/ravnica/DarkHeartOfTheWood.java +++ b/Mage.Sets/src/mage/sets/ravnica/DarkHeartOfTheWood.java @@ -56,8 +56,6 @@ public class DarkHeartOfTheWood extends CardImpl { super(ownerId, 200, "Dark Heart of the Wood", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}{G}"); this.expansionSetCode = "RAV"; - this.color.setGreen(true); - this.color.setBlack(true); // Sacrifice a Forest: You gain 3 life. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); diff --git a/Mage.Sets/src/mage/sets/ravnica/Darkblast.java b/Mage.Sets/src/mage/sets/ravnica/Darkblast.java index 9a600c67e8a..96caefa2c2a 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Darkblast.java +++ b/Mage.Sets/src/mage/sets/ravnica/Darkblast.java @@ -46,7 +46,6 @@ public class Darkblast extends CardImpl { super(ownerId, 82, "Darkblast", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "RAV"; - this.color.setBlack(true); // Target creature gets -1/-1 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-1, -1, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/ravnica/DevouringLight.java b/Mage.Sets/src/mage/sets/ravnica/DevouringLight.java index 114e3237037..6a39a176f3a 100644 --- a/Mage.Sets/src/mage/sets/ravnica/DevouringLight.java +++ b/Mage.Sets/src/mage/sets/ravnica/DevouringLight.java @@ -45,7 +45,6 @@ public class DevouringLight extends CardImpl { super(ownerId, 13, "Devouring Light", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}{W}"); this.expansionSetCode = "RAV"; - this.color.setWhite(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/ravnica/DimirCutpurse.java b/Mage.Sets/src/mage/sets/ravnica/DimirCutpurse.java index ba5462a8c13..015bba1ea82 100644 --- a/Mage.Sets/src/mage/sets/ravnica/DimirCutpurse.java +++ b/Mage.Sets/src/mage/sets/ravnica/DimirCutpurse.java @@ -51,8 +51,6 @@ public class DimirCutpurse extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Spirit"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/DimirDoppelganger.java b/Mage.Sets/src/mage/sets/ravnica/DimirDoppelganger.java index 25154ff4ab4..9cc2cf0d14b 100644 --- a/Mage.Sets/src/mage/sets/ravnica/DimirDoppelganger.java +++ b/Mage.Sets/src/mage/sets/ravnica/DimirDoppelganger.java @@ -58,8 +58,6 @@ public class DimirDoppelganger extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Shapeshifter"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/DimirGuildmage.java b/Mage.Sets/src/mage/sets/ravnica/DimirGuildmage.java index 9e93fe22677..b6d89069659 100644 --- a/Mage.Sets/src/mage/sets/ravnica/DimirGuildmage.java +++ b/Mage.Sets/src/mage/sets/ravnica/DimirGuildmage.java @@ -53,8 +53,6 @@ public class DimirGuildmage extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/DimirHouseGuard.java b/Mage.Sets/src/mage/sets/ravnica/DimirHouseGuard.java index c597d5c174a..2befa44791f 100644 --- a/Mage.Sets/src/mage/sets/ravnica/DimirHouseGuard.java +++ b/Mage.Sets/src/mage/sets/ravnica/DimirHouseGuard.java @@ -52,7 +52,6 @@ public class DimirHouseGuard extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Skeleton"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ravnica/DimirInfiltrator.java b/Mage.Sets/src/mage/sets/ravnica/DimirInfiltrator.java index b6f929395b5..44580556120 100644 --- a/Mage.Sets/src/mage/sets/ravnica/DimirInfiltrator.java +++ b/Mage.Sets/src/mage/sets/ravnica/DimirInfiltrator.java @@ -46,8 +46,6 @@ public class DimirInfiltrator extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Spirit"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ravnica/DivebomberGriffin.java b/Mage.Sets/src/mage/sets/ravnica/DivebomberGriffin.java index be93d90c573..58b8961751e 100644 --- a/Mage.Sets/src/mage/sets/ravnica/DivebomberGriffin.java +++ b/Mage.Sets/src/mage/sets/ravnica/DivebomberGriffin.java @@ -54,7 +54,6 @@ public class DivebomberGriffin extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Griffin"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/DizzySpell.java b/Mage.Sets/src/mage/sets/ravnica/DizzySpell.java index 1a08885d093..e1077a7451b 100644 --- a/Mage.Sets/src/mage/sets/ravnica/DizzySpell.java +++ b/Mage.Sets/src/mage/sets/ravnica/DizzySpell.java @@ -47,7 +47,6 @@ public class DizzySpell extends CardImpl { super(ownerId, 43, "Dizzy Spell", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "RAV"; - this.color.setBlue(true); // Target creature gets -3/-0 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-3, 0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/ravnica/DowsingShaman.java b/Mage.Sets/src/mage/sets/ravnica/DowsingShaman.java index a247a9d7000..75cd19b3ffd 100644 --- a/Mage.Sets/src/mage/sets/ravnica/DowsingShaman.java +++ b/Mage.Sets/src/mage/sets/ravnica/DowsingShaman.java @@ -61,7 +61,6 @@ public class DowsingShaman extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ravnica/DriftOfPhantasms.java b/Mage.Sets/src/mage/sets/ravnica/DriftOfPhantasms.java index 9925564fd99..6aac58f3962 100644 --- a/Mage.Sets/src/mage/sets/ravnica/DriftOfPhantasms.java +++ b/Mage.Sets/src/mage/sets/ravnica/DriftOfPhantasms.java @@ -47,7 +47,6 @@ public class DriftOfPhantasms extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/ravnica/ElvesOfDeepShadow.java b/Mage.Sets/src/mage/sets/ravnica/ElvesOfDeepShadow.java index be92ae4fe21..5239af3ab9a 100644 --- a/Mage.Sets/src/mage/sets/ravnica/ElvesOfDeepShadow.java +++ b/Mage.Sets/src/mage/sets/ravnica/ElvesOfDeepShadow.java @@ -52,7 +52,6 @@ public class ElvesOfDeepShadow extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/ElvishSkysweeper.java b/Mage.Sets/src/mage/sets/ravnica/ElvishSkysweeper.java index 2250ca46088..a1a3faed02c 100644 --- a/Mage.Sets/src/mage/sets/ravnica/ElvishSkysweeper.java +++ b/Mage.Sets/src/mage/sets/ravnica/ElvishSkysweeper.java @@ -63,7 +63,6 @@ public class ElvishSkysweeper extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/EtherealUsher.java b/Mage.Sets/src/mage/sets/ravnica/EtherealUsher.java index e53631e3fb4..b1ab5b005ee 100644 --- a/Mage.Sets/src/mage/sets/ravnica/EtherealUsher.java +++ b/Mage.Sets/src/mage/sets/ravnica/EtherealUsher.java @@ -52,7 +52,6 @@ public class EtherealUsher extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ravnica/Farseek.java b/Mage.Sets/src/mage/sets/ravnica/Farseek.java index b676b62f30f..fda117c6a14 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Farseek.java +++ b/Mage.Sets/src/mage/sets/ravnica/Farseek.java @@ -59,7 +59,6 @@ public class Farseek extends CardImpl { super(ownerId, 163, "Farseek", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "RAV"; - this.color.setGreen(true); // Search your library for a Plains, Island, Swamp, or Mountain card and put it onto the battlefield tapped. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), true, Outcome.PutLandInPlay)); diff --git a/Mage.Sets/src/mage/sets/ravnica/FieryConclusion.java b/Mage.Sets/src/mage/sets/ravnica/FieryConclusion.java index c644aa574c2..1414e2b710c 100644 --- a/Mage.Sets/src/mage/sets/ravnica/FieryConclusion.java +++ b/Mage.Sets/src/mage/sets/ravnica/FieryConclusion.java @@ -46,7 +46,6 @@ public class FieryConclusion extends CardImpl { super(ownerId, 122, "Fiery Conclusion", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "RAV"; - this.color.setRed(true); // As an additional cost to cast Fiery Conclusion, sacrifice a creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/ravnica/FiremaneAngel.java b/Mage.Sets/src/mage/sets/ravnica/FiremaneAngel.java index 8fd6b6c6056..d23339da7fe 100644 --- a/Mage.Sets/src/mage/sets/ravnica/FiremaneAngel.java +++ b/Mage.Sets/src/mage/sets/ravnica/FiremaneAngel.java @@ -60,8 +60,6 @@ public class FiremaneAngel extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Angel"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ravnica/FistsOfIronwood.java b/Mage.Sets/src/mage/sets/ravnica/FistsOfIronwood.java index 05910004f49..7cd7e140fbd 100644 --- a/Mage.Sets/src/mage/sets/ravnica/FistsOfIronwood.java +++ b/Mage.Sets/src/mage/sets/ravnica/FistsOfIronwood.java @@ -54,7 +54,6 @@ public class FistsOfIronwood extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/ravnica/FlameFusillade.java b/Mage.Sets/src/mage/sets/ravnica/FlameFusillade.java index 03f72230385..ddcdc5f5bf5 100644 --- a/Mage.Sets/src/mage/sets/ravnica/FlameFusillade.java +++ b/Mage.Sets/src/mage/sets/ravnica/FlameFusillade.java @@ -51,7 +51,6 @@ public class FlameFusillade extends CardImpl { super(ownerId, 123, "Flame Fusillade", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "RAV"; - this.color.setRed(true); // Until end of turn, permanents you control gain "{tap}: This permanent deals 1 damage to target creature or player." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/ravnica/FlameKinZealot.java b/Mage.Sets/src/mage/sets/ravnica/FlameKinZealot.java index 3d3f5bf228f..5545240ce4c 100644 --- a/Mage.Sets/src/mage/sets/ravnica/FlameKinZealot.java +++ b/Mage.Sets/src/mage/sets/ravnica/FlameKinZealot.java @@ -53,8 +53,6 @@ public class FlameKinZealot extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Berserker"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/FlightOfFancy.java b/Mage.Sets/src/mage/sets/ravnica/FlightOfFancy.java index cffe1705d05..2971c4876e7 100644 --- a/Mage.Sets/src/mage/sets/ravnica/FlightOfFancy.java +++ b/Mage.Sets/src/mage/sets/ravnica/FlightOfFancy.java @@ -53,7 +53,6 @@ public class FlightOfFancy extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/ravnica/FrenziedGoblin.java b/Mage.Sets/src/mage/sets/ravnica/FrenziedGoblin.java index 77aa289aa84..b9c8fb1f02d 100644 --- a/Mage.Sets/src/mage/sets/ravnica/FrenziedGoblin.java +++ b/Mage.Sets/src/mage/sets/ravnica/FrenziedGoblin.java @@ -53,7 +53,6 @@ public class FrenziedGoblin extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Berserker"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/GalvanicArc.java b/Mage.Sets/src/mage/sets/ravnica/GalvanicArc.java index 69ee6f0f6a6..7c7d98a36b9 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GalvanicArc.java +++ b/Mage.Sets/src/mage/sets/ravnica/GalvanicArc.java @@ -54,7 +54,6 @@ public class GalvanicArc extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/ravnica/GateHound.java b/Mage.Sets/src/mage/sets/ravnica/GateHound.java index e41fcd273e9..27c622cdf80 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GateHound.java +++ b/Mage.Sets/src/mage/sets/ravnica/GateHound.java @@ -52,7 +52,6 @@ public class GateHound extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Hound"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/GatherCourage.java b/Mage.Sets/src/mage/sets/ravnica/GatherCourage.java index 3b83c607b97..c2499f937f9 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GatherCourage.java +++ b/Mage.Sets/src/mage/sets/ravnica/GatherCourage.java @@ -47,7 +47,6 @@ public class GatherCourage extends CardImpl { super(ownerId, 165, "Gather Courage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "RAV"; - this.color.setGreen(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/ravnica/GlareOfSubdual.java b/Mage.Sets/src/mage/sets/ravnica/GlareOfSubdual.java index a9db099132c..77db56e0279 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GlareOfSubdual.java +++ b/Mage.Sets/src/mage/sets/ravnica/GlareOfSubdual.java @@ -65,8 +65,6 @@ public class GlareOfSubdual extends CardImpl { super(ownerId, 207, "Glare of Subdual", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{W}"); this.expansionSetCode = "RAV"; - this.color.setGreen(true); - this.color.setWhite(true); // Tap an untapped creature you control: Tap target artifact or creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filterCost, true))); diff --git a/Mage.Sets/src/mage/sets/ravnica/GlimpseTheUnthinkable.java b/Mage.Sets/src/mage/sets/ravnica/GlimpseTheUnthinkable.java index 2d4937b3cd4..91ccc59597f 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GlimpseTheUnthinkable.java +++ b/Mage.Sets/src/mage/sets/ravnica/GlimpseTheUnthinkable.java @@ -44,8 +44,6 @@ public class GlimpseTheUnthinkable extends CardImpl { super(ownerId, 208, "Glimpse the Unthinkable", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{U}{B}"); this.expansionSetCode = "RAV"; - this.color.setBlue(true); - this.color.setBlack(true); // Target player puts the top ten cards of his or her library into his or her graveyard. this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(10)); diff --git a/Mage.Sets/src/mage/sets/ravnica/GoblinSpelunkers.java b/Mage.Sets/src/mage/sets/ravnica/GoblinSpelunkers.java index 1e8ec7bdbeb..cc041a6a653 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GoblinSpelunkers.java +++ b/Mage.Sets/src/mage/sets/ravnica/GoblinSpelunkers.java @@ -46,7 +46,6 @@ public class GoblinSpelunkers extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/GolgariGraveTroll.java b/Mage.Sets/src/mage/sets/ravnica/GolgariGraveTroll.java index 6916bc1732f..1673b718af2 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GolgariGraveTroll.java +++ b/Mage.Sets/src/mage/sets/ravnica/GolgariGraveTroll.java @@ -61,7 +61,6 @@ public class GolgariGraveTroll extends CardImpl { this.subtype.add("Skeleton"); this.subtype.add("Troll"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/ravnica/GolgariRotwurm.java b/Mage.Sets/src/mage/sets/ravnica/GolgariRotwurm.java index 3dbf192ccc3..5902831398d 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GolgariRotwurm.java +++ b/Mage.Sets/src/mage/sets/ravnica/GolgariRotwurm.java @@ -55,8 +55,6 @@ public class GolgariRotwurm extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Wurm"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ravnica/GolgariThug.java b/Mage.Sets/src/mage/sets/ravnica/GolgariThug.java index a67ad039aeb..48129390fff 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GolgariThug.java +++ b/Mage.Sets/src/mage/sets/ravnica/GolgariThug.java @@ -58,7 +58,6 @@ public class GolgariThug extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/GoliathSpider.java b/Mage.Sets/src/mage/sets/ravnica/GoliathSpider.java index 33c46e3a1c6..66962438585 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GoliathSpider.java +++ b/Mage.Sets/src/mage/sets/ravnica/GoliathSpider.java @@ -45,7 +45,6 @@ public class GoliathSpider extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Spider"); - this.color.setGreen(true); this.power = new MageInt(7); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/ravnica/GraveShellScarab.java b/Mage.Sets/src/mage/sets/ravnica/GraveShellScarab.java index abf0e52128e..bb7892de4fc 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GraveShellScarab.java +++ b/Mage.Sets/src/mage/sets/ravnica/GraveShellScarab.java @@ -52,8 +52,6 @@ public class GraveShellScarab extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Insect"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ravnica/GreaterForgeling.java b/Mage.Sets/src/mage/sets/ravnica/GreaterForgeling.java index 910b9a31229..c00222b75a2 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GreaterForgeling.java +++ b/Mage.Sets/src/mage/sets/ravnica/GreaterForgeling.java @@ -50,7 +50,6 @@ public class GreaterForgeling extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ravnica/GreaterMossdog.java b/Mage.Sets/src/mage/sets/ravnica/GreaterMossdog.java index 0b3b0a73b0b..92346d0ec17 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GreaterMossdog.java +++ b/Mage.Sets/src/mage/sets/ravnica/GreaterMossdog.java @@ -46,7 +46,6 @@ public class GreaterMossdog extends CardImpl { this.subtype.add("Plant"); this.subtype.add("Hound"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ravnica/GuardianOfVituGhazi.java b/Mage.Sets/src/mage/sets/ravnica/GuardianOfVituGhazi.java index e78ec88d3e4..e2c8212c652 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GuardianOfVituGhazi.java +++ b/Mage.Sets/src/mage/sets/ravnica/GuardianOfVituGhazi.java @@ -46,8 +46,6 @@ public class GuardianOfVituGhazi extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Elemental"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/ravnica/HalcyonGlaze.java b/Mage.Sets/src/mage/sets/ravnica/HalcyonGlaze.java index d337b0c074b..52fcf810fbe 100644 --- a/Mage.Sets/src/mage/sets/ravnica/HalcyonGlaze.java +++ b/Mage.Sets/src/mage/sets/ravnica/HalcyonGlaze.java @@ -57,7 +57,6 @@ public class HalcyonGlaze extends CardImpl { super(ownerId, 54, "Halcyon Glaze", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}{U}"); this.expansionSetCode = "RAV"; - this.color.setBlue(true); // 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); diff --git a/Mage.Sets/src/mage/sets/ravnica/Hex.java b/Mage.Sets/src/mage/sets/ravnica/Hex.java index 6af019b798c..bebf899e632 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Hex.java +++ b/Mage.Sets/src/mage/sets/ravnica/Hex.java @@ -44,7 +44,6 @@ public class Hex extends CardImpl { super(ownerId, 89, "Hex", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{B}{B}"); this.expansionSetCode = "RAV"; - this.color.setBlack(true); // Destroy six target creatures. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/ravnica/HuntedDragon.java b/Mage.Sets/src/mage/sets/ravnica/HuntedDragon.java index 25a80e4b8b8..c8e042a2f22 100644 --- a/Mage.Sets/src/mage/sets/ravnica/HuntedDragon.java +++ b/Mage.Sets/src/mage/sets/ravnica/HuntedDragon.java @@ -54,7 +54,6 @@ public class HuntedDragon extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/ravnica/HuntedHorror.java b/Mage.Sets/src/mage/sets/ravnica/HuntedHorror.java index 94ad9858496..d080e6ed8c3 100644 --- a/Mage.Sets/src/mage/sets/ravnica/HuntedHorror.java +++ b/Mage.Sets/src/mage/sets/ravnica/HuntedHorror.java @@ -56,7 +56,6 @@ public class HuntedHorror extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/ravnica/HuntedLammasu.java b/Mage.Sets/src/mage/sets/ravnica/HuntedLammasu.java index c071ec539d1..4a691344c58 100644 --- a/Mage.Sets/src/mage/sets/ravnica/HuntedLammasu.java +++ b/Mage.Sets/src/mage/sets/ravnica/HuntedLammasu.java @@ -52,7 +52,6 @@ public class HuntedLammasu extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Lammasu"); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/ravnica/HuntedPhantasm.java b/Mage.Sets/src/mage/sets/ravnica/HuntedPhantasm.java index 59c75df0fac..c0bd01f1684 100644 --- a/Mage.Sets/src/mage/sets/ravnica/HuntedPhantasm.java +++ b/Mage.Sets/src/mage/sets/ravnica/HuntedPhantasm.java @@ -51,7 +51,6 @@ public class HuntedPhantasm extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/ravnica/HuntedTroll.java b/Mage.Sets/src/mage/sets/ravnica/HuntedTroll.java index 3c9ef802e30..faee3505cf0 100644 --- a/Mage.Sets/src/mage/sets/ravnica/HuntedTroll.java +++ b/Mage.Sets/src/mage/sets/ravnica/HuntedTroll.java @@ -59,7 +59,6 @@ public class HuntedTroll extends CardImpl { this.subtype.add("Troll"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(8); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ravnica/InfectiousHost.java b/Mage.Sets/src/mage/sets/ravnica/InfectiousHost.java index c99620444df..0ee9974290d 100644 --- a/Mage.Sets/src/mage/sets/ravnica/InfectiousHost.java +++ b/Mage.Sets/src/mage/sets/ravnica/InfectiousHost.java @@ -48,7 +48,6 @@ public class InfectiousHost extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/IvyDancer.java b/Mage.Sets/src/mage/sets/ravnica/IvyDancer.java index 641bb6bf1d6..189daa2b9f4 100644 --- a/Mage.Sets/src/mage/sets/ravnica/IvyDancer.java +++ b/Mage.Sets/src/mage/sets/ravnica/IvyDancer.java @@ -54,7 +54,6 @@ public class IvyDancer extends CardImpl { this.subtype.add("Dryad"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/KeeningBanshee.java b/Mage.Sets/src/mage/sets/ravnica/KeeningBanshee.java index 83b037d031b..f890f449112 100644 --- a/Mage.Sets/src/mage/sets/ravnica/KeeningBanshee.java +++ b/Mage.Sets/src/mage/sets/ravnica/KeeningBanshee.java @@ -51,7 +51,6 @@ public class KeeningBanshee extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/LastGasp.java b/Mage.Sets/src/mage/sets/ravnica/LastGasp.java index db982fb59f9..3d321a3dcef 100644 --- a/Mage.Sets/src/mage/sets/ravnica/LastGasp.java +++ b/Mage.Sets/src/mage/sets/ravnica/LastGasp.java @@ -46,7 +46,6 @@ public class LastGasp extends CardImpl { super(ownerId, 93, "Last Gasp", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "RAV"; - this.color.setBlack(true); // Target creature gets -3/-3 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -3, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/ravnica/LeaveNoTrace.java b/Mage.Sets/src/mage/sets/ravnica/LeaveNoTrace.java index 3d1e04787e8..cf9a98f6318 100644 --- a/Mage.Sets/src/mage/sets/ravnica/LeaveNoTrace.java +++ b/Mage.Sets/src/mage/sets/ravnica/LeaveNoTrace.java @@ -56,7 +56,6 @@ public class LeaveNoTrace extends CardImpl { super(ownerId, 23, "Leave No Trace", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "RAV"; - this.color.setWhite(true); // Radiance - Destroy target enchantment and each other enchantment that shares a color with it. this.getSpellAbility().addEffect(new LeaveNoTraceEffect()); diff --git a/Mage.Sets/src/mage/sets/ravnica/LifeFromTheLoam.java b/Mage.Sets/src/mage/sets/ravnica/LifeFromTheLoam.java index 437b2adcf8a..33a092c7563 100644 --- a/Mage.Sets/src/mage/sets/ravnica/LifeFromTheLoam.java +++ b/Mage.Sets/src/mage/sets/ravnica/LifeFromTheLoam.java @@ -46,7 +46,6 @@ public class LifeFromTheLoam extends CardImpl { super(ownerId, 172, "Life from the Loam", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "RAV"; - this.color.setGreen(true); // Return up to three target land cards from your graveyard to your hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/ravnica/LoreBroker.java b/Mage.Sets/src/mage/sets/ravnica/LoreBroker.java index 3fd0257be85..d9b6f523f56 100644 --- a/Mage.Sets/src/mage/sets/ravnica/LoreBroker.java +++ b/Mage.Sets/src/mage/sets/ravnica/LoreBroker.java @@ -52,7 +52,6 @@ public class LoreBroker extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/LoxodonHierarch.java b/Mage.Sets/src/mage/sets/ravnica/LoxodonHierarch.java index b555af121fa..82829262e02 100644 --- a/Mage.Sets/src/mage/sets/ravnica/LoxodonHierarch.java +++ b/Mage.Sets/src/mage/sets/ravnica/LoxodonHierarch.java @@ -63,8 +63,6 @@ public class LoxodonHierarch extends CardImpl { this.subtype.add("Elephant"); this.subtype.add("Cleric"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ravnica/MindleechMass.java b/Mage.Sets/src/mage/sets/ravnica/MindleechMass.java index 32ec937f53e..b339320f1df 100644 --- a/Mage.Sets/src/mage/sets/ravnica/MindleechMass.java +++ b/Mage.Sets/src/mage/sets/ravnica/MindleechMass.java @@ -57,8 +57,6 @@ public class MindleechMass extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Horror"); - this.color.setBlack(true); - this.color.setBlue(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/ravnica/Mindmoil.java b/Mage.Sets/src/mage/sets/ravnica/Mindmoil.java index 77ef82d8f52..b45b2478e6b 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Mindmoil.java +++ b/Mage.Sets/src/mage/sets/ravnica/Mindmoil.java @@ -55,7 +55,6 @@ public class Mindmoil extends CardImpl { super(ownerId, 135, "Mindmoil", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}"); this.expansionSetCode = "RAV"; - this.color.setRed(true); // Whenever you cast a spell, put the cards in your hand on the bottom of your library in any order, then draw that many cards. this.addAbility(new SpellCastControllerTriggeredAbility(new MindmoilEffect(), false)); diff --git a/Mage.Sets/src/mage/sets/ravnica/MoldervineCloak.java b/Mage.Sets/src/mage/sets/ravnica/MoldervineCloak.java index 19f54a56816..af70e8e6b97 100644 --- a/Mage.Sets/src/mage/sets/ravnica/MoldervineCloak.java +++ b/Mage.Sets/src/mage/sets/ravnica/MoldervineCloak.java @@ -53,7 +53,6 @@ public class MoldervineCloak extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/ravnica/Moroii.java b/Mage.Sets/src/mage/sets/ravnica/Moroii.java index 07d1d3274bb..836c4627120 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Moroii.java +++ b/Mage.Sets/src/mage/sets/ravnica/Moroii.java @@ -49,8 +49,6 @@ public class Moroii extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Vampire"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ravnica/MuddleTheMixture.java b/Mage.Sets/src/mage/sets/ravnica/MuddleTheMixture.java index dea53fcd02b..6d0fd8a4a52 100644 --- a/Mage.Sets/src/mage/sets/ravnica/MuddleTheMixture.java +++ b/Mage.Sets/src/mage/sets/ravnica/MuddleTheMixture.java @@ -55,7 +55,6 @@ public class MuddleTheMixture extends CardImpl { super(ownerId, 60, "Muddle the Mixture", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}{U}"); this.expansionSetCode = "RAV"; - this.color.setBlue(true); // Counter target instant or sorcery spell. this.getSpellAbility().addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/sets/ravnica/Necroplasm.java b/Mage.Sets/src/mage/sets/ravnica/Necroplasm.java index 4c713c0db71..ce5e622d82d 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Necroplasm.java +++ b/Mage.Sets/src/mage/sets/ravnica/Necroplasm.java @@ -59,7 +59,6 @@ public class Necroplasm extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Ooze"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/NightmareVoid.java b/Mage.Sets/src/mage/sets/ravnica/NightmareVoid.java index 77bee991aea..f574a7aab59 100644 --- a/Mage.Sets/src/mage/sets/ravnica/NightmareVoid.java +++ b/Mage.Sets/src/mage/sets/ravnica/NightmareVoid.java @@ -46,7 +46,6 @@ public class NightmareVoid extends CardImpl { super(ownerId, 100, "Nightmare Void", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "RAV"; - this.color.setBlack(true); // Target player reveals his or her hand. You choose a card from it. That player discards that card. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/ravnica/NullmageShepherd.java b/Mage.Sets/src/mage/sets/ravnica/NullmageShepherd.java index 8ec1dcb1041..ede068e74eb 100644 --- a/Mage.Sets/src/mage/sets/ravnica/NullmageShepherd.java +++ b/Mage.Sets/src/mage/sets/ravnica/NullmageShepherd.java @@ -68,7 +68,6 @@ public class NullmageShepherd extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ravnica/OathswornGiant.java b/Mage.Sets/src/mage/sets/ravnica/OathswornGiant.java index b1ed4247050..f00c92407f9 100644 --- a/Mage.Sets/src/mage/sets/ravnica/OathswornGiant.java +++ b/Mage.Sets/src/mage/sets/ravnica/OathswornGiant.java @@ -54,7 +54,6 @@ public class OathswornGiant extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ravnica/Overwhelm.java b/Mage.Sets/src/mage/sets/ravnica/Overwhelm.java index 13858b9a397..c2ea1ba7fc5 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Overwhelm.java +++ b/Mage.Sets/src/mage/sets/ravnica/Overwhelm.java @@ -45,7 +45,6 @@ public class Overwhelm extends CardImpl { super(ownerId, 175, "Overwhelm", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{5}{G}{G}"); this.expansionSetCode = "RAV"; - this.color.setGreen(true); // Convoke (Each creature you tap while casting this spell reduces its cost by {1} or by one mana of that creature's color.) this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/ravnica/Perplex.java b/Mage.Sets/src/mage/sets/ravnica/Perplex.java index 4ffadbeea89..2b629187214 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Perplex.java +++ b/Mage.Sets/src/mage/sets/ravnica/Perplex.java @@ -47,8 +47,6 @@ public class Perplex extends CardImpl { super(ownerId, 217, "Perplex", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{B}"); this.expansionSetCode = "RAV"; - this.color.setBlue(true); - this.color.setBlack(true); // Counter target spell unless its controller discards his or her hand. Effect effect = new CounterUnlessPaysEffect(new DiscardHandCost()); diff --git a/Mage.Sets/src/mage/sets/ravnica/Phytohydra.java b/Mage.Sets/src/mage/sets/ravnica/Phytohydra.java index 09e8c08cc1a..8e13c6aa989 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Phytohydra.java +++ b/Mage.Sets/src/mage/sets/ravnica/Phytohydra.java @@ -53,8 +53,6 @@ public class Phytohydra extends CardImpl { this.subtype.add("Plant"); this.subtype.add("Hydra"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/PrimordialSage.java b/Mage.Sets/src/mage/sets/ravnica/PrimordialSage.java index c93feb10d03..669e29ede4a 100644 --- a/Mage.Sets/src/mage/sets/ravnica/PrimordialSage.java +++ b/Mage.Sets/src/mage/sets/ravnica/PrimordialSage.java @@ -54,7 +54,6 @@ public class PrimordialSage extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/ravnica/PrivilegedPosition.java b/Mage.Sets/src/mage/sets/ravnica/PrivilegedPosition.java index 375a95a2fa3..0472d544365 100644 --- a/Mage.Sets/src/mage/sets/ravnica/PrivilegedPosition.java +++ b/Mage.Sets/src/mage/sets/ravnica/PrivilegedPosition.java @@ -49,8 +49,6 @@ public class PrivilegedPosition extends CardImpl { super(ownerId, 251, "Privileged Position", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G/W}{G/W}{G/W}"); this.expansionSetCode = "RAV"; - this.color.setGreen(true); - this.color.setWhite(true); // Other permanents you control have hexproof. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, new FilterPermanent(), true))); diff --git a/Mage.Sets/src/mage/sets/ravnica/RainOfEmbers.java b/Mage.Sets/src/mage/sets/ravnica/RainOfEmbers.java index 476fa8a4d45..941fa0db410 100644 --- a/Mage.Sets/src/mage/sets/ravnica/RainOfEmbers.java +++ b/Mage.Sets/src/mage/sets/ravnica/RainOfEmbers.java @@ -43,7 +43,6 @@ public class RainOfEmbers extends CardImpl { super(ownerId, 138, "Rain of Embers", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "RAV"; - this.color.setRed(true); // Rain of Embers deals 1 damage to each creature and each player. this.getSpellAbility().addEffect(new DamageEverythingEffect(1)); diff --git a/Mage.Sets/src/mage/sets/ravnica/Remand.java b/Mage.Sets/src/mage/sets/ravnica/Remand.java index 4ed5ff2fe55..999b62dd3df 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Remand.java +++ b/Mage.Sets/src/mage/sets/ravnica/Remand.java @@ -46,7 +46,6 @@ public class Remand extends CardImpl { super(ownerId, 63, "Remand", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "RAV"; - this.color.setBlue(true); // Counter target spell. If that spell is countered this way, put it into its owner's hand instead of into that player's graveyard. this.getSpellAbility().addEffect(new CounterTargetWithReplacementEffect(Zone.HAND)); diff --git a/Mage.Sets/src/mage/sets/ravnica/RollingSpoil.java b/Mage.Sets/src/mage/sets/ravnica/RollingSpoil.java index 7bcb07ba37c..d7ff37a5b52 100644 --- a/Mage.Sets/src/mage/sets/ravnica/RollingSpoil.java +++ b/Mage.Sets/src/mage/sets/ravnica/RollingSpoil.java @@ -49,7 +49,6 @@ public class RollingSpoil extends CardImpl { super(ownerId, 179, "Rolling Spoil", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}{G}"); this.expansionSetCode = "RAV"; - this.color.setGreen(true); // Destroy target land. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/ravnica/Sandsower.java b/Mage.Sets/src/mage/sets/ravnica/Sandsower.java index 1e9203e2b13..36dddde10e9 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Sandsower.java +++ b/Mage.Sets/src/mage/sets/ravnica/Sandsower.java @@ -61,7 +61,6 @@ public class Sandsower extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ravnica/ScatterTheSeeds.java b/Mage.Sets/src/mage/sets/ravnica/ScatterTheSeeds.java index 2aa690a1b23..8c6449946ad 100644 --- a/Mage.Sets/src/mage/sets/ravnica/ScatterTheSeeds.java +++ b/Mage.Sets/src/mage/sets/ravnica/ScatterTheSeeds.java @@ -45,7 +45,6 @@ public class ScatterTheSeeds extends CardImpl { super(ownerId, 181, "Scatter the Seeds", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{G}{G}"); this.expansionSetCode = "RAV"; - this.color.setGreen(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/ravnica/SearingMeditation.java b/Mage.Sets/src/mage/sets/ravnica/SearingMeditation.java index 93e2a67de91..022160a7d36 100644 --- a/Mage.Sets/src/mage/sets/ravnica/SearingMeditation.java +++ b/Mage.Sets/src/mage/sets/ravnica/SearingMeditation.java @@ -51,8 +51,6 @@ public class SearingMeditation extends CardImpl { super(ownerId, 226, "Searing Meditation", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{W}"); this.expansionSetCode = "RAV"; - this.color.setRed(true); - this.color.setWhite(true); // Whenever you gain life, you may pay {2}. If you do, Searing Meditation deals 2 damage to target creature or player. Ability ability = new SimpleTriggeredAbility(Zone.BATTLEFIELD, GameEvent.EventType.GAINED_LIFE, new DoIfCostPaid(new DamageTargetEffect(2), new GenericManaCost(2)), "Whenever you gain life, ", true); diff --git a/Mage.Sets/src/mage/sets/ravnica/SeismicSpike.java b/Mage.Sets/src/mage/sets/ravnica/SeismicSpike.java index fd164b6502b..3d3a1710bba 100644 --- a/Mage.Sets/src/mage/sets/ravnica/SeismicSpike.java +++ b/Mage.Sets/src/mage/sets/ravnica/SeismicSpike.java @@ -46,7 +46,6 @@ public class SeismicSpike extends CardImpl { super(ownerId, 141, "Seismic Spike", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); this.expansionSetCode = "RAV"; - this.color.setRed(true); // Destroy target land. Add {R}{R} to your mana pool. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/ravnica/SelesnyaEvangel.java b/Mage.Sets/src/mage/sets/ravnica/SelesnyaEvangel.java index b6a490e61bc..d860bc41216 100644 --- a/Mage.Sets/src/mage/sets/ravnica/SelesnyaEvangel.java +++ b/Mage.Sets/src/mage/sets/ravnica/SelesnyaEvangel.java @@ -64,8 +64,6 @@ public class SelesnyaEvangel extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/SellSwordBrute.java b/Mage.Sets/src/mage/sets/ravnica/SellSwordBrute.java index c696b4464f5..cbfe09940c6 100644 --- a/Mage.Sets/src/mage/sets/ravnica/SellSwordBrute.java +++ b/Mage.Sets/src/mage/sets/ravnica/SellSwordBrute.java @@ -47,7 +47,6 @@ public class SellSwordBrute extends CardImpl { this.subtype.add("Human"); this.subtype.add("Mercenary"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/ShadowOfDoubt.java b/Mage.Sets/src/mage/sets/ravnica/ShadowOfDoubt.java index 234448bbf56..519dafb2976 100644 --- a/Mage.Sets/src/mage/sets/ravnica/ShadowOfDoubt.java +++ b/Mage.Sets/src/mage/sets/ravnica/ShadowOfDoubt.java @@ -50,8 +50,6 @@ public class ShadowOfDoubt extends CardImpl { super(ownerId, 253, "Shadow of Doubt", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{U/B}{U/B}"); this.expansionSetCode = "RAV"; - this.color.setBlue(true); - this.color.setBlack(true); // ({UB} can be paid with either {U} or {B}.) // Players can't search libraries this turn. diff --git a/Mage.Sets/src/mage/sets/ravnica/ShamblingShell.java b/Mage.Sets/src/mage/sets/ravnica/ShamblingShell.java index 0d7c4c4c2ae..4ed34507dad 100644 --- a/Mage.Sets/src/mage/sets/ravnica/ShamblingShell.java +++ b/Mage.Sets/src/mage/sets/ravnica/ShamblingShell.java @@ -53,8 +53,6 @@ public class ShamblingShell extends CardImpl { this.subtype.add("Plant"); this.subtype.add("Zombie"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/ShredMemory.java b/Mage.Sets/src/mage/sets/ravnica/ShredMemory.java index b3717864d76..3d5e8195ae3 100644 --- a/Mage.Sets/src/mage/sets/ravnica/ShredMemory.java +++ b/Mage.Sets/src/mage/sets/ravnica/ShredMemory.java @@ -46,7 +46,6 @@ public class ShredMemory extends CardImpl { super(ownerId, 105, "Shred Memory", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "RAV"; - this.color.setBlack(true); // Exile up to four target cards from a single graveyard. this.getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/ravnica/SiegeWurm.java b/Mage.Sets/src/mage/sets/ravnica/SiegeWurm.java index 6b9ac90420d..75273e59bef 100644 --- a/Mage.Sets/src/mage/sets/ravnica/SiegeWurm.java +++ b/Mage.Sets/src/mage/sets/ravnica/SiegeWurm.java @@ -46,7 +46,6 @@ public class SiegeWurm extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/ravnica/StinkweedImp.java b/Mage.Sets/src/mage/sets/ravnica/StinkweedImp.java index ca9a1fc59db..c9210b412a2 100644 --- a/Mage.Sets/src/mage/sets/ravnica/StinkweedImp.java +++ b/Mage.Sets/src/mage/sets/ravnica/StinkweedImp.java @@ -48,7 +48,6 @@ public class StinkweedImp extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Imp"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/SunderingVitae.java b/Mage.Sets/src/mage/sets/ravnica/SunderingVitae.java index 47f40d94c50..bf5465aa574 100644 --- a/Mage.Sets/src/mage/sets/ravnica/SunderingVitae.java +++ b/Mage.Sets/src/mage/sets/ravnica/SunderingVitae.java @@ -56,7 +56,6 @@ public class SunderingVitae extends CardImpl { super(ownerId, 185, "Sundering Vitae", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "RAV"; - this.color.setGreen(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/ravnica/SuppressionField.java b/Mage.Sets/src/mage/sets/ravnica/SuppressionField.java index 95ee00a90a3..7c4142711e2 100644 --- a/Mage.Sets/src/mage/sets/ravnica/SuppressionField.java +++ b/Mage.Sets/src/mage/sets/ravnica/SuppressionField.java @@ -55,7 +55,6 @@ public class SuppressionField extends CardImpl { super(ownerId, 31, "Suppression Field", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "RAV"; - this.color.setWhite(true); // Activated abilities cost {2} more to activate unless they're mana abilities. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SuppressionFieldCostReductionEffect() )); diff --git a/Mage.Sets/src/mage/sets/ravnica/SurveillingSprite.java b/Mage.Sets/src/mage/sets/ravnica/SurveillingSprite.java index 78988e1cba6..7f3b9d1ee82 100644 --- a/Mage.Sets/src/mage/sets/ravnica/SurveillingSprite.java +++ b/Mage.Sets/src/mage/sets/ravnica/SurveillingSprite.java @@ -48,7 +48,6 @@ public class SurveillingSprite extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/ThoughtpickerWitch.java b/Mage.Sets/src/mage/sets/ravnica/ThoughtpickerWitch.java index 833302be411..e1f34930cc3 100644 --- a/Mage.Sets/src/mage/sets/ravnica/ThoughtpickerWitch.java +++ b/Mage.Sets/src/mage/sets/ravnica/ThoughtpickerWitch.java @@ -63,7 +63,6 @@ public class ThoughtpickerWitch extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/TolsimirWolfblood.java b/Mage.Sets/src/mage/sets/ravnica/TolsimirWolfblood.java index 4d637ba4445..0503a189489 100644 --- a/Mage.Sets/src/mage/sets/ravnica/TolsimirWolfblood.java +++ b/Mage.Sets/src/mage/sets/ravnica/TolsimirWolfblood.java @@ -67,8 +67,6 @@ public class TolsimirWolfblood extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ravnica/TwilightDrover.java b/Mage.Sets/src/mage/sets/ravnica/TwilightDrover.java index e4495ab33c0..a3790504e3e 100644 --- a/Mage.Sets/src/mage/sets/ravnica/TwilightDrover.java +++ b/Mage.Sets/src/mage/sets/ravnica/TwilightDrover.java @@ -59,7 +59,6 @@ public class TwilightDrover extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/UndercityShade.java b/Mage.Sets/src/mage/sets/ravnica/UndercityShade.java index 527d44e2d10..dc007f7ff54 100644 --- a/Mage.Sets/src/mage/sets/ravnica/UndercityShade.java +++ b/Mage.Sets/src/mage/sets/ravnica/UndercityShade.java @@ -48,7 +48,6 @@ public class UndercityShade extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Shade"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/Ursapine.java b/Mage.Sets/src/mage/sets/ravnica/Ursapine.java index 0f8805c9b16..2d11e01dc6f 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Ursapine.java +++ b/Mage.Sets/src/mage/sets/ravnica/Ursapine.java @@ -49,7 +49,6 @@ public class Ursapine extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ravnica/VedalkenDismisser.java b/Mage.Sets/src/mage/sets/ravnica/VedalkenDismisser.java index ac697a98baf..614d377f368 100644 --- a/Mage.Sets/src/mage/sets/ravnica/VedalkenDismisser.java +++ b/Mage.Sets/src/mage/sets/ravnica/VedalkenDismisser.java @@ -49,7 +49,6 @@ public class VedalkenDismisser extends CardImpl { this.subtype.add("Vedalken"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/VedalkenEntrancer.java b/Mage.Sets/src/mage/sets/ravnica/VedalkenEntrancer.java index 8235bcf54e5..55512946d68 100644 --- a/Mage.Sets/src/mage/sets/ravnica/VedalkenEntrancer.java +++ b/Mage.Sets/src/mage/sets/ravnica/VedalkenEntrancer.java @@ -54,7 +54,6 @@ public class VedalkenEntrancer extends CardImpl { this.subtype.add("Vedalken"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ravnica/VeteranArmorer.java b/Mage.Sets/src/mage/sets/ravnica/VeteranArmorer.java index 00d4cd06fa6..8a4c0c08422 100644 --- a/Mage.Sets/src/mage/sets/ravnica/VeteranArmorer.java +++ b/Mage.Sets/src/mage/sets/ravnica/VeteranArmorer.java @@ -50,7 +50,6 @@ public class VeteranArmorer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/ViashinoFangtail.java b/Mage.Sets/src/mage/sets/ravnica/ViashinoFangtail.java index 3a2ab26059c..521c223267b 100644 --- a/Mage.Sets/src/mage/sets/ravnica/ViashinoFangtail.java +++ b/Mage.Sets/src/mage/sets/ravnica/ViashinoFangtail.java @@ -52,7 +52,6 @@ public class ViashinoFangtail extends CardImpl { this.subtype.add("Viashino"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ravnica/ViashinoSlasher.java b/Mage.Sets/src/mage/sets/ravnica/ViashinoSlasher.java index ea323c24adb..7912d4bb257 100644 --- a/Mage.Sets/src/mage/sets/ravnica/ViashinoSlasher.java +++ b/Mage.Sets/src/mage/sets/ravnica/ViashinoSlasher.java @@ -48,7 +48,6 @@ public class ViashinoSlasher extends CardImpl { this.subtype.add("Viashino"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnica/VinelasherKudzu.java b/Mage.Sets/src/mage/sets/ravnica/VinelasherKudzu.java index 360be2018ab..ab4541517e5 100644 --- a/Mage.Sets/src/mage/sets/ravnica/VinelasherKudzu.java +++ b/Mage.Sets/src/mage/sets/ravnica/VinelasherKudzu.java @@ -48,7 +48,6 @@ public class VinelasherKudzu extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Plant"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnica/WarTorchGoblin.java b/Mage.Sets/src/mage/sets/ravnica/WarTorchGoblin.java index b805ac2d60c..71ea3a492ef 100644 --- a/Mage.Sets/src/mage/sets/ravnica/WarTorchGoblin.java +++ b/Mage.Sets/src/mage/sets/ravnica/WarTorchGoblin.java @@ -55,7 +55,6 @@ public class WarTorchGoblin extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AquusSteed.java b/Mage.Sets/src/mage/sets/returntoravnica/AquusSteed.java index 7d24d3b9436..12f66da33d0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AquusSteed.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AquusSteed.java @@ -53,7 +53,6 @@ public class AquusSteed extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Beast"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ArchonOfTheTriumvirate.java b/Mage.Sets/src/mage/sets/returntoravnica/ArchonOfTheTriumvirate.java index 8a2babf7e8e..5dbfcb9fa3f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ArchonOfTheTriumvirate.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ArchonOfTheTriumvirate.java @@ -59,8 +59,6 @@ public class ArchonOfTheTriumvirate extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Archon"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Archweaver.java b/Mage.Sets/src/mage/sets/returntoravnica/Archweaver.java index 063686646d5..2a3a80c82cf 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Archweaver.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Archweaver.java @@ -46,7 +46,6 @@ public class Archweaver extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Spider"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ArmoryGuard.java b/Mage.Sets/src/mage/sets/returntoravnica/ArmoryGuard.java index 4a7b1cf4f16..f79180d342b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ArmoryGuard.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ArmoryGuard.java @@ -62,7 +62,6 @@ public class ArmoryGuard extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AssassinsStrike.java b/Mage.Sets/src/mage/sets/returntoravnica/AssassinsStrike.java index 3f4a3eb22b8..c5c2e2bbc2c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AssassinsStrike.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AssassinsStrike.java @@ -52,7 +52,6 @@ public class AssassinsStrike extends CardImpl { super(ownerId, 57, "Assassin's Strike", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{B}{B}"); this.expansionSetCode = "RTR"; - this.color.setBlack(true); // Destroy target creature. Its controller discards a card. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AugerSpree.java b/Mage.Sets/src/mage/sets/returntoravnica/AugerSpree.java index cdcdd785899..876478ce9b3 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AugerSpree.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AugerSpree.java @@ -45,8 +45,6 @@ public class AugerSpree extends CardImpl { super(ownerId, 144, "Auger Spree", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}{R}"); this.expansionSetCode = "RTR"; - this.color.setRed(true); - this.color.setBlack(true); // Target creature gets +4/-4 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(4, -4, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java b/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java index 2f1b7f9fb74..927417d0787 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java @@ -51,7 +51,6 @@ public class AvengingArrow extends CardImpl { super(ownerId, 4, "Avenging Arrow", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "RTR"; - this.color.setWhite(true); // Destroy target creature that dealt damage this turn. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AxebaneGuardian.java b/Mage.Sets/src/mage/sets/returntoravnica/AxebaneGuardian.java index cb2dabb4b18..883a16c8fc7 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AxebaneGuardian.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AxebaneGuardian.java @@ -59,7 +59,6 @@ public class AxebaneGuardian extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AxebaneStag.java b/Mage.Sets/src/mage/sets/returntoravnica/AxebaneStag.java index f5c5147edd4..32d51d6bbad 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AxebaneStag.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AxebaneStag.java @@ -44,7 +44,6 @@ public class AxebaneStag extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Elk"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(7); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java index ca6442eba7a..e642eae4223 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java @@ -59,7 +59,6 @@ public class AzoriusArrester extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusCharm.java index e05740decef..6afa9c7c91a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusCharm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusCharm.java @@ -51,8 +51,6 @@ public class AzoriusCharm extends CardImpl { super(ownerId, 145, "Azorius Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}{U}"); this.expansionSetCode = "RTR"; - this.color.setWhite(true); - this.color.setBlue(true); // Choose one — Creatures you control gain lifelink until end of turn; this.getSpellAbility().addEffect(new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures"))); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusJusticiar.java b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusJusticiar.java index 39e46cdea51..8cf5d434a5d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusJusticiar.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusJusticiar.java @@ -59,7 +59,6 @@ public class AzoriusJusticiar extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/BazaarKrovod.java b/Mage.Sets/src/mage/sets/returntoravnica/BazaarKrovod.java index e80dbbdaeba..783a42eaea3 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/BazaarKrovod.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/BazaarKrovod.java @@ -62,7 +62,6 @@ public class BazaarKrovod extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Beast"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java b/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java index 96088f18c01..e03d674c015 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java @@ -62,7 +62,6 @@ public class Blustersquall extends CardImpl { super(ownerId, 30, "Blustersquall", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); // Tap target creature you don't control. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Brushstrider.java b/Mage.Sets/src/mage/sets/returntoravnica/Brushstrider.java index 7e6a239d746..1671593235e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Brushstrider.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Brushstrider.java @@ -45,7 +45,6 @@ public class Brushstrider extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CallOfTheConclave.java b/Mage.Sets/src/mage/sets/returntoravnica/CallOfTheConclave.java index e090cfbfeea..4653254e559 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CallOfTheConclave.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CallOfTheConclave.java @@ -44,8 +44,6 @@ public class CallOfTheConclave extends CardImpl { super(ownerId, 146, "Call of the Conclave", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{G}{W}"); this.expansionSetCode = "RTR"; - this.color.setGreen(true); - this.color.setWhite(true); // Put a 3/3 green Centaur creature token onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new CentaurToken())); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CatacombSlug.java b/Mage.Sets/src/mage/sets/returntoravnica/CatacombSlug.java index 0d15b812a83..ea8f48c373a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CatacombSlug.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CatacombSlug.java @@ -44,7 +44,6 @@ public class CatacombSlug extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Slug"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(6); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CentaurHealer.java b/Mage.Sets/src/mage/sets/returntoravnica/CentaurHealer.java index 054013f8370..6957130ae90 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CentaurHealer.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CentaurHealer.java @@ -47,8 +47,6 @@ public class CentaurHealer extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Cleric"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CentaursHerald.java b/Mage.Sets/src/mage/sets/returntoravnica/CentaursHerald.java index 0fa3c2b2bca..92c32cd12fa 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CentaursHerald.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CentaursHerald.java @@ -54,7 +54,6 @@ public class CentaursHerald extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Scout"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java b/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java index d94b50599dd..f0794114637 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java @@ -66,8 +66,6 @@ public class ChemistersTrick extends CardImpl { super(ownerId, 149, "Chemister's Trick", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}{R}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); - this.color.setRed(true); // Target creature you don't control gets -2/-0 until end of turn and attacks this turn if able. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CollectiveBlessing.java b/Mage.Sets/src/mage/sets/returntoravnica/CollectiveBlessing.java index a0704411806..89d88faf1ca 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CollectiveBlessing.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CollectiveBlessing.java @@ -47,8 +47,6 @@ public class CollectiveBlessing extends CardImpl { super(ownerId, 150, "Collective Blessing", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}{G}{W}"); this.expansionSetCode = "RTR"; - this.color.setGreen(true); - this.color.setWhite(true); // Creatures you control get +3/+3. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(3,3, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CommonBond.java b/Mage.Sets/src/mage/sets/returntoravnica/CommonBond.java index 147173c07b7..0e6f02e6692 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CommonBond.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CommonBond.java @@ -52,8 +52,6 @@ public class CommonBond extends CardImpl { super(ownerId, 151, "Common Bond", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}{W}"); this.expansionSetCode = "RTR"; - this.color.setGreen(true); - this.color.setWhite(true); // Put a +1/+1 counter on target creature. Put a +1/+1 counter on target creature. this.getSpellAbility().addEffect(new CommonBondEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ConcordiaPegasus.java b/Mage.Sets/src/mage/sets/returntoravnica/ConcordiaPegasus.java index f510fd8e994..81bbdef2e19 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ConcordiaPegasus.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ConcordiaPegasus.java @@ -45,7 +45,6 @@ public class ConcordiaPegasus extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Pegasus"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CorpsejackMenace.java b/Mage.Sets/src/mage/sets/returntoravnica/CorpsejackMenace.java index 469717d7759..91dd5a1a86c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CorpsejackMenace.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CorpsejackMenace.java @@ -62,8 +62,6 @@ public class CorpsejackMenace extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Fungus"); - this.color.setBlack(true); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Counterflux.java b/Mage.Sets/src/mage/sets/returntoravnica/Counterflux.java index a0e0597d6ab..ac6057e2a37 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Counterflux.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Counterflux.java @@ -69,8 +69,6 @@ public class Counterflux extends CardImpl { super(ownerId, 153, "Counterflux", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{U}{U}{R}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); - this.color.setRed(true); // Counterflux can't be countered by spells or abilities. Effect effect = new CantBeCounteredSourceEffect(); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CoursersAccord.java b/Mage.Sets/src/mage/sets/returntoravnica/CoursersAccord.java index 007283354f7..c63135e08c4 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CoursersAccord.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CoursersAccord.java @@ -45,8 +45,6 @@ public class CoursersAccord extends CardImpl { super(ownerId, 154, "Coursers' Accord", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{G}{W}"); this.expansionSetCode = "RTR"; - this.color.setGreen(true); - this.color.setWhite(true); // Put a 3/3 green Centaur creature token onto the battlefield, then populate. // (Put a token onto the battlefield that's a copy of a creature token you control.) diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CrosstownCourier.java b/Mage.Sets/src/mage/sets/returntoravnica/CrosstownCourier.java index 6c76d2a70b5..340ece52494 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CrosstownCourier.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CrosstownCourier.java @@ -54,7 +54,6 @@ public class CrosstownCourier extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Vedalken"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CyclonicRift.java b/Mage.Sets/src/mage/sets/returntoravnica/CyclonicRift.java index aa47e188145..3f67c1d0eb6 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CyclonicRift.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CyclonicRift.java @@ -59,7 +59,6 @@ public class CyclonicRift extends CardImpl { super(ownerId, 35, "Cyclonic Rift", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); // Return target nonland permanent you don't control to its owner's hand. this.getSpellAbility().addTarget(new TargetNonlandPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DaggerdromeImp.java b/Mage.Sets/src/mage/sets/returntoravnica/DaggerdromeImp.java index bb45951a4b3..994e64632a7 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DaggerdromeImp.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DaggerdromeImp.java @@ -46,7 +46,6 @@ public class DaggerdromeImp extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Imp"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DarkRevenant.java b/Mage.Sets/src/mage/sets/returntoravnica/DarkRevenant.java index 4a5b9d27e1d..50f82218538 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DarkRevenant.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DarkRevenant.java @@ -54,7 +54,6 @@ public class DarkRevenant extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DeadbridgeGoliath.java b/Mage.Sets/src/mage/sets/returntoravnica/DeadbridgeGoliath.java index dc742b1f391..932fb849009 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DeadbridgeGoliath.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DeadbridgeGoliath.java @@ -47,7 +47,6 @@ public class DeadbridgeGoliath extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DetentionSphere.java b/Mage.Sets/src/mage/sets/returntoravnica/DetentionSphere.java index 768775cb50b..487635f102c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DetentionSphere.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DetentionSphere.java @@ -67,8 +67,6 @@ public class DetentionSphere extends CardImpl { super(ownerId, 155, "Detention Sphere", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}{U}"); this.expansionSetCode = "RTR"; - this.color.setWhite(true); - this.color.setBlue(true); // When Detention Sphere enters the battlefield, you may exile // target nonland permanent not named Detention Sphere and all diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Doorkeeper.java b/Mage.Sets/src/mage/sets/returntoravnica/Doorkeeper.java index 4470fde5d7e..0cf422f649e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Doorkeeper.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Doorkeeper.java @@ -61,7 +61,6 @@ public class Doorkeeper extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Homunculus"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Downsize.java b/Mage.Sets/src/mage/sets/returntoravnica/Downsize.java index 04e03cd6077..628698bdeb7 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Downsize.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Downsize.java @@ -58,7 +58,6 @@ public class Downsize extends CardImpl { super(ownerId, 38, "Downsize", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); // Target creature you don't control gets -4/-0 until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DramaticRescue.java b/Mage.Sets/src/mage/sets/returntoravnica/DramaticRescue.java index 7732e7877a8..82f8fe72b92 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DramaticRescue.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DramaticRescue.java @@ -45,8 +45,6 @@ public class DramaticRescue extends CardImpl { super(ownerId, 156, "Dramatic Rescue", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}{U}"); this.expansionSetCode = "RTR"; - this.color.setWhite(true); - this.color.setBlue(true); // Target player draws two cards. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java b/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java index 483bf060145..6c3f8fe807f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java @@ -56,8 +56,6 @@ public class Dreadbore extends CardImpl { super(ownerId, 157, "Dreadbore", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{B}{R}"); this.expansionSetCode = "RTR"; - this.color.setRed(true); - this.color.setBlack(true); // Destroy target creature or planeswalker. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DregMangler.java b/Mage.Sets/src/mage/sets/returntoravnica/DregMangler.java index f5aba23c400..561ead42dfb 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DregMangler.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DregMangler.java @@ -49,8 +49,6 @@ public class DregMangler extends CardImpl { this.subtype.add("Plant"); this.subtype.add("Zombie"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DrudgeBeetle.java b/Mage.Sets/src/mage/sets/returntoravnica/DrudgeBeetle.java index d6c86477a4d..4f38bd0f514 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DrudgeBeetle.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DrudgeBeetle.java @@ -46,7 +46,6 @@ public class DrudgeBeetle extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DruidsDeliverance.java b/Mage.Sets/src/mage/sets/returntoravnica/DruidsDeliverance.java index 210096cc2ba..e505f1a12e6 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DruidsDeliverance.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DruidsDeliverance.java @@ -49,7 +49,6 @@ public class DruidsDeliverance extends CardImpl { super(ownerId, 123, "Druid's Deliverance", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "RTR"; - this.color.setGreen(true); // Prevent all combat damage that would be dealt to you this turn. Populate. // (Put a token onto the battlefield that's a copy of a creature token you control.) diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Dynacharge.java b/Mage.Sets/src/mage/sets/returntoravnica/Dynacharge.java index c5b22af211b..40982fad666 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Dynacharge.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Dynacharge.java @@ -48,7 +48,6 @@ public class Dynacharge extends CardImpl { super(ownerId, 92, "Dynacharge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "RTR"; - this.color.setRed(true); // Target creature you control gets +2/+0 until end of turn. this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Electrickery.java b/Mage.Sets/src/mage/sets/returntoravnica/Electrickery.java index 8183df6d5b9..670b00fffac 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Electrickery.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Electrickery.java @@ -57,7 +57,6 @@ public class Electrickery extends CardImpl { super(ownerId, 93, "Electrickery", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "RTR"; - this.color.setRed(true); // Electrickery deals 1 damage to target creature you don't control. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/EpicExperiment.java b/Mage.Sets/src/mage/sets/returntoravnica/EpicExperiment.java index fdbebd5e36e..a630ab1c42f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/EpicExperiment.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/EpicExperiment.java @@ -56,8 +56,6 @@ public class EpicExperiment extends CardImpl { super(ownerId, 159, "Epic Experiment", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{X}{U}{R}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); - this.color.setRed(true); // Exile the top X cards of your library. For each instant and sorcery card with // converted mana cost X or less among them, you may cast that card without paying diff --git a/Mage.Sets/src/mage/sets/returntoravnica/EssenceBacklash.java b/Mage.Sets/src/mage/sets/returntoravnica/EssenceBacklash.java index 7de44c0c815..61e4bbc1c0c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/EssenceBacklash.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/EssenceBacklash.java @@ -58,8 +58,6 @@ public class EssenceBacklash extends CardImpl { super(ownerId, 160, "Essence Backlash", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{R}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); - this.color.setRed(true); // Counter target creature spell. Essence Backlash deals damage equal to that spell's power to its controller. this.getSpellAbility().addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/EyesInTheSkies.java b/Mage.Sets/src/mage/sets/returntoravnica/EyesInTheSkies.java index f56d0dc7b9b..4529c5edf72 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/EyesInTheSkies.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/EyesInTheSkies.java @@ -47,7 +47,6 @@ public class EyesInTheSkies extends CardImpl { super(ownerId, 10, "Eyes in the Skies", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "RTR"; - this.color.setWhite(true); // Put a 1/1 white Bird creature token with flying onto the battlefield, then populate. // (Put a token onto the battlefield that's a copy of a creature token you control.) diff --git a/Mage.Sets/src/mage/sets/returntoravnica/FaerieImpostor.java b/Mage.Sets/src/mage/sets/returntoravnica/FaerieImpostor.java index 86b6654f6d5..4d786071745 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/FaerieImpostor.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/FaerieImpostor.java @@ -59,7 +59,6 @@ public class FaerieImpostor extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/FallOfTheGavel.java b/Mage.Sets/src/mage/sets/returntoravnica/FallOfTheGavel.java index 9328e31ef3e..1647d8f6677 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/FallOfTheGavel.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/FallOfTheGavel.java @@ -45,8 +45,6 @@ public class FallOfTheGavel extends CardImpl { super(ownerId, 161, "Fall of the Gavel", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{W}{U}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); - this.color.setWhite(true); // Target player draws two cards. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/FencingAce.java b/Mage.Sets/src/mage/sets/returntoravnica/FencingAce.java index 1a4ae4d6016..85a7a73850c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/FencingAce.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/FencingAce.java @@ -47,7 +47,6 @@ public class FencingAce extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/FiremindsForesight.java b/Mage.Sets/src/mage/sets/returntoravnica/FiremindsForesight.java index cb996fe6f8f..b8073010e3b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/FiremindsForesight.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/FiremindsForesight.java @@ -58,8 +58,6 @@ public class FiremindsForesight extends CardImpl { super(ownerId, 162, "Firemind's Foresight", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{5}{U}{R}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); - this.color.setRed(true); // Search your library for an instant card with converted mana cost 3, reveal it, // and put it into your hand. Then repeat this process for instant cards with diff --git a/Mage.Sets/src/mage/sets/returntoravnica/FrostburnWeird.java b/Mage.Sets/src/mage/sets/returntoravnica/FrostburnWeird.java index bdfde1561e1..1111d2f2a2b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/FrostburnWeird.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/FrostburnWeird.java @@ -50,8 +50,6 @@ public class FrostburnWeird extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Weird"); - this.color.setBlue(true); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GatecreeperVine.java b/Mage.Sets/src/mage/sets/returntoravnica/GatecreeperVine.java index 51216fc4668..83443c95d19 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GatecreeperVine.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GatecreeperVine.java @@ -63,7 +63,6 @@ public class GatecreeperVine extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Plant"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GobblingOoze.java b/Mage.Sets/src/mage/sets/returntoravnica/GobblingOoze.java index d91f99d1091..364149414b5 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GobblingOoze.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GobblingOoze.java @@ -60,7 +60,6 @@ public class GobblingOoze extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Ooze"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GoblinElectromancer.java b/Mage.Sets/src/mage/sets/returntoravnica/GoblinElectromancer.java index 66a9d0323c2..73ea0219e41 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GoblinElectromancer.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GoblinElectromancer.java @@ -60,8 +60,6 @@ public class GoblinElectromancer extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GolgariCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/GolgariCharm.java index cb202ef1246..0ba958e7fdd 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GolgariCharm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GolgariCharm.java @@ -51,8 +51,6 @@ public class GolgariCharm extends CardImpl { super(ownerId, 164, "Golgari Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{B}{G}"); this.expansionSetCode = "RTR"; - this.color.setBlack(true); - this.color.setGreen(true); // Choose one — All creatures get -1/-1 until end of turn; this.getSpellAbility().addEffect(new BoostAllEffect(-1,-1, Duration.EndOfTurn,new FilterCreaturePermanent("All creatures"), false)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GolgariDecoy.java b/Mage.Sets/src/mage/sets/returntoravnica/GolgariDecoy.java index d5ab3dfb874..c98d3ca3632 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GolgariDecoy.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GolgariDecoy.java @@ -51,7 +51,6 @@ public class GolgariDecoy extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Rogue"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GolgariLonglegs.java b/Mage.Sets/src/mage/sets/returntoravnica/GolgariLonglegs.java index c95d830e68b..ada4ea8dc7d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GolgariLonglegs.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GolgariLonglegs.java @@ -44,8 +44,6 @@ public class GolgariLonglegs extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Insect"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GrislySalvage.java b/Mage.Sets/src/mage/sets/returntoravnica/GrislySalvage.java index 6dafb2fa835..85bc21d4a6f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GrislySalvage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GrislySalvage.java @@ -56,8 +56,6 @@ public class GrislySalvage extends CardImpl { super(ownerId, 165, "Grisly Salvage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}{G}"); this.expansionSetCode = "RTR"; - this.color.setBlack(true); - this.color.setGreen(true); // Reveal the top five cards of your library. You may put a creature or land card from among them into your hand. Put the rest into your graveyard. this.getSpellAbility().addEffect(new GrislySalvageEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GrowingRanks.java b/Mage.Sets/src/mage/sets/returntoravnica/GrowingRanks.java index fd18880cd14..6d4f7b72fa7 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GrowingRanks.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GrowingRanks.java @@ -53,8 +53,6 @@ public class GrowingRanks extends CardImpl { super(ownerId, 217, "Growing Ranks", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G/W}{G/W}"); this.expansionSetCode = "RTR"; - this.color.setWhite(true); - this.color.setGreen(true); // At the beginning of your upkeep, populate. (Put a token onto the battlefield that's a copy of a creature token you control.) this.addAbility(new BeginningOfUpkeepTriggeredAbility(new PopulateEffect(""), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java b/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java index 7cd8fe17224..12f8b4e7cb3 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java @@ -59,7 +59,6 @@ public class GuildFeud extends CardImpl { super(ownerId, 97, "Guild Feud", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{5}{R}"); this.expansionSetCode = "RTR"; - this.color.setRed(true); // At the beginning of your upkeep, target opponent reveals the top three cards // of his or her library, may put a creature card from among them onto the battlefield, diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HavocFestival.java b/Mage.Sets/src/mage/sets/returntoravnica/HavocFestival.java index a9657612f28..d3af19f5726 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/HavocFestival.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/HavocFestival.java @@ -55,8 +55,6 @@ public class HavocFestival extends CardImpl { super(ownerId, 166, "Havoc Festival", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{B}{R}"); this.expansionSetCode = "RTR"; - this.color.setBlack(true); - this.color.setRed(true); // Players can't gain life. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantGainLifeAllEffect())); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HorncallersChant.java b/Mage.Sets/src/mage/sets/returntoravnica/HorncallersChant.java index c20724e18e9..19c26743571 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/HorncallersChant.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/HorncallersChant.java @@ -47,7 +47,6 @@ public class HorncallersChant extends CardImpl { super(ownerId, 128, "Horncaller's Chant", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{7}{G}"); this.expansionSetCode = "RTR"; - this.color.setGreen(true); // Put a 4/4 green Rhino creature token with trample onto the battlefield, then populate. // (Put a token onto the battlefield that's a copy of a creature token you control.) diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HoverBarrier.java b/Mage.Sets/src/mage/sets/returntoravnica/HoverBarrier.java index f6bc20940dd..61f19b52f16 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/HoverBarrier.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/HoverBarrier.java @@ -47,7 +47,6 @@ public class HoverBarrier extends CardImpl { this.subtype.add("Illusion"); this.subtype.add("Wall"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HussarPatrol.java b/Mage.Sets/src/mage/sets/returntoravnica/HussarPatrol.java index 789910f5dd1..010e5222fa9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/HussarPatrol.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/HussarPatrol.java @@ -47,8 +47,6 @@ public class HussarPatrol extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HypersonicDragon.java b/Mage.Sets/src/mage/sets/returntoravnica/HypersonicDragon.java index 2f45c4a5d85..7921c1d9f1d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/HypersonicDragon.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/HypersonicDragon.java @@ -57,8 +57,6 @@ public class HypersonicDragon extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Dragon"); - this.color.setRed(true); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Inspiration.java b/Mage.Sets/src/mage/sets/returntoravnica/Inspiration.java index 0193760d860..c53172423a3 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Inspiration.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Inspiration.java @@ -44,7 +44,6 @@ public class Inspiration extends CardImpl { super(ownerId, 42, "Inspiration", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); // Target player draws two cards. this.getSpellAbility().addEffect(new DrawCardTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java b/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java index 11dfd8f2101..d9c328accfd 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java @@ -60,7 +60,6 @@ public class IsperiasSkywatch extends CardImpl { this.subtype.add("Vedalken"); this.subtype.add("Knight"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IzzetCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/IzzetCharm.java index f4272d2356e..e08fb8ee63b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/IzzetCharm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/IzzetCharm.java @@ -57,8 +57,6 @@ public class IzzetCharm extends CardImpl { super(ownerId, 172, "Izzet Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}{R}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); - this.color.setRed(true); // Choose one — Counter target noncreature spell unless its controller pays {2}; this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new GenericManaCost(2))); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java b/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java index f9c9ad44d4e..8348c5e0dfa 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java @@ -82,7 +82,6 @@ public class JaceArchitectOfThought extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Jace"); - this.color.setBlue(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/JaradsOrders.java b/Mage.Sets/src/mage/sets/returntoravnica/JaradsOrders.java index 6e3d7c2613e..9b1a5887ca0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/JaradsOrders.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/JaradsOrders.java @@ -57,8 +57,6 @@ public class JaradsOrders extends CardImpl { super(ownerId, 175, "Jarad's Orders", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{B}{G}"); this.expansionSetCode = "RTR"; - this.color.setBlack(true); - this.color.setGreen(true); // Search your library for up to two creature cards and reveal them. Put one into your hand and the other into your graveyard. Then shuffle your library. this.getSpellAbility().addEffect(new JaradsOrdersEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java b/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java index 99256513115..6b3a00fd3ad 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java @@ -57,7 +57,6 @@ public class KeeningApparition extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/KorozdaMonitor.java b/Mage.Sets/src/mage/sets/returntoravnica/KorozdaMonitor.java index 790adb7121c..be6a9db45fa 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/KorozdaMonitor.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/KorozdaMonitor.java @@ -47,7 +47,6 @@ public class KorozdaMonitor extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Lizard"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/LotlethTroll.java b/Mage.Sets/src/mage/sets/returntoravnica/LotlethTroll.java index 8f57256787e..11f2e5df7b4 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/LotlethTroll.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/LotlethTroll.java @@ -58,8 +58,6 @@ public class LotlethTroll extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Troll"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ManaBloom.java b/Mage.Sets/src/mage/sets/returntoravnica/ManaBloom.java index 054ae5a3b1d..7bccbedcf04 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ManaBloom.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ManaBloom.java @@ -65,7 +65,6 @@ public class ManaBloom extends CardImpl { super(ownerId, 130, "Mana Bloom", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{X}{G}"); this.expansionSetCode = "RTR"; - this.color.setGreen(true); // Mana Bloom enters the battlefield with X charge counters on it. this.addAbility(new EntersBattlefieldAbility(new ManaBloomEffect(),rule)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java b/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java index a0a42b69201..81cb9cf8302 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java @@ -55,7 +55,6 @@ public class MartialLaw extends CardImpl { super(ownerId, 14, "Martial Law", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "RTR"; - this.color.setWhite(true); // At the beginning of your upkeep, detain target creature an opponent controls. // (Until your next turn, that creature can't attack or block and its activated abilities can't be activated.) diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java b/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java index a81db7eb24b..95e94af6aa8 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java @@ -58,7 +58,6 @@ public class MizziumMortars extends CardImpl { super(ownerId, 101, "Mizzium Mortars", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "RTR"; - this.color.setRed(true); // MizziumMortars deals 4 damage to target creature you don't control. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java b/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java index 79a2618ab8e..a0400cdcced 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java @@ -61,7 +61,6 @@ public class MizziumSkin extends CardImpl { super(ownerId, 45, "Mizzium Skin", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); // Target creature you control gets +0/+1 and gains hexproof until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/NivMizzetDracogenius.java b/Mage.Sets/src/mage/sets/returntoravnica/NivMizzetDracogenius.java index b01dd7d4a7a..eac5e940cc8 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/NivMizzetDracogenius.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/NivMizzetDracogenius.java @@ -56,8 +56,6 @@ public class NivMizzetDracogenius extends CardImpl { this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/NivixGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/NivixGuildmage.java index e49946d04b8..27e950ab298 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/NivixGuildmage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/NivixGuildmage.java @@ -65,8 +65,6 @@ public class NivixGuildmage extends CardImpl { this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/NivmagusElemental.java b/Mage.Sets/src/mage/sets/returntoravnica/NivmagusElemental.java index 65bd93ae1eb..2eccb5f42d5 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/NivmagusElemental.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/NivmagusElemental.java @@ -67,8 +67,6 @@ public class NivmagusElemental extends CardImpl { this.subtype.add("Elemental"); - this.color.setBlue(true); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/OakStreetInnkeeper.java b/Mage.Sets/src/mage/sets/returntoravnica/OakStreetInnkeeper.java index 03263dccadd..2a6ff8e02f1 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/OakStreetInnkeeper.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/OakStreetInnkeeper.java @@ -60,7 +60,6 @@ public class OakStreetInnkeeper extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/OgreJailbreaker.java b/Mage.Sets/src/mage/sets/returntoravnica/OgreJailbreaker.java index 936e9903681..f4d6c9f2f60 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/OgreJailbreaker.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/OgreJailbreaker.java @@ -53,7 +53,6 @@ public class OgreJailbreaker extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PackRat.java b/Mage.Sets/src/mage/sets/returntoravnica/PackRat.java index c669df2bd2f..451cc8df37c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PackRat.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PackRat.java @@ -83,7 +83,6 @@ public class PackRat extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Rat"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PalisadeGiant.java b/Mage.Sets/src/mage/sets/returntoravnica/PalisadeGiant.java index 672cab8fe38..53b8e164216 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PalisadeGiant.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PalisadeGiant.java @@ -74,7 +74,6 @@ public class PalisadeGiant extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PerilousShadow.java b/Mage.Sets/src/mage/sets/returntoravnica/PerilousShadow.java index d63a81d8fc9..0926c79ccf5 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PerilousShadow.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PerilousShadow.java @@ -51,7 +51,6 @@ public class PerilousShadow extends CardImpl { this.subtype.add("Insect"); this.subtype.add("Shade"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PhantomGeneral.java b/Mage.Sets/src/mage/sets/returntoravnica/PhantomGeneral.java index 3e10abef8ad..ce6bd1c6b0c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PhantomGeneral.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PhantomGeneral.java @@ -60,7 +60,6 @@ public class PhantomGeneral extends CardImpl { this.subtype.add("Spirit"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PrecinctCaptain.java b/Mage.Sets/src/mage/sets/returntoravnica/PrecinctCaptain.java index eba4f6bdc99..9bf708883b0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PrecinctCaptain.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PrecinctCaptain.java @@ -49,7 +49,6 @@ public class PrecinctCaptain extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java b/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java index a113b5b891f..67ae4f6ad97 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java @@ -50,7 +50,6 @@ public class PsychicSpiral extends CardImpl { super(ownerId, 47, "Psychic Spiral", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{U}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); // Shuffle all cards from your graveyard into your library. Target player puts that many cards from the top of his or her library into his or her graveyard. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosCharm.java index ca28bc80c65..d6b4a5f73fe 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosCharm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosCharm.java @@ -55,8 +55,6 @@ public class RakdosCharm extends CardImpl { super(ownerId, 184, "Rakdos Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{B}{R}"); this.expansionSetCode = "RTR"; - this.color.setBlack(true); - this.color.setRed(true); // Choose one — Exile all cards from target player's graveyard; this.getSpellAbility().addEffect(new ExileGraveyardAllTargetPlayerEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosRagemutt.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosRagemutt.java index 1878485763e..13475c5a5b5 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosRagemutt.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosRagemutt.java @@ -47,8 +47,6 @@ public class RakdosRagemutt extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Hound"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosRingleader.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosRingleader.java index 567fae89176..d55096021b9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosRingleader.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosRingleader.java @@ -52,8 +52,6 @@ public class RakdosRingleader extends CardImpl { this.subtype.add("Skeleton"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosShredFreak.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosShredFreak.java index a627aeb97be..16517289013 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosShredFreak.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosShredFreak.java @@ -46,8 +46,6 @@ public class RakdosShredFreak extends CardImpl { this.subtype.add("Human"); this.subtype.add("Berserker"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RestInPeace.java b/Mage.Sets/src/mage/sets/returntoravnica/RestInPeace.java index 33b9f23b91e..d4c29e9ca9b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RestInPeace.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RestInPeace.java @@ -71,7 +71,6 @@ public class RestInPeace extends CardImpl { super(ownerId, 18, "Rest in Peace", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "RTR"; - this.color.setWhite(true); // When Rest in Peace enters the battlefield, exile all cards from all graveyards. this.addAbility(new EntersBattlefieldTriggeredAbility(new RestInPeaceExileAllEffect())); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RisenSanctuary.java b/Mage.Sets/src/mage/sets/returntoravnica/RisenSanctuary.java index 9e44c28ca20..8ef4a7da0cf 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RisenSanctuary.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RisenSanctuary.java @@ -45,8 +45,6 @@ public class RisenSanctuary extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Elemental"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(8); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RitesOfReaping.java b/Mage.Sets/src/mage/sets/returntoravnica/RitesOfReaping.java index c407bc2923f..b51d0f6adc1 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RitesOfReaping.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RitesOfReaping.java @@ -51,8 +51,6 @@ public class RitesOfReaping extends CardImpl { super(ownerId, 191, "Rites of Reaping", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{B}{G}"); this.expansionSetCode = "RTR"; - this.color.setBlack(true); - this.color.setGreen(true); // Target creature gets +3/+3 until end of turn. Another target creature gets -3/-3 until end of turn. this.getSpellAbility().addEffect(new RitesOfReapingEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java index 4a3dbc4188a..46c74ab83c0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java @@ -67,8 +67,6 @@ public class RixMaadiGuildmage extends CardImpl { this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setBlack(true); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RootbornDefenses.java b/Mage.Sets/src/mage/sets/returntoravnica/RootbornDefenses.java index b3531c4b031..50de599866a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RootbornDefenses.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RootbornDefenses.java @@ -48,7 +48,6 @@ public class RootbornDefenses extends CardImpl { super(ownerId, 19, "Rootborn Defenses", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "RTR"; - this.color.setWhite(true); // Populate. Creatures you control are indestructible this turn. // (To populate, put a token onto the battlefield that's a copy of a creature diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RubblebackRhino.java b/Mage.Sets/src/mage/sets/returntoravnica/RubblebackRhino.java index f3e493881e2..7a4eb36bcf8 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RubblebackRhino.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RubblebackRhino.java @@ -53,7 +53,6 @@ public class RubblebackRhino extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Rhino"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Runewing.java b/Mage.Sets/src/mage/sets/returntoravnica/Runewing.java index dc29982fdf5..83a191b4da0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Runewing.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Runewing.java @@ -56,7 +56,6 @@ public class Runewing extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SavageSurge.java b/Mage.Sets/src/mage/sets/returntoravnica/SavageSurge.java index 6669b8cea44..42ba1c0e95c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SavageSurge.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SavageSurge.java @@ -48,7 +48,6 @@ public class SavageSurge extends CardImpl { super(ownerId, 133, "Savage Surge", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "RTR"; - this.color.setGreen(true); // Target creature gets +2/+2 until end of turn. Untap that creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SearchTheCity.java b/Mage.Sets/src/mage/sets/returntoravnica/SearchTheCity.java index 89b187aeab5..3032bf26c30 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SearchTheCity.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SearchTheCity.java @@ -60,7 +60,6 @@ public class SearchTheCity extends CardImpl { super(ownerId, 49, "Search the City", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); // When Search the City enters the battlefield, exile the top five cards of your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchTheCityExileEffect())); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java b/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java index a1934ae916f..20c85685131 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java @@ -48,8 +48,6 @@ public class SearchWarrant extends CardImpl { super(ownerId, 193, "Search Warrant", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{W}{U}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); - this.color.setWhite(true); // Target player reveals his or her hand. You gain life equal to the number of cards in that player's hand. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java index a4be011fbb9..840b6475f7d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java @@ -61,8 +61,6 @@ public class SelesnyaCharm extends CardImpl { super(ownerId, 194, "Selesnya Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}{W}"); this.expansionSetCode = "RTR"; - this.color.setGreen(true); - this.color.setWhite(true); // Choose one — Target creature gets +2/+2 and gains trample until end of turn; Effect effect = new BoostTargetEffect(2,2, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaSentry.java b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaSentry.java index b97cad69c5b..0f5927e6f8e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaSentry.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaSentry.java @@ -50,7 +50,6 @@ public class SelesnyaSentry extends CardImpl { this.subtype.add("Elephant"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SellerOfSongbirds.java b/Mage.Sets/src/mage/sets/returntoravnica/SellerOfSongbirds.java index 589c62a94ab..b4209fc67cc 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SellerOfSongbirds.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SellerOfSongbirds.java @@ -47,7 +47,6 @@ public class SellerOfSongbirds extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Human"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SewerShambler.java b/Mage.Sets/src/mage/sets/returntoravnica/SewerShambler.java index eb96817b1fc..64ff24bae42 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SewerShambler.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SewerShambler.java @@ -47,7 +47,6 @@ public class SewerShambler extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SkullRend.java b/Mage.Sets/src/mage/sets/returntoravnica/SkullRend.java index 107df37fe2f..b267409c6c7 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SkullRend.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SkullRend.java @@ -49,8 +49,6 @@ public class SkullRend extends CardImpl { super(ownerId, 195, "Skull Rend", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{R}"); this.expansionSetCode = "RTR"; - this.color.setBlack(true); - this.color.setRed(true); // Skull Rend deals 2 damage to each opponent. Those players each discard two cards at random. this.getSpellAbility().addEffect(new SkullRendEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SkylinePredator.java b/Mage.Sets/src/mage/sets/returntoravnica/SkylinePredator.java index bb4bf6778d3..1f5e1cdb4f2 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SkylinePredator.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SkylinePredator.java @@ -46,7 +46,6 @@ public class SkylinePredator extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java b/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java index 3d898de6f47..48f58783b3d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java @@ -57,8 +57,6 @@ public class SkymarkRoc extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Bird"); - this.color.setWhite(true); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SlaughterGames.java b/Mage.Sets/src/mage/sets/returntoravnica/SlaughterGames.java index 66ef17155c5..cb961ce176b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SlaughterGames.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SlaughterGames.java @@ -58,8 +58,6 @@ public class SlaughterGames extends CardImpl { super(ownerId, 197, "Slaughter Games", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{B}{R}"); this.expansionSetCode = "RTR"; - this.color.setBlack(true); - this.color.setRed(true); // Slaughter Games can't be countered by spells or abilities. Effect effect = new CantBeCounteredSourceEffect(); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SlimeMolding.java b/Mage.Sets/src/mage/sets/returntoravnica/SlimeMolding.java index 5858200600e..6322cbee4e9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SlimeMolding.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SlimeMolding.java @@ -49,7 +49,6 @@ public class SlimeMolding extends CardImpl { super(ownerId, 135, "Slime Molding", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{G}"); this.expansionSetCode = "RTR"; - this.color.setGreen(true); // Put an X/X green Ooze creature token onto the battlefield. this.getSpellAbility().addEffect(new SlimeMoldingEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Slitherhead.java b/Mage.Sets/src/mage/sets/returntoravnica/Slitherhead.java index e15f7268aa9..aa304b4f850 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Slitherhead.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Slitherhead.java @@ -47,8 +47,6 @@ public class Slitherhead extends CardImpl { this.subtype.add("Plant"); this.subtype.add("Zombie"); - this.color.setBlack(true); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SluicewayScorpion.java b/Mage.Sets/src/mage/sets/returntoravnica/SluicewayScorpion.java index 8186b994c24..342611563cd 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SluicewayScorpion.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SluicewayScorpion.java @@ -48,8 +48,6 @@ public class SluicewayScorpion extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Scorpion"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SlumReaper.java b/Mage.Sets/src/mage/sets/returntoravnica/SlumReaper.java index cfe2ffe8dfd..79ec46a3609 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SlumReaper.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SlumReaper.java @@ -47,7 +47,6 @@ public class SlumReaper extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java b/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java index 7b840c2d18b..d1ce845830c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java @@ -59,7 +59,6 @@ public class SoulswornSpirit extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SphinxOfTheChimes.java b/Mage.Sets/src/mage/sets/returntoravnica/SphinxOfTheChimes.java index 4ed987ffaa1..7e4bc01d44f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SphinxOfTheChimes.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SphinxOfTheChimes.java @@ -63,7 +63,6 @@ public class SphinxOfTheChimes extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SphinxsRevelation.java b/Mage.Sets/src/mage/sets/returntoravnica/SphinxsRevelation.java index 846dd67666d..c3918f16b6f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SphinxsRevelation.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SphinxsRevelation.java @@ -46,8 +46,6 @@ public class SphinxsRevelation extends CardImpl { super(ownerId, 200, "Sphinx's Revelation", Rarity.MYTHIC, new CardType[]{CardType.INSTANT}, "{X}{W}{U}{U}"); this.expansionSetCode = "RTR"; - this.color.setWhite(true); - this.color.setBlue(true); // You gain X life and draw X cards. ManacostVariableValue manaX = new ManacostVariableValue(); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/StealerOfSecrets.java b/Mage.Sets/src/mage/sets/returntoravnica/StealerOfSecrets.java index 1ae454c2ac8..39cd1b3c643 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/StealerOfSecrets.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/StealerOfSecrets.java @@ -56,7 +56,6 @@ public class StealerOfSecrets extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/StonefareCrocodile.java b/Mage.Sets/src/mage/sets/returntoravnica/StonefareCrocodile.java index e9a8689ba25..a8ad0f8f798 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/StonefareCrocodile.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/StonefareCrocodile.java @@ -51,7 +51,6 @@ public class StonefareCrocodile extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Crocodile"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java b/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java index 1c37c26a9cb..2f0b0abdaa7 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java @@ -62,7 +62,6 @@ public class StreetSpasm extends CardImpl { super(ownerId, 106, "Street Spasm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{R}"); this.expansionSetCode = "RTR"; - this.color.setRed(true); // Street Spasm deals X damage to target creature without flying you don't control. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java b/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java index 8f778c7c43b..914515574ae 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java @@ -56,8 +56,6 @@ public class SunderingGrowth extends CardImpl { super(ownerId, 223, "Sundering Growth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G/W}{G/W}"); this.expansionSetCode = "RTR"; - this.color.setGreen(true); - this.color.setWhite(true); // Destroy target artifact or enchantment, then populate. // (Put a token onto the battlefield that's a copy of a creature token you control.) diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SunspireGriffin.java b/Mage.Sets/src/mage/sets/returntoravnica/SunspireGriffin.java index 0d7344ef771..5a46511874c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SunspireGriffin.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SunspireGriffin.java @@ -45,7 +45,6 @@ public class SunspireGriffin extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Griffin"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SupremeVerdict.java b/Mage.Sets/src/mage/sets/returntoravnica/SupremeVerdict.java index 4e3d3dab2ad..3ea105437d5 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SupremeVerdict.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SupremeVerdict.java @@ -51,8 +51,6 @@ public class SupremeVerdict extends CardImpl { super(ownerId, 201, "Supreme Verdict", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{W}{W}{U}"); this.expansionSetCode = "RTR"; - this.color.setWhite(true); - this.color.setBlue(true); // Supreme Verdict can't be countered. Ability ability = new CantBeCounteredAbility(); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SurveyTheWreckage.java b/Mage.Sets/src/mage/sets/returntoravnica/SurveyTheWreckage.java index 22a9a6e92c1..968c43ad114 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SurveyTheWreckage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SurveyTheWreckage.java @@ -45,7 +45,6 @@ public class SurveyTheWreckage extends CardImpl { super(ownerId, 107, "Survey the Wreckage", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{R}"); this.expansionSetCode = "RTR"; - this.color.setRed(true); // Destroy target land. Put a 1/1 red Goblin creature token onto the battlefield. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Syncopate.java b/Mage.Sets/src/mage/sets/returntoravnica/Syncopate.java index 972a38525bf..e275c8a853f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Syncopate.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Syncopate.java @@ -56,7 +56,6 @@ public class Syncopate extends CardImpl { super(ownerId, 54, "Syncopate", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{U}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); // Counter target spell unless its controller pays {X}. If that spell is countered this way, exile it instead of putting it into its owner's graveyard. this.getSpellAbility().addEffect(new SyncopateCounterUnlessPaysEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TavernSwindler.java b/Mage.Sets/src/mage/sets/returntoravnica/TavernSwindler.java index c5473d76dc2..f41bc451115 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TavernSwindler.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TavernSwindler.java @@ -55,7 +55,6 @@ public class TavernSwindler extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Teleportal.java b/Mage.Sets/src/mage/sets/returntoravnica/Teleportal.java index 608223fdc6e..99349d1315e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Teleportal.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Teleportal.java @@ -67,8 +67,6 @@ public class Teleportal extends CardImpl { super(ownerId, 202, "Teleportal", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{U}{R}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); - this.color.setRed(true); // Target creature you control gets +1/+0 until end of turn and can't be blocked this turn. this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TenementCrasher.java b/Mage.Sets/src/mage/sets/returntoravnica/TenementCrasher.java index 0c1b1f97835..43a29673068 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TenementCrasher.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TenementCrasher.java @@ -45,7 +45,6 @@ public class TenementCrasher extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TerrusWurm.java b/Mage.Sets/src/mage/sets/returntoravnica/TerrusWurm.java index efe5880ea51..37b368d7d19 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TerrusWurm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TerrusWurm.java @@ -47,7 +47,6 @@ public class TerrusWurm extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Wurm"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Thoughtflare.java b/Mage.Sets/src/mage/sets/returntoravnica/Thoughtflare.java index 8f08b3e51e3..6c98b541685 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Thoughtflare.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Thoughtflare.java @@ -42,8 +42,6 @@ public class Thoughtflare extends CardImpl { super(ownerId, 203, "Thoughtflare", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{U}{R}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); - this.color.setRed(true); // Draw four cards, then discard two cards. this.getSpellAbility().addEffect(new DrawDiscardControllerEffect(4, 2)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TowerDrake.java b/Mage.Sets/src/mage/sets/returntoravnica/TowerDrake.java index 914374b7420..270d2b29bca 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TowerDrake.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TowerDrake.java @@ -52,7 +52,6 @@ public class TowerDrake extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ToweringIndrik.java b/Mage.Sets/src/mage/sets/returntoravnica/ToweringIndrik.java index b0d2251064b..867f347209a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ToweringIndrik.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ToweringIndrik.java @@ -45,7 +45,6 @@ public class ToweringIndrik extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TrainedCaracal.java b/Mage.Sets/src/mage/sets/returntoravnica/TrainedCaracal.java index 87e721e7a1c..b6965906eef 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TrainedCaracal.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TrainedCaracal.java @@ -45,7 +45,6 @@ public class TrainedCaracal extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Cat"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TrostanisJudgment.java b/Mage.Sets/src/mage/sets/returntoravnica/TrostanisJudgment.java index 48787509e39..289ab060f8c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TrostanisJudgment.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TrostanisJudgment.java @@ -45,7 +45,6 @@ public class TrostanisJudgment extends CardImpl { super(ownerId, 28, "Trostani's Judgment", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{5}{W}"); this.expansionSetCode = "RTR"; - this.color.setWhite(true); // Exile target creature, then populate. // (Put a token onto the battlefield that's a copy of a creature token you control.) diff --git a/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java b/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java index dabf0deb9e1..168ad1e8f70 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java @@ -53,7 +53,6 @@ public class UltimatePrice extends CardImpl { super(ownerId, 82, "Ultimate Price", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "RTR"; - this.color.setBlack(true); // Destroy target monocolored creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/UtvaraHellkite.java b/Mage.Sets/src/mage/sets/returntoravnica/UtvaraHellkite.java index 333a990e6c2..e6665cd58b7 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/UtvaraHellkite.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/UtvaraHellkite.java @@ -56,7 +56,6 @@ public class UtvaraHellkite extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Vandalblast.java b/Mage.Sets/src/mage/sets/returntoravnica/Vandalblast.java index 76a9ee83b5c..651ae6d3e05 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Vandalblast.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Vandalblast.java @@ -59,7 +59,6 @@ public class Vandalblast extends CardImpl { super(ownerId, 111, "Vandalblast", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "RTR"; - this.color.setRed(true); // Destroy target artifact you don't control. this.getSpellAbility().addTarget(new TargetArtifactPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/VassalSoul.java b/Mage.Sets/src/mage/sets/returntoravnica/VassalSoul.java index 007ba11791b..430f47ba667 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/VassalSoul.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/VassalSoul.java @@ -45,8 +45,6 @@ public class VassalSoul extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Spirit"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ViashinoRacketeer.java b/Mage.Sets/src/mage/sets/returntoravnica/ViashinoRacketeer.java index 0bfa71e8acf..5ebca885810 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ViashinoRacketeer.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ViashinoRacketeer.java @@ -49,7 +49,6 @@ public class ViashinoRacketeer extends CardImpl { this.subtype.add("Viashino"); this.subtype.add("Rogue"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Voidwielder.java b/Mage.Sets/src/mage/sets/returntoravnica/Voidwielder.java index b51971756bb..f80fb0e6a86 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Voidwielder.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Voidwielder.java @@ -49,7 +49,6 @@ public class Voidwielder extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/VraskaTheUnseen.java b/Mage.Sets/src/mage/sets/returntoravnica/VraskaTheUnseen.java index 00ac4b1b811..8ba32e31cf1 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/VraskaTheUnseen.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/VraskaTheUnseen.java @@ -74,8 +74,6 @@ public class VraskaTheUnseen extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Vraska"); - this.color.setBlack(true); - this.color.setGreen(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(5)), false)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/WayfaringTemple.java b/Mage.Sets/src/mage/sets/returntoravnica/WayfaringTemple.java index 554712449d3..1197d1ff4b8 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/WayfaringTemple.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/WayfaringTemple.java @@ -53,8 +53,6 @@ public class WayfaringTemple extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Elemental"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/WorldspineWurm.java b/Mage.Sets/src/mage/sets/returntoravnica/WorldspineWurm.java index 1a114d1eb84..a2927db3387 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/WorldspineWurm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/WorldspineWurm.java @@ -50,7 +50,6 @@ public class WorldspineWurm extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(15); this.toughness = new MageInt(15); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ZanikevLocust.java b/Mage.Sets/src/mage/sets/returntoravnica/ZanikevLocust.java index 3aa16fabe16..36c27ee84e2 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ZanikevLocust.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ZanikevLocust.java @@ -47,7 +47,6 @@ public class ZanikevLocust extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Insect"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/revisededition/DesertTwister.java b/Mage.Sets/src/mage/sets/revisededition/DesertTwister.java index a6f9215dd82..33a25f6adb0 100644 --- a/Mage.Sets/src/mage/sets/revisededition/DesertTwister.java +++ b/Mage.Sets/src/mage/sets/revisededition/DesertTwister.java @@ -44,7 +44,6 @@ public class DesertTwister extends CardImpl { super(ownerId, 99, "Desert Twister", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{G}{G}"); this.expansionSetCode = "3ED"; - this.color.setGreen(true); // Destroy target permanent. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java index 858ff500d18..d5c41c421b1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java @@ -51,7 +51,6 @@ public class AffaGuardHound extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Hound"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AkoumBoulderfoot.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AkoumBoulderfoot.java index c29259c349e..c24c8c3a45f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AkoumBoulderfoot.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AkoumBoulderfoot.java @@ -50,7 +50,6 @@ public class AkoumBoulderfoot extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArrogantBloodlord.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArrogantBloodlord.java index 568f7bba137..1f262a497b2 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArrogantBloodlord.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArrogantBloodlord.java @@ -56,7 +56,6 @@ public class ArrogantBloodlord extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Knight"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java index 7e00674a7df..c99e4b202c4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java @@ -63,7 +63,6 @@ public class AuraFinesse extends CardImpl { super(ownerId, 54, "Aura Finesse", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "ROE"; - this.color.setBlue(true); // Attach target Aura you control to target creature. this.getSpellAbility().addEffect(new AuraFinesseEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraGnarlid.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraGnarlid.java index a27d3d23db4..6eb09605864 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraGnarlid.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraGnarlid.java @@ -58,7 +58,6 @@ public class AuraGnarlid extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java index 34c765c0e29..237f8b492ea 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java @@ -56,7 +56,6 @@ public class BalaGedScorpion extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Scorpion"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java index 8f80b785f1b..e8dbc4fd6d1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java @@ -54,7 +54,6 @@ public class BanefulOmen extends CardImpl { super(ownerId, 96, "Baneful Omen", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{B}{B}{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); // At the beginning of your end step, you may reveal the top card of your library. If you do, each opponent loses life equal to that card's converted mana cost. this.addAbility(new BanefulOmenTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRampart.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRampart.java index 2a76ed18207..50ff105a228 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRampart.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRampart.java @@ -52,7 +52,6 @@ public class BattleRampart extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Wall"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRattleShaman.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRattleShaman.java index ac7826f8809..f3c073e76e0 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRattleShaman.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRattleShaman.java @@ -49,7 +49,6 @@ public class BattleRattleShaman extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BearUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BearUmbra.java index a77b5421cf3..09273bc49f7 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BearUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BearUmbra.java @@ -54,7 +54,6 @@ public class BearUmbra extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BoarUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BoarUmbra.java index 1b25ba3ac24..7d7e388457d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BoarUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BoarUmbra.java @@ -51,7 +51,6 @@ public class BoarUmbra extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Bramblesnap.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Bramblesnap.java index 7fc94ed9ab1..2b1200402f3 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Bramblesnap.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Bramblesnap.java @@ -51,7 +51,6 @@ public class Bramblesnap extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BroodBirthing.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BroodBirthing.java index 3c5dbd4e130..16904f6c3d0 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BroodBirthing.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BroodBirthing.java @@ -49,7 +49,6 @@ public class BroodBirthing extends CardImpl { super(ownerId, 138, "Brood Birthing", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "ROE"; - this.color.setRed(true); this.getSpellAbility().addEffect(new BroodBirthingEffect()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Broodwarden.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Broodwarden.java index d42212df165..40d0e9ec177 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Broodwarden.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Broodwarden.java @@ -58,7 +58,6 @@ public class Broodwarden extends CardImpl { this.subtype.add("Eldrazi"); this.subtype.add("Drone"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); // Eldrazi Spawn creatures you control get +2/+1. diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CadaverImp.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CadaverImp.java index a2339b7cb26..0b80e4c99dc 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CadaverImp.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CadaverImp.java @@ -50,7 +50,6 @@ public class CadaverImp extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Imp"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConqueringManticore.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConqueringManticore.java index 62c12b369f4..12d14aa4a61 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConqueringManticore.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConqueringManticore.java @@ -53,7 +53,6 @@ public class ConqueringManticore extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Manticore"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumeTheMeek.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumeTheMeek.java index 95955d63e25..b849f14a455 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumeTheMeek.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumeTheMeek.java @@ -52,7 +52,6 @@ public class ConsumeTheMeek extends CardImpl { super(ownerId, 100, "Consume the Meek", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{B}{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); // Destroy each creature with converted mana cost 3 or less. They can't be regenerated. this.getSpellAbility().addEffect(new DestroyAllEffect(filter, false)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumingVapors.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumingVapors.java index 2d2c90787cc..25841a83bcc 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumingVapors.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumingVapors.java @@ -57,7 +57,6 @@ public class ConsumingVapors extends CardImpl { super(ownerId, 101, "Consuming Vapors", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); // Target player sacrifices a creature. You gain life equal to that creature's toughness. this.getSpellAbility().addEffect(new ConsumingVaporsEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ContaminatedGround.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ContaminatedGround.java index 9a924159e26..854f7419668 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ContaminatedGround.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ContaminatedGround.java @@ -58,7 +58,6 @@ public class ContaminatedGround extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java index 5fb3d7ab18e..9f0589f7300 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java @@ -56,7 +56,6 @@ public class Corpsehatch extends CardImpl { super(ownerId, 103, "Corpsehatch", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CrabUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CrabUmbra.java index 717ee5e646c..7ce010422e8 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CrabUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CrabUmbra.java @@ -55,7 +55,6 @@ public class CrabUmbra extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CurseOfWizardry.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CurseOfWizardry.java index 765c9420e81..d03c36b7c12 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CurseOfWizardry.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CurseOfWizardry.java @@ -57,7 +57,6 @@ public class CurseOfWizardry extends CardImpl { super(ownerId, 104, "Curse of Wizardry", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); // As Curse of Wizardry enters the battlefield, choose a color. this.addAbility(new AsEntersBattlefieldAbility(new CurseOfWizardryChooseColorEffect())); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DaggerbackBasilisk.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DaggerbackBasilisk.java index c36fabd6fdd..6ec37845148 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DaggerbackBasilisk.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DaggerbackBasilisk.java @@ -45,7 +45,6 @@ public class DaggerbackBasilisk extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Basilisk"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DawnglareInvoker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DawnglareInvoker.java index c6ace5049ed..0a6ed85ffc3 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DawnglareInvoker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DawnglareInvoker.java @@ -58,7 +58,6 @@ public class DawnglareInvoker extends CardImpl { this.subtype.add("Kor"); this.subtype.add("Wizard"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathCultist.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathCultist.java index 28b5e5f567c..889267a603e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathCultist.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathCultist.java @@ -52,7 +52,6 @@ public class DeathCultist extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DevastatingSummons.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DevastatingSummons.java index 7babffaa7de..86481e5768b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DevastatingSummons.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DevastatingSummons.java @@ -51,7 +51,6 @@ public class DevastatingSummons extends CardImpl { super(ownerId, 140, "Devastating Summons", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "ROE"; - this.color.setRed(true); // As an additional cost to cast Devastating Summons, sacrifice X lands. this.getSpellAbility().addCost(new SacrificeXTargetCost(new FilterControlledLandPermanent("lands"), true)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DisasterRadius.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DisasterRadius.java index 08f848ccfc3..f653494a47d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DisasterRadius.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DisasterRadius.java @@ -54,7 +54,6 @@ public class DisasterRadius extends CardImpl { super(ownerId, 141, "Disaster Radius", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{R}{R}"); this.expansionSetCode = "ROE"; - this.color.setRed(true); // As an additional cost to cast Disaster Radius, reveal a creature card from your hand. TargetCardInHand targetCard = new TargetCardInHand(new FilterCreatureCard("a creature card")); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DistortionStrike.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DistortionStrike.java index 3b4887bdfab..7984b60ac45 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DistortionStrike.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DistortionStrike.java @@ -48,7 +48,6 @@ public class DistortionStrike extends CardImpl { super(ownerId, 60, "Distortion Strike", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}"); this.expansionSetCode = "ROE"; - this.color.setBlue(true); // Target creature gets +1/+0 until end of turn and can't be blocked this turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Domestication.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Domestication.java index 977187b1235..9333934ddf8 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Domestication.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Domestication.java @@ -60,7 +60,6 @@ public class Domestication extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DormantGomazoa.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DormantGomazoa.java index 810ddce3f42..a608cbfa080 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DormantGomazoa.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DormantGomazoa.java @@ -51,7 +51,6 @@ public class DormantGomazoa extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Jellyfish"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DrakeUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DrakeUmbra.java index 77f49853d57..98f305b9e57 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DrakeUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DrakeUmbra.java @@ -53,7 +53,6 @@ public class DrakeUmbra extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DranaKalastriaBloodchief.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DranaKalastriaBloodchief.java index 700f8f473be..46aa20a3480 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DranaKalastriaBloodchief.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DranaKalastriaBloodchief.java @@ -59,7 +59,6 @@ public class DranaKalastriaBloodchief extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Shaman"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EelUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EelUmbra.java index 561f6373add..1a875fc57ed 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EelUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EelUmbra.java @@ -52,7 +52,6 @@ public class EelUmbra extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setBlue(true); this.addAbility(FlashAbility.getInstance()); // Enchant creature diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ElandUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ElandUmbra.java index d390e68b9b0..9b9c7078c94 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ElandUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ElandUmbra.java @@ -51,7 +51,6 @@ public class ElandUmbra extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmergeUnscathed.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmergeUnscathed.java index 0469a9f70ea..5e7b03d5dd6 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmergeUnscathed.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmergeUnscathed.java @@ -46,7 +46,6 @@ public class EmergeUnscathed extends CardImpl { super(ownerId, 20, "Emerge Unscathed", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "ROE"; - this.color.setWhite(true); // Target creature you control gains protection from the color of your choice until end of turn. this.getSpellAbility().addEffect(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EscapedNull.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EscapedNull.java index a8603ceda1f..456453c370c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EscapedNull.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EscapedNull.java @@ -49,7 +49,6 @@ public class EscapedNull extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Berserker"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java index dde6a4b8de7..9861b161829 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java @@ -54,7 +54,6 @@ public class ExplosiveRevelation extends CardImpl { super(ownerId, 143, "Explosive Revelation", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); this.expansionSetCode = "ROE"; - this.color.setRed(true); // Choose target creature or player. Reveal cards from the top of your library until you reveal a nonland card. Explosive Revelation deals damage equal to that card's converted mana cost to that creature or player. Put the nonland card into your hand and the rest on the bottom of your library in any order. this.getSpellAbility().addEffect(new ExplosiveRevelationEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ForkedBolt.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ForkedBolt.java index ba5a1fbd837..5433eb60464 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ForkedBolt.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ForkedBolt.java @@ -45,7 +45,6 @@ public class ForkedBolt extends CardImpl { super(ownerId, 146, "Forked Bolt", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "ROE"; - this.color.setRed(true); // Forked Bolt deals 2 damage divided as you choose among one or two target creatures and/or players. Effect effect = new DamageMultiEffect(2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FrostwindInvoker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FrostwindInvoker.java index 3af36d92096..4a8fb163ff5 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FrostwindInvoker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FrostwindInvoker.java @@ -51,7 +51,6 @@ public class FrostwindInvoker extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GelatinousGenesis.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GelatinousGenesis.java index 4101c3feb73..7bb21ce4121 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GelatinousGenesis.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GelatinousGenesis.java @@ -49,7 +49,6 @@ public class GelatinousGenesis extends CardImpl { super(ownerId, 183, "Gelatinous Genesis", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{X}{G}"); this.expansionSetCode = "ROE"; - this.color.setGreen(true); // Put X X/X green Ooze creature tokens onto the battlefield. this.getSpellAbility().addEffect(new GelatinousGenesisEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java index 7a950fe8f4e..88ca532f94a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java @@ -54,7 +54,6 @@ public class GoblinArsonist extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravitationalShift.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravitationalShift.java index cc4c29bf979..4b279030e33 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravitationalShift.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravitationalShift.java @@ -58,7 +58,6 @@ public class GravitationalShift extends CardImpl { super(ownerId, 69, "Gravitational Shift", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}{U}"); this.expansionSetCode = "ROE"; - this.color.setBlue(true); // Creatures with flying get +2/+0. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(2, 0, Duration.WhileOnBattlefield, filter1, false))); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravityWell.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravityWell.java index 92eeaed15c4..26920211183 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravityWell.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravityWell.java @@ -52,7 +52,6 @@ public class GravityWell extends CardImpl { super(ownerId, 185, "Gravity Well", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}{G}"); this.expansionSetCode = "ROE"; - this.color.setGreen(true); // Whenever a creature with flying attacks, it loses flying until end of turn. this.addAbility(new GravityWellTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java index 4da2f2d170b..4c8578d6096 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java @@ -66,7 +66,6 @@ public class GrotagSiegeRunner extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Rogue"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrowthSpasm.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrowthSpasm.java index a6f418e4910..f3953cb591c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrowthSpasm.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrowthSpasm.java @@ -49,7 +49,6 @@ public class GrowthSpasm extends CardImpl { super(ownerId, 186, "Growth Spasm", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "ROE"; - this.color.setGreen(true); this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), true)); this.getSpellAbility().addEffect(new CreateTokenEffect(new EldraziSpawnToken())); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardGomazoa.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardGomazoa.java index 78dc3e9b9c2..c8d19f70354 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardGomazoa.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardGomazoa.java @@ -51,7 +51,6 @@ public class GuardGomazoa extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Jellyfish"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HarmlessAssault.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HarmlessAssault.java index 990b19fb58e..3560af1bd08 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HarmlessAssault.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HarmlessAssault.java @@ -46,7 +46,6 @@ public class HarmlessAssault extends CardImpl { new CardType[] { CardType.INSTANT }, "{2}{W}{W}"); this.expansionSetCode = "ROE"; - this.color.setWhite(true); // Prevent all combat damage that would be dealt this turn by attacking // creatures. diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HazeFrog.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HazeFrog.java index 962febe27ec..ea0c8dad303 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HazeFrog.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HazeFrog.java @@ -54,7 +54,6 @@ public class HazeFrog extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Frog"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HeatRay.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HeatRay.java index 4e33df0b4fe..43263666e47 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HeatRay.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HeatRay.java @@ -45,7 +45,6 @@ public class HeatRay extends CardImpl { super(ownerId, 150, "Heat Ray", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{X}{R}"); this.expansionSetCode = "ROE"; - this.color.setRed(true); this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellcarverDemon.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellcarverDemon.java index a4161ef869d..7a840918c4a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellcarverDemon.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellcarverDemon.java @@ -57,7 +57,6 @@ public class HellcarverDemon extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Demon"); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellionEruption.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellionEruption.java index be382e273a4..243f48bf2df 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellionEruption.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellionEruption.java @@ -52,7 +52,6 @@ public class HellionEruption extends CardImpl { super(ownerId, 151, "Hellion Eruption", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{R}"); this.expansionSetCode = "ROE"; - this.color.setRed(true); // Sacrifice all creatures you control, then put that many 4/4 red Hellion creature tokens onto the battlefield. this.getSpellAbility().addEffect(new HellionEruptionEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HyenaUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HyenaUmbra.java index af0f2668cc0..b3baf380e1b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HyenaUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HyenaUmbra.java @@ -53,7 +53,6 @@ public class HyenaUmbra extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/InduceDespair.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/InduceDespair.java index b18854a4f88..24b5f55f6af 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/InduceDespair.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/InduceDespair.java @@ -54,7 +54,6 @@ public class InduceDespair extends CardImpl { super(ownerId, 114, "Induce Despair", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); // As an additional cost to cast Induce Despair, reveal a creature card from your hand. // Target creature gets -X/-X until end of turn, where X is the revealed card's converted mana cost. diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/IrresistiblePrey.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/IrresistiblePrey.java index f41f23220c5..9bc6be82e1d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/IrresistiblePrey.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/IrresistiblePrey.java @@ -49,7 +49,6 @@ public class IrresistiblePrey extends CardImpl { super(ownerId, 188, "Irresistible Prey", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{G}"); this.expansionSetCode = "ROE"; - this.color.setGreen(true); // Target creature must be blocked this turn if able. // Draw a card. diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java index d6a3edc3d97..23b77289681 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java @@ -57,7 +57,6 @@ public class JaddiLifestrider extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KhalniHydra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KhalniHydra.java index e8987937e66..4a731c29462 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KhalniHydra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KhalniHydra.java @@ -63,7 +63,6 @@ public class KhalniHydra extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Hydra"); - this.color.setGreen(true); this.power = new MageInt(8); this.toughness = new MageInt(8); this.addAbility(new SimpleStaticAbility(Zone.STACK, new KhalniHydraCostReductionEffect())); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KilnFiend.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KilnFiend.java index a52c8e7b88a..570d2de83ed 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KilnFiend.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KilnFiend.java @@ -58,7 +58,6 @@ public class KilnFiend extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java index e94f046638f..1016dcbc269 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java @@ -60,7 +60,6 @@ public class KorLineSlinger extends CardImpl { this.subtype.add("Kor"); this.subtype.add("Scout"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorSpiritdancer.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorSpiritdancer.java index 951e090533b..664f46594a1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorSpiritdancer.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorSpiritdancer.java @@ -60,7 +60,6 @@ public class KorSpiritdancer extends CardImpl { this.subtype.add("Kor"); this.subtype.add("Wizard"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LavafumeInvoker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LavafumeInvoker.java index b5e5914780f..c32cee46563 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LavafumeInvoker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LavafumeInvoker.java @@ -50,7 +50,6 @@ public class LavafumeInvoker extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LayBare.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LayBare.java index 97374800574..c18b37fa5b4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LayBare.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LayBare.java @@ -52,7 +52,6 @@ public class LayBare extends CardImpl { super(ownerId, 74, "Lay Bare", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); this.expansionSetCode = "ROE"; - this.color.setBlue(true); // Counter target spell. Look at its controller's hand. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java index 4eb12335331..59dfb78b21a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java @@ -53,7 +53,6 @@ public class LeafArrow extends CardImpl { super(ownerId, 194, "Leaf Arrow", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "ROE"; - this.color.setGreen(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LightmineField.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LightmineField.java index d99aff5f8b7..d32ca3ab7c5 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LightmineField.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LightmineField.java @@ -52,7 +52,6 @@ public class LightmineField extends CardImpl { super(ownerId, 32, "Lightmine Field", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "ROE"; - this.color.setWhite(true); // Whenever one or more creatures attack, Lightmine Field deals damage to each of those creatures equal to the number of attacking creatures. this.addAbility(new LightmineFieldTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LivingDestiny.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LivingDestiny.java index 1d0c7f7dfed..95462107555 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LivingDestiny.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LivingDestiny.java @@ -51,7 +51,6 @@ public class LivingDestiny extends CardImpl { super(ownerId, 195, "Living Destiny", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{G}"); this.expansionSetCode = "ROE"; - this.color.setGreen(true); // As an additional cost to cast Living Destiny, reveal a creature card from your hand. TargetCardInHand targetCard = new TargetCardInHand(new FilterCreatureCard("a creature card")); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LoneMissionary.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LoneMissionary.java index 233811e5213..a343c97b180 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LoneMissionary.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LoneMissionary.java @@ -47,7 +47,6 @@ public class LoneMissionary extends CardImpl { this.subtype.add("Kor"); this.subtype.add("Monk"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java index a15773efca9..dbeb1e9dc72 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java @@ -53,7 +53,6 @@ public class LuminousWake extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LustForWar.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LustForWar.java index 4b9aed41f81..a0fb89d181e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LustForWar.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LustForWar.java @@ -53,7 +53,6 @@ public class LustForWar extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Magmaw.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Magmaw.java index 87996b6c8e0..fc43046f7e5 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Magmaw.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Magmaw.java @@ -61,7 +61,6 @@ public class Magmaw extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MammothUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MammothUmbra.java index 73919b5214e..58e79b4c160 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MammothUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MammothUmbra.java @@ -53,7 +53,6 @@ public class MammothUmbra extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkObserver.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkObserver.java index cac4c81285f..5eac8a1d204 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkObserver.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkObserver.java @@ -48,7 +48,6 @@ public class MerfolkObserver extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkSkyscout.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkSkyscout.java index 6343ad7026a..833aa1dfad2 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkSkyscout.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkSkyscout.java @@ -49,7 +49,6 @@ public class MerfolkSkyscout extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Scout"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java index 6930a0d1b8d..1ed90ff2ac0 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java @@ -47,7 +47,6 @@ public class MightOfTheMasses extends CardImpl { super(ownerId, 196, "Might of the Masses", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "ROE"; - this.color.setGreen(true); PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MnemonicWall.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MnemonicWall.java index 1d660a44c52..0df84886947 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MnemonicWall.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MnemonicWall.java @@ -60,7 +60,6 @@ public class MnemonicWall extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Wall"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MomentousFall.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MomentousFall.java index 30b897f4a04..0eb9cb4907e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MomentousFall.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MomentousFall.java @@ -50,7 +50,6 @@ public class MomentousFall extends CardImpl { super(ownerId, 197, "Momentous Fall", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{G}{G}"); this.expansionSetCode = "ROE"; - this.color.setGreen(true); // As an additional cost to cast Momentous Fall, sacrifice a creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MorticianBeetle.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MorticianBeetle.java index 8003ef63014..f4a47a2c246 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MorticianBeetle.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MorticianBeetle.java @@ -54,7 +54,6 @@ public class MorticianBeetle extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Insect"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java index 0ddc350317b..3ead7d24975 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java @@ -56,7 +56,6 @@ public class Narcolepsy extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetPermanent(filter); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NearDeathExperience.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NearDeathExperience.java index b21b3d3092a..9b290346b8b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NearDeathExperience.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NearDeathExperience.java @@ -51,7 +51,6 @@ public class NearDeathExperience extends CardImpl { super(ownerId, 38, "Near-Death Experience", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}{W}"); this.expansionSetCode = "ROE"; - this.color.setWhite(true); // At the beginning of your upkeep, if you have exactly 1 life, you win the game. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new WinGameSourceControllerEffect(), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaRevenant.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaRevenant.java index beba1bb3282..c609cfaca16 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaRevenant.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaRevenant.java @@ -60,7 +60,6 @@ public class NirkanaRevenant extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Shade"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NomadsAssembly.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NomadsAssembly.java index f2c7a059ccc..7dd99c31499 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NomadsAssembly.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NomadsAssembly.java @@ -49,7 +49,6 @@ public class NomadsAssembly extends CardImpl { super(ownerId, 39, "Nomads' Assembly", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{W}{W}"); this.expansionSetCode = "ROE"; - this.color.setWhite(true); this.getSpellAbility().addEffect(new CreateTokenEffect(new SoldierToken(), new PermanentsOnBattlefieldCount(filter))); this.addAbility(new ReboundAbility()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/OgreSentry.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/OgreSentry.java index 39b62bc4a83..7ce9bedaa16 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/OgreSentry.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/OgreSentry.java @@ -46,7 +46,6 @@ public class OgreSentry extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/OnduGiant.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/OnduGiant.java index da70d8d616b..6acfa580555 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/OnduGiant.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/OnduGiant.java @@ -51,7 +51,6 @@ public class OnduGiant extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Oust.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Oust.java index c52ab425cbb..dd95f45f1d1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Oust.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Oust.java @@ -51,7 +51,6 @@ public class Oust extends CardImpl { super(ownerId, 40, "Oust", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{W}"); this.expansionSetCode = "ROE"; - this.color.setWhite(true); // Put target creature into its owner's library second from the top. Its controller gains 3 life. this.getSpellAbility().addEffect(new OustEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/OvergrownBattlement.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/OvergrownBattlement.java index a397fae9a84..b1762872eeb 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/OvergrownBattlement.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/OvergrownBattlement.java @@ -56,7 +56,6 @@ public class OvergrownBattlement extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Wall"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PawnOfUlamog.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PawnOfUlamog.java index c03015a6d00..33e4def384f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PawnOfUlamog.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PawnOfUlamog.java @@ -56,7 +56,6 @@ public class PawnOfUlamog extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Shaman"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PelakkaWurm.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PelakkaWurm.java index 8ccdb9782de..889d554aa34 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PelakkaWurm.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PelakkaWurm.java @@ -49,7 +49,6 @@ public class PelakkaWurm extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PerishTheThought.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PerishTheThought.java index 1be53047aa7..90f0368c91a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PerishTheThought.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PerishTheThought.java @@ -53,7 +53,6 @@ public class PerishTheThought extends CardImpl { super(ownerId, 123, "Perish the Thought", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); // Target opponent reveals his or her hand. You choose a card from it. That player shuffles that card into his or her library. this.getSpellAbility().addEffect(new PerishTheThoughtEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PhantasmalAbomination.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PhantasmalAbomination.java index d7e457c1964..e6330ff634e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PhantasmalAbomination.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PhantasmalAbomination.java @@ -47,7 +47,6 @@ public class PhantasmalAbomination extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java index 1a59af03f60..0aa4f5b4313 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java @@ -54,7 +54,6 @@ public class PuncturingLight extends CardImpl { super(ownerId, 41, "Puncturing Light", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "ROE"; - this.color.setWhite(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RageNimbus.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RageNimbus.java index 07e84fad38f..09f70b84491 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RageNimbus.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RageNimbus.java @@ -52,7 +52,6 @@ public class RageNimbus extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java index d0b894258ba..14afa729600 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java @@ -50,7 +50,6 @@ public class RaidBombardment extends CardImpl { super(ownerId, 161, "Raid Bombardment", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "ROE"; - this.color.setRed(true); // Whenever a creature you control with power 2 or less attacks, Raid Bombardment deals 1 damage to defending player. this.addAbility(new RaidBombardmentTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RapaciousOne.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RapaciousOne.java index 8b20ca1c6df..30d39552110 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RapaciousOne.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RapaciousOne.java @@ -54,7 +54,6 @@ public class RapaciousOne extends CardImpl { this.subtype.add("Eldrazi"); this.subtype.add("Drone"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealitySpasm.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealitySpasm.java index 1f990fc7533..bca33de3c6c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealitySpasm.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealitySpasm.java @@ -51,7 +51,6 @@ public class RealitySpasm extends CardImpl { super(ownerId, 81, "Reality Spasm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{U}{U}"); this.expansionSetCode = "ROE"; - this.color.setBlue(true); // Choose one - Tap X target permanents; or untap X target permanents. this.getSpellAbility().addEffect(new RealitySpasmTapEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RecurringInsight.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RecurringInsight.java index e2bfab453be..4745f6eef18 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RecurringInsight.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RecurringInsight.java @@ -50,7 +50,6 @@ public class RecurringInsight extends CardImpl { super(ownerId, 82, "Recurring Insight", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{U}{U}"); this.expansionSetCode = "ROE"; - this.color.setBlue(true); // Rebound this.addAbility(new ReboundAbility()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java index e8f280e2c17..2f3f445d5f6 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java @@ -57,7 +57,6 @@ public class RenegadeDoppelganger extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Shapeshifter"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepayInKind.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepayInKind.java index 2a8fbe4cd32..e1d85adac24 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepayInKind.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepayInKind.java @@ -48,7 +48,6 @@ public class RepayInKind extends CardImpl { super(ownerId, 125, "Repay in Kind", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{B}{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); // Each player's life total becomes the lowest life total among all players. this.getSpellAbility().addEffect(new RepayInKindEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepelTheDarkness.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepelTheDarkness.java index 26769e0b55f..5d4d6566c10 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepelTheDarkness.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepelTheDarkness.java @@ -45,7 +45,6 @@ public class RepelTheDarkness extends CardImpl { super(ownerId, 42, "Repel the Darkness", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "ROE"; - this.color.setWhite(true); this.getSpellAbility().addEffect(new TapTargetEffect()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java index 7c8c36d7049..9124f195994 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java @@ -67,8 +67,6 @@ public class SarkhanTheMad extends CardImpl { this.subtype.add("Sarkhan"); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(7)), false)); - this.color.setBlack(true); - this.color.setRed(true); this.addAbility(new LoyaltyAbility(new SarkhanTheMadRevealAndDrawEffect(), 0)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SharedDiscovery.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SharedDiscovery.java index f8a7854a9df..747ac115f43 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SharedDiscovery.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SharedDiscovery.java @@ -54,7 +54,6 @@ public class SharedDiscovery extends CardImpl { super(ownerId, 87, "Shared Discovery", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}"); this.expansionSetCode = "ROE"; - this.color.setBlue(true); // As an additional cost to cast Shared Discovery, tap four untapped creatures you control. // Draw three cards. diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Shrivel.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Shrivel.java index 9788c5a00c5..9718fa23bd4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Shrivel.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Shrivel.java @@ -45,7 +45,6 @@ public class Shrivel extends CardImpl { super(ownerId, 126, "Shrivel", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); this.getSpellAbility().addEffect(new BoostAllEffect(-1, -1, Duration.EndOfTurn, new FilterCreaturePermanent("All creatures"), false)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkeletalWurm.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkeletalWurm.java index 24b9654a9a8..018b78b7f3b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkeletalWurm.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkeletalWurm.java @@ -49,7 +49,6 @@ public class SkeletalWurm extends CardImpl { this.subtype.add("Skeleton"); this.subtype.add("Wurm"); - this.color.setBlack(true); this.power = new MageInt(7); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java index ec38b2c83e2..9d3d545e116 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java @@ -52,7 +52,6 @@ public class Smite extends CardImpl { super(ownerId, 43, "Smite", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "ROE"; - this.color.setWhite(true); // Destroy target blocked creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SnakeUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SnakeUmbra.java index 5140c0ca2db..45efa75b0a4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SnakeUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SnakeUmbra.java @@ -54,7 +54,6 @@ public class SnakeUmbra extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsAttendant.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsAttendant.java index c269a7d2678..b30fe9d2c5e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsAttendant.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsAttendant.java @@ -48,7 +48,6 @@ public class SoulsAttendant extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsurgeElemental.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsurgeElemental.java index c9e662b748c..227628209b9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsurgeElemental.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsurgeElemental.java @@ -56,7 +56,6 @@ public class SoulsurgeElemental extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpawningBreath.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpawningBreath.java index 9d05e52d539..a9123bff175 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpawningBreath.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpawningBreath.java @@ -46,7 +46,6 @@ public class SpawningBreath extends CardImpl { super(ownerId, 164, "Spawning Breath", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "ROE"; - this.color.setRed(true); this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpiderUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpiderUmbra.java index da0f4243960..885b6ef197f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpiderUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpiderUmbra.java @@ -53,7 +53,6 @@ public class SpiderUmbra extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java index 935ebb8b7b1..f3025d07eb1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java @@ -65,7 +65,6 @@ public class SplinterTwin extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SporecapSpider.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SporecapSpider.java index 3fcc5629aee..5a5bc634f30 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SporecapSpider.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SporecapSpider.java @@ -45,7 +45,6 @@ public class SporecapSpider extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Spider"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Staggershock.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Staggershock.java index 675044cdfaf..7a9bbf3e074 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Staggershock.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Staggershock.java @@ -45,7 +45,6 @@ public class Staggershock extends CardImpl { super(ownerId, 166, "Staggershock", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "ROE"; - this.color.setRed(true); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.addAbility(new ReboundAbility()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/StalwartShieldBearers.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/StalwartShieldBearers.java index 7585d5fa827..8282c9b0b32 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/StalwartShieldBearers.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/StalwartShieldBearers.java @@ -58,7 +58,6 @@ public class StalwartShieldBearers extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SufferThePast.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SufferThePast.java index d27410bde17..b160245935d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SufferThePast.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SufferThePast.java @@ -53,7 +53,6 @@ public class SufferThePast extends CardImpl { super(ownerId, 128, "Suffer the Past", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); // Exile X target cards from target player's graveyard. For each card exiled this way, that player loses 1 life and you gain 1 life. this.getSpellAbility().addEffect(new SufferThePastEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrakarSpellblade.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrakarSpellblade.java index d08aa693ae6..1042deafbc0 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrakarSpellblade.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrakarSpellblade.java @@ -61,7 +61,6 @@ public class SurrakarSpellblade extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Surrakar"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrealMemoir.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrealMemoir.java index b2f3ba73a44..e79af1b5e13 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrealMemoir.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrealMemoir.java @@ -53,7 +53,6 @@ public class SurrealMemoir extends CardImpl { super(ownerId, 167, "Surreal Memoir", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "ROE"; - this.color.setRed(true); // Return an instant card at random from your graveyard to your hand. this.getSpellAbility().addEffect(new SurrealMemoirEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurvivalCache.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurvivalCache.java index 84f9d83405a..de5422fdade 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurvivalCache.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurvivalCache.java @@ -50,7 +50,6 @@ public class SurvivalCache extends CardImpl { super(ownerId, 48, "Survival Cache", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{W}"); this.expansionSetCode = "ROE"; - this.color.setWhite(true); // You gain 2 life. Then if you have more life than an opponent, draw a card. this.getSpellAbility().addEffect(new GainLifeEffect(2)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TajuruPreserver.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TajuruPreserver.java index deff455f1fa..9a22c9cdf4b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TajuruPreserver.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TajuruPreserver.java @@ -52,7 +52,6 @@ public class TajuruPreserver extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ThoughtGorger.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ThoughtGorger.java index c6f6676da98..454012e5763 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ThoughtGorger.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ThoughtGorger.java @@ -55,7 +55,6 @@ public class ThoughtGorger extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TimeOfHeroes.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TimeOfHeroes.java index b712b652ee5..13aad41c934 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TimeOfHeroes.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TimeOfHeroes.java @@ -56,7 +56,6 @@ public class TimeOfHeroes extends CardImpl { super(ownerId, 49, "Time of Heroes", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "ROE"; - this.color.setWhite(true); // Each creature you control with a level counter on it gets +2/+2. ContinuousEffect boost = new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TotemGuideHartebeest.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TotemGuideHartebeest.java index 8c7eb5a2cf2..bd99231287b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TotemGuideHartebeest.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TotemGuideHartebeest.java @@ -57,7 +57,6 @@ public class TotemGuideHartebeest extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Antelope"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TrainingGrounds.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TrainingGrounds.java index 771b76a7360..d1aeb9882d5 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TrainingGrounds.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TrainingGrounds.java @@ -60,7 +60,6 @@ public class TrainingGrounds extends CardImpl { super(ownerId, 91, "Training Grounds", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{U}"); this.expansionSetCode = "ROE"; - this.color.setBlue(true); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TrainingGroundsEffect())); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TraitorousInstinct.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TraitorousInstinct.java index 7208357d0d6..4007bc0b5fe 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TraitorousInstinct.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TraitorousInstinct.java @@ -49,7 +49,6 @@ public class TraitorousInstinct extends CardImpl { super(ownerId, 168, "Traitorous Instinct", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "ROE"; - this.color.setRed(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UmbraMystic.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UmbraMystic.java index d5194802dd7..beb71067f23 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UmbraMystic.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UmbraMystic.java @@ -62,7 +62,6 @@ public class UmbraMystic extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ValakutFireboar.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ValakutFireboar.java index 5aa7ab01ee8..294a57e7564 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ValakutFireboar.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ValakutFireboar.java @@ -48,7 +48,6 @@ public class ValakutFireboar extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Boar"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java index f94f9103b69..0b43e92410b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java @@ -62,7 +62,6 @@ public class Vendetta extends CardImpl { super(ownerId, 130, "Vendetta", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); // Destroy target nonblack creature. It can't be regenerated. You lose life equal to that creature's toughness. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VeneratedTeacher.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VeneratedTeacher.java index 51b2304842a..b28714cd125 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VeneratedTeacher.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VeneratedTeacher.java @@ -55,7 +55,6 @@ public class VeneratedTeacher extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VentSentinel.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VentSentinel.java index 559da4fd1b8..e77519aad50 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VentSentinel.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VentSentinel.java @@ -58,7 +58,6 @@ public class VentSentinel extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VirulentSwipe.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VirulentSwipe.java index 89e1882e262..104ad129119 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VirulentSwipe.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VirulentSwipe.java @@ -49,7 +49,6 @@ public class VirulentSwipe extends CardImpl { super(ownerId, 131, "Virulent Swipe", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); // Target creature gets +2/+0 and gains deathtouch until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WildheartInvoker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WildheartInvoker.java index 42b300bfbf3..25e84b3cb86 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WildheartInvoker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WildheartInvoker.java @@ -54,7 +54,6 @@ public class WildheartInvoker extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java index 97cf8ffc2de..4e1640d7dc7 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java @@ -55,7 +55,6 @@ public class WorldAtWar extends CardImpl { super(ownerId, 172, "World at War", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); this.expansionSetCode = "ROE"; - this.color.setRed(true); // After the first postcombat main phase this turn, there's an additional combat phase followed by an additional main phase. At the beginning of that combat, untap all creatures that attacked this turn. this.getSpellAbility().addEffect(new WorldAtWarEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WrapInFlames.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WrapInFlames.java index 0a1a66c3f05..cf99ba61905 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WrapInFlames.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WrapInFlames.java @@ -46,7 +46,6 @@ public class WrapInFlames extends CardImpl { super(ownerId, 173, "Wrap in Flames", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "ROE"; - this.color.setRed(true); // Wrap in Flames deals 1 damage to each of up to three target creatures. Those creatures can't block this turn. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZofShade.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZofShade.java index 7592110e6d3..d5181a1f7fd 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZofShade.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZofShade.java @@ -49,7 +49,6 @@ public class ZofShade extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Shade"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AEtherShockwave.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AEtherShockwave.java index 32962f81f99..7b52687d80b 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AEtherShockwave.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AEtherShockwave.java @@ -54,7 +54,6 @@ public class AEtherShockwave extends CardImpl { super(ownerId, 1, "AEther Shockwave", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "SOK"; - this.color.setWhite(true); // Choose one - Tap all Spirits; or tap all non-Spirit creatures. this.getSpellAbility().addEffect(new TapAllEffect(filterSpirit)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AdamaroFirstToDesire.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AdamaroFirstToDesire.java index d5973a93b61..3a9e7d0266d 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AdamaroFirstToDesire.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AdamaroFirstToDesire.java @@ -54,7 +54,6 @@ public class AdamaroFirstToDesire extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiUnderling.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiUnderling.java index d99af0f9344..67e021bba9a 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiUnderling.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiUnderling.java @@ -55,7 +55,6 @@ public class AkkiUnderling extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkutaBornOfAsh.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkutaBornOfAsh.java index d8fa6b881b5..301e1fae51c 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkutaBornOfAsh.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkutaBornOfAsh.java @@ -65,7 +65,6 @@ public class AkutaBornOfAsh extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ArabaMothrider.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ArabaMothrider.java index e9cbd68b187..e528be7c862 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ArabaMothrider.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ArabaMothrider.java @@ -47,7 +47,6 @@ public class ArabaMothrider extends CardImpl { this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AyumiTheLastVisitor.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AyumiTheLastVisitor.java index 38d9625e5cb..50b761d8468 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AyumiTheLastVisitor.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AyumiTheLastVisitor.java @@ -53,7 +53,6 @@ public class AyumiTheLastVisitor extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(7); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java index 0afaee06091..0491b747371 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java @@ -50,7 +50,6 @@ public class BarrelDownSokenzan extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setRed(true); // Sweep - Return any number of Mountains you control to their owner's hand. Barrel Down Sokenzan deals damage to target creature equal to twice the number of Mountains returned this way. this.getSpellAbility().addEffect(new SweepEffect("Mountain")); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BounteousKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BounteousKirin.java index 1d0b5a575f5..a6f1ec3b2c4 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BounteousKirin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BounteousKirin.java @@ -58,7 +58,6 @@ public class BounteousKirin extends CardImpl { this.subtype.add("Kirin"); this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BurningEyeZubera.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BurningEyeZubera.java index b801bebf07b..0a27dca842b 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BurningEyeZubera.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BurningEyeZubera.java @@ -54,7 +54,6 @@ public class BurningEyeZubera extends CardImpl { this.subtype.add("Zubera"); this.subtype.add("Spirit"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CelestialKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CelestialKirin.java index 676e6f3a04d..ad0b871c909 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CelestialKirin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CelestialKirin.java @@ -59,7 +59,6 @@ public class CelestialKirin extends CardImpl { this.subtype.add("Kirin"); this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ChargeAcrossTheAraba.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ChargeAcrossTheAraba.java index e389ff22b59..d84109a89ed 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ChargeAcrossTheAraba.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ChargeAcrossTheAraba.java @@ -48,7 +48,6 @@ public class ChargeAcrossTheAraba extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setWhite(true); // Sweep - Return any number of Plains you control to their owner's hand. Creatures you control get +1/+1 until end of turn for each Plains returned this way. this.getSpellAbility().addEffect(new SweepEffect("Plains")); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java index 93e8dab0d60..b3486d48e43 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java @@ -59,7 +59,6 @@ public class CloudhoofKirin extends CardImpl { this.subtype.add("Kirin"); this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CutTheEarthlyBond.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CutTheEarthlyBond.java index c7d8d6a3463..4bbbabb31c2 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CutTheEarthlyBond.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CutTheEarthlyBond.java @@ -53,7 +53,6 @@ public class CutTheEarthlyBond extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setBlue(true); // Return target enchanted permanent to its owner's hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathDenied.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathDenied.java index 5c7b83c31c1..e73c75a492b 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathDenied.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathDenied.java @@ -51,7 +51,6 @@ public class DeathDenied extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setBlack(true); // Return X target creature cards from your graveyard to your hand. Effect effect = new ReturnFromGraveyardToHandTargetEffect(); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathOfAThousandStings.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathOfAThousandStings.java index 3a954004826..52c9424e24f 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathOfAThousandStings.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathOfAThousandStings.java @@ -53,7 +53,6 @@ public class DeathOfAThousandStings extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setBlack(true); // Target player loses 1 life and you gain 1 life. this.getSpellAbility().addEffect(new LoseLifeTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathknellKami.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathknellKami.java index b75cfea5a27..c1ad6867d27 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathknellKami.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathknellKami.java @@ -56,7 +56,6 @@ public class DeathknellKami extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathmaskNezumi.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathmaskNezumi.java index f40c558899a..d6325fa4e95 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathmaskNezumi.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathmaskNezumi.java @@ -55,7 +55,6 @@ public class DeathmaskNezumi extends CardImpl { this.subtype.add("Rat"); this.subtype.add("Shaman"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DenseCanopy.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DenseCanopy.java index 4a45301e3ef..d79e1f86371 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DenseCanopy.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DenseCanopy.java @@ -52,7 +52,6 @@ public class DenseCanopy extends CardImpl { super(ownerId, 125, "Dense Canopy", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "SOK"; - this.color.setGreen(true); // Creatures with flying can block only creatures with flying. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DenseCanopyCantBlockEffect())); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfKiyomaro.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfKiyomaro.java index baf667585f8..c52d47b9da5 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfKiyomaro.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfKiyomaro.java @@ -54,7 +54,6 @@ public class DescendantOfKiyomaro extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/Dreamcatcher.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/Dreamcatcher.java index 92d2ad8402f..9e5753c8d41 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/Dreamcatcher.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/Dreamcatcher.java @@ -49,7 +49,6 @@ public class Dreamcatcher extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ElderPineOfJukai.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ElderPineOfJukai.java index f19e97deae0..ac6b74af586 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ElderPineOfJukai.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ElderPineOfJukai.java @@ -57,7 +57,6 @@ public class ElderPineOfJukai extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/EndlessSwarm.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/EndlessSwarm.java index a98965db9d1..c9fbaca8224 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/EndlessSwarm.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/EndlessSwarm.java @@ -47,7 +47,6 @@ public class EndlessSwarm extends CardImpl { super(ownerId, 129, "Endless Swarm", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{G}{G}{G}"); this.expansionSetCode = "SOK"; - this.color.setGreen(true); // Put a 1/1 green Snake creature token onto the battlefield for each card in your hand. this.getSpellAbility().addEffect(new CreateTokenEffect(new SnakeToken(), new CardsInControllerHandCount())); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/EnduringIdeal.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/EnduringIdeal.java index 799b8318a17..b3483485a0a 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/EnduringIdeal.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/EnduringIdeal.java @@ -54,7 +54,6 @@ public class EnduringIdeal extends CardImpl { super(ownerId, 9, "Enduring Ideal", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{W}{W}"); this.expansionSetCode = "SOK"; - this.color.setWhite(true); // Search your library for an enchantment card and put it onto the battlefield. Then shuffle your library. this.getSpellAbility().addEffect(new EnduringIdealEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/EternalDominion.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/EternalDominion.java index ed5d6ea273a..cd5d754421b 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/EternalDominion.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/EternalDominion.java @@ -56,7 +56,6 @@ public class EternalDominion extends CardImpl { super(ownerId, 36, "Eternal Dominion", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{7}{U}{U}{U}"); this.expansionSetCode = "SOK"; - this.color.setBlue(true); // Search target opponent's library for an artifact, creature, enchantment, or land card. // Put that card onto the battlefield under your control. Then that player shuffles his or her library. diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ExileIntoDarkness.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ExileIntoDarkness.java index df1e40d3054..2d27f30f7ef 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ExileIntoDarkness.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ExileIntoDarkness.java @@ -59,7 +59,6 @@ public class ExileIntoDarkness extends CardImpl { super(ownerId, 67, "Exile into Darkness", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{B}"); this.expansionSetCode = "SOK"; - this.color.setBlack(true); // Target player sacrifices a creature with converted mana cost 3 or less. this.getSpellAbility().addEffect(new SacrificeEffect(filter, 1, "Target player")); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FeralLightning.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FeralLightning.java index 9b97fb0cf52..ea95bd89163 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FeralLightning.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FeralLightning.java @@ -56,7 +56,6 @@ public class FeralLightning extends CardImpl { super(ownerId, 97, "Feral Lightning", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}{R}{R}"); this.expansionSetCode = "SOK"; - this.color.setRed(true); // Put three 3/1 red Elemental creature tokens with haste onto the battlefield. Exile them at the beginning of the next end step. this.getSpellAbility().addEffect(new FeralLightningEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FootstepsOfTheGoryo.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FootstepsOfTheGoryo.java index 7b95bd8050c..d558731be79 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FootstepsOfTheGoryo.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FootstepsOfTheGoryo.java @@ -62,7 +62,6 @@ public class FootstepsOfTheGoryo extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setBlack(true); // Return target creature card from your graveyard to the battlefield. Sacrifice that creature at the beginning of the next end step. this.getSpellAbility().addEffect(new FootstepsOfTheGoryoEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GazeOfAdamaro.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GazeOfAdamaro.java index fc16e8b4a2b..7c4777b0b54 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GazeOfAdamaro.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GazeOfAdamaro.java @@ -49,7 +49,6 @@ public class GazeOfAdamaro extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setRed(true); // Gaze of Adamaro deals damage to target player equal to the number of cards in that player's hand. this.getSpellAbility().addEffect(new GazeOfAdamaroEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitNourisher.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitNourisher.java index 3ae616d1969..dad8201e960 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitNourisher.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitNourisher.java @@ -54,7 +54,6 @@ public class GhostLitNourisher extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitRaider.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitRaider.java index 6049c92472c..29651630ebd 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitRaider.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitRaider.java @@ -52,7 +52,6 @@ public class GhostLitRaider extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitRedeemer.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitRedeemer.java index 07a5ed3f0b7..09d83440d6e 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitRedeemer.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitRedeemer.java @@ -51,7 +51,6 @@ public class GhostLitRedeemer extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitStalker.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitStalker.java index 47aceabea15..2a047c1eb05 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitStalker.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitStalker.java @@ -54,7 +54,6 @@ public class GhostLitStalker extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitWarder.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitWarder.java index 9a2b40d5dea..0acafc88c9e 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitWarder.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitWarder.java @@ -54,7 +54,6 @@ public class GhostLitWarder extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/Glitterfang.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/Glitterfang.java index f54706d411f..553a8951a0f 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/Glitterfang.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/Glitterfang.java @@ -48,7 +48,6 @@ public class Glitterfang extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GodosIrregulars.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GodosIrregulars.java index 2206574414f..ed5fe602c33 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GodosIrregulars.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GodosIrregulars.java @@ -63,7 +63,6 @@ public class GodosIrregulars extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HailOfArrows.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HailOfArrows.java index 5f730091bc9..337d1870e76 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HailOfArrows.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HailOfArrows.java @@ -46,7 +46,6 @@ public class HailOfArrows extends CardImpl { super(ownerId, 11, "Hail of Arrows", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{W}"); this.expansionSetCode = "SOK"; - this.color.setWhite(true); // Hail of Arrows deals X damage divided as you choose among any number of target attacking creatures. this.getSpellAbility().addEffect(new DamageMultiEffect(new ManacostVariableValue())); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HidetsugusSecondRite.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HidetsugusSecondRite.java index ef6773fb151..93478befe24 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HidetsugusSecondRite.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HidetsugusSecondRite.java @@ -48,7 +48,6 @@ public class HidetsugusSecondRite extends CardImpl { super(ownerId, 102, "Hidetsugu's Second Rite", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{R}"); this.expansionSetCode = "SOK"; - this.color.setRed(true); // If target player has exactly 10 life, Hidetsugu's Second Rite deals 10 damage to that player. this.getSpellAbility().addEffect(new HidetsugusSecondRiteEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HomuraHumanAscendant.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HomuraHumanAscendant.java index 02e1fbbcad7..d1ae39ee11a 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HomuraHumanAscendant.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HomuraHumanAscendant.java @@ -61,7 +61,6 @@ public class HomuraHumanAscendant extends CardImpl { this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); this.flipCard = true; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/IdeasUnbound.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/IdeasUnbound.java index b7bb7138704..6853969f770 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/IdeasUnbound.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/IdeasUnbound.java @@ -47,7 +47,6 @@ public class IdeasUnbound extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setBlue(true); // Draw three cards. Discard three cards at the beginning of the next end step. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java index e7410d23d64..d616fbdfa58 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java @@ -60,7 +60,6 @@ public class InfernalKirin extends CardImpl { this.subtype.add("Kirin"); this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerCalmOuterStrength.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerCalmOuterStrength.java index f1ce37eb8aa..60183c3824b 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerCalmOuterStrength.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerCalmOuterStrength.java @@ -49,7 +49,6 @@ public class InnerCalmOuterStrength extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setGreen(true); // Target creature gets +X/+X until end of turn, where X is the number of cards in your hand. DynamicValue xValue= new CardsInControllerHandCount(); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerChamberGuard.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerChamberGuard.java index ccd987184bf..75cffdcc167 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerChamberGuard.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerChamberGuard.java @@ -46,7 +46,6 @@ public class InnerChamberGuard extends CardImpl { this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerFire.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerFire.java index 1663ac37fea..80fd5d5ba04 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerFire.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerFire.java @@ -45,7 +45,6 @@ public class InnerFire extends CardImpl { super(ownerId, 105, "Inner Fire", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "SOK"; - this.color.setRed(true); // Add {R} to your mana pool for each card in your hand. this.getSpellAbility().addEffect(new DynamicManaEffect(Mana.RedMana, new CardsInControllerHandCount())); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/IntoTheFray.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/IntoTheFray.java index 00498a887d4..4947913e299 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/IntoTheFray.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/IntoTheFray.java @@ -47,7 +47,6 @@ public class IntoTheFray extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setRed(true); // Target creature attacks this turn if able. this.getSpellAbility().addEffect(new AttacksIfAbleTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/JiwariTheEarthAflame.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/JiwariTheEarthAflame.java index d28d9e8abfd..986eff7ea3e 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/JiwariTheEarthAflame.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/JiwariTheEarthAflame.java @@ -65,7 +65,6 @@ public class JiwariTheEarthAflame extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KagemaroFirstToSuffer.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KagemaroFirstToSuffer.java index e34c29c5c39..c53726664b8 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KagemaroFirstToSuffer.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KagemaroFirstToSuffer.java @@ -59,7 +59,6 @@ public class KagemaroFirstToSuffer extends CardImpl { this.subtype.add("Demon"); this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KagemarosClutch.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KagemarosClutch.java index 636174fe7cf..07b8d6886e9 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KagemarosClutch.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KagemarosClutch.java @@ -57,7 +57,6 @@ public class KagemarosClutch extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfEmptyGraves.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfEmptyGraves.java index 1bd62386d04..86a6946ef6f 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfEmptyGraves.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfEmptyGraves.java @@ -45,7 +45,6 @@ public class KamiOfEmptyGraves extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheCrescentMoon.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheCrescentMoon.java index e7635d35669..2d29b2589ac 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheCrescentMoon.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheCrescentMoon.java @@ -48,7 +48,6 @@ public class KamiOfTheCrescentMoon extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KashiTribeElite.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KashiTribeElite.java index e804dde57c5..0ee54d40e14 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KashiTribeElite.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KashiTribeElite.java @@ -65,7 +65,6 @@ public class KashiTribeElite extends CardImpl { this.subtype.add("Snake"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KikusShadow.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KikusShadow.java index 9050de6ec14..0cd6f8f8e2e 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KikusShadow.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KikusShadow.java @@ -49,7 +49,6 @@ public class KikusShadow extends CardImpl { super(ownerId, 77, "Kiku's Shadow", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}{B}"); this.expansionSetCode = "SOK"; - this.color.setBlack(true); // Target creature deals damage to itself equal to its power. this.getSpellAbility().addEffect(new KikusShadowEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MagaTraitorToMortals.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MagaTraitorToMortals.java index dbcbe767322..cde762b0dac 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MagaTraitorToMortals.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MagaTraitorToMortals.java @@ -59,7 +59,6 @@ public class MagaTraitorToMortals extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MasumaroFirstToLive.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MasumaroFirstToLive.java index f1da202d252..a669f229ec3 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MasumaroFirstToLive.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MasumaroFirstToLive.java @@ -53,7 +53,6 @@ public class MasumaroFirstToLive extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MatsuTribeBirdstalker.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MatsuTribeBirdstalker.java index 7ac2ea9c270..34fed8bc030 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MatsuTribeBirdstalker.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MatsuTribeBirdstalker.java @@ -56,7 +56,6 @@ public class MatsuTribeBirdstalker extends CardImpl { this.subtype.add("Snake"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MeasureOfWickedness.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MeasureOfWickedness.java index 695767fa0ce..a35a067a2c7 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MeasureOfWickedness.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MeasureOfWickedness.java @@ -67,7 +67,6 @@ public class MeasureOfWickedness extends CardImpl { super(ownerId, 82, "Measure of Wickedness", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}"); this.expansionSetCode = "SOK"; - this.color.setBlack(true); // At the beginning of your end step, sacrifice Measure of Wickedness and you lose 8 life. Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, null, false); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MeishinTheMindCage.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MeishinTheMindCage.java index 4765005265a..f2d34a5b667 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MeishinTheMindCage.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MeishinTheMindCage.java @@ -51,7 +51,6 @@ public class MeishinTheMindCage extends CardImpl { this.expansionSetCode = "SOK"; this.supertype.add("Legendary"); - this.color.setBlue(true); // All creatures get -X/-0, where X is the number of cards in your hand. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(new SignInversionDynamicValue(new CardsInControllerHandCount()), new StaticValue(0), Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false, "All creatures get -X/-0, where X is the number of cards in your hand"))); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonbowIllusionist.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonbowIllusionist.java index 1f3e5c6ac48..509d353e226 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonbowIllusionist.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonbowIllusionist.java @@ -56,7 +56,6 @@ public class MoonbowIllusionist extends CardImpl { this.subtype.add("Moonfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NeverendingTorment.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NeverendingTorment.java index a9a418bb4de..28bb4f962b5 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NeverendingTorment.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NeverendingTorment.java @@ -56,7 +56,6 @@ public class NeverendingTorment extends CardImpl { super(ownerId, 83, "Neverending Torment", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{B}{B}"); this.expansionSetCode = "SOK"; - this.color.setBlack(true); // Search target player's library for X cards, where X is the number of cards in your hand, and exile them. Then that player shuffles his or her library. this.getSpellAbility().addEffect(new NeverendingTormentEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NightsoilKami.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NightsoilKami.java index 86387be28e3..372442e6f94 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NightsoilKami.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NightsoilKami.java @@ -45,7 +45,6 @@ public class NightsoilKami extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OkinaNightwatch.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OkinaNightwatch.java index a0b8051f243..d7510d37cb2 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OkinaNightwatch.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OkinaNightwatch.java @@ -51,7 +51,6 @@ public class OkinaNightwatch extends CardImpl { this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OneWithNothing.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OneWithNothing.java index 135b386387a..f141bd79ee6 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OneWithNothing.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OneWithNothing.java @@ -48,7 +48,6 @@ public class OneWithNothing extends CardImpl { super(ownerId, 84, "One with Nothing", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "SOK"; - this.color.setBlack(true); // Discard your hand. this.getSpellAbility().addEffect(new OneWithNothingEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PainsReward.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PainsReward.java index e4af0b81eeb..5d61a72b1cc 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PainsReward.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PainsReward.java @@ -48,7 +48,6 @@ public class PainsReward extends CardImpl { super(ownerId, 85, "Pain's Reward", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "SOK"; - this.color.setBlack(true); // Each player may bid life. You start the bidding with a bid of any number. In turn order, each player may top the high bid. The bidding ends if the high bid stands. The high bidder loses life equal to the high bid and draws four cards. this.getSpellAbility().addEffect(new PainsRewardEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PlowThroughReito.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PlowThroughReito.java index 8ccba940807..e6fa8d3221f 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PlowThroughReito.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PlowThroughReito.java @@ -49,7 +49,6 @@ public class PlowThroughReito extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setWhite(true); // Sweep - Return any number of Plains you control to their owner's hand. Target creature gets +1/+1 until end of turn for each Plains returned this way. this.getSpellAbility().addEffect(new SweepEffect("Plains")); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PromisedKannushi.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PromisedKannushi.java index 1232d8b839c..c813f033a07 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PromisedKannushi.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PromisedKannushi.java @@ -46,7 +46,6 @@ public class PromisedKannushi extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RallyTheHorde.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RallyTheHorde.java index 4066c7dee31..b06a935bbbd 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RallyTheHorde.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RallyTheHorde.java @@ -52,7 +52,6 @@ public class RallyTheHorde extends CardImpl { super(ownerId, 110, "Rally the Horde", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{R}"); this.expansionSetCode = "SOK"; - this.color.setRed(true); // Exile the top card of your library. Exile the top card of your library. Exile the top card of your library. If the last card exiled isn't a land, repeat this process. Put a 1/1 red Warrior creature token onto the battlefield for each nonland card exiled this way. this.getSpellAbility().addEffect(new RallyTheHordeEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RavingOniSlave.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RavingOniSlave.java index 108c5a7171a..4d5b5602e8b 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RavingOniSlave.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RavingOniSlave.java @@ -52,7 +52,6 @@ public class RavingOniSlave extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RazorjawOni.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RazorjawOni.java index d6fc1e8ca7b..8d81f9f9787 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RazorjawOni.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RazorjawOni.java @@ -58,7 +58,6 @@ public class RazorjawOni extends CardImpl { this.subtype.add("Demon"); this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RendingVines.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RendingVines.java index f448a825043..4e59199b067 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RendingVines.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RendingVines.java @@ -52,7 +52,6 @@ public class RendingVines extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setGreen(true); // Destroy target artifact or enchantment if its converted mana cost is less than or equal to the number of cards in your hand. this.getSpellAbility().addEffect(new RendingVinesEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RoninCavekeeper.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RoninCavekeeper.java index 732084e67a4..aa58d691908 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RoninCavekeeper.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RoninCavekeeper.java @@ -46,7 +46,6 @@ public class RoninCavekeeper extends CardImpl { this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RuneTailKitsuneAscendant.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RuneTailKitsuneAscendant.java index 0952da07a95..ed256a39876 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RuneTailKitsuneAscendant.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RuneTailKitsuneAscendant.java @@ -57,7 +57,6 @@ public class RuneTailKitsuneAscendant extends CardImpl { this.subtype.add("Fox"); this.subtype.add("Monk"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); this.flipCard = true; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RushingTideZubera.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RushingTideZubera.java index 7a635af7297..5f8635f4fe5 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RushingTideZubera.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RushingTideZubera.java @@ -55,7 +55,6 @@ public class RushingTideZubera extends CardImpl { this.subtype.add("Zubera"); this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SakuraTribeScout.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SakuraTribeScout.java index e4403ac13e4..711f2e9a0db 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SakuraTribeScout.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SakuraTribeScout.java @@ -53,7 +53,6 @@ public class SakuraTribeScout extends CardImpl { this.subtype.add("Shaman"); this.subtype.add("Scout"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/Secretkeeper.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/Secretkeeper.java index 7512f0dc61e..050a9703164 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/Secretkeeper.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/Secretkeeper.java @@ -52,7 +52,6 @@ public class Secretkeeper extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SekkiSeasonsGuide.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SekkiSeasonsGuide.java index b7fa2a18ead..83cfa25aafb 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SekkiSeasonsGuide.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SekkiSeasonsGuide.java @@ -70,7 +70,6 @@ public class SekkiSeasonsGuide extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFearsChill.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFearsChill.java index 2ff9127c8b9..f06388b3cb9 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFearsChill.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFearsChill.java @@ -52,7 +52,6 @@ public class ShinenOfFearsChill extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFlightsWings.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFlightsWings.java index 41027796ae3..4caeae4dd42 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFlightsWings.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFlightsWings.java @@ -50,7 +50,6 @@ public class ShinenOfFlightsWings extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFurysFire.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFurysFire.java index 464968480a0..ba59307c5c0 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFurysFire.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFurysFire.java @@ -50,7 +50,6 @@ public class ShinenOfFurysFire extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfLifesRoar.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfLifesRoar.java index d0564232610..dce6b3e9912 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfLifesRoar.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfLifesRoar.java @@ -52,7 +52,6 @@ public class ShinenOfLifesRoar extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfStarsLight.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfStarsLight.java index 815a6b4e545..eaa202d489f 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfStarsLight.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfStarsLight.java @@ -50,7 +50,6 @@ public class ShinenOfStarsLight extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java index 34de0a2bf42..ac5b0467148 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java @@ -48,7 +48,6 @@ public class SinkIntoTakenuma extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setBlack(true); // Sweep - Return any number of Swamps you control to their owner's hand. Target player discards a card for each Swamp returned this way. this.getSpellAbility().addEffect(new SweepEffect("Swamp")); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java index 6d2727f5e3b..7fce2704922 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java @@ -67,7 +67,6 @@ public class SkyfireKirin extends CardImpl { this.subtype.add("Kirin"); this.subtype.add("Spirit"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SokenzanRenegade.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SokenzanRenegade.java index 3713f412022..08c08995814 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SokenzanRenegade.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SokenzanRenegade.java @@ -62,7 +62,6 @@ public class SokenzanRenegade extends CardImpl { this.subtype.add("Samurai"); this.subtype.add("Mercenary"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SokenzanSpellblade.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SokenzanSpellblade.java index abc9f7f1983..1d627672984 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SokenzanSpellblade.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SokenzanSpellblade.java @@ -55,7 +55,6 @@ public class SokenzanSpellblade extends CardImpl { this.subtype.add("Samurai"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SpiralingEmbers.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SpiralingEmbers.java index 3ba5fec6dec..5cf45b7ccad 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SpiralingEmbers.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SpiralingEmbers.java @@ -47,7 +47,6 @@ public class SpiralingEmbers extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setRed(true); // Spiraling Embers deals damage to target creature or player equal to the number of cards in your hand. Effect effect = new DamageTargetEffect(new CardsInControllerHandCount()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ThoughtsOfRuin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ThoughtsOfRuin.java index 6be0f54b697..43fa08caaba 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ThoughtsOfRuin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ThoughtsOfRuin.java @@ -54,7 +54,6 @@ public class ThoughtsOfRuin extends CardImpl { super(ownerId, 118, "Thoughts of Ruin", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); this.expansionSetCode = "SOK"; - this.color.setRed(true); // Each player sacrifices a land for each card in your hand. this.getSpellAbility().addEffect(new ThoughtsOfRuinEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ToriiWatchward.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ToriiWatchward.java index 3f642130eaf..f964323f58d 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ToriiWatchward.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ToriiWatchward.java @@ -46,7 +46,6 @@ public class ToriiWatchward extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/UndyingFlames.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/UndyingFlames.java index 07014e7666a..c9a1c61c0ed 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/UndyingFlames.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/UndyingFlames.java @@ -54,7 +54,6 @@ public class UndyingFlames extends CardImpl { super(ownerId, 119, "Undying Flames", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{R}{R}"); this.expansionSetCode = "SOK"; - this.color.setRed(true); // Exile cards from the top of your library until you exile a nonland card. Undying Flames deals damage to target creature or player equal to that card's converted mana cost. this.getSpellAbility().addEffect(new UndyingFlamesEffect()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArcTrail.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArcTrail.java index 6dc62788ace..46d94237c83 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArcTrail.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArcTrail.java @@ -53,7 +53,6 @@ public class ArcTrail extends CardImpl { super(ownerId, 81, "Arc Trail", Rarity.UNCOMMON, new CardType[] { CardType.SORCERY }, "{1}{R}"); this.expansionSetCode = "SOM"; - this.color.setRed(true); Target target = new TargetCreatureOrPlayer(2); this.getSpellAbility().addTarget(target); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java index d2f241e1215..16e625a5958 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java @@ -55,7 +55,6 @@ public class AuriokEdgewright extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java index ebc6a8a6f3f..161cd819954 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java @@ -57,7 +57,6 @@ public class AuriokSunchaser extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BladeTribeBerserkers.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BladeTribeBerserkers.java index 4866ac1eab3..9a876ff5399 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BladeTribeBerserkers.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BladeTribeBerserkers.java @@ -55,7 +55,6 @@ public class BladeTribeBerserkers extends CardImpl { this.subtype.add("Human"); this.subtype.add("Berserker"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BleakCovenVampires.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BleakCovenVampires.java index d57b85e7c7f..40af1a90450 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BleakCovenVampires.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BleakCovenVampires.java @@ -55,7 +55,6 @@ public class BleakCovenVampires extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java index fb050c0b2c6..02296e641aa 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java @@ -54,7 +54,6 @@ public class BloodshotTrainee extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java index d9467860166..703dc889763 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java @@ -56,7 +56,6 @@ public class CopperhornScout extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Scout"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Cystbearer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Cystbearer.java index 05a3a83911a..f43bdcb6024 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Cystbearer.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Cystbearer.java @@ -48,7 +48,6 @@ public class Cystbearer extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DispenseJustice.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DispenseJustice.java index b417a9d0915..babaa02f05d 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DispenseJustice.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DispenseJustice.java @@ -51,7 +51,6 @@ public class DispenseJustice extends CardImpl { super(ownerId, 5, "Dispense Justice", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "SOM"; - this.color.setWhite(true); this.getSpellAbility().addEffect(new DispenseJusticeEffect()); this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java index be627165154..4982994c785 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java @@ -63,7 +63,6 @@ public class Embersmith extends CardImpl { this.subtype.add("Human"); this.subtype.add("Artificer"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzuriRenegadeLeader.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzuriRenegadeLeader.java index 5ab18a7d56d..e99398ba5a8 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzuriRenegadeLeader.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzuriRenegadeLeader.java @@ -71,7 +71,6 @@ public class EzuriRenegadeLeader extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisArchers.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisArchers.java index 63745fec333..99aed7807b2 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisArchers.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisArchers.java @@ -55,7 +55,6 @@ public class EzurisArchers extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Archer"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Ferrovore.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Ferrovore.java index 71cfa313e4e..51896858dcd 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Ferrovore.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Ferrovore.java @@ -60,7 +60,6 @@ public class Ferrovore extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FlamebornHellion.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FlamebornHellion.java index 8ffe0900a30..31f63c640c6 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FlamebornHellion.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FlamebornHellion.java @@ -47,7 +47,6 @@ public class FlamebornHellion extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Hellion"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(4); this.addAbility(HasteAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FulgentDistraction.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FulgentDistraction.java index 60904194b01..70487f05016 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FulgentDistraction.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FulgentDistraction.java @@ -52,7 +52,6 @@ public class FulgentDistraction extends CardImpl { super(ownerId, 7, "Fulgent Distraction", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "SOM"; - this.color.setWhite(true); this.getSpellAbility().addEffect(new FulgentDistractionEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(2)); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlimmerpointStag.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlimmerpointStag.java index d50ba2057c9..74e732372a0 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlimmerpointStag.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlimmerpointStag.java @@ -57,7 +57,6 @@ public class GlimmerpointStag extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Elk"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java index 34105e9ccb5..8c4c249ca20 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java @@ -57,7 +57,6 @@ public class GlintHawk extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Bird"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GoblinGaveleer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GoblinGaveleer.java index 9c62ecd438a..62da40ea107 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GoblinGaveleer.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GoblinGaveleer.java @@ -51,7 +51,6 @@ public class GoblinGaveleer extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java index 45e5ed92c3d..dc91af94fa9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java @@ -67,7 +67,6 @@ public class HandOfThePraetors extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/KembaKhaRegent.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/KembaKhaRegent.java index 26f99c25f20..91e4e6d7672 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/KembaKhaRegent.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/KembaKhaRegent.java @@ -53,7 +53,6 @@ public class KembaKhaRegent extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/KembasSkyguard.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/KembasSkyguard.java index 066e82be237..e42c5c81654 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/KembasSkyguard.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/KembasSkyguard.java @@ -49,7 +49,6 @@ public class KembasSkyguard extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java index 04367722cb7..e86bc9a5e14 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java @@ -65,7 +65,6 @@ public class LeoninArbiter extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Lifesmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Lifesmith.java index 7752cdc016e..778fd03b286 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Lifesmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Lifesmith.java @@ -62,7 +62,6 @@ public class Lifesmith extends CardImpl { this.subtype.add("Human"); this.subtype.add("Artificer"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MolderBeast.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MolderBeast.java index 11da42219a0..c858186ec10 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MolderBeast.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MolderBeast.java @@ -54,7 +54,6 @@ public class MolderBeast extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java index a28ddcefede..29371f63ce1 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java @@ -62,7 +62,6 @@ public class Myrsmith extends CardImpl { this.subtype.add("Human"); this.subtype.add("Artificer"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java index cb8469e83f5..cc009c250ba 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java @@ -52,7 +52,6 @@ public class OxiddaScrapmelter extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java index db58f0e893a..1ef30490727 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java @@ -59,7 +59,6 @@ public class Painsmith extends CardImpl { this.subtype.add("Human"); this.subtype.add("Artificer"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorHippogriff.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorHippogriff.java index d61a8ae2455..e9152c3f6cb 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorHippogriff.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorHippogriff.java @@ -59,7 +59,6 @@ public class RazorHippogriff extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Hippogriff"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Riddlesmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Riddlesmith.java index 08a8168dfb8..11588e86349 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Riddlesmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Riddlesmith.java @@ -55,7 +55,6 @@ public class Riddlesmith extends CardImpl { this.subtype.add("Human"); this.subtype.add("Artificer"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SalvageScout.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SalvageScout.java index 49ca2cab190..1a06e71ec20 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SalvageScout.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SalvageScout.java @@ -54,7 +54,6 @@ public class SalvageScout extends CardImpl { this.subtype.add("Human"); this.subtype.add("Scout"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ScreechingSilcaw.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ScreechingSilcaw.java index 648dd2d00c7..1daf2a8e959 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ScreechingSilcaw.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ScreechingSilcaw.java @@ -53,7 +53,6 @@ public class ScreechingSilcaw extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Thrummingbird.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Thrummingbird.java index 88f23f9f7d3..5846deaf3f4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Thrummingbird.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Thrummingbird.java @@ -49,7 +49,6 @@ public class Thrummingbird extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Horror"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrueConviction.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrueConviction.java index 08d27132941..4aab536da1a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrueConviction.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrueConviction.java @@ -51,7 +51,6 @@ public class TrueConviction extends CardImpl { super(ownerId, 25, "True Conviction", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}{W}{W}"); this.expansionSetCode = "SOM"; - this.color.setWhite(true); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()))); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java index 63ee4806244..6ca7757f455 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java @@ -59,7 +59,6 @@ public class WingPuncture extends CardImpl { super(ownerId, 133, "Wing Puncture", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "SOM"; - this.color.setGreen(true); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/scourge/AstralSteel.java b/Mage.Sets/src/mage/sets/scourge/AstralSteel.java index 4ca2e1e45fd..6229b4ca500 100644 --- a/Mage.Sets/src/mage/sets/scourge/AstralSteel.java +++ b/Mage.Sets/src/mage/sets/scourge/AstralSteel.java @@ -47,7 +47,6 @@ public class AstralSteel extends CardImpl { super(ownerId, 2, "Astral Steel", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "SCG"; - this.color.setWhite(true); // Target creature gets +1/+2 until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/scourge/BrainFreeze.java b/Mage.Sets/src/mage/sets/scourge/BrainFreeze.java index 2cbb8e54096..cc688c373b7 100644 --- a/Mage.Sets/src/mage/sets/scourge/BrainFreeze.java +++ b/Mage.Sets/src/mage/sets/scourge/BrainFreeze.java @@ -45,7 +45,6 @@ public class BrainFreeze extends CardImpl { super(ownerId, 29, "Brain Freeze", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "SCG"; - this.color.setBlue(true); // Target player puts the top three cards of his or her library into his or her graveyard. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/scourge/CarrionFeeder.java b/Mage.Sets/src/mage/sets/scourge/CarrionFeeder.java index b2f3f809f3e..ac37d383c10 100644 --- a/Mage.Sets/src/mage/sets/scourge/CarrionFeeder.java +++ b/Mage.Sets/src/mage/sets/scourge/CarrionFeeder.java @@ -51,7 +51,6 @@ public class CarrionFeeder extends CardImpl { this.expansionSetCode = "SCG"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/scourge/ChartoothCougar.java b/Mage.Sets/src/mage/sets/scourge/ChartoothCougar.java index a99f8525bc8..e10b6708eef 100644 --- a/Mage.Sets/src/mage/sets/scourge/ChartoothCougar.java +++ b/Mage.Sets/src/mage/sets/scourge/ChartoothCougar.java @@ -52,7 +52,6 @@ public class ChartoothCougar extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/scourge/DaruWarchief.java b/Mage.Sets/src/mage/sets/scourge/DaruWarchief.java index b327fe2aa68..59503a629a2 100644 --- a/Mage.Sets/src/mage/sets/scourge/DaruWarchief.java +++ b/Mage.Sets/src/mage/sets/scourge/DaruWarchief.java @@ -61,7 +61,6 @@ public class DaruWarchief extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/scourge/DayOfTheDragons.java b/Mage.Sets/src/mage/sets/scourge/DayOfTheDragons.java index 942deffbc79..4c442ac3611 100644 --- a/Mage.Sets/src/mage/sets/scourge/DayOfTheDragons.java +++ b/Mage.Sets/src/mage/sets/scourge/DayOfTheDragons.java @@ -58,7 +58,6 @@ public class DayOfTheDragons extends CardImpl { super(ownerId, 31, "Day of the Dragons", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}{U}{U}"); this.expansionSetCode = "SCG"; - this.color.setBlue(true); // When Day of the Dragons enters the battlefield, exile all creatures you control. Then put that many 5/5 red Dragon creature tokens with flying onto the battlefield. this.addAbility(new EntersBattlefieldTriggeredAbility(new DayOfTheDragonsEntersEffect(), false)); diff --git a/Mage.Sets/src/mage/sets/scourge/DragonspeakerShaman.java b/Mage.Sets/src/mage/sets/scourge/DragonspeakerShaman.java index 8f5ae781828..427fbc67866 100644 --- a/Mage.Sets/src/mage/sets/scourge/DragonspeakerShaman.java +++ b/Mage.Sets/src/mage/sets/scourge/DragonspeakerShaman.java @@ -57,7 +57,6 @@ public class DragonspeakerShaman extends CardImpl { this.subtype.add("Barbarian"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/scourge/ElvishAberration.java b/Mage.Sets/src/mage/sets/scourge/ElvishAberration.java index 7a953f4cafa..2fd82ad804f 100644 --- a/Mage.Sets/src/mage/sets/scourge/ElvishAberration.java +++ b/Mage.Sets/src/mage/sets/scourge/ElvishAberration.java @@ -52,7 +52,6 @@ public class ElvishAberration extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Mutant"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/scourge/EternalDragon.java b/Mage.Sets/src/mage/sets/scourge/EternalDragon.java index 72346cddb1c..e6db14be8ec 100644 --- a/Mage.Sets/src/mage/sets/scourge/EternalDragon.java +++ b/Mage.Sets/src/mage/sets/scourge/EternalDragon.java @@ -55,7 +55,6 @@ public class EternalDragon extends CardImpl { this.subtype.add("Dragon"); this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/scourge/FormOfTheDragon.java b/Mage.Sets/src/mage/sets/scourge/FormOfTheDragon.java index ddc91932cda..255e17ceafc 100644 --- a/Mage.Sets/src/mage/sets/scourge/FormOfTheDragon.java +++ b/Mage.Sets/src/mage/sets/scourge/FormOfTheDragon.java @@ -66,7 +66,6 @@ public class FormOfTheDragon extends CardImpl { super(ownerId, 93, "Form of the Dragon", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}{R}{R}"); this.expansionSetCode = "SCG"; - this.color.setRed(true); // At the beginning of your upkeep, Form of the Dragon deals 5 damage to target creature or player. Ability ability = new BeginningOfUpkeepTriggeredAbility(new DamageTargetEffect(5), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/scourge/GoblinWarStrike.java b/Mage.Sets/src/mage/sets/scourge/GoblinWarStrike.java index c7360cd732b..90232ad2bee 100644 --- a/Mage.Sets/src/mage/sets/scourge/GoblinWarStrike.java +++ b/Mage.Sets/src/mage/sets/scourge/GoblinWarStrike.java @@ -56,7 +56,6 @@ public class GoblinWarStrike extends CardImpl { super(ownerId, 96, "Goblin War Strike", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "SCG"; - this.color.setRed(true); // Goblin War Strike deals damage equal to the number of Goblins you control to target player. this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); diff --git a/Mage.Sets/src/mage/sets/scourge/GoblinWarchief.java b/Mage.Sets/src/mage/sets/scourge/GoblinWarchief.java index 19153009da8..0d62d55ccd7 100644 --- a/Mage.Sets/src/mage/sets/scourge/GoblinWarchief.java +++ b/Mage.Sets/src/mage/sets/scourge/GoblinWarchief.java @@ -61,7 +61,6 @@ public class GoblinWarchief extends CardImpl { this.expansionSetCode = "SCG"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/scourge/HinderingTouch.java b/Mage.Sets/src/mage/sets/scourge/HinderingTouch.java index 98c9961cc77..5e68e4778d2 100644 --- a/Mage.Sets/src/mage/sets/scourge/HinderingTouch.java +++ b/Mage.Sets/src/mage/sets/scourge/HinderingTouch.java @@ -46,7 +46,6 @@ public class HinderingTouch extends CardImpl { super(ownerId, 37, "Hindering Touch", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "SCG"; - this.color.setBlue(true); // Counter target spell unless its controller pays {2}. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/scourge/HuntingPack.java b/Mage.Sets/src/mage/sets/scourge/HuntingPack.java index be739370c7c..f099f4f25fb 100644 --- a/Mage.Sets/src/mage/sets/scourge/HuntingPack.java +++ b/Mage.Sets/src/mage/sets/scourge/HuntingPack.java @@ -47,7 +47,6 @@ public class HuntingPack extends CardImpl { super(ownerId, 121, "Hunting Pack", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{5}{G}{G}"); this.expansionSetCode = "SCG"; - this.color.setGreen(true); // Put a 4/4 green Beast creature token onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new HuntingPackToken(), 1)); diff --git a/Mage.Sets/src/mage/sets/scourge/KrosanWarchief.java b/Mage.Sets/src/mage/sets/scourge/KrosanWarchief.java index 87b6e645b99..6a00d5df594 100644 --- a/Mage.Sets/src/mage/sets/scourge/KrosanWarchief.java +++ b/Mage.Sets/src/mage/sets/scourge/KrosanWarchief.java @@ -63,7 +63,6 @@ public class KrosanWarchief extends CardImpl { this.expansionSetCode = "SCG"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/scourge/LongTermPlans.java b/Mage.Sets/src/mage/sets/scourge/LongTermPlans.java index d743b0bd455..63ae7ed652c 100644 --- a/Mage.Sets/src/mage/sets/scourge/LongTermPlans.java +++ b/Mage.Sets/src/mage/sets/scourge/LongTermPlans.java @@ -49,7 +49,6 @@ public class LongTermPlans extends CardImpl { super(ownerId, 38, "Long-Term Plans", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "SCG"; - this.color.setBlue(true); // Search your library for a card, shuffle your library, then put that card third from the top. this.getSpellAbility().addEffect(new LongTermPlansEffect()); diff --git a/Mage.Sets/src/mage/sets/scourge/NobleTemplar.java b/Mage.Sets/src/mage/sets/scourge/NobleTemplar.java index e322077868c..07597ed057e 100644 --- a/Mage.Sets/src/mage/sets/scourge/NobleTemplar.java +++ b/Mage.Sets/src/mage/sets/scourge/NobleTemplar.java @@ -49,7 +49,6 @@ public class NobleTemplar extends CardImpl { this.subtype.add("Cleric"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/scourge/PyrostaticPillar.java b/Mage.Sets/src/mage/sets/scourge/PyrostaticPillar.java index 922413d6867..8eefa287fe1 100644 --- a/Mage.Sets/src/mage/sets/scourge/PyrostaticPillar.java +++ b/Mage.Sets/src/mage/sets/scourge/PyrostaticPillar.java @@ -51,7 +51,6 @@ public class PyrostaticPillar extends CardImpl { super(ownerId, 100, "Pyrostatic Pillar", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); this.expansionSetCode = "SCG"; - this.color.setRed(true); // Whenever a player casts a spell with converted mana cost 3 or less, Pyrostatic Pillar deals 2 damage to that player. this.addAbility(new PyrostaticPillarTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/scourge/ReapingTheGraves.java b/Mage.Sets/src/mage/sets/scourge/ReapingTheGraves.java index ef5053df60a..ee71ca3f750 100644 --- a/Mage.Sets/src/mage/sets/scourge/ReapingTheGraves.java +++ b/Mage.Sets/src/mage/sets/scourge/ReapingTheGraves.java @@ -46,7 +46,6 @@ public class ReapingTheGraves extends CardImpl { super(ownerId, 72, "Reaping the Graves", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "SCG"; - this.color.setBlack(true); // Return target creature card from your graveyard to your hand. this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); diff --git a/Mage.Sets/src/mage/sets/scourge/Scattershot.java b/Mage.Sets/src/mage/sets/scourge/Scattershot.java index b94f5228c20..f683b622647 100644 --- a/Mage.Sets/src/mage/sets/scourge/Scattershot.java +++ b/Mage.Sets/src/mage/sets/scourge/Scattershot.java @@ -45,7 +45,6 @@ public class Scattershot extends CardImpl { super(ownerId, 102, "Scattershot", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "SCG"; - this.color.setRed(true); // Scattershot deals 1 damage to target creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/scourge/ShorelineRanger.java b/Mage.Sets/src/mage/sets/scourge/ShorelineRanger.java index c03ea727fc9..6228c188c78 100644 --- a/Mage.Sets/src/mage/sets/scourge/ShorelineRanger.java +++ b/Mage.Sets/src/mage/sets/scourge/ShorelineRanger.java @@ -48,7 +48,6 @@ public class ShorelineRanger extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/scourge/SproutingVines.java b/Mage.Sets/src/mage/sets/scourge/SproutingVines.java index be569a12261..826d5a7f7aa 100644 --- a/Mage.Sets/src/mage/sets/scourge/SproutingVines.java +++ b/Mage.Sets/src/mage/sets/scourge/SproutingVines.java @@ -46,7 +46,6 @@ public class SproutingVines extends CardImpl { super(ownerId, 128, "Sprouting Vines", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "SCG"; - this.color.setGreen(true); // Search your library for a basic land card, reveal that card, and put it into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, 1, new FilterBasicLandCard()), true)); diff --git a/Mage.Sets/src/mage/sets/scourge/Stifle.java b/Mage.Sets/src/mage/sets/scourge/Stifle.java index 1d44154a4ab..00bddf94222 100644 --- a/Mage.Sets/src/mage/sets/scourge/Stifle.java +++ b/Mage.Sets/src/mage/sets/scourge/Stifle.java @@ -45,7 +45,6 @@ public class Stifle extends CardImpl { super(ownerId, 52, "Stifle", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "SCG"; - this.color.setBlue(true); // Counter target activated or triggered ability. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/scourge/SulfuricVortex.java b/Mage.Sets/src/mage/sets/scourge/SulfuricVortex.java index cfb5a6f49be..8655a506714 100644 --- a/Mage.Sets/src/mage/sets/scourge/SulfuricVortex.java +++ b/Mage.Sets/src/mage/sets/scourge/SulfuricVortex.java @@ -55,7 +55,6 @@ public class SulfuricVortex extends CardImpl { super(ownerId, 106, "Sulfuric Vortex", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{R}"); this.expansionSetCode = "SCG"; - this.color.setRed(true); // At the beginning of each player's upkeep, Sulfuric Vortex deals 2 damage to that player. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, true, "that player"), TargetController.ANY, false, true)); diff --git a/Mage.Sets/src/mage/sets/scourge/TemporalFissure.java b/Mage.Sets/src/mage/sets/scourge/TemporalFissure.java index 494b1575d77..ac48ae3d71a 100644 --- a/Mage.Sets/src/mage/sets/scourge/TemporalFissure.java +++ b/Mage.Sets/src/mage/sets/scourge/TemporalFissure.java @@ -45,7 +45,6 @@ public class TemporalFissure extends CardImpl { super(ownerId, 53, "Temporal Fissure", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{U}"); this.expansionSetCode = "SCG"; - this.color.setBlue(true); // Return target permanent to its owner's hand. this.getSpellAbility().addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/sets/scourge/TendrilsOfAgony.java b/Mage.Sets/src/mage/sets/scourge/TendrilsOfAgony.java index 72d1e0542d9..66df5e40979 100644 --- a/Mage.Sets/src/mage/sets/scourge/TendrilsOfAgony.java +++ b/Mage.Sets/src/mage/sets/scourge/TendrilsOfAgony.java @@ -46,7 +46,6 @@ public class TendrilsOfAgony extends CardImpl { super(ownerId, 75, "Tendrils of Agony", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{B}{B}"); this.expansionSetCode = "SCG"; - this.color.setBlack(true); // Target player loses 2 life and you gain 2 life. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/scourge/UnspeakableSymbol.java b/Mage.Sets/src/mage/sets/scourge/UnspeakableSymbol.java index 505562e00c8..66723547474 100644 --- a/Mage.Sets/src/mage/sets/scourge/UnspeakableSymbol.java +++ b/Mage.Sets/src/mage/sets/scourge/UnspeakableSymbol.java @@ -49,7 +49,6 @@ public class UnspeakableSymbol extends CardImpl { super(ownerId, 79, "Unspeakable Symbol", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}"); this.expansionSetCode = "SCG"; - this.color.setBlack(true); // Pay 3 life: Put a +1/+1 counter on target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new PayLifeCost(3)); diff --git a/Mage.Sets/src/mage/sets/scourge/WingShards.java b/Mage.Sets/src/mage/sets/scourge/WingShards.java index 2aa1e349260..a5b0374d3d9 100644 --- a/Mage.Sets/src/mage/sets/scourge/WingShards.java +++ b/Mage.Sets/src/mage/sets/scourge/WingShards.java @@ -46,7 +46,6 @@ public class WingShards extends CardImpl { super(ownerId, 25, "Wing Shards", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}{W}"); this.expansionSetCode = "SCG"; - this.color.setWhite(true); // Target player sacrifices an attacking creature. this.getSpellAbility().addEffect(new SacrificeEffect(new FilterAttackingCreature(), 1, "Target player")); diff --git a/Mage.Sets/src/mage/sets/scourge/WirewoodGuardian.java b/Mage.Sets/src/mage/sets/scourge/WirewoodGuardian.java index 2f364b618ee..2b8734bdd0f 100644 --- a/Mage.Sets/src/mage/sets/scourge/WirewoodGuardian.java +++ b/Mage.Sets/src/mage/sets/scourge/WirewoodGuardian.java @@ -47,7 +47,6 @@ public class WirewoodGuardian extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Mutant"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/scourge/WirewoodSymbiote.java b/Mage.Sets/src/mage/sets/scourge/WirewoodSymbiote.java index 44f6946bdfc..90ef6961d60 100644 --- a/Mage.Sets/src/mage/sets/scourge/WirewoodSymbiote.java +++ b/Mage.Sets/src/mage/sets/scourge/WirewoodSymbiote.java @@ -59,7 +59,6 @@ public class WirewoodSymbiote extends CardImpl { this.expansionSetCode = "SCG"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java b/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java index 1f37db32d6c..c411bb82f41 100644 --- a/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java +++ b/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java @@ -56,7 +56,6 @@ public class XantidSwarm extends CardImpl { this.expansionSetCode = "SCG"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/seventhedition/AEtherFlash.java b/Mage.Sets/src/mage/sets/seventhedition/AEtherFlash.java index a09941e4297..ffd7cc6f5d0 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/AEtherFlash.java +++ b/Mage.Sets/src/mage/sets/seventhedition/AEtherFlash.java @@ -51,7 +51,6 @@ public class AEtherFlash extends CardImpl { super(ownerId, 172, "AEther Flash", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{R}"); this.expansionSetCode = "7ED"; - this.color.setRed(true); // Whenever a creature enters the battlefield, AEther Flash deals 2 damage to it. this.addAbility(new AEtherFlashTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/seventhedition/AgonizingMemories.java b/Mage.Sets/src/mage/sets/seventhedition/AgonizingMemories.java index 3a2f0464ee2..b41be8998c3 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/AgonizingMemories.java +++ b/Mage.Sets/src/mage/sets/seventhedition/AgonizingMemories.java @@ -53,7 +53,6 @@ public class AgonizingMemories extends CardImpl { super(ownerId, 117, "Agonizing Memories", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{B}{B}"); this.expansionSetCode = "7ED"; - this.color.setBlack(true); // Look at target player's hand and choose two cards from it. Put them on top of that player's library in any order. this.getSpellAbility().addEffect(new AgonizingMemoriesEffect()); diff --git a/Mage.Sets/src/mage/sets/seventhedition/AncestralMemories.java b/Mage.Sets/src/mage/sets/seventhedition/AncestralMemories.java index d282ff54107..a9903de426b 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/AncestralMemories.java +++ b/Mage.Sets/src/mage/sets/seventhedition/AncestralMemories.java @@ -54,7 +54,6 @@ public class AncestralMemories extends CardImpl { super(ownerId, 59, "Ancestral Memories", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{U}{U}{U}"); this.expansionSetCode = "7ED"; - this.color.setBlue(true); // Look at the top seven cards of your library. Put two of them into your hand and the rest into your graveyard. this.getSpellAbility().addEffect(new AncestralMemoriesEffect()); diff --git a/Mage.Sets/src/mage/sets/seventhedition/Compost.java b/Mage.Sets/src/mage/sets/seventhedition/Compost.java index ebe6f04e53a..2b1b44ee3c8 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Compost.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Compost.java @@ -54,7 +54,6 @@ public class Compost extends CardImpl { super(ownerId, 235, "Compost", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "7ED"; - this.color.setGreen(true); // Whenever a black card is put into an opponent's graveyard from anywhere, you may draw a card. this.addAbility(new PutCardIntoGraveFromAnywhereAllTriggeredAbility( diff --git a/Mage.Sets/src/mage/sets/seventhedition/CrimsonHellkite.java b/Mage.Sets/src/mage/sets/seventhedition/CrimsonHellkite.java index 49534279a3a..b8b96c75de7 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/CrimsonHellkite.java +++ b/Mage.Sets/src/mage/sets/seventhedition/CrimsonHellkite.java @@ -63,7 +63,6 @@ public class CrimsonHellkite extends CardImpl { this.expansionSetCode = "7ED"; this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/seventhedition/DarkestHour.java b/Mage.Sets/src/mage/sets/seventhedition/DarkestHour.java index f13fb35b49d..280425a5827 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/DarkestHour.java +++ b/Mage.Sets/src/mage/sets/seventhedition/DarkestHour.java @@ -54,7 +54,6 @@ public class DarkestHour extends CardImpl { super(ownerId, 128, "Darkest Hour", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "7ED"; - this.color.setBlack(true); // All creatures are black. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DarkestHourEffect())); diff --git a/Mage.Sets/src/mage/sets/seventhedition/EagerCadet.java b/Mage.Sets/src/mage/sets/seventhedition/EagerCadet.java index f11964edd09..fed2d846757 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/EagerCadet.java +++ b/Mage.Sets/src/mage/sets/seventhedition/EagerCadet.java @@ -45,7 +45,6 @@ public class EagerCadet extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/FallenAngel.java b/Mage.Sets/src/mage/sets/seventhedition/FallenAngel.java index a0af44cc4ad..08ec298b2ab 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/FallenAngel.java +++ b/Mage.Sets/src/mage/sets/seventhedition/FallenAngel.java @@ -52,7 +52,6 @@ public class FallenAngel extends CardImpl { this.expansionSetCode = "7ED"; this.subtype.add("Angel"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/seventhedition/FamiliarGround.java b/Mage.Sets/src/mage/sets/seventhedition/FamiliarGround.java index b4dda84f472..1c5a04f54d4 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/FamiliarGround.java +++ b/Mage.Sets/src/mage/sets/seventhedition/FamiliarGround.java @@ -46,7 +46,6 @@ public class FamiliarGround extends CardImpl { super(ownerId, 243, "Familiar Ground", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "7ED"; - this.color.setGreen(true); // Each creature you control can't be blocked by more than one creature. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneAllEffect(new FilterControlledCreaturePermanent()))); diff --git a/Mage.Sets/src/mage/sets/seventhedition/FinalFortune.java b/Mage.Sets/src/mage/sets/seventhedition/FinalFortune.java index a31b52688a9..f3c2fa96bf6 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/FinalFortune.java +++ b/Mage.Sets/src/mage/sets/seventhedition/FinalFortune.java @@ -51,7 +51,6 @@ public class FinalFortune extends CardImpl { super(ownerId, 182, "Final Fortune", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{R}{R}"); this.expansionSetCode = "7ED"; - this.color.setRed(true); // Take an extra turn after this one. At the beginning of that turn's end step, you lose the game. this.getSpellAbility().addEffect(new FinalFortuneEffect()); diff --git a/Mage.Sets/src/mage/sets/seventhedition/ForceSpike.java b/Mage.Sets/src/mage/sets/seventhedition/ForceSpike.java index d1f5f69bf46..ca2227ca4b2 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/ForceSpike.java +++ b/Mage.Sets/src/mage/sets/seventhedition/ForceSpike.java @@ -46,7 +46,6 @@ public class ForceSpike extends CardImpl { super(ownerId, 76, "Force Spike", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "7ED"; - this.color.setBlue(true); // Counter target spell unless its controller pays {1}. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/seventhedition/GiantOctopus.java b/Mage.Sets/src/mage/sets/seventhedition/GiantOctopus.java index dd16f9226a3..2b4ec8cadcf 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/GiantOctopus.java +++ b/Mage.Sets/src/mage/sets/seventhedition/GiantOctopus.java @@ -45,7 +45,6 @@ public class GiantOctopus extends CardImpl { this.expansionSetCode = "7ED"; this.subtype.add("Octopus"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/GoblinGlider.java b/Mage.Sets/src/mage/sets/seventhedition/GoblinGlider.java index 30a9fba897a..459097a874d 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/GoblinGlider.java +++ b/Mage.Sets/src/mage/sets/seventhedition/GoblinGlider.java @@ -46,7 +46,6 @@ public class GoblinGlider extends CardImpl { this.expansionSetCode = "7ED"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/seventhedition/GorillaChieftain.java b/Mage.Sets/src/mage/sets/seventhedition/GorillaChieftain.java index 305f47ea05e..50c16e3670c 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/GorillaChieftain.java +++ b/Mage.Sets/src/mage/sets/seventhedition/GorillaChieftain.java @@ -48,7 +48,6 @@ public class GorillaChieftain extends CardImpl { this.expansionSetCode = "7ED"; this.subtype.add("Ape"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/seventhedition/HealingSalve.java b/Mage.Sets/src/mage/sets/seventhedition/HealingSalve.java index 9adaaf2b1c6..07f45c802aa 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/HealingSalve.java +++ b/Mage.Sets/src/mage/sets/seventhedition/HealingSalve.java @@ -49,7 +49,6 @@ public class HealingSalve extends CardImpl { super(ownerId, 18, "Healing Salve", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "7ED"; - this.color.setWhite(true); // Choose one - Target player gains 3 life; or prevent the next 3 damage that would be dealt to target creature or player this turn. this.getSpellAbility().addEffect(new GainLifeTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/seventhedition/HeavyBallista.java b/Mage.Sets/src/mage/sets/seventhedition/HeavyBallista.java index 17bbedd0a42..3c42db67cb8 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/HeavyBallista.java +++ b/Mage.Sets/src/mage/sets/seventhedition/HeavyBallista.java @@ -51,7 +51,6 @@ public class HeavyBallista extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/seventhedition/InfernalContract.java b/Mage.Sets/src/mage/sets/seventhedition/InfernalContract.java index 102a69b1772..32a8f5762dd 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/InfernalContract.java +++ b/Mage.Sets/src/mage/sets/seventhedition/InfernalContract.java @@ -45,7 +45,6 @@ public class InfernalContract extends CardImpl { super(ownerId, 143, "Infernal Contract", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{B}{B}{B}"); this.expansionSetCode = "7ED"; - this.color.setBlack(true); // Draw four cards. You lose half your life, rounded up. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(4)); diff --git a/Mage.Sets/src/mage/sets/seventhedition/KnightErrant.java b/Mage.Sets/src/mage/sets/seventhedition/KnightErrant.java index f6ff972918f..e43405eebb0 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/KnightErrant.java +++ b/Mage.Sets/src/mage/sets/seventhedition/KnightErrant.java @@ -45,7 +45,6 @@ public class KnightErrant extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/LongbowArcher.java b/Mage.Sets/src/mage/sets/seventhedition/LongbowArcher.java index bef58aec215..0c500303e4e 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/LongbowArcher.java +++ b/Mage.Sets/src/mage/sets/seventhedition/LongbowArcher.java @@ -48,7 +48,6 @@ public class LongbowArcher extends CardImpl { this.subtype.add("Soldier"); this.subtype.add("Archer"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/seventhedition/MemoryLapse.java b/Mage.Sets/src/mage/sets/seventhedition/MemoryLapse.java index 2b9e89d6b53..ccf4f0c46f2 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/MemoryLapse.java +++ b/Mage.Sets/src/mage/sets/seventhedition/MemoryLapse.java @@ -46,7 +46,6 @@ public class MemoryLapse extends CardImpl { super(ownerId, 88, "Memory Lapse", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "7ED"; - this.color.setBlue(true); // Counter target spell. If that spell is countered this way, put it on top of its owner's library instead of into that player's graveyard. this.getSpellAbility().addEffect(new CounterTargetWithReplacementEffect(Zone.LIBRARY, true)); diff --git a/Mage.Sets/src/mage/sets/seventhedition/MonstrousGrowth.java b/Mage.Sets/src/mage/sets/seventhedition/MonstrousGrowth.java index bcb1858f0c1..b20c3a55d0e 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/MonstrousGrowth.java +++ b/Mage.Sets/src/mage/sets/seventhedition/MonstrousGrowth.java @@ -46,7 +46,6 @@ public class MonstrousGrowth extends CardImpl { super(ownerId, 258, "Monstrous Growth", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "7ED"; - this.color.setGreen(true); // Target creature gets +4/+4 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/seventhedition/NaturesResurgence.java b/Mage.Sets/src/mage/sets/seventhedition/NaturesResurgence.java index d32ed399152..0686fc8fb61 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/NaturesResurgence.java +++ b/Mage.Sets/src/mage/sets/seventhedition/NaturesResurgence.java @@ -49,7 +49,6 @@ public class NaturesResurgence extends CardImpl { super(ownerId, 259, "Nature's Resurgence", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{G}{G}"); this.expansionSetCode = "7ED"; - this.color.setGreen(true); // Each player draws a card for each creature card in his or her graveyard. this.getSpellAbility().addEffect(new NaturesResurgenceEffect()); diff --git a/Mage.Sets/src/mage/sets/seventhedition/Nausea.java b/Mage.Sets/src/mage/sets/seventhedition/Nausea.java index 171a864c295..b0c9e1ec668 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Nausea.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Nausea.java @@ -45,7 +45,6 @@ public class Nausea extends CardImpl { super(ownerId, 148, "Nausea", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "7ED"; - this.color.setBlack(true); // All creatures get -1/-1 until end of turn. this.getSpellAbility().addEffect(new BoostAllEffect(-1, -1, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/seventhedition/OrcishArtillery.java b/Mage.Sets/src/mage/sets/seventhedition/OrcishArtillery.java index 7cc7ee48ddb..cfdb80f9f8f 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/OrcishArtillery.java +++ b/Mage.Sets/src/mage/sets/seventhedition/OrcishArtillery.java @@ -53,7 +53,6 @@ public class OrcishArtillery extends CardImpl { this.subtype.add("Orc"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/seventhedition/Pillage.java b/Mage.Sets/src/mage/sets/seventhedition/Pillage.java index c1e56d99009..6b7082cd061 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Pillage.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Pillage.java @@ -56,7 +56,6 @@ public class Pillage extends CardImpl { super(ownerId, 207, "Pillage", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); this.expansionSetCode = "7ED"; - this.color.setRed(true); // Destroy target artifact or land. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/seventhedition/Pyrotechnics.java b/Mage.Sets/src/mage/sets/seventhedition/Pyrotechnics.java index 49f3455bcfe..6814cd70c70 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Pyrotechnics.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Pyrotechnics.java @@ -44,7 +44,6 @@ public class Pyrotechnics extends CardImpl { super(ownerId, 210, "Pyrotechnics", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{R}"); this.expansionSetCode = "7ED"; - this.color.setRed(true); // Pyrotechnics deals 4 damage divided as you choose among any number of target creatures and/or players. this.getSpellAbility().addEffect(new DamageMultiEffect(4)); diff --git a/Mage.Sets/src/mage/sets/seventhedition/RaiseDead.java b/Mage.Sets/src/mage/sets/seventhedition/RaiseDead.java index 9ca70a2fd76..2ba550417cc 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/RaiseDead.java +++ b/Mage.Sets/src/mage/sets/seventhedition/RaiseDead.java @@ -48,7 +48,6 @@ public class RaiseDead extends CardImpl { super(ownerId, 157, "Raise Dead", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "7ED"; - this.color.setBlack(true); // Return target creature card from your graveyard to your hand. this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter)); diff --git a/Mage.Sets/src/mage/sets/seventhedition/RecklessEmbermage.java b/Mage.Sets/src/mage/sets/seventhedition/RecklessEmbermage.java index 6db15657043..1987de88865 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/RecklessEmbermage.java +++ b/Mage.Sets/src/mage/sets/seventhedition/RecklessEmbermage.java @@ -52,7 +52,6 @@ public class RecklessEmbermage extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java b/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java index 96516b21b99..d2bd4b22835 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java +++ b/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java @@ -55,7 +55,6 @@ public class RelentlessAssault extends CardImpl { super(ownerId, 214, "Relentless Assault", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); this.expansionSetCode = "7ED"; - this.color.setRed(true); // Untap all creatures that attacked this turn. After this main phase, there is an additional combat phase followed by an additional main phase. this.getSpellAbility().addWatcher(new AttackedThisTurnWatcher()); diff --git a/Mage.Sets/src/mage/sets/seventhedition/Reprisal.java b/Mage.Sets/src/mage/sets/seventhedition/Reprisal.java index 371dcd9d491..395dcc476cf 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Reprisal.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Reprisal.java @@ -53,7 +53,6 @@ public class Reprisal extends CardImpl { super(ownerId, 33, "Reprisal", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "7ED"; - this.color.setWhite(true); // Destroy target creature with power 4 or greater. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/seventhedition/Rowen.java b/Mage.Sets/src/mage/sets/seventhedition/Rowen.java index 03abdd1b40d..0fb92631fdb 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Rowen.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Rowen.java @@ -52,7 +52,6 @@ public class Rowen extends CardImpl { super(ownerId, 266, "Rowen", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); this.expansionSetCode = "7ED"; - this.color.setGreen(true); // Reveal the first card you draw each turn. Whenever you reveal a basic land card this way, draw a card. this.addAbility(new RowenAbility()); diff --git a/Mage.Sets/src/mage/sets/seventhedition/Sanctimony.java b/Mage.Sets/src/mage/sets/seventhedition/Sanctimony.java index a413f2e783c..f4f62250eeb 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Sanctimony.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Sanctimony.java @@ -56,7 +56,6 @@ public class Sanctimony extends CardImpl { super(ownerId, 39, "Sanctimony", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "7ED"; - this.color.setWhite(true); // Whenever an opponent taps a Mountain for mana, you may gain 1 life. this.addAbility(new TapForManaAllTriggeredAbility(new GainLifeEffect(1), filter, SetTargetPointer.NONE)); diff --git a/Mage.Sets/src/mage/sets/seventhedition/SeismicAssault.java b/Mage.Sets/src/mage/sets/seventhedition/SeismicAssault.java index a0ce518799b..4cdfcbaca37 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/SeismicAssault.java +++ b/Mage.Sets/src/mage/sets/seventhedition/SeismicAssault.java @@ -53,7 +53,6 @@ public class SeismicAssault extends CardImpl { super(ownerId, 216, "Seismic Assault", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{R}{R}{R}"); this.expansionSetCode = "7ED"; - this.color.setRed(true); // Discard a land card: Seismic Assault deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new DiscardTargetCost(new TargetCardInHand(filter))); diff --git a/Mage.Sets/src/mage/sets/seventhedition/SpiritLink.java b/Mage.Sets/src/mage/sets/seventhedition/SpiritLink.java index 13034049447..9845f487f69 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/SpiritLink.java +++ b/Mage.Sets/src/mage/sets/seventhedition/SpiritLink.java @@ -57,7 +57,6 @@ public class SpiritLink extends CardImpl { this.expansionSetCode = "7ED"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/seventhedition/StealArtifact.java b/Mage.Sets/src/mage/sets/seventhedition/StealArtifact.java index 0a6767d50f0..383d8fda121 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/StealArtifact.java +++ b/Mage.Sets/src/mage/sets/seventhedition/StealArtifact.java @@ -52,7 +52,6 @@ public class StealArtifact extends CardImpl { this.expansionSetCode = "7ED"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant artifact TargetPermanent auraTarget = new TargetArtifactPermanent(); diff --git a/Mage.Sets/src/mage/sets/seventhedition/StrandsOfNight.java b/Mage.Sets/src/mage/sets/seventhedition/StrandsOfNight.java index e3249d57a13..651f326b4cf 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/StrandsOfNight.java +++ b/Mage.Sets/src/mage/sets/seventhedition/StrandsOfNight.java @@ -60,7 +60,6 @@ public class StrandsOfNight extends CardImpl { super(ownerId, 165, "Strands of Night", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "7ED"; - this.color.setBlack(true); // {B}{B}, Pay 2 life, Sacrifice a Swamp: Return target creature card from your graveyard to the battlefield. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{B}{B}")); diff --git a/Mage.Sets/src/mage/sets/seventhedition/StreamOfLife.java b/Mage.Sets/src/mage/sets/seventhedition/StreamOfLife.java index 13d5ce9ea94..92d874d2577 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/StreamOfLife.java +++ b/Mage.Sets/src/mage/sets/seventhedition/StreamOfLife.java @@ -45,7 +45,6 @@ public class StreamOfLife extends CardImpl { super(ownerId, 272, "Stream of Life", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{X}{G}"); this.expansionSetCode = "7ED"; - this.color.setGreen(true); // Target player gains X life. this.getSpellAbility().addEffect(new GainLifeTargetEffect(new ManacostVariableValue())); diff --git a/Mage.Sets/src/mage/sets/seventhedition/SuddenImpact.java b/Mage.Sets/src/mage/sets/seventhedition/SuddenImpact.java index 3a7f83a3b36..802f7b157cf 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/SuddenImpact.java +++ b/Mage.Sets/src/mage/sets/seventhedition/SuddenImpact.java @@ -49,7 +49,6 @@ public class SuddenImpact extends CardImpl { super(ownerId, 223, "Sudden Impact", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{R}"); this.expansionSetCode = "7ED"; - this.color.setRed(true); // Sudden Impact deals damage to target player equal to the number of cards in that player's hand. Effect effect = new DamageTargetEffect(new TargetPlayerCardsInHandCount()); diff --git a/Mage.Sets/src/mage/sets/seventhedition/Sunweb.java b/Mage.Sets/src/mage/sets/seventhedition/Sunweb.java index ad183430615..95a1fee41a3 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Sunweb.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Sunweb.java @@ -62,7 +62,6 @@ public class Sunweb extends CardImpl { this.expansionSetCode = "7ED"; this.subtype.add("Wall"); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/seventhedition/TrainedOrgg.java b/Mage.Sets/src/mage/sets/seventhedition/TrainedOrgg.java index 4cd82fe0a7d..8403abc913e 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/TrainedOrgg.java +++ b/Mage.Sets/src/mage/sets/seventhedition/TrainedOrgg.java @@ -44,7 +44,6 @@ public class TrainedOrgg extends CardImpl { this.expansionSetCode = "7ED"; this.subtype.add("Orgg"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(6); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/Tremor.java b/Mage.Sets/src/mage/sets/seventhedition/Tremor.java index 55a2783633f..f0b834b9c3a 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Tremor.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Tremor.java @@ -53,7 +53,6 @@ public class Tremor extends CardImpl { super(ownerId, 225, "Tremor", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "7ED"; - this.color.setRed(true); // Tremor deals 1 damage to each creature without flying. this.getSpellAbility().addEffect(new DamageAllEffect(1, filter)); diff --git a/Mage.Sets/src/mage/sets/seventhedition/UktabiWildcats.java b/Mage.Sets/src/mage/sets/seventhedition/UktabiWildcats.java index ada9501bc68..21bfbe95bb3 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/UktabiWildcats.java +++ b/Mage.Sets/src/mage/sets/seventhedition/UktabiWildcats.java @@ -65,7 +65,6 @@ public class UktabiWildcats extends CardImpl { this.expansionSetCode = "7ED"; this.subtype.add("Cat"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/seventhedition/UntamedWilds.java b/Mage.Sets/src/mage/sets/seventhedition/UntamedWilds.java index 9584f2077e6..f41fbb78e1e 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/UntamedWilds.java +++ b/Mage.Sets/src/mage/sets/seventhedition/UntamedWilds.java @@ -45,7 +45,6 @@ public class UntamedWilds extends CardImpl { super(ownerId, 279, "Untamed Wilds", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "7ED"; - this.color.setGreen(true); // Search your library for a basic land card and put that card onto the battlefield. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterBasicLandCard()))); diff --git a/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java b/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java index 530b3082f71..1732219273a 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java @@ -51,7 +51,6 @@ public class Vengeance extends CardImpl { super(ownerId, 54, "Vengeance", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{W}"); this.expansionSetCode = "7ED"; - this.color.setWhite(true); // Destroy target tapped creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java b/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java index d143b8ff655..39dfb1a7fcc 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java +++ b/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java @@ -55,7 +55,6 @@ public class VerduranEnchantress extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/seventhedition/Vizzerdrix.java b/Mage.Sets/src/mage/sets/seventhedition/Vizzerdrix.java index 56d959fbf84..a20f37cd945 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Vizzerdrix.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Vizzerdrix.java @@ -46,7 +46,6 @@ public class Vizzerdrix extends CardImpl { this.subtype.add("Rabbit"); this.subtype.add("Beast"); - this.color.setBlue(true); this.power = new MageInt(6); this.toughness = new MageInt(6); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ApothecaryInitiate.java b/Mage.Sets/src/mage/sets/shadowmoor/ApothecaryInitiate.java index 9091e43f6d7..7a4c8cb3571 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ApothecaryInitiate.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ApothecaryInitiate.java @@ -59,7 +59,6 @@ public class ApothecaryInitiate extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorCohort.java b/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorCohort.java index 8a91be0bad9..d21f48fce86 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorCohort.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorCohort.java @@ -66,7 +66,6 @@ public class AshenmoorCohort extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorGouger.java b/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorGouger.java index 5af343864f6..b5e4b5657d7 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorGouger.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorGouger.java @@ -46,8 +46,6 @@ public class AshenmoorGouger extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorLiege.java b/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorLiege.java index b2d56e34088..5ba1bd8ef54 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorLiege.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorLiege.java @@ -67,8 +67,6 @@ public class AshenmoorLiege extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Knight"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/AuguryAdept.java b/Mage.Sets/src/mage/sets/shadowmoor/AuguryAdept.java index 80314dd6d45..fe1612ba1dc 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/AuguryAdept.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/AuguryAdept.java @@ -57,8 +57,6 @@ public class AuguryAdept extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BarrentonCragtreads.java b/Mage.Sets/src/mage/sets/shadowmoor/BarrentonCragtreads.java index d1bfd7e22db..ee6dbb6cab3 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BarrentonCragtreads.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BarrentonCragtreads.java @@ -58,8 +58,6 @@ public class BarrentonCragtreads extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Scout"); - this.color.setWhite(true); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BarrentonMedic.java b/Mage.Sets/src/mage/sets/shadowmoor/BarrentonMedic.java index 4a585ce2728..e28615d8bc4 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BarrentonMedic.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BarrentonMedic.java @@ -56,7 +56,6 @@ public class BarrentonMedic extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BeseechTheQueen.java b/Mage.Sets/src/mage/sets/shadowmoor/BeseechTheQueen.java index 3b5f31d1a1a..867ce108899 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BeseechTheQueen.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BeseechTheQueen.java @@ -53,7 +53,6 @@ public class BeseechTheQueen extends CardImpl { super(ownerId, 57, "Beseech the Queen", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2/B}{2/B}{2/B}"); this.expansionSetCode = "SHM"; - this.color.setBlack(true); // ({2B} can be paid with any two mana or with {B}. This card's converted mana cost is 6.) // Search your library for a card with converted mana cost less than or equal to the number of lands you control, reveal it, and put it into your hand. Then shuffle your library. diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BitingTether.java b/Mage.Sets/src/mage/sets/shadowmoor/BitingTether.java index 545afec21ee..6501317face 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BitingTether.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BitingTether.java @@ -59,7 +59,6 @@ public class BitingTether extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BlisteringDieflyn.java b/Mage.Sets/src/mage/sets/shadowmoor/BlisteringDieflyn.java index 37caa977953..b2d66bc8023 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BlisteringDieflyn.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BlisteringDieflyn.java @@ -50,7 +50,6 @@ public class BlisteringDieflyn extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Imp"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BloodmarkMentor.java b/Mage.Sets/src/mage/sets/shadowmoor/BloodmarkMentor.java index 1d7954026d4..cd9bbeb86fd 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BloodmarkMentor.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BloodmarkMentor.java @@ -59,7 +59,6 @@ public class BloodmarkMentor extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BloodshedFever.java b/Mage.Sets/src/mage/sets/shadowmoor/BloodshedFever.java index 96e54253628..af7f6074765 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BloodshedFever.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BloodshedFever.java @@ -55,7 +55,6 @@ public class BloodshedFever extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BoartuskLiege.java b/Mage.Sets/src/mage/sets/shadowmoor/BoartuskLiege.java index 6eb3d4093e6..44197d8bda8 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BoartuskLiege.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BoartuskLiege.java @@ -61,8 +61,6 @@ public class BoartuskLiege extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Knight"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BoggartArsonists.java b/Mage.Sets/src/mage/sets/shadowmoor/BoggartArsonists.java index ab2fc0fe3da..124e49e9a7b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BoggartArsonists.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BoggartArsonists.java @@ -64,7 +64,6 @@ public class BoggartArsonists extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Rogue"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BoggartRamGang.java b/Mage.Sets/src/mage/sets/shadowmoor/BoggartRamGang.java index 9f9b7b44534..78c9c550482 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BoggartRamGang.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BoggartRamGang.java @@ -47,8 +47,6 @@ public class BoggartRamGang extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CemeteryPuca.java b/Mage.Sets/src/mage/sets/shadowmoor/CemeteryPuca.java index d5704ee2f6f..e3bc6c33655 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CemeteryPuca.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CemeteryPuca.java @@ -59,8 +59,6 @@ public class CemeteryPuca extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Shapeshifter"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Cinderbones.java b/Mage.Sets/src/mage/sets/shadowmoor/Cinderbones.java index ac4ecf3c1f9..8ed65ad6aeb 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Cinderbones.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Cinderbones.java @@ -50,7 +50,6 @@ public class Cinderbones extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Skeleton"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CinderhazeWretch.java b/Mage.Sets/src/mage/sets/shadowmoor/CinderhazeWretch.java index 857d98a6650..ea8304a579f 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CinderhazeWretch.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CinderhazeWretch.java @@ -57,7 +57,6 @@ public class CinderhazeWretch extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Shaman"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ConsignToDream.java b/Mage.Sets/src/mage/sets/shadowmoor/ConsignToDream.java index da2dedfd75d..99f3493addf 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ConsignToDream.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ConsignToDream.java @@ -51,7 +51,6 @@ public class ConsignToDream extends CardImpl { super(ownerId, 32, "Consign to Dream", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "SHM"; - this.color.setBlue(true); // Return target permanent to its owner's hand. If that permanent is red or green, put it on top of its owner's library instead. this.getSpellAbility().addEffect(new ConsignToDreamEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CorrosiveMentor.java b/Mage.Sets/src/mage/sets/shadowmoor/CorrosiveMentor.java index a3a47483f43..5d2aac5be75 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CorrosiveMentor.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CorrosiveMentor.java @@ -59,7 +59,6 @@ public class CorrosiveMentor extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Counterbore.java b/Mage.Sets/src/mage/sets/shadowmoor/Counterbore.java index deb3ec86319..e81d4e5e32c 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Counterbore.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Counterbore.java @@ -44,7 +44,6 @@ public class Counterbore extends CardImpl { super(ownerId, 33, "Counterbore", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); this.expansionSetCode = "SHM"; - this.color.setBlue(true); // Counter target spell. // Search its controller's graveyard, hand, and library for all cards with the same name as that spell and exile them. Then that player shuffles his or her library. diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CragganwickCremator.java b/Mage.Sets/src/mage/sets/shadowmoor/CragganwickCremator.java index 7260a7696d9..1a18f370549 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CragganwickCremator.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CragganwickCremator.java @@ -56,7 +56,6 @@ public class CragganwickCremator extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CrowdOfCinders.java b/Mage.Sets/src/mage/sets/shadowmoor/CrowdOfCinders.java index 679eca4118e..085b6389c0e 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CrowdOfCinders.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CrowdOfCinders.java @@ -59,7 +59,6 @@ public class CrowdOfCinders extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Elemental"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CultbrandCinder.java b/Mage.Sets/src/mage/sets/shadowmoor/CultbrandCinder.java index d3a42d6d3d2..e143a982f72 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CultbrandCinder.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CultbrandCinder.java @@ -50,8 +50,6 @@ public class CultbrandCinder extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Shaman"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CurseOfChains.java b/Mage.Sets/src/mage/sets/shadowmoor/CurseOfChains.java index e0985f84183..24a07ff15ba 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CurseOfChains.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CurseOfChains.java @@ -52,8 +52,6 @@ public class CurseOfChains extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Aura"); - this.color.setBlue(true); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Cursecatcher.java b/Mage.Sets/src/mage/sets/shadowmoor/Cursecatcher.java index c734519273f..fd59cc55461 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Cursecatcher.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Cursecatcher.java @@ -62,7 +62,6 @@ public class Cursecatcher extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DawnglowInfusion.java b/Mage.Sets/src/mage/sets/shadowmoor/DawnglowInfusion.java index dd985af2a65..4670ba9e81b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DawnglowInfusion.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DawnglowInfusion.java @@ -52,8 +52,6 @@ public class DawnglowInfusion extends CardImpl { super(ownerId, 225, "Dawnglow Infusion", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{G/W}"); this.expansionSetCode = "SHM"; - this.color.setGreen(true); - this.color.setWhite(true); // You gain X life if {G} was spent to cast Dawnglow Infusion and X life if {W} was spent to cast it. DynamicValue xValue = new ManacostVariableValue(); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DeepSlumberTitan.java b/Mage.Sets/src/mage/sets/shadowmoor/DeepSlumberTitan.java index d57caa93416..dad02d0b5d8 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DeepSlumberTitan.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DeepSlumberTitan.java @@ -52,7 +52,6 @@ public class DeepSlumberTitan extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DeepchannelMentor.java b/Mage.Sets/src/mage/sets/shadowmoor/DeepchannelMentor.java index 01c19b17b0c..853d06610d6 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DeepchannelMentor.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DeepchannelMentor.java @@ -58,7 +58,6 @@ public class DeepchannelMentor extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DemigodOfRevenge.java b/Mage.Sets/src/mage/sets/shadowmoor/DemigodOfRevenge.java index 6a6e4977938..1f2c4b99845 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DemigodOfRevenge.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DemigodOfRevenge.java @@ -58,8 +58,6 @@ public class DemigodOfRevenge extends CardImpl { this.subtype.add("Spirit"); this.subtype.add("Avatar"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DevotedDruid.java b/Mage.Sets/src/mage/sets/shadowmoor/DevotedDruid.java index 59387e20305..e8b7f5ac6bf 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DevotedDruid.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DevotedDruid.java @@ -51,7 +51,6 @@ public class DevotedDruid extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DireUndercurrents.java b/Mage.Sets/src/mage/sets/shadowmoor/DireUndercurrents.java index 34b74c12275..cf81ef52e4c 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DireUndercurrents.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DireUndercurrents.java @@ -63,8 +63,6 @@ public class DireUndercurrents extends CardImpl { super(ownerId, 159, "Dire Undercurrents", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{U/B}{U/B}"); this.expansionSetCode = "SHM"; - this.color.setBlue(true); - this.color.setBlack(true); // Whenever a blue creature enters the battlefield under your control, you may have target player draw a card. Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(1), filterBlue, true, rule1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DramaticEntrance.java b/Mage.Sets/src/mage/sets/shadowmoor/DramaticEntrance.java index a58446b76eb..e85f8d10686 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DramaticEntrance.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DramaticEntrance.java @@ -54,7 +54,6 @@ public class DramaticEntrance extends CardImpl { super(ownerId, 111, "Dramatic Entrance", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{G}{G}"); this.expansionSetCode = "SHM"; - this.color.setGreen(true); // You may put a green creature card from your hand onto the battlefield. this.getSpellAbility().addEffect(new DramaticEntranceEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DreamSalvage.java b/Mage.Sets/src/mage/sets/shadowmoor/DreamSalvage.java index 0b1d64a61e8..f028b7638e0 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DreamSalvage.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DreamSalvage.java @@ -54,8 +54,6 @@ public class DreamSalvage extends CardImpl { super(ownerId, 160, "Dream Salvage", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U/B}"); this.expansionSetCode = "SHM"; - this.color.setBlue(true); - this.color.setBlack(true); // Draw cards equal to the number of cards target opponent discarded this turn. this.getSpellAbility().addEffect(new DreamSalvageEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DroveOfElves.java b/Mage.Sets/src/mage/sets/shadowmoor/DroveOfElves.java index 111fda0f877..977a783a59b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DroveOfElves.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DroveOfElves.java @@ -59,7 +59,6 @@ public class DroveOfElves extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DrownerInitiate.java b/Mage.Sets/src/mage/sets/shadowmoor/DrownerInitiate.java index fe360db92e1..e2c04a54d62 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DrownerInitiate.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DrownerInitiate.java @@ -61,7 +61,6 @@ public class DrownerInitiate extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DuskUrchins.java b/Mage.Sets/src/mage/sets/shadowmoor/DuskUrchins.java index e73628dd26c..3a24b807048 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DuskUrchins.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DuskUrchins.java @@ -50,7 +50,6 @@ public class DuskUrchins extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Ouphe"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ElementalMastery.java b/Mage.Sets/src/mage/sets/shadowmoor/ElementalMastery.java index f09c9b30ed4..7d06f996307 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ElementalMastery.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ElementalMastery.java @@ -65,7 +65,6 @@ public class ElementalMastery extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ElvishHexhunter.java b/Mage.Sets/src/mage/sets/shadowmoor/ElvishHexhunter.java index 0b72fab24d6..76b437705e5 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ElvishHexhunter.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ElvishHexhunter.java @@ -61,8 +61,6 @@ public class ElvishHexhunter extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/EmberGale.java b/Mage.Sets/src/mage/sets/shadowmoor/EmberGale.java index db7264b0dc6..e75660ee5a4 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/EmberGale.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/EmberGale.java @@ -59,7 +59,6 @@ public class EmberGale extends CardImpl { super(ownerId, 91, "Ember Gale", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "SHM"; - this.color.setRed(true); // Creatures target player controls can't block this turn. Ember Gale deals 1 damage to each white and/or blue creature that player controls. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/EmberstrikeDuo.java b/Mage.Sets/src/mage/sets/shadowmoor/EmberstrikeDuo.java index 9eb39dcdc0e..cd039a49026 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/EmberstrikeDuo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/EmberstrikeDuo.java @@ -62,8 +62,6 @@ public class EmberstrikeDuo extends CardImpl { this.subtype.add("Warrior"); this.subtype.add("Shaman"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/EnchantedEvening.java b/Mage.Sets/src/mage/sets/shadowmoor/EnchantedEvening.java index 5b04cf78be1..f90471ad704 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/EnchantedEvening.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/EnchantedEvening.java @@ -54,8 +54,6 @@ public class EnchantedEvening extends CardImpl { super(ownerId, 140, "Enchanted Evening", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W/U}{W/U}"); this.expansionSetCode = "SHM"; - this.color.setBlue(true); - this.color.setWhite(true); // All permanents are enchantments in addition to their other types. Effect effect = new EnchangedEveningEffect(CardType.ENCHANTMENT, Duration.WhileOnBattlefield, new FilterPermanent()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FaerieMacabre.java b/Mage.Sets/src/mage/sets/shadowmoor/FaerieMacabre.java index 7f5dacbecba..508d48c4845 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FaerieMacabre.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FaerieMacabre.java @@ -58,7 +58,6 @@ public class FaerieMacabre extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FaerieSwarm.java b/Mage.Sets/src/mage/sets/shadowmoor/FaerieSwarm.java index 4f66798ac99..ae944bcbc66 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FaerieSwarm.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FaerieSwarm.java @@ -59,7 +59,6 @@ public class FaerieSwarm extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Faerie"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FarhavenElf.java b/Mage.Sets/src/mage/sets/shadowmoor/FarhavenElf.java index 04703ac427d..6289edb7289 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FarhavenElf.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FarhavenElf.java @@ -49,7 +49,6 @@ public class FarhavenElf extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FateTransfer.java b/Mage.Sets/src/mage/sets/shadowmoor/FateTransfer.java index e9216df5fba..dcfe9b5a38b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FateTransfer.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FateTransfer.java @@ -53,8 +53,6 @@ public class FateTransfer extends CardImpl { super(ownerId, 161, "Fate Transfer", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U/B}"); this.expansionSetCode = "SHM"; - this.color.setBlue(true); - this.color.setBlack(true); // Move all counters from target creature onto another target creature. this.getSpellAbility().addEffect(new FateTransferEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Firespout.java b/Mage.Sets/src/mage/sets/shadowmoor/Firespout.java index df34048116f..09704dfc1aa 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Firespout.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Firespout.java @@ -59,8 +59,6 @@ public class Firespout extends CardImpl { super(ownerId, 205, "Firespout", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R/G}"); this.expansionSetCode = "SHM"; - this.color.setRed(true); - this.color.setGreen(true); // Firespout deals 3 damage to each creature without flying if {R} was spent to cast Firespout and 3 damage to each creature with flying if {G} was spent to cast it. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FistsOfTheDemigod.java b/Mage.Sets/src/mage/sets/shadowmoor/FistsOfTheDemigod.java index 856ba829b42..a3246991bb1 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FistsOfTheDemigod.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FistsOfTheDemigod.java @@ -59,8 +59,6 @@ public class FistsOfTheDemigod extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Aura"); - this.color.setRed(true); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FlameJavelin.java b/Mage.Sets/src/mage/sets/shadowmoor/FlameJavelin.java index 129fc534b05..334067a5a70 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FlameJavelin.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FlameJavelin.java @@ -44,7 +44,6 @@ public class FlameJavelin extends CardImpl { super(ownerId, 92, "Flame Javelin", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2/R}{2/R}{2/R}"); this.expansionSetCode = "SHM"; - this.color.setRed(true); // Flame Javelin deals 4 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FlourishingDefenses.java b/Mage.Sets/src/mage/sets/shadowmoor/FlourishingDefenses.java index be924606cd6..0357616ac7f 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FlourishingDefenses.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FlourishingDefenses.java @@ -50,7 +50,6 @@ public class FlourishingDefenses extends CardImpl { super(ownerId, 114, "Flourishing Defenses", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}"); this.expansionSetCode = "SHM"; - this.color.setGreen(true); // Whenever a -1/-1 counter is placed on a creature, you may put a 1/1 green Elf Warrior creature token onto the battlefield. this.addAbility(new FlourishingDefensesTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FlowOfIdeas.java b/Mage.Sets/src/mage/sets/shadowmoor/FlowOfIdeas.java index 36df62ddf33..431c3aa776a 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FlowOfIdeas.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FlowOfIdeas.java @@ -52,7 +52,6 @@ public class FlowOfIdeas extends CardImpl { super(ownerId, 38, "Flow of Ideas", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{5}{U}"); this.expansionSetCode = "SHM"; - this.color.setBlue(true); // Draw a card for each Island you control. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter))); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FossilFind.java b/Mage.Sets/src/mage/sets/shadowmoor/FossilFind.java index 328636fdec4..25f6fc97393 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FossilFind.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FossilFind.java @@ -49,8 +49,6 @@ public class FossilFind extends CardImpl { super(ownerId, 206, "Fossil Find", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{R/G}"); this.expansionSetCode = "SHM"; - this.color.setRed(true); - this.color.setGreen(true); // Return a card at random from your graveyard to your hand, then reorder your graveyard as you choose. this.getSpellAbility().addEffect(new FossilFindEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FoxfireOak.java b/Mage.Sets/src/mage/sets/shadowmoor/FoxfireOak.java index 898d01f432b..0004f95250c 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FoxfireOak.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FoxfireOak.java @@ -50,7 +50,6 @@ public class FoxfireOak extends CardImpl { this.subtype.add("Treefolk"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FracturingGust.java b/Mage.Sets/src/mage/sets/shadowmoor/FracturingGust.java index 28959918dec..b214901a10d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FracturingGust.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FracturingGust.java @@ -51,8 +51,6 @@ public class FracturingGust extends CardImpl { super(ownerId, 227, "Fracturing Gust", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{G/W}{G/W}{G/W}"); this.expansionSetCode = "SHM"; - this.color.setGreen(true); - this.color.setWhite(true); // Destroy all artifacts and enchantments. You gain 2 life for each permanent destroyed this way. this.getSpellAbility().addEffect(new FracturingGustDestroyEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FulminatorMage.java b/Mage.Sets/src/mage/sets/shadowmoor/FulminatorMage.java index 19767b06369..6f85c765ce1 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FulminatorMage.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FulminatorMage.java @@ -51,8 +51,6 @@ public class FulminatorMage extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Shaman"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GhastlordOfFugue.java b/Mage.Sets/src/mage/sets/shadowmoor/GhastlordOfFugue.java index 188934d1d36..1e03e6627ef 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GhastlordOfFugue.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GhastlordOfFugue.java @@ -59,8 +59,6 @@ public class GhastlordOfFugue extends CardImpl { this.subtype.add("Spirit"); this.subtype.add("Avatar"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GlamerSpinners.java b/Mage.Sets/src/mage/sets/shadowmoor/GlamerSpinners.java index 658b27ce7c9..7b4916bdfd5 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GlamerSpinners.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GlamerSpinners.java @@ -62,8 +62,6 @@ public class GlamerSpinners extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Wizard"); - this.color.setWhite(true); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GleefulSabotage.java b/Mage.Sets/src/mage/sets/shadowmoor/GleefulSabotage.java index c335912db36..e2799927f80 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GleefulSabotage.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GleefulSabotage.java @@ -55,7 +55,6 @@ public class GleefulSabotage extends CardImpl { super(ownerId, 116, "Gleeful Sabotage", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "SHM"; - this.color.setGreen(true); // Destroy target artifact or enchantment. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GlenElendraLiege.java b/Mage.Sets/src/mage/sets/shadowmoor/GlenElendraLiege.java index 1b6373574d2..e6a7c9b5a49 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GlenElendraLiege.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GlenElendraLiege.java @@ -61,8 +61,6 @@ public class GlenElendraLiege extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Knight"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Gloomlance.java b/Mage.Sets/src/mage/sets/shadowmoor/Gloomlance.java index 507ae581ffb..38c20be6e2c 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Gloomlance.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Gloomlance.java @@ -50,7 +50,6 @@ public class Gloomlance extends CardImpl { super(ownerId, 67, "Gloomlance", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "SHM"; - this.color.setBlack(true); // Destroy target creature. If that creature was green or white, its controller discards a card. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GloomwidowsFeast.java b/Mage.Sets/src/mage/sets/shadowmoor/GloomwidowsFeast.java index c874caf68c1..64695d2f25b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GloomwidowsFeast.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GloomwidowsFeast.java @@ -60,7 +60,6 @@ public class GloomwidowsFeast extends CardImpl { super(ownerId, 118, "Gloomwidow's Feast", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{G}"); this.expansionSetCode = "SHM"; - this.color.setGreen(true); // Destroy target creature with flying. If that creature was blue or black, put a 1/2 green Spider creature token with reach onto the battlefield. this.getSpellAbility().addEffect(new GloomwidowsFeastEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GodheadOfAwe.java b/Mage.Sets/src/mage/sets/shadowmoor/GodheadOfAwe.java index eaaf4d16424..d841091ddec 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GodheadOfAwe.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GodheadOfAwe.java @@ -61,8 +61,6 @@ public class GodheadOfAwe extends CardImpl { this.subtype.add("Spirit"); this.subtype.add("Avatar"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GravelgillAxeshark.java b/Mage.Sets/src/mage/sets/shadowmoor/GravelgillAxeshark.java index 5b1f550fc35..ac506ce65f3 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GravelgillAxeshark.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GravelgillAxeshark.java @@ -46,8 +46,6 @@ public class GravelgillAxeshark extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Soldier"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GravelgillDuo.java b/Mage.Sets/src/mage/sets/shadowmoor/GravelgillDuo.java index c528ac64750..1a53310e0cf 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GravelgillDuo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GravelgillDuo.java @@ -62,8 +62,6 @@ public class GravelgillDuo extends CardImpl { this.subtype.add("Rogue"); this.subtype.add("Warrior"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GreaterAuramancy.java b/Mage.Sets/src/mage/sets/shadowmoor/GreaterAuramancy.java index 625c2f363e9..70465b9b0b9 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GreaterAuramancy.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GreaterAuramancy.java @@ -64,7 +64,6 @@ public class GreaterAuramancy extends CardImpl { super(ownerId, 7, "Greater Auramancy", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "SHM"; - this.color.setWhite(true); // Other enchantments you control have shroud. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GutturalResponse.java b/Mage.Sets/src/mage/sets/shadowmoor/GutturalResponse.java index 940236486ff..49aedf4a1fa 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GutturalResponse.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GutturalResponse.java @@ -55,8 +55,6 @@ public class GutturalResponse extends CardImpl { super(ownerId, 208, "Guttural Response", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R/G}"); this.expansionSetCode = "SHM"; - this.color.setRed(true); - this.color.setGreen(true); // Counter target blue instant spell. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java b/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java index 1c8d9490c46..c496435799c 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java @@ -60,8 +60,6 @@ public class HelmOfTheGhastlord extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Aura"); - this.color.setBlue(true); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/HollowbornBarghest.java b/Mage.Sets/src/mage/sets/shadowmoor/HollowbornBarghest.java index 4936b47df78..81864e22c2d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/HollowbornBarghest.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/HollowbornBarghest.java @@ -61,7 +61,6 @@ public class HollowbornBarghest extends CardImpl { this.subtype.add("Demon"); this.subtype.add("Hound"); - this.color.setBlack(true); this.power = new MageInt(7); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/HordeOfBoggarts.java b/Mage.Sets/src/mage/sets/shadowmoor/HordeOfBoggarts.java index 526b9df0832..04547fea1d1 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/HordeOfBoggarts.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/HordeOfBoggarts.java @@ -59,7 +59,6 @@ public class HordeOfBoggarts extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/HungrySpriggan.java b/Mage.Sets/src/mage/sets/shadowmoor/HungrySpriggan.java index 8010b5404f2..aea90f5105b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/HungrySpriggan.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/HungrySpriggan.java @@ -49,7 +49,6 @@ public class HungrySpriggan extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/IncrementalBlight.java b/Mage.Sets/src/mage/sets/shadowmoor/IncrementalBlight.java index 133532414e5..52e1c7100a8 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/IncrementalBlight.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/IncrementalBlight.java @@ -50,7 +50,6 @@ public class IncrementalBlight extends CardImpl { super(ownerId, 70, "Incremental Blight", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "SHM"; - this.color.setBlack(true); // Put a -1/-1 counter on target creature, two -1/-1 counters on another target creature, and three -1/-1 counters on a third target creature. this.getSpellAbility().addEffect(new IncrementalBlightEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/InkfathomInfiltrator.java b/Mage.Sets/src/mage/sets/shadowmoor/InkfathomInfiltrator.java index a9774312c5c..f84802c1ac7 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/InkfathomInfiltrator.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/InkfathomInfiltrator.java @@ -47,8 +47,6 @@ public class InkfathomInfiltrator extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Rogue"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/InquisitorsSnare.java b/Mage.Sets/src/mage/sets/shadowmoor/InquisitorsSnare.java index 0155f061f4f..e32dac76740 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/InquisitorsSnare.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/InquisitorsSnare.java @@ -55,7 +55,6 @@ public class InquisitorsSnare extends CardImpl { super(ownerId, 8, "Inquisitor's Snare", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "SHM"; - this.color.setWhite(true); // Prevent all damage target attacking or blocking creature would deal this turn. If that creature is black or red, destroy it. this.getSpellAbility().addEffect(new InquisitorsSnareEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/IslebackSpawn.java b/Mage.Sets/src/mage/sets/shadowmoor/IslebackSpawn.java index 33beb4e627b..35c11d52255 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/IslebackSpawn.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/IslebackSpawn.java @@ -52,7 +52,6 @@ public class IslebackSpawn extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Kraken"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/JuvenileGloomwidow.java b/Mage.Sets/src/mage/sets/shadowmoor/JuvenileGloomwidow.java index 1377f7d99d3..abab5e310c6 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/JuvenileGloomwidow.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/JuvenileGloomwidow.java @@ -46,7 +46,6 @@ public class JuvenileGloomwidow extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Spider"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/KinscaerHarpoonist.java b/Mage.Sets/src/mage/sets/shadowmoor/KinscaerHarpoonist.java index f3e346320c3..f7167a22f3f 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/KinscaerHarpoonist.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/KinscaerHarpoonist.java @@ -53,7 +53,6 @@ public class KinscaerHarpoonist extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/KitchenFinks.java b/Mage.Sets/src/mage/sets/shadowmoor/KitchenFinks.java index 79ef6f108b9..9e96e82687e 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/KitchenFinks.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/KitchenFinks.java @@ -47,8 +47,6 @@ public class KitchenFinks extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Ouphe"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/KithkinRabble.java b/Mage.Sets/src/mage/sets/shadowmoor/KithkinRabble.java index 42fea1d4330..add932e3a63 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/KithkinRabble.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/KithkinRabble.java @@ -59,7 +59,6 @@ public class KithkinRabble extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Kithkin"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java b/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java index ebc9b8ee407..4f57a15de1c 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java @@ -56,7 +56,6 @@ public class KithkinShielddare extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/KnacksawClique.java b/Mage.Sets/src/mage/sets/shadowmoor/KnacksawClique.java index dd350c6aeee..6679cc7a4a6 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/KnacksawClique.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/KnacksawClique.java @@ -62,7 +62,6 @@ public class KnacksawClique extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/LastBreath.java b/Mage.Sets/src/mage/sets/shadowmoor/LastBreath.java index 44b35e55ff0..3ecc4a8c264 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/LastBreath.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/LastBreath.java @@ -59,7 +59,6 @@ public class LastBreath extends CardImpl { super(ownerId, 11, "Last Breath", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "SHM"; - this.color.setWhite(true); // Exile target creature with power 2 or less. Its controller gains 4 life. this.getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/LeechBonder.java b/Mage.Sets/src/mage/sets/shadowmoor/LeechBonder.java index f207c35d7fd..623580db2d0 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/LeechBonder.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/LeechBonder.java @@ -66,7 +66,6 @@ public class LeechBonder extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/LoamdraggerGiant.java b/Mage.Sets/src/mage/sets/shadowmoor/LoamdraggerGiant.java index b2454a81dff..4cf30921940 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/LoamdraggerGiant.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/LoamdraggerGiant.java @@ -45,8 +45,6 @@ public class LoamdraggerGiant extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(7); this.toughness = new MageInt(6); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/LochKorrigan.java b/Mage.Sets/src/mage/sets/shadowmoor/LochKorrigan.java index ac6cf717470..5071f24cd73 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/LochKorrigan.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/LochKorrigan.java @@ -49,7 +49,6 @@ public class LochKorrigan extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ManaReflection.java b/Mage.Sets/src/mage/sets/shadowmoor/ManaReflection.java index 9f9c6aed85e..8acddd38c13 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ManaReflection.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ManaReflection.java @@ -53,7 +53,6 @@ public class ManaReflection extends CardImpl { super(ownerId, 122, "Mana Reflection", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}{G}"); this.expansionSetCode = "SHM"; - this.color.setGreen(true); // If you tap a permanent for mana, it produces twice as much of that mana instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ManaReflectionReplacementEffect())); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Manamorphose.java b/Mage.Sets/src/mage/sets/shadowmoor/Manamorphose.java index 8ded1736667..730d93cc09c 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Manamorphose.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Manamorphose.java @@ -44,8 +44,6 @@ public class Manamorphose extends CardImpl { super(ownerId, 211, "Manamorphose", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R/G}"); this.expansionSetCode = "SHM"; - this.color.setRed(true); - this.color.setGreen(true); // Add two mana in any combination of colors to your mana pool. this.getSpellAbility().addEffect(new AddManaInAnyCombinationEffect(2)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MassCalcify.java b/Mage.Sets/src/mage/sets/shadowmoor/MassCalcify.java index 6ff773415d4..3c7f32d9d09 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MassCalcify.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MassCalcify.java @@ -53,7 +53,6 @@ public class MassCalcify extends CardImpl { super(ownerId, 12, "Mass Calcify", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{W}{W}"); this.expansionSetCode = "SHM"; - this.color.setWhite(true); // Destroy all nonwhite creatures. this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MemoryPlunder.java b/Mage.Sets/src/mage/sets/shadowmoor/MemoryPlunder.java index 62360e68585..c0544f0791c 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MemoryPlunder.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MemoryPlunder.java @@ -60,8 +60,6 @@ public class MemoryPlunder extends CardImpl { super(ownerId, 169, "Memory Plunder", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{U/B}{U/B}{U/B}{U/B}"); this.expansionSetCode = "SHM"; - this.color.setBlue(true); - this.color.setBlack(true); // You may cast target instant or sorcery card from an opponent's graveyard without paying its mana cost. this.getSpellAbility().addEffect(new MemoryPlunderEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MerrowGrimeblotter.java b/Mage.Sets/src/mage/sets/shadowmoor/MerrowGrimeblotter.java index a7f65854606..5d671f8e57d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MerrowGrimeblotter.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MerrowGrimeblotter.java @@ -53,8 +53,6 @@ public class MerrowGrimeblotter extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlack(true); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MerrowWavebreakers.java b/Mage.Sets/src/mage/sets/shadowmoor/MerrowWavebreakers.java index b341ceacf63..cfc9c8a544d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MerrowWavebreakers.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MerrowWavebreakers.java @@ -54,7 +54,6 @@ public class MerrowWavebreakers extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MidnightBanshee.java b/Mage.Sets/src/mage/sets/shadowmoor/MidnightBanshee.java index 25fdb7b7d84..46233fd2bb9 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MidnightBanshee.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MidnightBanshee.java @@ -60,7 +60,6 @@ public class MidnightBanshee extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Mirrorweave.java b/Mage.Sets/src/mage/sets/shadowmoor/Mirrorweave.java index 7513148bdd4..fa2ecb5d7c0 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Mirrorweave.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Mirrorweave.java @@ -61,8 +61,6 @@ public class Mirrorweave extends CardImpl { super(ownerId, 143, "Mirrorweave", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{W/U}{W/U}"); this.expansionSetCode = "SHM"; - this.color.setBlue(true); - this.color.setWhite(true); // Each other creature becomes a copy of target nonlegendary creature until end of turn. this.getSpellAbility().addEffect(new MirrorWeaveEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowSkulk.java b/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowSkulk.java index 0bac195d9cd..c074c079787 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowSkulk.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowSkulk.java @@ -56,7 +56,6 @@ public class MistmeadowSkulk extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Rogue"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowWitch.java b/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowWitch.java index a471b42244e..0b85cca6af5 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowWitch.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowWitch.java @@ -57,8 +57,6 @@ public class MistmeadowWitch extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MossbridgeTroll.java b/Mage.Sets/src/mage/sets/shadowmoor/MossbridgeTroll.java index 0f42ca7ee2f..d72317de5d1 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MossbridgeTroll.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MossbridgeTroll.java @@ -68,7 +68,6 @@ public class MossbridgeTroll extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Troll"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MurderousRedcap.java b/Mage.Sets/src/mage/sets/shadowmoor/MurderousRedcap.java index df9c061a867..86ce59e5e6e 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MurderousRedcap.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MurderousRedcap.java @@ -56,8 +56,6 @@ public class MurderousRedcap extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Assassin"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/NurturerInitiate.java b/Mage.Sets/src/mage/sets/shadowmoor/NurturerInitiate.java index e7eee2df2bc..ed5dce5a4a4 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/NurturerInitiate.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/NurturerInitiate.java @@ -61,7 +61,6 @@ public class NurturerInitiate extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/OldGhastbark.java b/Mage.Sets/src/mage/sets/shadowmoor/OldGhastbark.java index ec68109eff6..a94935a032b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/OldGhastbark.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/OldGhastbark.java @@ -45,8 +45,6 @@ public class OldGhastbark extends CardImpl { this.subtype.add("Treefolk"); this.subtype.add("Warrior"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(6); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/OonaQueenOfTheFae.java b/Mage.Sets/src/mage/sets/shadowmoor/OonaQueenOfTheFae.java index 7c956cdfbde..6e783d289df 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/OonaQueenOfTheFae.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/OonaQueenOfTheFae.java @@ -60,8 +60,6 @@ public class OonaQueenOfTheFae extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/OonasGatewarden.java b/Mage.Sets/src/mage/sets/shadowmoor/OonasGatewarden.java index 25587123a48..73f0f8c4d0b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/OonasGatewarden.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/OonasGatewarden.java @@ -48,8 +48,6 @@ public class OonasGatewarden extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Soldier"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/OracleOfNectars.java b/Mage.Sets/src/mage/sets/shadowmoor/OracleOfNectars.java index 02c9bd471d2..ed80b4a566c 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/OracleOfNectars.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/OracleOfNectars.java @@ -53,8 +53,6 @@ public class OracleOfNectars extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Cleric"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/OrderOfWhiteclay.java b/Mage.Sets/src/mage/sets/shadowmoor/OrderOfWhiteclay.java index d351c4e72d8..8572aeb33ad 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/OrderOfWhiteclay.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/OrderOfWhiteclay.java @@ -63,7 +63,6 @@ public class OrderOfWhiteclay extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/OversoulOfDusk.java b/Mage.Sets/src/mage/sets/shadowmoor/OversoulOfDusk.java index fc5431da62f..fb1703f02ea 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/OversoulOfDusk.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/OversoulOfDusk.java @@ -59,8 +59,6 @@ public class OversoulOfDusk extends CardImpl { this.subtype.add("Spirit"); this.subtype.add("Avatar"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PaleWayfarer.java b/Mage.Sets/src/mage/sets/shadowmoor/PaleWayfarer.java index c8c2caf8c50..3e3e2990350 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PaleWayfarer.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PaleWayfarer.java @@ -58,7 +58,6 @@ public class PaleWayfarer extends CardImpl { this.subtype.add("Spirit"); this.subtype.add("Giant"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ParapetWatchers.java b/Mage.Sets/src/mage/sets/shadowmoor/ParapetWatchers.java index 1a871d09e82..db0d4737f25 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ParapetWatchers.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ParapetWatchers.java @@ -50,7 +50,6 @@ public class ParapetWatchers extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PlagueOfVermin.java b/Mage.Sets/src/mage/sets/shadowmoor/PlagueOfVermin.java index 0ee7214ad8a..9eecc114643 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PlagueOfVermin.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PlagueOfVermin.java @@ -52,7 +52,6 @@ public class PlagueOfVermin extends CardImpl { super(ownerId, 73, "Plague of Vermin", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{6}{B}"); this.expansionSetCode = "SHM"; - this.color.setBlack(true); // Starting with you, each player may pay any amount of life. Repeat this process until no one pays life. Each player puts a 1/1 black Rat creature token onto the battlefield for each 1 life he or she paid this way. this.getSpellAbility().addEffect(new PlagueOfVerminEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Plumeveil.java b/Mage.Sets/src/mage/sets/shadowmoor/Plumeveil.java index 9bebee8d0b7..86d3a43ffa4 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Plumeveil.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Plumeveil.java @@ -47,8 +47,6 @@ public class Plumeveil extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Elemental"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PollutedBonds.java b/Mage.Sets/src/mage/sets/shadowmoor/PollutedBonds.java index 09b018c4adf..ed7d4b1d8d8 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PollutedBonds.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PollutedBonds.java @@ -61,7 +61,6 @@ public class PollutedBonds extends CardImpl { super(ownerId, 74, "Polluted Bonds", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{B}"); this.expansionSetCode = "SHM"; - this.color.setBlack(true); // Whenever a land enters the battlefield under an opponent's control, that player loses 2 life and you gain 2 life. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new PollutedBondsEffect(), filter, false, SetTargetPointer.PLAYER, rule, true)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PrismaticOmen.java b/Mage.Sets/src/mage/sets/shadowmoor/PrismaticOmen.java index 671c6f3872c..f3e7e5bc716 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PrismaticOmen.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PrismaticOmen.java @@ -62,7 +62,6 @@ public class PrismaticOmen extends CardImpl { super(ownerId, 126, "Prismatic Omen", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "SHM"; - this.color.setGreen(true); // Lands you control are every basic land type in addition to their other types. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandTypeAllEffect("Swamp", "Mountain", "Forest", "Island", "Plains"))); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PrisonTerm.java b/Mage.Sets/src/mage/sets/shadowmoor/PrisonTerm.java index ccb6d675dc9..5739ca71617 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PrisonTerm.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PrisonTerm.java @@ -69,7 +69,6 @@ public class PrisonTerm extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PunctureBolt.java b/Mage.Sets/src/mage/sets/shadowmoor/PunctureBolt.java index b84c2d4834c..d9edbe97ee9 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PunctureBolt.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PunctureBolt.java @@ -46,7 +46,6 @@ public class PunctureBolt extends CardImpl { super(ownerId, 102, "Puncture Bolt", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "SHM"; - this.color.setRed(true); // Puncture Bolt deals 1 damage to target creature. Put a -1/-1 counter on that creature. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PuresightMerrow.java b/Mage.Sets/src/mage/sets/shadowmoor/PuresightMerrow.java index 2f643cf339a..431d12e7e65 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PuresightMerrow.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PuresightMerrow.java @@ -57,8 +57,6 @@ public class PuresightMerrow extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PutAway.java b/Mage.Sets/src/mage/sets/shadowmoor/PutAway.java index 9c1b3afb7b6..e54f35ad639 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PutAway.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PutAway.java @@ -54,7 +54,6 @@ public class PutAway extends CardImpl { super(ownerId, 48, "Put Away", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); this.expansionSetCode = "SHM"; - this.color.setBlue(true); // Counter target spell. You may shuffle up to one target card from your graveyard into your library. this.getSpellAbility().addEffect(new PutAwayEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PyreCharger.java b/Mage.Sets/src/mage/sets/shadowmoor/PyreCharger.java index a26f468e573..bacf5769376 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PyreCharger.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PyreCharger.java @@ -51,7 +51,6 @@ public class PyreCharger extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RageReflection.java b/Mage.Sets/src/mage/sets/shadowmoor/RageReflection.java index 0466ac105c5..94aa5b778a3 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RageReflection.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RageReflection.java @@ -50,7 +50,6 @@ public class RageReflection extends CardImpl { super(ownerId, 104, "Rage Reflection", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}{R}"); this.expansionSetCode = "SHM"; - this.color.setRed(true); // Creatures you control have double strike. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RakingCanopy.java b/Mage.Sets/src/mage/sets/shadowmoor/RakingCanopy.java index dc291ab39ae..2f1ec921331 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RakingCanopy.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RakingCanopy.java @@ -51,7 +51,6 @@ public class RakingCanopy extends CardImpl { super(ownerId, 127, "Raking Canopy", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}{G}"); this.expansionSetCode = "SHM"; - this.color.setGreen(true); // Whenever a creature with flying attacks you, Raking Canopy deals 4 damage to it. this.addAbility(new RakingCanopyTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ReaperKing.java b/Mage.Sets/src/mage/sets/shadowmoor/ReaperKing.java index 20ab665287a..ea03a2bcd7d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ReaperKing.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ReaperKing.java @@ -65,11 +65,6 @@ public class ReaperKing extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Scarecrow"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setGreen(true); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Reknit.java b/Mage.Sets/src/mage/sets/shadowmoor/Reknit.java index 1826f7053af..dd98185b4ac 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Reknit.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Reknit.java @@ -44,8 +44,6 @@ public class Reknit extends CardImpl { super(ownerId, 236, "Reknit", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{G/W}"); this.expansionSetCode = "SHM"; - this.color.setGreen(true); - this.color.setWhite(true); // Regenerate target permanent. this.getSpellAbility().addEffect(new RegenerateTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RepelIntruders.java b/Mage.Sets/src/mage/sets/shadowmoor/RepelIntruders.java index f06ae825a65..fc27daf8267 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RepelIntruders.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RepelIntruders.java @@ -52,8 +52,6 @@ public class RepelIntruders extends CardImpl { super(ownerId, 147, "Repel Intruders", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{W/U}"); this.expansionSetCode = "SHM"; - this.color.setWhite(true); - this.color.setBlue(true); // Put two 1/1 white Kithkin Soldier creature tokens onto the battlefield if {W} was spent to cast Repel Intruders. Counter up to one target creature spell if {U} was spent to cast Repel Intruders. TargetSpell target = new TargetSpell(0,1, new FilterCreatureSpell()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ResplendentMentor.java b/Mage.Sets/src/mage/sets/shadowmoor/ResplendentMentor.java index 5c8dee92566..b795669fba8 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ResplendentMentor.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ResplendentMentor.java @@ -62,7 +62,6 @@ public class ResplendentMentor extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RhysTheRedeemed.java b/Mage.Sets/src/mage/sets/shadowmoor/RhysTheRedeemed.java index e624b95f715..c66ba3594b3 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RhysTheRedeemed.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RhysTheRedeemed.java @@ -63,8 +63,6 @@ public class RhysTheRedeemed extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setWhite(true); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RiteOfConsumption.java b/Mage.Sets/src/mage/sets/shadowmoor/RiteOfConsumption.java index 6f0df0b9802..edbc849e9b9 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RiteOfConsumption.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RiteOfConsumption.java @@ -53,7 +53,6 @@ public class RiteOfConsumption extends CardImpl { super(ownerId, 76, "Rite of Consumption", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "SHM"; - this.color.setBlack(true); // As an additional cost to cast Rite of Consumption, sacrifice a creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,new FilterControlledCreaturePermanent("a creature"), false))); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RoughshodMentor.java b/Mage.Sets/src/mage/sets/shadowmoor/RoughshodMentor.java index af69a8ba33d..bf8ed495319 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RoughshodMentor.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RoughshodMentor.java @@ -59,7 +59,6 @@ public class RoughshodMentor extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RuneCervinRider.java b/Mage.Sets/src/mage/sets/shadowmoor/RuneCervinRider.java index 5117ba1f62b..97b18e14440 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RuneCervinRider.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RuneCervinRider.java @@ -51,7 +51,6 @@ public class RuneCervinRider extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RunedHalo.java b/Mage.Sets/src/mage/sets/shadowmoor/RunedHalo.java index 1d119bf2f17..df76fd6ff8a 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RunedHalo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RunedHalo.java @@ -63,7 +63,6 @@ public class RunedHalo extends CardImpl { super(ownerId, 21, "Runed Halo", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{W}{W}"); this.expansionSetCode = "SHM"; - this.color.setWhite(true); // As Runed Halo enters the battlefield, name a card. Ability ability = new AsEntersBattlefieldAbility(new NameACardEffect(NameACardEffect.TypeOfName.ALL)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RunesOfTheDeus.java b/Mage.Sets/src/mage/sets/shadowmoor/RunesOfTheDeus.java index d268311acda..2e7f990231f 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RunesOfTheDeus.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RunesOfTheDeus.java @@ -59,8 +59,6 @@ public class RunesOfTheDeus extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Aura"); - this.color.setRed(true); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RustrazorButcher.java b/Mage.Sets/src/mage/sets/shadowmoor/RustrazorButcher.java index 6f9e2a0faa1..b65bca50f1f 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RustrazorButcher.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RustrazorButcher.java @@ -47,7 +47,6 @@ public class RustrazorButcher extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SafeholdDuo.java b/Mage.Sets/src/mage/sets/shadowmoor/SafeholdDuo.java index 5278651a4bb..e0f540d7e84 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SafeholdDuo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SafeholdDuo.java @@ -62,8 +62,6 @@ public class SafeholdDuo extends CardImpl { this.subtype.add("Warrior"); this.subtype.add("Shaman"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SafeholdElite.java b/Mage.Sets/src/mage/sets/shadowmoor/SafeholdElite.java index faa87c2223f..467a5c8262b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SafeholdElite.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SafeholdElite.java @@ -46,8 +46,6 @@ public class SafeholdElite extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Scout"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SafeholdSentry.java b/Mage.Sets/src/mage/sets/shadowmoor/SafeholdSentry.java index 8ef83fee763..c01f70dc09e 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SafeholdSentry.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SafeholdSentry.java @@ -53,7 +53,6 @@ public class SafeholdSentry extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SafewrightQuest.java b/Mage.Sets/src/mage/sets/shadowmoor/SafewrightQuest.java index 2aefdb73c4d..994d54b0bac 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SafewrightQuest.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SafewrightQuest.java @@ -53,8 +53,6 @@ public class SafewrightQuest extends CardImpl { super(ownerId, 240, "Safewright Quest", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{G/W}"); this.expansionSetCode = "SHM"; - this.color.setGreen(true); - this.color.setWhite(true); // Search your library for a Forest or Plains card, reveal it, and put it into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SavorTheMoment.java b/Mage.Sets/src/mage/sets/shadowmoor/SavorTheMoment.java index 180a2300485..3513b022c04 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SavorTheMoment.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SavorTheMoment.java @@ -50,7 +50,6 @@ public class SavorTheMoment extends CardImpl { super(ownerId, 50, "Savor the Moment", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{U}{U}"); this.expansionSetCode = "SHM"; - this.color.setBlue(true); // Take an extra turn after this one. Skip the untap step of that turn. this.getSpellAbility().addEffect(new AddExtraTurnControllerEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Scar.java b/Mage.Sets/src/mage/sets/shadowmoor/Scar.java index 194002cd5c3..55ab4570bb5 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Scar.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Scar.java @@ -45,8 +45,6 @@ public class Scar extends CardImpl { super(ownerId, 194, "Scar", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B/R}"); this.expansionSetCode = "SHM"; - this.color.setRed(true); - this.color.setBlack(true); // Put a -1/-1 counter on target creature.] this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.M1M1.createInstance())); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackMarauders.java b/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackMarauders.java index 9836c13b10b..a14dba59c08 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackMarauders.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackMarauders.java @@ -47,8 +47,6 @@ public class ScuzzbackMarauders extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackScrapper.java b/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackScrapper.java index 11b6790fd8c..4a2dd40ccbf 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackScrapper.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackScrapper.java @@ -46,8 +46,6 @@ public class ScuzzbackScrapper extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SeedcradleWitch.java b/Mage.Sets/src/mage/sets/shadowmoor/SeedcradleWitch.java index d8fda4d6519..6d27cc23c75 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SeedcradleWitch.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SeedcradleWitch.java @@ -52,8 +52,6 @@ public class SeedcradleWitch extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ShieldOfTheOversoul.java b/Mage.Sets/src/mage/sets/shadowmoor/ShieldOfTheOversoul.java index eea6ff8d2b8..7ad460ce6be 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ShieldOfTheOversoul.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ShieldOfTheOversoul.java @@ -59,8 +59,6 @@ public class ShieldOfTheOversoul extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Aura"); - this.color.setGreen(true); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SickleRipper.java b/Mage.Sets/src/mage/sets/shadowmoor/SickleRipper.java index 8f94188ac58..49c59aa0ebf 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SickleRipper.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SickleRipper.java @@ -46,7 +46,6 @@ public class SickleRipper extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SilkbindFaerie.java b/Mage.Sets/src/mage/sets/shadowmoor/SilkbindFaerie.java index 61e207185f6..1badc652f4d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SilkbindFaerie.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SilkbindFaerie.java @@ -53,8 +53,6 @@ public class SilkbindFaerie extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Rogue"); - this.color.setWhite(true); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SinkingFeeling.java b/Mage.Sets/src/mage/sets/shadowmoor/SinkingFeeling.java index 4617f087021..638c154b1c0 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SinkingFeeling.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SinkingFeeling.java @@ -60,7 +60,6 @@ public class SinkingFeeling extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SlinkingGiant.java b/Mage.Sets/src/mage/sets/shadowmoor/SlinkingGiant.java index 6bf0e7ee4c8..da544295749 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SlinkingGiant.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SlinkingGiant.java @@ -49,7 +49,6 @@ public class SlinkingGiant extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Rogue"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SmashToSmithereens.java b/Mage.Sets/src/mage/sets/shadowmoor/SmashToSmithereens.java index 2dfdd75f41c..3214585d64f 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SmashToSmithereens.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SmashToSmithereens.java @@ -51,7 +51,6 @@ public class SmashToSmithereens extends CardImpl { super(ownerId, 107, "Smash to Smithereens", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "SHM"; - this.color.setRed(true); // Destroy target artifact. Smash to Smithereens deals 3 damage to that artifact's controller. this.getSpellAbility().addTarget(new TargetArtifactPermanent()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SmolderInitiate.java b/Mage.Sets/src/mage/sets/shadowmoor/SmolderInitiate.java index 7a5886aa979..2fc02735cb4 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SmolderInitiate.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SmolderInitiate.java @@ -60,7 +60,6 @@ public class SmolderInitiate extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Shaman"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Somnomancer.java b/Mage.Sets/src/mage/sets/shadowmoor/Somnomancer.java index b8a213d0813..5423f2a7134 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Somnomancer.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Somnomancer.java @@ -48,8 +48,6 @@ public class Somnomancer extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java b/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java index a0223e7288b..8de25faadb2 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java @@ -64,8 +64,6 @@ public class SootstokeKindler extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Shaman"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SpectralProcession.java b/Mage.Sets/src/mage/sets/shadowmoor/SpectralProcession.java index f2dd1836407..aa04bde11e8 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SpectralProcession.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SpectralProcession.java @@ -44,7 +44,6 @@ public class SpectralProcession extends CardImpl { super(ownerId, 23, "Spectral Procession", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2/W}{2/W}{2/W}"); this.expansionSetCode = "SHM"; - this.color.setWhite(true); // Put three 1/1 white Spirit creature tokens with flying onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new SpiritWhiteToken(), 3)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SpellSyphon.java b/Mage.Sets/src/mage/sets/shadowmoor/SpellSyphon.java index aae52b60185..72fe7c98f81 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SpellSyphon.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SpellSyphon.java @@ -56,7 +56,6 @@ public class SpellSyphon extends CardImpl { super(ownerId, 52, "Spell Syphon", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "SHM"; - this.color.setBlue(true); // Counter target spell unless its controller pays {1} for each blue permanent you control. this.getSpellAbility().addEffect(new SpellSyphonEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SpiteflameWitch.java b/Mage.Sets/src/mage/sets/shadowmoor/SpiteflameWitch.java index fd24d7bacb7..35ee2576508 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SpiteflameWitch.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SpiteflameWitch.java @@ -49,8 +49,6 @@ public class SpiteflameWitch extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Shaman"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SpitefulVisions.java b/Mage.Sets/src/mage/sets/shadowmoor/SpitefulVisions.java index 06583b9a5c3..0900ed73daa 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SpitefulVisions.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SpitefulVisions.java @@ -54,8 +54,6 @@ public class SpitefulVisions extends CardImpl { super(ownerId, 198, "Spiteful Visions", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B/R}{B/R}"); this.expansionSetCode = "SHM"; - this.color.setRed(true); - this.color.setBlack(true); // At the beginning of each player's draw step, that player draws an additional card. this.addAbility(new BeginningOfDrawTriggeredAbility(new DrawCardTargetEffect(1), TargetController.ANY, false)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SplittingHeadache.java b/Mage.Sets/src/mage/sets/shadowmoor/SplittingHeadache.java index 933177a98a9..6aaa0734757 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SplittingHeadache.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SplittingHeadache.java @@ -54,7 +54,6 @@ public class SplittingHeadache extends CardImpl { super(ownerId, 79, "Splitting Headache", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "SHM"; - this.color.setBlack(true); // Choose one - Target player discards two cards; or target player reveals his or her hand, you choose a card from it, then that player discards that card. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SteelOfTheGodhead.java b/Mage.Sets/src/mage/sets/shadowmoor/SteelOfTheGodhead.java index 8858eb6e6e1..b28662c72bc 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SteelOfTheGodhead.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SteelOfTheGodhead.java @@ -62,8 +62,6 @@ public class SteelOfTheGodhead extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Aura"); - this.color.setBlue(true); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/StripBare.java b/Mage.Sets/src/mage/sets/shadowmoor/StripBare.java index 4ad8eebb705..a723cd5069f 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/StripBare.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/StripBare.java @@ -52,7 +52,6 @@ public class StripBare extends CardImpl { super(ownerId, 24, "Strip Bare", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "SHM"; - this.color.setWhite(true); // Destroy all Auras and Equipment attached to target creature. this.getSpellAbility().addEffect(new StripBareEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SwansOfBrynArgoll.java b/Mage.Sets/src/mage/sets/shadowmoor/SwansOfBrynArgoll.java index bcf5fda469b..8f0eec7d81e 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SwansOfBrynArgoll.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SwansOfBrynArgoll.java @@ -60,8 +60,6 @@ public class SwansOfBrynArgoll extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Spirit"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SyggRiverCutthroat.java b/Mage.Sets/src/mage/sets/shadowmoor/SyggRiverCutthroat.java index 8cc10951e38..748745d50e0 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SyggRiverCutthroat.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SyggRiverCutthroat.java @@ -53,8 +53,6 @@ public class SyggRiverCutthroat extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Rogue"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TattermungeDuo.java b/Mage.Sets/src/mage/sets/shadowmoor/TattermungeDuo.java index b239bda0f48..834c2477a36 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/TattermungeDuo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/TattermungeDuo.java @@ -62,8 +62,6 @@ public class TattermungeDuo extends CardImpl { this.subtype.add("Warrior"); this.subtype.add("Shaman"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TattermungeManiac.java b/Mage.Sets/src/mage/sets/shadowmoor/TattermungeManiac.java index 46e4704a93e..5d033489353 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/TattermungeManiac.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/TattermungeManiac.java @@ -46,8 +46,6 @@ public class TattermungeManiac extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ThistledownDuo.java b/Mage.Sets/src/mage/sets/shadowmoor/ThistledownDuo.java index dc7d311886d..d8ec6dbb3d0 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ThistledownDuo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ThistledownDuo.java @@ -62,8 +62,6 @@ public class ThistledownDuo extends CardImpl { this.subtype.add("Soldier"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ThistledownLiege.java b/Mage.Sets/src/mage/sets/shadowmoor/ThistledownLiege.java index 1cd0082b6b9..d9a6b9ed625 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ThistledownLiege.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ThistledownLiege.java @@ -61,8 +61,6 @@ public class ThistledownLiege extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Knight"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ThoughtweftGambit.java b/Mage.Sets/src/mage/sets/shadowmoor/ThoughtweftGambit.java index 83f9cf1eea9..f6c0b113a1d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ThoughtweftGambit.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ThoughtweftGambit.java @@ -50,8 +50,6 @@ public class ThoughtweftGambit extends CardImpl { super(ownerId, 154, "Thoughtweft Gambit", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{W/U}{W/U}"); this.expansionSetCode = "SHM"; - this.color.setBlue(true); - this.color.setWhite(true); // Tap all creatures your opponents control and untap all creatures you control. this.getSpellAbility().addEffect(new ThoughtweftGambitEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ToilToRenown.java b/Mage.Sets/src/mage/sets/shadowmoor/ToilToRenown.java index 98a2b172e4e..fe8019d3816 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ToilToRenown.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ToilToRenown.java @@ -61,7 +61,6 @@ public class ToilToRenown extends CardImpl { super(ownerId, 130, "Toil to Renown", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "SHM"; - this.color.setGreen(true); // You gain 1 life for each tapped artifact, creature, and land you control. this.getSpellAbility().addEffect(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter))); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TowerAbove.java b/Mage.Sets/src/mage/sets/shadowmoor/TowerAbove.java index 723c5786cd8..7528a7e2917 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/TowerAbove.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/TowerAbove.java @@ -59,7 +59,6 @@ public class TowerAbove extends CardImpl { super(ownerId, 131, "Tower Above", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2/G}{2/G}{2/G}"); this.expansionSetCode = "SHM"; - this.color.setGreen(true); // ({2G} can be paid with any two mana or with {G}. This card's converted mana cost is 6.) // Until end of turn, target creature gets +4/+4 and gains trample, wither, and "When this creature attacks, target creature blocks it this turn if able." diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TurnToMist.java b/Mage.Sets/src/mage/sets/shadowmoor/TurnToMist.java index d61fdc66a75..153adcb5b62 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/TurnToMist.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/TurnToMist.java @@ -43,8 +43,6 @@ public class TurnToMist extends CardImpl { super(ownerId, 155, "Turn to Mist", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W/U}"); this.expansionSetCode = "SHM"; - this.color.setBlue(true); - this.color.setWhite(true); // Exile target creature. Return that card to the battlefield under its owner's control at the beginning of the next end step. this.getSpellAbility().addEffect(new MistmeadowWitchEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java b/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java index 81b4ee53ed8..09f251c2d9c 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java @@ -57,7 +57,6 @@ public class TwilightShepherd extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/VexingShusher.java b/Mage.Sets/src/mage/sets/shadowmoor/VexingShusher.java index 92b547813dd..050027e70c2 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/VexingShusher.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/VexingShusher.java @@ -58,8 +58,6 @@ public class VexingShusher extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WaspLancer.java b/Mage.Sets/src/mage/sets/shadowmoor/WaspLancer.java index 6eb69aa84e1..3f75be701cb 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WaspLancer.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WaspLancer.java @@ -46,8 +46,6 @@ public class WaspLancer extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Soldier"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WheelOfSunAndMoon.java b/Mage.Sets/src/mage/sets/shadowmoor/WheelOfSunAndMoon.java index ab0b4277c28..db1f8e3602d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WheelOfSunAndMoon.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WheelOfSunAndMoon.java @@ -62,8 +62,6 @@ public class WheelOfSunAndMoon extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Aura"); - this.color.setGreen(true); - this.color.setWhite(true); // Enchant player TargetPlayer auraTarget = new TargetPlayer(); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Whimwader.java b/Mage.Sets/src/mage/sets/shadowmoor/Whimwader.java index 725d334ae12..100c6556302 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Whimwader.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Whimwader.java @@ -57,7 +57,6 @@ public class Whimwader extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WildSwing.java b/Mage.Sets/src/mage/sets/shadowmoor/WildSwing.java index 8c2a91a0b0d..b7737a78b8a 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WildSwing.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WildSwing.java @@ -57,7 +57,6 @@ public class WildSwing extends CardImpl { super(ownerId, 108, "Wild Swing", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "SHM"; - this.color.setRed(true); // Choose three target nonenchantment permanents. Destroy one of them at random. this.getSpellAbility().addEffect(new WildSwingEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WildslayerElves.java b/Mage.Sets/src/mage/sets/shadowmoor/WildslayerElves.java index 8a466f8f51f..894cc9757b3 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WildslayerElves.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WildslayerElves.java @@ -46,7 +46,6 @@ public class WildslayerElves extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WiltLeafCavaliers.java b/Mage.Sets/src/mage/sets/shadowmoor/WiltLeafCavaliers.java index f02d4b5fcdf..ed975c4788a 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WiltLeafCavaliers.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WiltLeafCavaliers.java @@ -46,8 +46,6 @@ public class WiltLeafCavaliers extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Knight"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WiltLeafLiege.java b/Mage.Sets/src/mage/sets/shadowmoor/WiltLeafLiege.java index c1a2290194c..373f7aaa411 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WiltLeafLiege.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WiltLeafLiege.java @@ -73,8 +73,6 @@ public class WiltLeafLiege extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Knight"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WindbriskRaptor.java b/Mage.Sets/src/mage/sets/shadowmoor/WindbriskRaptor.java index 79ad2cd9246..96bf48236db 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WindbriskRaptor.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WindbriskRaptor.java @@ -60,7 +60,6 @@ public class WindbriskRaptor extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Bird"); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WitherscaleWurm.java b/Mage.Sets/src/mage/sets/shadowmoor/WitherscaleWurm.java index 2e09587444c..505fab69390 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WitherscaleWurm.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WitherscaleWurm.java @@ -56,7 +56,6 @@ public class WitherscaleWurm extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(9); this.toughness = new MageInt(9); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Woeleecher.java b/Mage.Sets/src/mage/sets/shadowmoor/Woeleecher.java index 83fdc2e5a49..06c7641eef5 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Woeleecher.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Woeleecher.java @@ -57,7 +57,6 @@ public class Woeleecher extends CardImpl { this.expansionSetCode = "SHM"; this.subtype.add("Elemental"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java b/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java index 19d4e333675..f490adf60c4 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java @@ -59,7 +59,6 @@ public class WoodfallPrimus extends CardImpl { this.subtype.add("Treefolk"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Worldpurge.java b/Mage.Sets/src/mage/sets/shadowmoor/Worldpurge.java index d45c83e9319..ae23a082507 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Worldpurge.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Worldpurge.java @@ -55,8 +55,6 @@ public class Worldpurge extends CardImpl { super(ownerId, 156, "Worldpurge", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{W/U}{W/U}{W/U}{W/U}"); this.expansionSetCode = "SHM"; - this.color.setWhite(true); - this.color.setBlue(true); // Return all permanents to their owners' hands. Each player chooses up to seven cards in his or her hand, then shuffles the rest into his or her library. Empty all mana pools. this.getSpellAbility().addEffect(new WorldpurgeEffect()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WoundReflection.java b/Mage.Sets/src/mage/sets/shadowmoor/WoundReflection.java index ad7e2fa465c..08deefaf0b6 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WoundReflection.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WoundReflection.java @@ -50,7 +50,6 @@ public class WoundReflection extends CardImpl { super(ownerId, 81, "Wound Reflection", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{5}{B}"); this.expansionSetCode = "SHM"; - this.color.setBlack(true); // At the beginning of each end step, each opponent loses life equal to the life he or she lost this turn. this.addAbility(new BeginningOfEndStepTriggeredAbility(new WoundReflectionEffect(), TargetController.ANY, false)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ZealousGuardian.java b/Mage.Sets/src/mage/sets/shadowmoor/ZealousGuardian.java index 23d873f16ce..595b0b7227b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ZealousGuardian.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ZealousGuardian.java @@ -46,8 +46,6 @@ public class ZealousGuardian extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Soldier"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java b/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java index b2b5378e822..492703bbd94 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java @@ -50,7 +50,6 @@ public class AdNauseam extends CardImpl { super(ownerId, 63, "Ad Nauseam", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{B}{B}"); this.expansionSetCode = "ALA"; - this.color.setBlack(true); // Reveal the top card of your library and put that card into your hand. You lose life equal to its converted mana cost. You may repeat this process any number of times. this.getSpellAbility().addEffect(new AdNauseamEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AgonyWarp.java b/Mage.Sets/src/mage/sets/shardsofalara/AgonyWarp.java index e0c244166b2..1ef3b53a4ef 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AgonyWarp.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AgonyWarp.java @@ -49,8 +49,6 @@ public class AgonyWarp extends CardImpl { super(ownerId, 153, "Agony Warp", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}{B}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); - this.color.setBlack(true); // Target creature gets -3/-0 until end of turn. Effect effect = new BoostTargetEffect(-3,0, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AlgaeGharial.java b/Mage.Sets/src/mage/sets/shardsofalara/AlgaeGharial.java index 394d07baf59..675a9340a10 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AlgaeGharial.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AlgaeGharial.java @@ -48,7 +48,6 @@ public class AlgaeGharial extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Crocodile"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java b/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java index f752e61605e..fb9757e95e2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java @@ -50,7 +50,6 @@ public class AngelicBenediction extends CardImpl { super(ownerId, 3, "Angelic Benediction", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "ALA"; - this.color.setWhite(true); this.addAbility(new ExaltedAbility()); // Whenever a creature you control attacks alone, you may tap target creature. diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AngelsHerald.java b/Mage.Sets/src/mage/sets/shardsofalara/AngelsHerald.java index bfd83deaf0c..d0db6c68186 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AngelsHerald.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AngelsHerald.java @@ -70,7 +70,6 @@ public class AngelsHerald extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ArchdemonOfUnx.java b/Mage.Sets/src/mage/sets/shardsofalara/ArchdemonOfUnx.java index 61c0c097104..9d490cb6f31 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ArchdemonOfUnx.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ArchdemonOfUnx.java @@ -60,7 +60,6 @@ public class ArchdemonOfUnx extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Demon"); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BanewaspAffliction.java b/Mage.Sets/src/mage/sets/shardsofalara/BanewaspAffliction.java index 00d12c9dd4a..1e6afa2e0d0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BanewaspAffliction.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BanewaspAffliction.java @@ -55,7 +55,6 @@ public class BanewaspAffliction extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BantCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/BantCharm.java index 65e6f4d4091..1a60ea6d4c3 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BantCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BantCharm.java @@ -57,9 +57,6 @@ public class BantCharm extends CardImpl { super(ownerId, 155, "Bant Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}{W}{U}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); - this.color.setGreen(true); - this.color.setWhite(true); // Choose one - Destroy target artifact; this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BehemothsHerald.java b/Mage.Sets/src/mage/sets/shardsofalara/BehemothsHerald.java index 4219f31f5ab..d38921840c0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BehemothsHerald.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BehemothsHerald.java @@ -71,7 +71,6 @@ public class BehemothsHerald extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BlisterBeetle.java b/Mage.Sets/src/mage/sets/shardsofalara/BlisterBeetle.java index 6dd990212ad..8c4d3c9c6bb 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BlisterBeetle.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BlisterBeetle.java @@ -49,7 +49,6 @@ public class BlisterBeetle extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Insect"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BloodCultist.java b/Mage.Sets/src/mage/sets/shardsofalara/BloodCultist.java index bec0fbbee6f..7dbb40b9290 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BloodCultist.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BloodCultist.java @@ -54,8 +54,6 @@ public class BloodCultist extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BloodpyreElemental.java b/Mage.Sets/src/mage/sets/shardsofalara/BloodpyreElemental.java index 4143ec00341..d3fed5c4f95 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BloodpyreElemental.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BloodpyreElemental.java @@ -51,7 +51,6 @@ public class BloodpyreElemental extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java b/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java index 219705c02b6..584f9d60d1c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java @@ -61,7 +61,6 @@ public class BloodthornTaunter extends CardImpl { this.subtype.add("Human"); this.subtype.add("Scout"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BoneSplinters.java b/Mage.Sets/src/mage/sets/shardsofalara/BoneSplinters.java index 0306b339f15..c499cc268e0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BoneSplinters.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BoneSplinters.java @@ -46,7 +46,6 @@ public class BoneSplinters extends CardImpl { super(ownerId, 67, "Bone Splinters", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "ALA"; - this.color.setBlack(true); // As an additional cost to cast Bone Splinters, sacrifice a creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BranchingBolt.java b/Mage.Sets/src/mage/sets/shardsofalara/BranchingBolt.java index f6774e77d7a..1a83128f037 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BranchingBolt.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BranchingBolt.java @@ -62,8 +62,6 @@ public class BranchingBolt extends CardImpl { super(ownerId, 158, "Branching Bolt", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}{G}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); - this.color.setGreen(true); // Choose one or both - this.getSpellAbility().getModes().setMinModes(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java b/Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java index f53143dc2d5..590adf790ea 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java @@ -56,9 +56,6 @@ public class BrilliantUltimatum extends CardImpl { super(ownerId, 159, "Brilliant Ultimatum", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{W}{W}{U}{U}{U}{B}{B}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); - this.color.setBlack(true); - this.color.setWhite(true); // Exile the top five cards of your library. An opponent separates those cards into two piles. You may play any number of cards from one of those piles without paying their mana costs. this.getSpellAbility().addEffect(new BrilliantUltimatumEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CallToHeel.java b/Mage.Sets/src/mage/sets/shardsofalara/CallToHeel.java index 1ba540f2a2f..6f8c48412a3 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CallToHeel.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CallToHeel.java @@ -51,7 +51,6 @@ public class CallToHeel extends CardImpl { super(ownerId, 32, "Call to Heel", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); // Return target creature to its owner's hand. Its controller draws a card. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CarrionThrash.java b/Mage.Sets/src/mage/sets/shardsofalara/CarrionThrash.java index 9e04eae30fd..692b267fe43 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CarrionThrash.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CarrionThrash.java @@ -57,9 +57,6 @@ public class CarrionThrash extends CardImpl { this.subtype.add("Viashino"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CatharticAdept.java b/Mage.Sets/src/mage/sets/shardsofalara/CatharticAdept.java index 250aaf7ea21..5e7772fee8e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CatharticAdept.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CatharticAdept.java @@ -50,7 +50,6 @@ public class CatharticAdept extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ClarionUltimatum.java b/Mage.Sets/src/mage/sets/shardsofalara/ClarionUltimatum.java index 68b90bc6f97..db50b5b57a5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ClarionUltimatum.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ClarionUltimatum.java @@ -56,9 +56,6 @@ public class ClarionUltimatum extends CardImpl { super(ownerId, 163, "Clarion Ultimatum", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{G}{G}{W}{W}{W}{U}{U}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); - this.color.setGreen(true); - this.color.setWhite(true); // Choose five permanents you control. For each of those permanents, you may search your library for a card with the same name as that permanent. Put those cards onto the battlefield tapped, then shuffle your library. this.getSpellAbility().addEffect(new ClarionUltimatumEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java b/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java index 3e56ea8b018..bfbf3aacebe 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java @@ -59,7 +59,6 @@ public class ComaVeil extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant artifact or creature TargetPermanent auraTarget = new TargetPermanent(filter); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CorpseConnoisseur.java b/Mage.Sets/src/mage/sets/shardsofalara/CorpseConnoisseur.java index 2533a235f34..6c31bd267e2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CorpseConnoisseur.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CorpseConnoisseur.java @@ -61,7 +61,6 @@ public class CorpseConnoisseur extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CovenantOfMinds.java b/Mage.Sets/src/mage/sets/shardsofalara/CovenantOfMinds.java index e22555dd561..e1f822f5e5e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CovenantOfMinds.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CovenantOfMinds.java @@ -51,7 +51,6 @@ public class CovenantOfMinds extends CardImpl { super(ownerId, 38, "Covenant of Minds", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{U}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); // Reveal the top three cards of your library. Target opponent may choose to put those cards into your hand. // If he or she doesn't, put those cards into your graveyard and draw five cards. diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java b/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java index abc5fec5713..93c64d92bb1 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java @@ -54,7 +54,6 @@ public class CradleOfVitality extends CardImpl { super(ownerId, 7, "Cradle of Vitality", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "ALA"; - this.color.setWhite(true); // Whenever you gain life, you may pay {1}{W}. If you do, put a +1/+1 counter on target creature for each 1 life you gained. Ability ability = new CradleOfVitalityGainLifeTriggeredAbility(); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CrucibleOfFire.java b/Mage.Sets/src/mage/sets/shardsofalara/CrucibleOfFire.java index 7d0745f9f7e..b84cb936e8b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CrucibleOfFire.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CrucibleOfFire.java @@ -53,7 +53,6 @@ public class CrucibleOfFire extends CardImpl { super(ownerId, 96, "Crucible of Fire", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); // Dragon creatures you control get +3/+3. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(3, 3, Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java b/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java index e5f2f46bd16..0e4a703fca4 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java @@ -58,9 +58,6 @@ public class CruelUltimatum extends CardImpl { super(ownerId, 164, "Cruel Ultimatum", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{U}{U}{B}{B}{B}{R}{R}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); - this.color.setBlue(true); - this.color.setBlack(true); // Target opponent sacrifices a creature, discards three cards, then loses 5 life. // You return a creature card from your graveyard to your hand, draw three cards, then gain 5 life. diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CunningLethemancer.java b/Mage.Sets/src/mage/sets/shardsofalara/CunningLethemancer.java index 64270e13051..3bc51c40c60 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CunningLethemancer.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CunningLethemancer.java @@ -48,7 +48,6 @@ public class CunningLethemancer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DawnrayArcher.java b/Mage.Sets/src/mage/sets/shardsofalara/DawnrayArcher.java index 73c0a7a6357..1b69b6f0441 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DawnrayArcher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DawnrayArcher.java @@ -54,7 +54,6 @@ public class DawnrayArcher extends CardImpl { this.subtype.add("Human"); this.subtype.add("Archer"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Deathgreeter.java b/Mage.Sets/src/mage/sets/shardsofalara/Deathgreeter.java index df5b483aaaa..013eb1cce3b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Deathgreeter.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Deathgreeter.java @@ -47,7 +47,6 @@ public class Deathgreeter extends CardImpl { this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DeftDuelist.java b/Mage.Sets/src/mage/sets/shardsofalara/DeftDuelist.java index dec229f8cd3..10da8d6acdc 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DeftDuelist.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DeftDuelist.java @@ -47,8 +47,6 @@ public class DeftDuelist extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setWhite(true); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DemonsHerald.java b/Mage.Sets/src/mage/sets/shardsofalara/DemonsHerald.java index 65fcc979556..f7dcdfec903 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DemonsHerald.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DemonsHerald.java @@ -71,7 +71,6 @@ public class DemonsHerald extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DragonsHerald.java b/Mage.Sets/src/mage/sets/shardsofalara/DragonsHerald.java index 329685599dd..cc38685b0f5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DragonsHerald.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DragonsHerald.java @@ -71,7 +71,6 @@ public class DragonsHerald extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Drumhunter.java b/Mage.Sets/src/mage/sets/shardsofalara/Drumhunter.java index 8aa3cc7667d..9029908afa2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Drumhunter.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Drumhunter.java @@ -55,7 +55,6 @@ public class Drumhunter extends CardImpl { this.subtype.add("Druid"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EmpyrialArchangel.java b/Mage.Sets/src/mage/sets/shardsofalara/EmpyrialArchangel.java index 52de6db95d0..3ddeb53edc4 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EmpyrialArchangel.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EmpyrialArchangel.java @@ -53,9 +53,6 @@ public class EmpyrialArchangel extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Angel"); - this.color.setBlue(true); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EsperBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/EsperBattlemage.java index e20f52cc8a8..58670625500 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EsperBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EsperBattlemage.java @@ -57,7 +57,6 @@ public class EsperBattlemage extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); // {W}, {tap}: Prevent the next 2 damage that would be dealt to you this turn. diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java index e8d72531789..50659d51c4b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java @@ -56,9 +56,6 @@ public class EsperCharm extends CardImpl { super(ownerId, 167, "Esper Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}{U}{B}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); - this.color.setBlack(true); - this.color.setWhite(true); // Choose one - Destroy target enchantment; this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EtheriumAstrolabe.java b/Mage.Sets/src/mage/sets/shardsofalara/EtheriumAstrolabe.java index 96f79b6e41a..706284ad19d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EtheriumAstrolabe.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EtheriumAstrolabe.java @@ -59,7 +59,6 @@ public class EtheriumAstrolabe extends CardImpl { super(ownerId, 41, "Etherium Astrolabe", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}{U}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); // Flash this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EtheriumSculptor.java b/Mage.Sets/src/mage/sets/shardsofalara/EtheriumSculptor.java index 1274cccc9b6..93a876c0932 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EtheriumSculptor.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EtheriumSculptor.java @@ -54,7 +54,6 @@ public class EtheriumSculptor extends CardImpl { this.subtype.add("Vedalken"); this.subtype.add("Artificer"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java b/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java index f2506f17667..deb77e86b75 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java @@ -58,7 +58,6 @@ public class EtherswornCanonist extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java b/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java index 84f63a733d2..730ad0fa18d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java @@ -59,7 +59,6 @@ public class ExecutionersCapsule extends CardImpl { super(ownerId, 75, "Executioner's Capsule", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{B}"); this.expansionSetCode = "ALA"; - this.color.setBlack(true); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{B}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java b/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java index 692d57e89f6..71f96db6773 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java @@ -56,7 +56,6 @@ public class ExuberantFirestoker extends CardImpl { this.subtype.add("Druid"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java b/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java index e9185add12e..cda919b4b24 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java @@ -61,7 +61,6 @@ public class Fatestitcher extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/FeralHydra.java b/Mage.Sets/src/mage/sets/shardsofalara/FeralHydra.java index 6b4d3404d72..f4d54f31c0e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/FeralHydra.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/FeralHydra.java @@ -60,7 +60,6 @@ public class FeralHydra extends CardImpl { this.subtype.add("Hydra"); this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/FireFieldOgre.java b/Mage.Sets/src/mage/sets/shardsofalara/FireFieldOgre.java index 4158df821ca..9b1ffaec2ff 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/FireFieldOgre.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/FireFieldOgre.java @@ -48,9 +48,6 @@ public class FireFieldOgre extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Mutant"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/FleshbagMarauder.java b/Mage.Sets/src/mage/sets/shardsofalara/FleshbagMarauder.java index 8c56de1e88b..f6b6abee6d2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/FleshbagMarauder.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/FleshbagMarauder.java @@ -48,7 +48,6 @@ public class FleshbagMarauder extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GatherSpecimens.java b/Mage.Sets/src/mage/sets/shardsofalara/GatherSpecimens.java index 34e541b2602..1287b0fc327 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GatherSpecimens.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GatherSpecimens.java @@ -52,7 +52,6 @@ public class GatherSpecimens extends CardImpl { super(ownerId, 45, "Gather Specimens", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}{U}{U}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); // If a creature would enter the battlefield under an opponent's control this turn, it enters the battlefield under your control instead. this.getSpellAbility().addEffect(new GatherSpecimensReplacementEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GiftOfTheGargantuan.java b/Mage.Sets/src/mage/sets/shardsofalara/GiftOfTheGargantuan.java index b7799a71a18..19a205b9b45 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GiftOfTheGargantuan.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GiftOfTheGargantuan.java @@ -55,7 +55,6 @@ public class GiftOfTheGargantuan extends CardImpl { super(ownerId, 132, "Gift of the Gargantuan", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "ALA"; - this.color.setGreen(true); // Look at the top four cards of your library. You may reveal a creature card and/or a land card from among them and put the revealed cards into your hand. Put the rest on the bottom of your library in any order. this.getSpellAbility().addEffect(new GiftOfTheGargantuanEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GlazeFiend.java b/Mage.Sets/src/mage/sets/shardsofalara/GlazeFiend.java index 5ab40dd6a30..7b3abf12628 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GlazeFiend.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GlazeFiend.java @@ -59,7 +59,6 @@ public class GlazeFiend extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Illusion"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GoblinAssault.java b/Mage.Sets/src/mage/sets/shardsofalara/GoblinAssault.java index 42a5d9fe8df..43ca9f54978 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GoblinAssault.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GoblinAssault.java @@ -55,7 +55,6 @@ public class GoblinAssault extends CardImpl { super(ownerId, 101, "Goblin Assault", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); // At the beginning of your upkeep, put a 1/1 red Goblin creature token with haste onto the battlefield. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new GoblinAssaultToken()), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GoblinDeathraiders.java b/Mage.Sets/src/mage/sets/shardsofalara/GoblinDeathraiders.java index b32824a1e62..cf045c1f0c1 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GoblinDeathraiders.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GoblinDeathraiders.java @@ -46,8 +46,6 @@ public class GoblinDeathraiders extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setBlack(true); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java b/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java index bdb87758e7e..85cc8b3bf19 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java @@ -64,7 +64,6 @@ public class Godtoucher extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Cleric"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GrixisBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/GrixisBattlemage.java index c32c8db9168..798cf9d91fc 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GrixisBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GrixisBattlemage.java @@ -55,7 +55,6 @@ public class GrixisBattlemage extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GrixisCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/GrixisCharm.java index cc9d1ecce92..1a07155aa53 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GrixisCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GrixisCharm.java @@ -50,9 +50,6 @@ public class GrixisCharm extends CardImpl { super(ownerId, 171, "Grixis Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}{B}{R}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); - this.color.setBlue(true); - this.color.setBlack(true); // Choose one - Return target permanent to its owner's hand; this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GustriderExuberant.java b/Mage.Sets/src/mage/sets/shardsofalara/GustriderExuberant.java index c26a3c5bbdb..2b626a2270c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GustriderExuberant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GustriderExuberant.java @@ -60,7 +60,6 @@ public class GustriderExuberant extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/HinderingLight.java b/Mage.Sets/src/mage/sets/shardsofalara/HinderingLight.java index 595defec47e..d0866344a9f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/HinderingLight.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/HinderingLight.java @@ -58,8 +58,6 @@ public class HinderingLight extends CardImpl { super(ownerId, 173, "Hindering Light", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}{U}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); - this.color.setWhite(true); // Counter target spell that targets you or a permanent you control. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/HissingIguanar.java b/Mage.Sets/src/mage/sets/shardsofalara/HissingIguanar.java index 34693b88214..6ba976b2d91 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/HissingIguanar.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/HissingIguanar.java @@ -47,7 +47,6 @@ public class HissingIguanar extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Lizard"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ImmortalCoil.java b/Mage.Sets/src/mage/sets/shardsofalara/ImmortalCoil.java index 82e4fddd96d..1b3d3fb54a6 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ImmortalCoil.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ImmortalCoil.java @@ -58,7 +58,6 @@ public class ImmortalCoil extends CardImpl { super(ownerId, 79, "Immortal Coil", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}{B}{B}"); this.expansionSetCode = "ALA"; - this.color.setBlack(true); // {tap}, Exile two cards from your graveyard: Draw a card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Infest.java b/Mage.Sets/src/mage/sets/shardsofalara/Infest.java index e36f82006f1..f905ce27fb0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Infest.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Infest.java @@ -46,7 +46,6 @@ public class Infest extends CardImpl { super(ownerId, 80, "Infest", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{B}{B}"); this.expansionSetCode = "ALA"; - this.color.setBlack(true); // All creatures get -2/-2 until end of turn. this.getSpellAbility().addEffect(new BoostAllEffect(-2, -2, Duration.EndOfTurn, new FilterCreaturePermanent("All creatures"), false)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/InvincibleHymn.java b/Mage.Sets/src/mage/sets/shardsofalara/InvincibleHymn.java index e02c8969d7d..2b6ef62a065 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/InvincibleHymn.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/InvincibleHymn.java @@ -47,7 +47,6 @@ public class InvincibleHymn extends CardImpl { super(ownerId, 14, "Invincible Hymn", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{6}{W}{W}"); this.expansionSetCode = "ALA"; - this.color.setWhite(true); // Count the number of cards in your library. Your life total becomes that number. this.getSpellAbility().addEffect(new InvincibleHymnEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JundCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/JundCharm.java index cb93c3f93ea..648d8c50c3d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JundCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JundCharm.java @@ -51,9 +51,6 @@ public class JundCharm extends CardImpl { super(ownerId, 175, "Jund Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{B}{R}{G}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); - this.color.setGreen(true); - this.color.setBlack(true); // Choose one - Exile all cards from target player's graveyard; this.getSpellAbility().addEffect(new ExileGraveyardAllTargetPlayerEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KederektCreeper.java b/Mage.Sets/src/mage/sets/shardsofalara/KederektCreeper.java index e1975633436..bcbc0065194 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KederektCreeper.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KederektCreeper.java @@ -48,9 +48,6 @@ public class KederektCreeper extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Horror"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KederektLeviathan.java b/Mage.Sets/src/mage/sets/shardsofalara/KederektLeviathan.java index 2d4c94c4f5b..d2cef15ae55 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KederektLeviathan.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KederektLeviathan.java @@ -55,7 +55,6 @@ public class KederektLeviathan extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Leviathan"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KeeperOfProgenitus.java b/Mage.Sets/src/mage/sets/shardsofalara/KeeperOfProgenitus.java index f59829a1d4f..a6cdd744f90 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KeeperOfProgenitus.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KeeperOfProgenitus.java @@ -61,7 +61,6 @@ public class KeeperOfProgenitus extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KissOfTheAmesha.java b/Mage.Sets/src/mage/sets/shardsofalara/KissOfTheAmesha.java index 929aca2548e..157ceb62ae5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KissOfTheAmesha.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KissOfTheAmesha.java @@ -45,8 +45,6 @@ public class KissOfTheAmesha extends CardImpl { super(ownerId, 177, "Kiss of the Amesha", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{W}{U}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); - this.color.setWhite(true); // Target player gains 7 life and draws two cards. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KnightCaptainOfEos.java b/Mage.Sets/src/mage/sets/shardsofalara/KnightCaptainOfEos.java index 26299b403c2..b306f587603 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KnightCaptainOfEos.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KnightCaptainOfEos.java @@ -63,7 +63,6 @@ public class KnightCaptainOfEos extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheSkywardEye.java b/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheSkywardEye.java index 5aa3058b157..9e3332bf6c8 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheSkywardEye.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheSkywardEye.java @@ -51,7 +51,6 @@ public class KnightOfTheSkywardEye extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KreshTheBloodbraided.java b/Mage.Sets/src/mage/sets/shardsofalara/KreshTheBloodbraided.java index 8628b5c146b..caa5def8ca5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KreshTheBloodbraided.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KreshTheBloodbraided.java @@ -56,9 +56,6 @@ public class KreshTheBloodbraided extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/LushGrowth.java b/Mage.Sets/src/mage/sets/shardsofalara/LushGrowth.java index 3e6f9e04352..a724e24e8e8 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/LushGrowth.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/LushGrowth.java @@ -52,7 +52,6 @@ public class LushGrowth extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java b/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java index 09ef47f242b..0cf238061a2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java @@ -48,7 +48,6 @@ public class MagmaSpray extends CardImpl { super(ownerId, 108, "Magma Spray", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); // Magma Spray deals 2 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Manaplasm.java b/Mage.Sets/src/mage/sets/shardsofalara/Manaplasm.java index eb742a84040..d7615f200e1 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Manaplasm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Manaplasm.java @@ -54,7 +54,6 @@ public class Manaplasm extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Ooze"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MayaelTheAnima.java b/Mage.Sets/src/mage/sets/shardsofalara/MayaelTheAnima.java index 391d5d5adf1..d7338908007 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MayaelTheAnima.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MayaelTheAnima.java @@ -61,9 +61,6 @@ public class MayaelTheAnima extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setRed(true); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MemoryErosion.java b/Mage.Sets/src/mage/sets/shardsofalara/MemoryErosion.java index e19d9ee1951..14f2cd93a5a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MemoryErosion.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MemoryErosion.java @@ -50,7 +50,6 @@ public class MemoryErosion extends CardImpl { super(ownerId, 50, "Memory Erosion", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}{U}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); // Whenever an opponent casts a spell, that player puts the top two cards of his or her library into his or her graveyard. this.addAbility(new SpellCastTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Metallurgeon.java b/Mage.Sets/src/mage/sets/shardsofalara/Metallurgeon.java index 1e49c47cc5c..caa538e129e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Metallurgeon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Metallurgeon.java @@ -51,7 +51,6 @@ public class Metallurgeon extends CardImpl { this.subtype.add("Human"); this.subtype.add("Artificer"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MightyEmergence.java b/Mage.Sets/src/mage/sets/shardsofalara/MightyEmergence.java index a4f25e243ae..e340be7c793 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MightyEmergence.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MightyEmergence.java @@ -58,7 +58,6 @@ public class MightyEmergence extends CardImpl { super(ownerId, 137, "Mighty Emergence", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "ALA"; - this.color.setGreen(true); // Whenever a creature with power 5 or greater enters the battlefield under your control, you may put two +1/+1 counters on it. this.addAbility(new MightyEmergenceTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MindlockOrb.java b/Mage.Sets/src/mage/sets/shardsofalara/MindlockOrb.java index 92b722191c1..6490425e00d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MindlockOrb.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MindlockOrb.java @@ -51,7 +51,6 @@ public class MindlockOrb extends CardImpl { super(ownerId, 51, "Mindlock Orb", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}{U}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); // Players can't search libraries. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MindlockRuleModifyingEffect())); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java b/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java index 0ef54f06c14..75ad9f7205a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java @@ -61,7 +61,6 @@ public class Mosstodon extends CardImpl { this.subtype.add("Plant"); this.subtype.add("Elephant"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/NayaCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/NayaCharm.java index 3914673d82f..ecca5d6752a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/NayaCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/NayaCharm.java @@ -56,9 +56,6 @@ public class NayaCharm extends CardImpl { super(ownerId, 180, "Naya Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}{G}{W}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); - this.color.setGreen(true); - this.color.setWhite(true); // Choose one - Naya Charm deals 3 damage to target creature; this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/OozeGarden.java b/Mage.Sets/src/mage/sets/shardsofalara/OozeGarden.java index 89a9582a132..0027721c611 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/OozeGarden.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/OozeGarden.java @@ -64,7 +64,6 @@ public class OozeGarden extends CardImpl { super(ownerId, 143, "Ooze Garden", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "ALA"; - this.color.setGreen(true); // {1}{G}, Sacrifice a non-Ooze creature: Put an X/X green Ooze creature token onto the battlefield, where X is the sacrificed creature's power. Activate this ability only any time you could cast a sorcery. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OozeGardenCreateTokenEffect(), new ManaCostsImpl("{1}{G}")); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/PrinceOfThralls.java b/Mage.Sets/src/mage/sets/shardsofalara/PrinceOfThralls.java index 1d8e014a06d..581a1106ec0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/PrinceOfThralls.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/PrinceOfThralls.java @@ -59,9 +59,6 @@ public class PrinceOfThralls extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Demon"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ProtomatterPowder.java b/Mage.Sets/src/mage/sets/shardsofalara/ProtomatterPowder.java index 128268e200d..a0217e236ac 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ProtomatterPowder.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ProtomatterPowder.java @@ -52,7 +52,6 @@ public class ProtomatterPowder extends CardImpl { super(ownerId, 53, "Protomatter Powder", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}{U}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); // {4}{W}, {tap}, Sacrifice Protomatter Powder: Return target artifact card from your graveyard to the battlefield. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{4}{W}")); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/PunishIgnorance.java b/Mage.Sets/src/mage/sets/shardsofalara/PunishIgnorance.java index 40052ee8071..8f8c5fc07bd 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/PunishIgnorance.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/PunishIgnorance.java @@ -48,9 +48,6 @@ public class PunishIgnorance extends CardImpl { super(ownerId, 183, "Punish Ignorance", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{W}{U}{U}{B}"); this.expansionSetCode = "ALA"; - this.color.setWhite(true); - this.color.setBlue(true); - this.color.setBlack(true); // Counter target spell. Its controller loses 3 life and you gain 3 life. this.getSpellAbility().addTarget(new TargetSpell(new FilterSpell())); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/PuppetConjurer.java b/Mage.Sets/src/mage/sets/shardsofalara/PuppetConjurer.java index e432836040d..f9c0aa9653f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/PuppetConjurer.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/PuppetConjurer.java @@ -64,7 +64,6 @@ public class PuppetConjurer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/QasaliAmbusher.java b/Mage.Sets/src/mage/sets/shardsofalara/QasaliAmbusher.java index 5b2499611b0..6e83656ea72 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/QasaliAmbusher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/QasaliAmbusher.java @@ -60,8 +60,6 @@ public class QasaliAmbusher extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Warrior"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java b/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java index 96e0cebef16..764f68d9473 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java @@ -60,9 +60,6 @@ public class RakeclawGargantuan extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Beast"); - this.color.setRed(true); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RealmRazer.java b/Mage.Sets/src/mage/sets/shardsofalara/RealmRazer.java index 76e9d8490b2..4399d836446 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RealmRazer.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RealmRazer.java @@ -57,9 +57,6 @@ public class RealmRazer extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Beast"); - this.color.setRed(true); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingRoar.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingRoar.java index 457d930a952..a2e327f955b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingRoar.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingRoar.java @@ -50,7 +50,6 @@ public class ResoundingRoar extends CardImpl { super(ownerId, 144, "Resounding Roar", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "ALA"; - this.color.setGreen(true); // Target creature gets +3/+3 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java index 016f2525a95..a16fb8cb9d3 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java @@ -48,7 +48,6 @@ public class ResoundingScream extends CardImpl { super(ownerId, 83, "Resounding Scream", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "ALA"; - this.color.setBlack(true); // Target player discards a card at random. this.getSpellAbility().addEffect(new DiscardTargetEffect(1, true)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingSilence.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingSilence.java index f35d76aac41..232adc2c520 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingSilence.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingSilence.java @@ -50,7 +50,6 @@ public class ResoundingSilence extends CardImpl { super(ownerId, 22, "Resounding Silence", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "ALA"; - this.color.setWhite(true); // Exile target attacking creature. this.getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingThunder.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingThunder.java index 611d18f8ecb..0127a524a38 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingThunder.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingThunder.java @@ -48,7 +48,6 @@ public class ResoundingThunder extends CardImpl { super(ownerId, 110, "Resounding Thunder", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); // Resounding Thunder deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingWave.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingWave.java index fafbe1ff3e3..0bc6649b312 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingWave.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingWave.java @@ -49,7 +49,6 @@ public class ResoundingWave extends CardImpl { super(ownerId, 54, "Resounding Wave", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); // Return target permanent to its owner's hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RidgeRannet.java b/Mage.Sets/src/mage/sets/shardsofalara/RidgeRannet.java index 026f8557306..eb2823969ac 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RidgeRannet.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RidgeRannet.java @@ -46,7 +46,6 @@ public class RidgeRannet extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RipClanCrasher.java b/Mage.Sets/src/mage/sets/shardsofalara/RipClanCrasher.java index 012f864fef3..1c4c8554d3c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RipClanCrasher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RipClanCrasher.java @@ -46,8 +46,6 @@ public class RipClanCrasher extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RockcasterPlatoon.java b/Mage.Sets/src/mage/sets/shardsofalara/RockcasterPlatoon.java index 048bb2a7e25..acca934f45e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RockcasterPlatoon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RockcasterPlatoon.java @@ -60,7 +60,6 @@ public class RockcasterPlatoon extends CardImpl { this.subtype.add("Rhino"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RockslideElemental.java b/Mage.Sets/src/mage/sets/shardsofalara/RockslideElemental.java index 96debf059ee..53d8d871908 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RockslideElemental.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RockslideElemental.java @@ -48,7 +48,6 @@ public class RockslideElemental extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SacellumGodspeaker.java b/Mage.Sets/src/mage/sets/shardsofalara/SacellumGodspeaker.java index 6570933c5be..617454b09d4 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SacellumGodspeaker.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SacellumGodspeaker.java @@ -58,7 +58,6 @@ public class SacellumGodspeaker extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SalvageTitan.java b/Mage.Sets/src/mage/sets/shardsofalara/SalvageTitan.java index d7f00265b73..443d314797e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SalvageTitan.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SalvageTitan.java @@ -61,7 +61,6 @@ public class SalvageTitan extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Golem"); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SanctumGargoyle.java b/Mage.Sets/src/mage/sets/shardsofalara/SanctumGargoyle.java index 4a9e048df87..b3f052ef193 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SanctumGargoyle.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SanctumGargoyle.java @@ -50,7 +50,6 @@ public class SanctumGargoyle extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Gargoyle"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SangriteSurge.java b/Mage.Sets/src/mage/sets/shardsofalara/SangriteSurge.java index 7210b3482be..b9b5b3af182 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SangriteSurge.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SangriteSurge.java @@ -47,8 +47,6 @@ public class SangriteSurge extends CardImpl { super(ownerId, 190, "Sangrite Surge", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{R}{G}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); - this.color.setGreen(true); // Target creature gets +3/+3 and gains double strike until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ScavengerDrake.java b/Mage.Sets/src/mage/sets/shardsofalara/ScavengerDrake.java index b3a323e3dcf..78cff1d834e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ScavengerDrake.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ScavengerDrake.java @@ -48,7 +48,6 @@ public class ScavengerDrake extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Drake"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ScourgeDevil.java b/Mage.Sets/src/mage/sets/shardsofalara/ScourgeDevil.java index 6101d1ae8b7..b8d90d1d280 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ScourgeDevil.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ScourgeDevil.java @@ -49,7 +49,6 @@ public class ScourgeDevil extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Devil"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Scourglass.java b/Mage.Sets/src/mage/sets/shardsofalara/Scourglass.java index e68adadeff5..9efaefc29ce 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Scourglass.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Scourglass.java @@ -60,7 +60,6 @@ public class Scourglass extends CardImpl { super(ownerId, 25, "Scourglass", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}{W}{W}"); this.expansionSetCode = "ALA"; - this.color.setWhite(true); // {tap}, Sacrifice Scourglass: Destroy all permanents except for artifacts and lands. Activate this ability only during your upkeep. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SedraxisSpecter.java b/Mage.Sets/src/mage/sets/shardsofalara/SedraxisSpecter.java index 940cdf1dc12..428cf6bcf5b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SedraxisSpecter.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SedraxisSpecter.java @@ -49,9 +49,6 @@ public class SedraxisSpecter extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Specter"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SedrisTheTraitorKing.java b/Mage.Sets/src/mage/sets/shardsofalara/SedrisTheTraitorKing.java index 314389d2499..4385300c15e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SedrisTheTraitorKing.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SedrisTheTraitorKing.java @@ -53,9 +53,6 @@ public class SedrisTheTraitorKing extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Shadowfeed.java b/Mage.Sets/src/mage/sets/shardsofalara/Shadowfeed.java index 4efa08a8945..5d20ca2918b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Shadowfeed.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Shadowfeed.java @@ -45,7 +45,6 @@ public class Shadowfeed extends CardImpl { super(ownerId, 86, "Shadowfeed", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "ALA"; - this.color.setBlack(true); // Exile target card from a graveyard. this.getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ShoreSnapper.java b/Mage.Sets/src/mage/sets/shardsofalara/ShoreSnapper.java index 4926ef079db..891b67dbb85 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ShoreSnapper.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ShoreSnapper.java @@ -50,7 +50,6 @@ public class ShoreSnapper extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Beast"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SkeletalKathari.java b/Mage.Sets/src/mage/sets/shardsofalara/SkeletalKathari.java index 1845d723e44..d8aaac4636d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SkeletalKathari.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SkeletalKathari.java @@ -53,7 +53,6 @@ public class SkeletalKathari extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Skeleton"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java b/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java index 5ff6e3656fb..aa1d7aa00d2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java @@ -62,7 +62,6 @@ public class Skeletonize extends CardImpl { super(ownerId, 114, "Skeletonize", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{R}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); // Skeletonize deals 3 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SkillBorrower.java b/Mage.Sets/src/mage/sets/shardsofalara/SkillBorrower.java index bb3aa404745..9cf3628aa9e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SkillBorrower.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SkillBorrower.java @@ -61,7 +61,6 @@ public class SkillBorrower extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SoulsFire.java b/Mage.Sets/src/mage/sets/shardsofalara/SoulsFire.java index 3f45bbe1081..a0c885794ed 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SoulsFire.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SoulsFire.java @@ -52,7 +52,6 @@ public class SoulsFire extends CardImpl { super(ownerId, 115, "Soul's Fire", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); // Target creature you control on the battlefield deals damage equal to its power to target creature or player. this.getSpellAbility().addEffect(new SoulsFireEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SoulsGrace.java b/Mage.Sets/src/mage/sets/shardsofalara/SoulsGrace.java index 01b4d1bea13..748c30b10b0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SoulsGrace.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SoulsGrace.java @@ -49,7 +49,6 @@ public class SoulsGrace extends CardImpl { super(ownerId, 28, "Soul's Grace", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "ALA"; - this.color.setWhite(true); // You gain life equal to target creature's power. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SoulsMight.java b/Mage.Sets/src/mage/sets/shardsofalara/SoulsMight.java index 0a35aeffa5f..7796aae84f3 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SoulsMight.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SoulsMight.java @@ -49,7 +49,6 @@ public class SoulsMight extends CardImpl { super(ownerId, 149, "Soul's Might", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{G}"); this.expansionSetCode = "ALA"; - this.color.setGreen(true); // Put X +1/+1 counters on target creature, where X is that creature's power. this.getSpellAbility().addEffect(new SoulsMightEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java b/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java index 60696a573c5..b4956584289 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java @@ -60,7 +60,6 @@ public class SpearbreakerBehemoth extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SpellSnip.java b/Mage.Sets/src/mage/sets/shardsofalara/SpellSnip.java index 6565d0ad956..42b79b79b10 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SpellSnip.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SpellSnip.java @@ -47,7 +47,6 @@ public class SpellSnip extends CardImpl { super(ownerId, 57, "Spell Snip", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); // Counter target spell unless its controller pays {1}. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SphinxsHerald.java b/Mage.Sets/src/mage/sets/shardsofalara/SphinxsHerald.java index 1b91b42ddb1..e2c3d7d1fd4 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SphinxsHerald.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SphinxsHerald.java @@ -69,7 +69,6 @@ public class SphinxsHerald extends CardImpl { this.subtype.add("Vedalken"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SteelcladSerpent.java b/Mage.Sets/src/mage/sets/shardsofalara/SteelcladSerpent.java index 2ba5290a892..c89658a203b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SteelcladSerpent.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SteelcladSerpent.java @@ -55,7 +55,6 @@ public class SteelcladSerpent extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Serpent"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/StoicAngel.java b/Mage.Sets/src/mage/sets/shardsofalara/StoicAngel.java index 402f4da5308..58394eafe1e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/StoicAngel.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/StoicAngel.java @@ -55,9 +55,6 @@ public class StoicAngel extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Angel"); - this.color.setBlue(true); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SunseedNurturer.java b/Mage.Sets/src/mage/sets/shardsofalara/SunseedNurturer.java index d99f1f2c39a..096f447de3c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SunseedNurturer.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SunseedNurturer.java @@ -55,7 +55,6 @@ public class SunseedNurturer extends CardImpl { this.subtype.add("Druid"); this.subtype.add("Wizard"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Swerve.java b/Mage.Sets/src/mage/sets/shardsofalara/Swerve.java index 2358a0fb134..49b8d700f97 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Swerve.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Swerve.java @@ -52,8 +52,6 @@ public class Swerve extends CardImpl { super(ownerId, 200, "Swerve", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}{R}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); - this.color.setBlue(true); // Change the target of target spell with a single target. this.getSpellAbility().addEffect(new ChooseNewTargetsTargetEffect(true, true)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TezzeretTheSeeker.java b/Mage.Sets/src/mage/sets/shardsofalara/TezzeretTheSeeker.java index a77884aa238..9cae9ec46d7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TezzeretTheSeeker.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TezzeretTheSeeker.java @@ -69,7 +69,6 @@ public class TezzeretTheSeeker extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Tezzeret"); - this.color.setBlue(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false)); // +1: Untap up to two target artifacts. diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ThoughtcutterAgent.java b/Mage.Sets/src/mage/sets/shardsofalara/ThoughtcutterAgent.java index 3356432ecfd..d85b8bcd52e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ThoughtcutterAgent.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ThoughtcutterAgent.java @@ -56,8 +56,6 @@ public class ThoughtcutterAgent extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TidehollowSculler.java b/Mage.Sets/src/mage/sets/shardsofalara/TidehollowSculler.java index 8afa6eedfd9..ef631580a15 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TidehollowSculler.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TidehollowSculler.java @@ -61,8 +61,6 @@ public class TidehollowSculler extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Zombie"); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TidehollowStrix.java b/Mage.Sets/src/mage/sets/shardsofalara/TidehollowStrix.java index 0b6d2abfcdf..fd3494b2642 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TidehollowStrix.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TidehollowStrix.java @@ -46,8 +46,6 @@ public class TidehollowStrix extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Bird"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TitanicUltimatum.java b/Mage.Sets/src/mage/sets/shardsofalara/TitanicUltimatum.java index 765df2cd9bc..eca47ae66a7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TitanicUltimatum.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TitanicUltimatum.java @@ -50,9 +50,6 @@ public class TitanicUltimatum extends CardImpl { super(ownerId, 204, "Titanic Ultimatum", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{R}{R}{G}{G}{G}{W}{W}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); - this.color.setGreen(true); - this.color.setWhite(true); // Until end of turn, creatures you control get +5/+5 and gain first strike, lifelink, and trample. this.getSpellAbility().addEffect(new BoostControlledEffect(5, 5, Duration.EndOfTurn, filter)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TopanAscetic.java b/Mage.Sets/src/mage/sets/shardsofalara/TopanAscetic.java index 0951b0880c0..04fb9bd92f0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TopanAscetic.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TopanAscetic.java @@ -61,7 +61,6 @@ public class TopanAscetic extends CardImpl { this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TortoiseFormation.java b/Mage.Sets/src/mage/sets/shardsofalara/TortoiseFormation.java index df51284c15a..3e39a14a239 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TortoiseFormation.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TortoiseFormation.java @@ -47,7 +47,6 @@ public class TortoiseFormation extends CardImpl { super(ownerId, 61, "Tortoise Formation", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); // Creatures you control gain shroud until end of turn. this.getSpellAbility().addEffect(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TowerGargoyle.java b/Mage.Sets/src/mage/sets/shardsofalara/TowerGargoyle.java index a5eaf6ca0ed..e573e554720 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TowerGargoyle.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TowerGargoyle.java @@ -45,9 +45,6 @@ public class TowerGargoyle extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Gargoyle"); - this.color.setBlue(true); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/VeinDrinker.java b/Mage.Sets/src/mage/sets/shardsofalara/VeinDrinker.java index 5e43542fabf..3248596ce07 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/VeinDrinker.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/VeinDrinker.java @@ -60,7 +60,6 @@ public class VeinDrinker extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Vampire"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ViashinoSkeleton.java b/Mage.Sets/src/mage/sets/shardsofalara/ViashinoSkeleton.java index 03ee4a2d36d..6fd1eddf46e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ViashinoSkeleton.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ViashinoSkeleton.java @@ -52,7 +52,6 @@ public class ViashinoSkeleton extends CardImpl { this.subtype.add("Viashino"); this.subtype.add("Skeleton"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ViciousShadows.java b/Mage.Sets/src/mage/sets/shardsofalara/ViciousShadows.java index 2dbeb83d210..56dfca353ec 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ViciousShadows.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ViciousShadows.java @@ -51,7 +51,6 @@ public class ViciousShadows extends CardImpl { super(ownerId, 119, "Vicious Shadows", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{6}{R}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); // Whenever a creature dies, you may have Vicious Shadows deal damage to target player equal to the number of cards in that player's hand. Ability ability = new DiesCreatureTriggeredAbility(new DamageTargetEffect(new TargetPlayerCardsInHandCount()), true); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/VisceraDragger.java b/Mage.Sets/src/mage/sets/shardsofalara/VisceraDragger.java index 9d8704620da..48503e5f146 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/VisceraDragger.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/VisceraDragger.java @@ -49,7 +49,6 @@ public class VisceraDragger extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/VithianStinger.java b/Mage.Sets/src/mage/sets/shardsofalara/VithianStinger.java index c2ac1f3cb44..7bac3516563 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/VithianStinger.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/VithianStinger.java @@ -53,7 +53,6 @@ public class VithianStinger extends CardImpl { this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java b/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java index f06170b6ff6..2fdc62376e5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java @@ -57,7 +57,6 @@ public class VolcanicSubmersion extends CardImpl { super(ownerId, 121, "Volcanic Submersion", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{R}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); // Destroy target artifact or land. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WelkinGuide.java b/Mage.Sets/src/mage/sets/shardsofalara/WelkinGuide.java index f2776dde1ee..57136c41f02 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WelkinGuide.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WelkinGuide.java @@ -52,7 +52,6 @@ public class WelkinGuide extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WhereAncientsTread.java b/Mage.Sets/src/mage/sets/shardsofalara/WhereAncientsTread.java index ea4c41d4f34..52e18d94e83 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WhereAncientsTread.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WhereAncientsTread.java @@ -56,7 +56,6 @@ import mage.target.common.TargetCreatureOrPlayer; super(ownerId, 122, "Where Ancients Tread", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); // Whenever a creature with power 5 or greater enters the battlefield under your control, you may have Where Ancients Tread deal 5 damage to target creature or player. Ability ability = new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), filter, true); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WindwrightMage.java b/Mage.Sets/src/mage/sets/shardsofalara/WindwrightMage.java index fe74f0ce972..5c081c1f643 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WindwrightMage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WindwrightMage.java @@ -58,9 +58,6 @@ public class WindwrightMage extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/starter1999/AngelOfLight.java b/Mage.Sets/src/mage/sets/starter1999/AngelOfLight.java index 3ed32296f66..c9470d26b1a 100644 --- a/Mage.Sets/src/mage/sets/starter1999/AngelOfLight.java +++ b/Mage.Sets/src/mage/sets/starter1999/AngelOfLight.java @@ -46,7 +46,6 @@ public class AngelOfLight extends CardImpl { this.expansionSetCode = "S99"; this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/starter1999/GrimTutor.java b/Mage.Sets/src/mage/sets/starter1999/GrimTutor.java index 3c2c78c915a..bce153cd6a1 100644 --- a/Mage.Sets/src/mage/sets/starter1999/GrimTutor.java +++ b/Mage.Sets/src/mage/sets/starter1999/GrimTutor.java @@ -45,7 +45,6 @@ public class GrimTutor extends CardImpl { super(ownerId, 79, "Grim Tutor", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{B}{B}"); this.expansionSetCode = "S99"; - this.color.setBlack(true); // Search your library for a card and put that card into your hand, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(); diff --git a/Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java b/Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java index afd48abe07c..0f7bff29282 100644 --- a/Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java +++ b/Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java @@ -45,7 +45,6 @@ public class PrideOfLions extends CardImpl { this.expansionSetCode = "S99"; this.subtype.add("Cat"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/starter2000/BreathOfLife.java b/Mage.Sets/src/mage/sets/starter2000/BreathOfLife.java index 9ef3e775aa5..b86f497de27 100644 --- a/Mage.Sets/src/mage/sets/starter2000/BreathOfLife.java +++ b/Mage.Sets/src/mage/sets/starter2000/BreathOfLife.java @@ -46,7 +46,6 @@ public class BreathOfLife extends CardImpl { super(ownerId, 2, "Breath of Life", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{W}"); this.expansionSetCode = "S00"; - this.color.setWhite(true); // Return target creature card from your graveyard to the battlefield. this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/starter2000/HandOfDeath.java b/Mage.Sets/src/mage/sets/starter2000/HandOfDeath.java index 6ae00588dc0..64432c06658 100644 --- a/Mage.Sets/src/mage/sets/starter2000/HandOfDeath.java +++ b/Mage.Sets/src/mage/sets/starter2000/HandOfDeath.java @@ -54,7 +54,6 @@ public class HandOfDeath extends CardImpl { super(ownerId, 6, "Hand of Death", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "S00"; - this.color.setBlack(true); // Destroy target nonblack creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/starter2000/RoyalFalcon.java b/Mage.Sets/src/mage/sets/starter2000/RoyalFalcon.java index 7a8239a0716..6167870f16f 100644 --- a/Mage.Sets/src/mage/sets/starter2000/RoyalFalcon.java +++ b/Mage.Sets/src/mage/sets/starter2000/RoyalFalcon.java @@ -45,7 +45,6 @@ public class RoyalFalcon extends CardImpl { this.expansionSetCode = "S00"; this.subtype.add("Bird"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/starter2000/WillowElf.java b/Mage.Sets/src/mage/sets/starter2000/WillowElf.java index 79d7e45db1d..d53c1e5fc0f 100644 --- a/Mage.Sets/src/mage/sets/starter2000/WillowElf.java +++ b/Mage.Sets/src/mage/sets/starter2000/WillowElf.java @@ -44,7 +44,6 @@ public class WillowElf extends CardImpl { this.expansionSetCode = "S00"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/stronghold/AcidicSliver.java b/Mage.Sets/src/mage/sets/stronghold/AcidicSliver.java index 28ee10bb4d4..5aa04a6905f 100644 --- a/Mage.Sets/src/mage/sets/stronghold/AcidicSliver.java +++ b/Mage.Sets/src/mage/sets/stronghold/AcidicSliver.java @@ -62,8 +62,6 @@ public class AcidicSliver extends CardImpl { this.expansionSetCode = "STH"; this.subtype.add("Sliver"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/stronghold/BottomlessPit.java b/Mage.Sets/src/mage/sets/stronghold/BottomlessPit.java index f3aea5d0608..3a2d4c5450d 100644 --- a/Mage.Sets/src/mage/sets/stronghold/BottomlessPit.java +++ b/Mage.Sets/src/mage/sets/stronghold/BottomlessPit.java @@ -46,7 +46,6 @@ public class BottomlessPit extends CardImpl { super(ownerId, 1, "Bottomless Pit", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}"); this.expansionSetCode = "STH"; - this.color.setBlack(true); // At the beginning of each player's upkeep, that player discards a card at random. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DiscardTargetEffect(1, true), TargetController.ANY, false)); diff --git a/Mage.Sets/src/mage/sets/stronghold/Carnassid.java b/Mage.Sets/src/mage/sets/stronghold/Carnassid.java index a14c768788d..b58ac41ebe2 100644 --- a/Mage.Sets/src/mage/sets/stronghold/Carnassid.java +++ b/Mage.Sets/src/mage/sets/stronghold/Carnassid.java @@ -49,7 +49,6 @@ public class Carnassid extends CardImpl { this.expansionSetCode = "STH"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/stronghold/CrystallineSliver.java b/Mage.Sets/src/mage/sets/stronghold/CrystallineSliver.java index 12946eded7a..92121276533 100644 --- a/Mage.Sets/src/mage/sets/stronghold/CrystallineSliver.java +++ b/Mage.Sets/src/mage/sets/stronghold/CrystallineSliver.java @@ -50,8 +50,6 @@ public class CrystallineSliver extends CardImpl { this.expansionSetCode = "STH"; this.subtype.add("Sliver"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/stronghold/DauthiTrapper.java b/Mage.Sets/src/mage/sets/stronghold/DauthiTrapper.java index cf019906c85..6783be5a00d 100644 --- a/Mage.Sets/src/mage/sets/stronghold/DauthiTrapper.java +++ b/Mage.Sets/src/mage/sets/stronghold/DauthiTrapper.java @@ -53,7 +53,6 @@ public class DauthiTrapper extends CardImpl { this.subtype.add("Dauthi"); this.subtype.add("Minion"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/stronghold/DreamHalls.java b/Mage.Sets/src/mage/sets/stronghold/DreamHalls.java index 4df3c458c12..317db0e0183 100644 --- a/Mage.Sets/src/mage/sets/stronghold/DreamHalls.java +++ b/Mage.Sets/src/mage/sets/stronghold/DreamHalls.java @@ -58,7 +58,6 @@ public class DreamHalls extends CardImpl { super(ownerId, 28, "Dream Halls", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}{U}"); this.expansionSetCode = "STH"; - this.color.setBlue(true); // Rather than pay the mana cost for a spell, its controller may discard a card that shares a color with that spell. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DreamHallsEffect())); diff --git a/Mage.Sets/src/mage/sets/stronghold/Evacuation.java b/Mage.Sets/src/mage/sets/stronghold/Evacuation.java index c4061e0f4ed..7e85dcf6fa8 100644 --- a/Mage.Sets/src/mage/sets/stronghold/Evacuation.java +++ b/Mage.Sets/src/mage/sets/stronghold/Evacuation.java @@ -50,7 +50,6 @@ public class Evacuation extends CardImpl { super(ownerId, 30, "Evacuation", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); this.expansionSetCode = "STH"; - this.color.setBlue(true); // Return all creatures to their owners' hands. this.getSpellAbility().addEffect(new EvacuationEffect()); diff --git a/Mage.Sets/src/mage/sets/stronghold/FlowstoneHellion.java b/Mage.Sets/src/mage/sets/stronghold/FlowstoneHellion.java index aefce80953f..2adfcdfceaf 100644 --- a/Mage.Sets/src/mage/sets/stronghold/FlowstoneHellion.java +++ b/Mage.Sets/src/mage/sets/stronghold/FlowstoneHellion.java @@ -51,7 +51,6 @@ public class FlowstoneHellion extends CardImpl { this.subtype.add("Hellion"); this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/stronghold/HermitDruid.java b/Mage.Sets/src/mage/sets/stronghold/HermitDruid.java index 01963c72250..89a48a3c88f 100644 --- a/Mage.Sets/src/mage/sets/stronghold/HermitDruid.java +++ b/Mage.Sets/src/mage/sets/stronghold/HermitDruid.java @@ -60,7 +60,6 @@ public class HermitDruid extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/stronghold/HibernationSliver.java b/Mage.Sets/src/mage/sets/stronghold/HibernationSliver.java index 98d2ba23163..9421f6bcb79 100644 --- a/Mage.Sets/src/mage/sets/stronghold/HibernationSliver.java +++ b/Mage.Sets/src/mage/sets/stronghold/HibernationSliver.java @@ -54,8 +54,6 @@ public class HibernationSliver extends CardImpl { this.expansionSetCode = "STH"; this.subtype.add("Sliver"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/stronghold/IntruderAlarm.java b/Mage.Sets/src/mage/sets/stronghold/IntruderAlarm.java index cc2275104af..2fe7b279841 100644 --- a/Mage.Sets/src/mage/sets/stronghold/IntruderAlarm.java +++ b/Mage.Sets/src/mage/sets/stronghold/IntruderAlarm.java @@ -51,7 +51,6 @@ public class IntruderAlarm extends CardImpl { super(ownerId, 34, "Intruder Alarm", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "STH"; - this.color.setBlue(true); // Creatures don't untap during their controllers' untap steps. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepAllEffect(Duration.WhileOnBattlefield, TargetController.ANY, new FilterCreaturePermanent("Creatures")))); diff --git a/Mage.Sets/src/mage/sets/stronghold/LabRats.java b/Mage.Sets/src/mage/sets/stronghold/LabRats.java index fba572a7f70..3f42d455c67 100644 --- a/Mage.Sets/src/mage/sets/stronghold/LabRats.java +++ b/Mage.Sets/src/mage/sets/stronghold/LabRats.java @@ -45,7 +45,6 @@ public class LabRats extends CardImpl { super(ownerId, 11, "Lab Rats", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "STH"; - this.color.setBlack(true); // Buyback {4} this.addAbility(new BuybackAbility("{4}")); diff --git a/Mage.Sets/src/mage/sets/stronghold/NomadsEnKor.java b/Mage.Sets/src/mage/sets/stronghold/NomadsEnKor.java index 3c32dca7c7b..2c2bf9a230f 100644 --- a/Mage.Sets/src/mage/sets/stronghold/NomadsEnKor.java +++ b/Mage.Sets/src/mage/sets/stronghold/NomadsEnKor.java @@ -51,7 +51,6 @@ public class NomadsEnKor extends CardImpl { this.subtype.add("Nomad"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/stronghold/Overgrowth.java b/Mage.Sets/src/mage/sets/stronghold/Overgrowth.java index 16b59376975..0e9c8f527c2 100644 --- a/Mage.Sets/src/mage/sets/stronghold/Overgrowth.java +++ b/Mage.Sets/src/mage/sets/stronghold/Overgrowth.java @@ -57,7 +57,6 @@ public class Overgrowth extends CardImpl { this.expansionSetCode = "STH"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/stronghold/Provoke.java b/Mage.Sets/src/mage/sets/stronghold/Provoke.java index 412a479c662..01c9e1fa76e 100644 --- a/Mage.Sets/src/mage/sets/stronghold/Provoke.java +++ b/Mage.Sets/src/mage/sets/stronghold/Provoke.java @@ -57,7 +57,6 @@ public class Provoke extends CardImpl { super(ownerId, 63, "Provoke", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "STH"; - this.color.setGreen(true); // Untap target creature you don't control. That creature blocks this turn if able. this.getSpellAbility().addEffect(new UntapTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/stronghold/RollingStones.java b/Mage.Sets/src/mage/sets/stronghold/RollingStones.java index aaebcec1684..a37bc80bbe7 100644 --- a/Mage.Sets/src/mage/sets/stronghold/RollingStones.java +++ b/Mage.Sets/src/mage/sets/stronghold/RollingStones.java @@ -54,7 +54,6 @@ public class RollingStones extends CardImpl { super(ownerId, 111, "Rolling Stones", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "STH"; - this.color.setWhite(true); // Wall creatures can attack as though they didn't have defender. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanAttackAsThoughtItDidntHaveDefenderAllEffect(Duration.WhileOnBattlefield, filter))); diff --git a/Mage.Sets/src/mage/sets/stronghold/Ruination.java b/Mage.Sets/src/mage/sets/stronghold/Ruination.java index d333e60daf7..44cd6b82c03 100644 --- a/Mage.Sets/src/mage/sets/stronghold/Ruination.java +++ b/Mage.Sets/src/mage/sets/stronghold/Ruination.java @@ -53,7 +53,6 @@ public class Ruination extends CardImpl { super(ownerId, 95, "Ruination", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "STH"; - this.color.setRed(true); // Destroy all nonbasic lands. this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/stronghold/SacredGround.java b/Mage.Sets/src/mage/sets/stronghold/SacredGround.java index 08846966fe8..d10fc0980db 100644 --- a/Mage.Sets/src/mage/sets/stronghold/SacredGround.java +++ b/Mage.Sets/src/mage/sets/stronghold/SacredGround.java @@ -53,7 +53,6 @@ public class SacredGround extends CardImpl { super(ownerId, 112, "Sacred Ground", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "STH"; - this.color.setWhite(true); // Whenever a spell or ability an opponent controls causes a land to be put into your graveyard from the battlefield, return that card to the battlefield. this.addAbility(new SacredGroundTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/stronghold/SerpentWarrior.java b/Mage.Sets/src/mage/sets/stronghold/SerpentWarrior.java index 3fa3f1354e8..c990a9e985d 100644 --- a/Mage.Sets/src/mage/sets/stronghold/SerpentWarrior.java +++ b/Mage.Sets/src/mage/sets/stronghold/SerpentWarrior.java @@ -47,7 +47,6 @@ public class SerpentWarrior extends CardImpl { this.subtype.add("Snake"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/stronghold/ShamanEnKor.java b/Mage.Sets/src/mage/sets/stronghold/ShamanEnKor.java index 4fc4630be7e..3285803e740 100644 --- a/Mage.Sets/src/mage/sets/stronghold/ShamanEnKor.java +++ b/Mage.Sets/src/mage/sets/stronghold/ShamanEnKor.java @@ -65,7 +65,6 @@ public class ShamanEnKor extends CardImpl { this.subtype.add("Cleric"); this.subtype.add("Shaman"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/stronghold/SkyshroudFalcon.java b/Mage.Sets/src/mage/sets/stronghold/SkyshroudFalcon.java index c328f2013be..dcabde03b28 100644 --- a/Mage.Sets/src/mage/sets/stronghold/SkyshroudFalcon.java +++ b/Mage.Sets/src/mage/sets/stronghold/SkyshroudFalcon.java @@ -46,7 +46,6 @@ public class SkyshroudFalcon extends CardImpl { this.expansionSetCode = "STH"; this.subtype.add("Bird"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/stronghold/SliverQueen.java b/Mage.Sets/src/mage/sets/stronghold/SliverQueen.java index 40feb99f319..a7d7b7c7273 100644 --- a/Mage.Sets/src/mage/sets/stronghold/SliverQueen.java +++ b/Mage.Sets/src/mage/sets/stronghold/SliverQueen.java @@ -50,11 +50,6 @@ public class SliverQueen extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Sliver"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setGreen(true); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/stronghold/SoltariChampion.java b/Mage.Sets/src/mage/sets/stronghold/SoltariChampion.java index bab42984a13..6716d74caa3 100644 --- a/Mage.Sets/src/mage/sets/stronghold/SoltariChampion.java +++ b/Mage.Sets/src/mage/sets/stronghold/SoltariChampion.java @@ -50,7 +50,6 @@ public class SoltariChampion extends CardImpl { this.subtype.add("Soltari"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/stronghold/SpinedSliver.java b/Mage.Sets/src/mage/sets/stronghold/SpinedSliver.java index d86b93c3be7..da10b8dc8f6 100644 --- a/Mage.Sets/src/mage/sets/stronghold/SpinedSliver.java +++ b/Mage.Sets/src/mage/sets/stronghold/SpinedSliver.java @@ -60,8 +60,6 @@ public class SpinedSliver extends CardImpl { this.expansionSetCode = "STH"; this.subtype.add("Sliver"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/stronghold/StrongholdAssassin.java b/Mage.Sets/src/mage/sets/stronghold/StrongholdAssassin.java index 32483941eef..cc5e19380d1 100644 --- a/Mage.Sets/src/mage/sets/stronghold/StrongholdAssassin.java +++ b/Mage.Sets/src/mage/sets/stronghold/StrongholdAssassin.java @@ -64,7 +64,6 @@ public class StrongholdAssassin extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Assassin"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/stronghold/TidalSurge.java b/Mage.Sets/src/mage/sets/stronghold/TidalSurge.java index 0e4137dd1e9..bfd3a6311be 100644 --- a/Mage.Sets/src/mage/sets/stronghold/TidalSurge.java +++ b/Mage.Sets/src/mage/sets/stronghold/TidalSurge.java @@ -54,7 +54,6 @@ public class TidalSurge extends CardImpl { super(ownerId, 46, "Tidal Surge", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{U}"); this.expansionSetCode = "STH"; - this.color.setBlue(true); // Tap up to three target creatures without flying. this.getSpellAbility().addEffect(new TapTargetEffect("Tap up to three target creatures without flying")); diff --git a/Mage.Sets/src/mage/sets/stronghold/VictualSliver.java b/Mage.Sets/src/mage/sets/stronghold/VictualSliver.java index 0d137d20474..e1560748458 100644 --- a/Mage.Sets/src/mage/sets/stronghold/VictualSliver.java +++ b/Mage.Sets/src/mage/sets/stronghold/VictualSliver.java @@ -61,8 +61,6 @@ public class VictualSliver extends CardImpl { this.expansionSetCode = "STH"; this.subtype.add("Sliver"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/stronghold/WallOfBlossoms.java b/Mage.Sets/src/mage/sets/stronghold/WallOfBlossoms.java index 6942cc3d9a3..8740ea57e83 100644 --- a/Mage.Sets/src/mage/sets/stronghold/WallOfBlossoms.java +++ b/Mage.Sets/src/mage/sets/stronghold/WallOfBlossoms.java @@ -48,7 +48,6 @@ public class WallOfBlossoms extends CardImpl { this.subtype.add("Plant"); this.subtype.add("Wall"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/stronghold/WallOfEssence.java b/Mage.Sets/src/mage/sets/stronghold/WallOfEssence.java index 59154239038..0c4f7ab0647 100644 --- a/Mage.Sets/src/mage/sets/stronghold/WallOfEssence.java +++ b/Mage.Sets/src/mage/sets/stronghold/WallOfEssence.java @@ -54,7 +54,6 @@ public class WallOfEssence extends CardImpl { this.expansionSetCode = "STH"; this.subtype.add("Wall"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/stronghold/WallOfRazors.java b/Mage.Sets/src/mage/sets/stronghold/WallOfRazors.java index 7c54ddb9581..ef3e42605a7 100644 --- a/Mage.Sets/src/mage/sets/stronghold/WallOfRazors.java +++ b/Mage.Sets/src/mage/sets/stronghold/WallOfRazors.java @@ -46,7 +46,6 @@ public class WallOfRazors extends CardImpl { this.expansionSetCode = "STH"; this.subtype.add("Wall"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tempest/Aluren.java b/Mage.Sets/src/mage/sets/tempest/Aluren.java index 61741db8f3c..baba29b103a 100644 --- a/Mage.Sets/src/mage/sets/tempest/Aluren.java +++ b/Mage.Sets/src/mage/sets/tempest/Aluren.java @@ -74,7 +74,6 @@ public class Aluren extends CardImpl { super(ownerId, 107, "Aluren", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); this.expansionSetCode = "TMP"; - this.color.setGreen(true); // Any player may play creature cards with converted mana cost 3 or less without paying their mana cost Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new AlurenRuleEffect()); diff --git a/Mage.Sets/src/mage/sets/tempest/AngelicProtector.java b/Mage.Sets/src/mage/sets/tempest/AngelicProtector.java index d432d8c77c4..9367eb18aa7 100644 --- a/Mage.Sets/src/mage/sets/tempest/AngelicProtector.java +++ b/Mage.Sets/src/mage/sets/tempest/AngelicProtector.java @@ -48,7 +48,6 @@ public class AngelicProtector extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tempest/ArmoredPegasus.java b/Mage.Sets/src/mage/sets/tempest/ArmoredPegasus.java index 355deddcadf..6f5fd735faf 100644 --- a/Mage.Sets/src/mage/sets/tempest/ArmoredPegasus.java +++ b/Mage.Sets/src/mage/sets/tempest/ArmoredPegasus.java @@ -45,7 +45,6 @@ public class ArmoredPegasus extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Pegasus"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tempest/BayouDragonfly.java b/Mage.Sets/src/mage/sets/tempest/BayouDragonfly.java index 6855297e134..3fcd26b6cfc 100644 --- a/Mage.Sets/src/mage/sets/tempest/BayouDragonfly.java +++ b/Mage.Sets/src/mage/sets/tempest/BayouDragonfly.java @@ -46,7 +46,6 @@ public class BayouDragonfly extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tempest/BenthicBehemoth.java b/Mage.Sets/src/mage/sets/tempest/BenthicBehemoth.java index d8aa02f9a15..20ce6e50c5d 100644 --- a/Mage.Sets/src/mage/sets/tempest/BenthicBehemoth.java +++ b/Mage.Sets/src/mage/sets/tempest/BenthicBehemoth.java @@ -45,7 +45,6 @@ public class BenthicBehemoth extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Serpent"); - this.color.setBlue(true); this.power = new MageInt(7); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/tempest/CanopySpider.java b/Mage.Sets/src/mage/sets/tempest/CanopySpider.java index e9bce45caf4..ab9c01e31ff 100644 --- a/Mage.Sets/src/mage/sets/tempest/CanopySpider.java +++ b/Mage.Sets/src/mage/sets/tempest/CanopySpider.java @@ -45,7 +45,6 @@ public class CanopySpider extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Spider"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/tempest/CanyonWildcat.java b/Mage.Sets/src/mage/sets/tempest/CanyonWildcat.java index 52e8298e016..c14cbcf7967 100644 --- a/Mage.Sets/src/mage/sets/tempest/CanyonWildcat.java +++ b/Mage.Sets/src/mage/sets/tempest/CanyonWildcat.java @@ -45,7 +45,6 @@ public class CanyonWildcat extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Cat"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tempest/Capsize.java b/Mage.Sets/src/mage/sets/tempest/Capsize.java index cf068a9af47..6678d971f48 100644 --- a/Mage.Sets/src/mage/sets/tempest/Capsize.java +++ b/Mage.Sets/src/mage/sets/tempest/Capsize.java @@ -45,7 +45,6 @@ public class Capsize extends CardImpl { super(ownerId, 55, "Capsize", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{U}"); this.expansionSetCode = "TMP"; - this.color.setBlue(true); // Buyback {3} this.addAbility(new BuybackAbility("{3}")); diff --git a/Mage.Sets/src/mage/sets/tempest/ChargingRhino.java b/Mage.Sets/src/mage/sets/tempest/ChargingRhino.java index 6f805946c44..a8a597da627 100644 --- a/Mage.Sets/src/mage/sets/tempest/ChargingRhino.java +++ b/Mage.Sets/src/mage/sets/tempest/ChargingRhino.java @@ -47,7 +47,6 @@ public class ChargingRhino extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Rhino"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/tempest/Chill.java b/Mage.Sets/src/mage/sets/tempest/Chill.java index 4231549b874..5fbd1413be9 100644 --- a/Mage.Sets/src/mage/sets/tempest/Chill.java +++ b/Mage.Sets/src/mage/sets/tempest/Chill.java @@ -53,7 +53,6 @@ public class Chill extends CardImpl { super(ownerId, 56, "Chill", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "TMP"; - this.color.setBlue(true); // Red spells cost {2} more to cast. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasementAllEffect(filter, 2))); diff --git a/Mage.Sets/src/mage/sets/tempest/Choke.java b/Mage.Sets/src/mage/sets/tempest/Choke.java index 63b5076b0c4..790a1d6679b 100644 --- a/Mage.Sets/src/mage/sets/tempest/Choke.java +++ b/Mage.Sets/src/mage/sets/tempest/Choke.java @@ -55,7 +55,6 @@ public class Choke extends CardImpl { super(ownerId, 113, "Choke", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "TMP"; - this.color.setGreen(true); // Islands don't untap during their controllers' untap steps. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepAllEffect(Duration.WhileOnBattlefield, TargetController.ANY, filter))); diff --git a/Mage.Sets/src/mage/sets/tempest/CorpseDance.java b/Mage.Sets/src/mage/sets/tempest/CorpseDance.java index 3476d2477c3..a7589fdc5c7 100644 --- a/Mage.Sets/src/mage/sets/tempest/CorpseDance.java +++ b/Mage.Sets/src/mage/sets/tempest/CorpseDance.java @@ -58,7 +58,6 @@ public class CorpseDance extends CardImpl { super(ownerId, 10, "Corpse Dance", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "TMP"; - this.color.setBlack(true); // Buyback {2} this.addAbility(new BuybackAbility("{2}")); diff --git a/Mage.Sets/src/mage/sets/tempest/DauthiEmbrace.java b/Mage.Sets/src/mage/sets/tempest/DauthiEmbrace.java index 8680daf7b63..c7066871c9a 100644 --- a/Mage.Sets/src/mage/sets/tempest/DauthiEmbrace.java +++ b/Mage.Sets/src/mage/sets/tempest/DauthiEmbrace.java @@ -50,7 +50,6 @@ public class DauthiEmbrace extends CardImpl { super(ownerId, 14, "Dauthi Embrace", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "TMP"; - this.color.setBlack(true); // {B}{B}: Target creature gains shadow until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{B}{B}")); diff --git a/Mage.Sets/src/mage/sets/tempest/DauthiHorror.java b/Mage.Sets/src/mage/sets/tempest/DauthiHorror.java index 4b06b582f8a..29ce431cf41 100644 --- a/Mage.Sets/src/mage/sets/tempest/DauthiHorror.java +++ b/Mage.Sets/src/mage/sets/tempest/DauthiHorror.java @@ -57,7 +57,6 @@ public class DauthiHorror extends CardImpl { this.subtype.add("Dauthi"); this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tempest/DauthiSlayer.java b/Mage.Sets/src/mage/sets/tempest/DauthiSlayer.java index 96467e93a9a..0f73f3c1fbb 100644 --- a/Mage.Sets/src/mage/sets/tempest/DauthiSlayer.java +++ b/Mage.Sets/src/mage/sets/tempest/DauthiSlayer.java @@ -47,7 +47,6 @@ public class DauthiSlayer extends CardImpl { this.subtype.add("Dauthi"); this.subtype.add("Soldier"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tempest/DeathPitsOfRath.java b/Mage.Sets/src/mage/sets/tempest/DeathPitsOfRath.java index 130bd099057..f1c4a314bfa 100644 --- a/Mage.Sets/src/mage/sets/tempest/DeathPitsOfRath.java +++ b/Mage.Sets/src/mage/sets/tempest/DeathPitsOfRath.java @@ -50,7 +50,6 @@ public class DeathPitsOfRath extends CardImpl { super(ownerId, 21, "Death Pits of Rath", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{B}"); this.expansionSetCode = "TMP"; - this.color.setBlack(true); // Whenever a creature is dealt damage, destroy it. It can't be regenerated. this.addAbility(new DeathPitsOfRathTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/tempest/DreamCache.java b/Mage.Sets/src/mage/sets/tempest/DreamCache.java index 1aea178245a..3a3c54336cd 100644 --- a/Mage.Sets/src/mage/sets/tempest/DreamCache.java +++ b/Mage.Sets/src/mage/sets/tempest/DreamCache.java @@ -50,7 +50,6 @@ public class DreamCache extends CardImpl { super(ownerId, 59, "Dream Cache", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "TMP"; - this.color.setBlue(true); // Draw three cards, then put two cards from your hand both on top of your library or both on the bottom of your library. this.getSpellAbility().addEffect(new DreamCacheEffect()); diff --git a/Mage.Sets/src/mage/sets/tempest/EladamrisVineyard.java b/Mage.Sets/src/mage/sets/tempest/EladamrisVineyard.java index dd38f1cb86b..1ce24ec645d 100644 --- a/Mage.Sets/src/mage/sets/tempest/EladamrisVineyard.java +++ b/Mage.Sets/src/mage/sets/tempest/EladamrisVineyard.java @@ -47,7 +47,6 @@ public class EladamrisVineyard extends CardImpl { super(ownerId, 118, "Eladamri's Vineyard", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "TMP"; - this.color.setGreen(true); // At the beginning of each player's precombat main phase, add {G}{G} to that player's mana pool. this.addAbility(new BeginningOfPreCombatMainTriggeredAbility( diff --git a/Mage.Sets/src/mage/sets/tempest/FightingDrake.java b/Mage.Sets/src/mage/sets/tempest/FightingDrake.java index 7856cf2866e..e705df29676 100644 --- a/Mage.Sets/src/mage/sets/tempest/FightingDrake.java +++ b/Mage.Sets/src/mage/sets/tempest/FightingDrake.java @@ -45,7 +45,6 @@ public class FightingDrake extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/tempest/FurnaceOfRath.java b/Mage.Sets/src/mage/sets/tempest/FurnaceOfRath.java index ec5f49607ec..cfbf7d803c5 100644 --- a/Mage.Sets/src/mage/sets/tempest/FurnaceOfRath.java +++ b/Mage.Sets/src/mage/sets/tempest/FurnaceOfRath.java @@ -52,7 +52,6 @@ public class FurnaceOfRath extends CardImpl { super(ownerId, 177, "Furnace of Rath", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{R}{R}"); this.expansionSetCode = "TMP"; - this.color.setRed(true); // If a source would deal damage to a creature or player, it deals double that damage to that creature or player instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FurnaceOfRathEffect())); diff --git a/Mage.Sets/src/mage/sets/tempest/GaseousForm.java b/Mage.Sets/src/mage/sets/tempest/GaseousForm.java index d067cee399c..112a9019a91 100644 --- a/Mage.Sets/src/mage/sets/tempest/GaseousForm.java +++ b/Mage.Sets/src/mage/sets/tempest/GaseousForm.java @@ -53,7 +53,6 @@ public class GaseousForm extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/tempest/HeartwoodTreefolk.java b/Mage.Sets/src/mage/sets/tempest/HeartwoodTreefolk.java index c7156a03e92..c0b5666d656 100644 --- a/Mage.Sets/src/mage/sets/tempest/HeartwoodTreefolk.java +++ b/Mage.Sets/src/mage/sets/tempest/HeartwoodTreefolk.java @@ -45,7 +45,6 @@ public class HeartwoodTreefolk extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Treefolk"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/tempest/Humility.java b/Mage.Sets/src/mage/sets/tempest/Humility.java index 49803b6cb23..fba82fc8bf7 100644 --- a/Mage.Sets/src/mage/sets/tempest/Humility.java +++ b/Mage.Sets/src/mage/sets/tempest/Humility.java @@ -56,7 +56,6 @@ public class Humility extends CardImpl { super(ownerId, 236, "Humility", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "TMP"; - this.color.setWhite(true); // All creatures lose all abilities and have base power and toughness 1/1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HumilityEffect(Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/tempest/Insight.java b/Mage.Sets/src/mage/sets/tempest/Insight.java index e7077520d8a..5121a5911af 100644 --- a/Mage.Sets/src/mage/sets/tempest/Insight.java +++ b/Mage.Sets/src/mage/sets/tempest/Insight.java @@ -53,7 +53,6 @@ public class Insight extends CardImpl { super(ownerId, 68, "Insight", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "TMP"; - this.color.setBlue(true); // Whenever an opponent casts a green spell, you draw a card. this.addAbility(new SpellCastOpponentTriggeredAbility(new DrawCardSourceControllerEffect(1), filter, false)); diff --git a/Mage.Sets/src/mage/sets/tempest/Intuition.java b/Mage.Sets/src/mage/sets/tempest/Intuition.java index 332acb4d4b9..88e4186bd80 100644 --- a/Mage.Sets/src/mage/sets/tempest/Intuition.java +++ b/Mage.Sets/src/mage/sets/tempest/Intuition.java @@ -57,7 +57,6 @@ public class Intuition extends CardImpl { super(ownerId, 70, "Intuition", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "TMP"; - this.color.setBlue(true); // Search your library for three cards and reveal them. Target opponent chooses one. Put that card into your hand and the rest into your graveyard. Then shuffle your library. this.getSpellAbility().addEffect(new IntuitionEffect()); diff --git a/Mage.Sets/src/mage/sets/tempest/JackalPup.java b/Mage.Sets/src/mage/sets/tempest/JackalPup.java index 3af46ed3481..54ab6823a3f 100644 --- a/Mage.Sets/src/mage/sets/tempest/JackalPup.java +++ b/Mage.Sets/src/mage/sets/tempest/JackalPup.java @@ -52,7 +52,6 @@ public class JackalPup extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Hound"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tempest/Kezzerdrix.java b/Mage.Sets/src/mage/sets/tempest/Kezzerdrix.java index d3878ba57ed..068be29c5cf 100644 --- a/Mage.Sets/src/mage/sets/tempest/Kezzerdrix.java +++ b/Mage.Sets/src/mage/sets/tempest/Kezzerdrix.java @@ -53,7 +53,6 @@ public class Kezzerdrix extends CardImpl { this.subtype.add("Rabbit"); this.subtype.add("Beast"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/tempest/Kindle.java b/Mage.Sets/src/mage/sets/tempest/Kindle.java index 4e4e4057497..52435e41187 100644 --- a/Mage.Sets/src/mage/sets/tempest/Kindle.java +++ b/Mage.Sets/src/mage/sets/tempest/Kindle.java @@ -58,7 +58,6 @@ public class Kindle extends CardImpl { super(ownerId, 184, "Kindle", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "TMP"; - this.color.setRed(true); // Kindle deals X damage to target creature or player, where X is 2 plus the number of cards named Kindle in all graveyards. Effect effect = new DamageTargetEffect(new KindleCardsInAllGraveyardsCount(filter)); diff --git a/Mage.Sets/src/mage/sets/tempest/KnightOfDusk.java b/Mage.Sets/src/mage/sets/tempest/KnightOfDusk.java index 425d53f4395..c453b50f657 100644 --- a/Mage.Sets/src/mage/sets/tempest/KnightOfDusk.java +++ b/Mage.Sets/src/mage/sets/tempest/KnightOfDusk.java @@ -55,7 +55,6 @@ public class KnightOfDusk extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tempest/LightOfDay.java b/Mage.Sets/src/mage/sets/tempest/LightOfDay.java index a934aa4ae1b..8924dcf50bb 100644 --- a/Mage.Sets/src/mage/sets/tempest/LightOfDay.java +++ b/Mage.Sets/src/mage/sets/tempest/LightOfDay.java @@ -53,7 +53,6 @@ public class LightOfDay extends CardImpl { super(ownerId, 239, "Light of Day", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "TMP"; - this.color.setWhite(true); // Black creatures can't attack or block. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LightOfDayEffect())); diff --git a/Mage.Sets/src/mage/sets/tempest/LivingDeath.java b/Mage.Sets/src/mage/sets/tempest/LivingDeath.java index 2afec1061a4..81f109de857 100644 --- a/Mage.Sets/src/mage/sets/tempest/LivingDeath.java +++ b/Mage.Sets/src/mage/sets/tempest/LivingDeath.java @@ -53,7 +53,6 @@ public class LivingDeath extends CardImpl { super(ownerId, 36, "Living Death", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "TMP"; - this.color.setBlack(true); // Each player exiles all creature cards from his or her graveyard, then sacrifices all creatures he or she controls, then puts all cards he or she exiled this way onto the battlefield. this.getSpellAbility().addEffect(new LivingDeathEffect()); diff --git a/Mage.Sets/src/mage/sets/tempest/LowlandGiant.java b/Mage.Sets/src/mage/sets/tempest/LowlandGiant.java index 241346d48ce..15f8f717c7d 100644 --- a/Mage.Sets/src/mage/sets/tempest/LowlandGiant.java +++ b/Mage.Sets/src/mage/sets/tempest/LowlandGiant.java @@ -44,7 +44,6 @@ public class LowlandGiant extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Giant"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/tempest/Meditate.java b/Mage.Sets/src/mage/sets/tempest/Meditate.java index 6fe45144d15..7440c3916c1 100644 --- a/Mage.Sets/src/mage/sets/tempest/Meditate.java +++ b/Mage.Sets/src/mage/sets/tempest/Meditate.java @@ -49,7 +49,6 @@ public class Meditate extends CardImpl { super(ownerId, 76, "Meditate", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "TMP"; - this.color.setBlue(true); // Draw four cards. You skip your next turn. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(4)); diff --git a/Mage.Sets/src/mage/sets/tempest/MirrisGuile.java b/Mage.Sets/src/mage/sets/tempest/MirrisGuile.java index 0e867f26da1..81e73cdca59 100644 --- a/Mage.Sets/src/mage/sets/tempest/MirrisGuile.java +++ b/Mage.Sets/src/mage/sets/tempest/MirrisGuile.java @@ -45,7 +45,6 @@ public class MirrisGuile extends CardImpl { super(ownerId, 130, "Mirri's Guile", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "TMP"; - this.color.setGreen(true); // At the beginning of your upkeep, you may look at the top three cards of your library, then put them back in any order. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LookLibraryControllerEffect(3), TargetController.YOU, true)); diff --git a/Mage.Sets/src/mage/sets/tempest/MoggConscripts.java b/Mage.Sets/src/mage/sets/tempest/MoggConscripts.java index 11605721176..2a94bcfeefa 100644 --- a/Mage.Sets/src/mage/sets/tempest/MoggConscripts.java +++ b/Mage.Sets/src/mage/sets/tempest/MoggConscripts.java @@ -52,7 +52,6 @@ public class MoggConscripts extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tempest/MongrelPack.java b/Mage.Sets/src/mage/sets/tempest/MongrelPack.java index c0a243bb94e..da175031081 100644 --- a/Mage.Sets/src/mage/sets/tempest/MongrelPack.java +++ b/Mage.Sets/src/mage/sets/tempest/MongrelPack.java @@ -52,7 +52,6 @@ public class MongrelPack extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Hound"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tempest/Perish.java b/Mage.Sets/src/mage/sets/tempest/Perish.java index 89c7fccbcf8..d0f3dba50ae 100644 --- a/Mage.Sets/src/mage/sets/tempest/Perish.java +++ b/Mage.Sets/src/mage/sets/tempest/Perish.java @@ -54,7 +54,6 @@ public class Perish extends CardImpl { super(ownerId, 41, "Perish", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "TMP"; - this.color.setBlack(true); // Destroy all green creatures. They can't be regenerated. this.getSpellAbility().addEffect(new DestroyAllEffect(filter, true)); diff --git a/Mage.Sets/src/mage/sets/tempest/PincherBeetles.java b/Mage.Sets/src/mage/sets/tempest/PincherBeetles.java index 886e113a586..b96db6fea73 100644 --- a/Mage.Sets/src/mage/sets/tempest/PincherBeetles.java +++ b/Mage.Sets/src/mage/sets/tempest/PincherBeetles.java @@ -45,7 +45,6 @@ public class PincherBeetles extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tempest/Reanimate.java b/Mage.Sets/src/mage/sets/tempest/Reanimate.java index 15a51cd5c01..99444d12b76 100644 --- a/Mage.Sets/src/mage/sets/tempest/Reanimate.java +++ b/Mage.Sets/src/mage/sets/tempest/Reanimate.java @@ -48,7 +48,6 @@ public class Reanimate extends CardImpl { super(ownerId, 45, "Reanimate", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "TMP"; - this.color.setBlack(true); // Put target creature card from a graveyard onto the battlefield under your control. You lose life equal to its converted mana cost. getSpellAbility().addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard"))); diff --git a/Mage.Sets/src/mage/sets/tempest/RootMaze.java b/Mage.Sets/src/mage/sets/tempest/RootMaze.java index aa2e68d1226..e79acbf4201 100644 --- a/Mage.Sets/src/mage/sets/tempest/RootMaze.java +++ b/Mage.Sets/src/mage/sets/tempest/RootMaze.java @@ -52,7 +52,6 @@ public class RootMaze extends CardImpl { super(ownerId, 144, "Root Maze", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "TMP"; - this.color.setGreen(true); // Artifacts and lands enter the battlefield tapped. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RootMazeEffect())); diff --git a/Mage.Sets/src/mage/sets/tempest/RootbreakerWurm.java b/Mage.Sets/src/mage/sets/tempest/RootbreakerWurm.java index 56fcb8dc6fe..f4c38b43232 100644 --- a/Mage.Sets/src/mage/sets/tempest/RootbreakerWurm.java +++ b/Mage.Sets/src/mage/sets/tempest/RootbreakerWurm.java @@ -45,7 +45,6 @@ public class RootbreakerWurm extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java b/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java index 27f95aa8b52..39d3449e1f7 100644 --- a/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java +++ b/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java @@ -54,7 +54,6 @@ public class RootwaterMatriarch extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Merfolk"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/tempest/Sarcomancy.java b/Mage.Sets/src/mage/sets/tempest/Sarcomancy.java index 8cae60838d7..19a9c322c3f 100644 --- a/Mage.Sets/src/mage/sets/tempest/Sarcomancy.java +++ b/Mage.Sets/src/mage/sets/tempest/Sarcomancy.java @@ -54,7 +54,6 @@ public class Sarcomancy extends CardImpl { super(ownerId, 48, "Sarcomancy", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "TMP"; - this.color.setBlack(true); // When Sarcomancy enters the battlefield, put a 2/2 black Zombie creature token onto the battlefield. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ZombieToken(), 1), false)); diff --git a/Mage.Sets/src/mage/sets/tempest/Scragnoth.java b/Mage.Sets/src/mage/sets/tempest/Scragnoth.java index b5cc2219c6c..44d8ff33c80 100644 --- a/Mage.Sets/src/mage/sets/tempest/Scragnoth.java +++ b/Mage.Sets/src/mage/sets/tempest/Scragnoth.java @@ -54,7 +54,6 @@ public class Scragnoth extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/tempest/SeaMonster.java b/Mage.Sets/src/mage/sets/tempest/SeaMonster.java index 1b19dbf3150..96f683a4d93 100644 --- a/Mage.Sets/src/mage/sets/tempest/SeaMonster.java +++ b/Mage.Sets/src/mage/sets/tempest/SeaMonster.java @@ -48,7 +48,6 @@ import mage.filter.common.FilterLandPermanent; this.expansionSetCode = "TMP"; this.subtype.add("Serpent"); - this.color.setBlue(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/tempest/SegmentedWurm.java b/Mage.Sets/src/mage/sets/tempest/SegmentedWurm.java index 87886ccf3fe..fbe883b82bf 100644 --- a/Mage.Sets/src/mage/sets/tempest/SegmentedWurm.java +++ b/Mage.Sets/src/mage/sets/tempest/SegmentedWurm.java @@ -47,8 +47,6 @@ public class SegmentedWurm extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Wurm"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/tempest/ShadowRift.java b/Mage.Sets/src/mage/sets/tempest/ShadowRift.java index a4f08c1bc6b..72e896fdb83 100644 --- a/Mage.Sets/src/mage/sets/tempest/ShadowRift.java +++ b/Mage.Sets/src/mage/sets/tempest/ShadowRift.java @@ -47,7 +47,6 @@ public class ShadowRift extends CardImpl { super(ownerId, 86, "Shadow Rift", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "TMP"; - this.color.setBlue(true); // Target creature gains shadow until end of turn. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(ShadowAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/tempest/SkySpirit.java b/Mage.Sets/src/mage/sets/tempest/SkySpirit.java index 5eb09a6be60..162268571f1 100644 --- a/Mage.Sets/src/mage/sets/tempest/SkySpirit.java +++ b/Mage.Sets/src/mage/sets/tempest/SkySpirit.java @@ -46,8 +46,6 @@ public class SkySpirit extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Spirit"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tempest/SkyshroudElf.java b/Mage.Sets/src/mage/sets/tempest/SkyshroudElf.java index bbad632c2af..f715f11300e 100644 --- a/Mage.Sets/src/mage/sets/tempest/SkyshroudElf.java +++ b/Mage.Sets/src/mage/sets/tempest/SkyshroudElf.java @@ -52,7 +52,6 @@ public class SkyshroudElf extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tempest/SkyshroudRanger.java b/Mage.Sets/src/mage/sets/tempest/SkyshroudRanger.java index 2b3e2af731f..d857cd19c98 100644 --- a/Mage.Sets/src/mage/sets/tempest/SkyshroudRanger.java +++ b/Mage.Sets/src/mage/sets/tempest/SkyshroudRanger.java @@ -51,7 +51,6 @@ public class SkyshroudRanger extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tempest/SoltariEmissary.java b/Mage.Sets/src/mage/sets/tempest/SoltariEmissary.java index 5ca1543c939..a3903c602b3 100644 --- a/Mage.Sets/src/mage/sets/tempest/SoltariEmissary.java +++ b/Mage.Sets/src/mage/sets/tempest/SoltariEmissary.java @@ -51,7 +51,6 @@ public class SoltariEmissary extends CardImpl { this.subtype.add("Soltari"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tempest/SoltariMonk.java b/Mage.Sets/src/mage/sets/tempest/SoltariMonk.java index 4609a07f212..7072a7627d7 100644 --- a/Mage.Sets/src/mage/sets/tempest/SoltariMonk.java +++ b/Mage.Sets/src/mage/sets/tempest/SoltariMonk.java @@ -56,7 +56,6 @@ public class SoltariMonk extends CardImpl { this.subtype.add("Monk"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tempest/SoltariPriest.java b/Mage.Sets/src/mage/sets/tempest/SoltariPriest.java index 3bdfd4213f9..9149cebe6af 100644 --- a/Mage.Sets/src/mage/sets/tempest/SoltariPriest.java +++ b/Mage.Sets/src/mage/sets/tempest/SoltariPriest.java @@ -55,7 +55,6 @@ public class SoltariPriest extends CardImpl { this.subtype.add("Soltari"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tempest/SoltariTrooper.java b/Mage.Sets/src/mage/sets/tempest/SoltariTrooper.java index a3d778dca4a..5264db21eb3 100644 --- a/Mage.Sets/src/mage/sets/tempest/SoltariTrooper.java +++ b/Mage.Sets/src/mage/sets/tempest/SoltariTrooper.java @@ -49,7 +49,6 @@ public class SoltariTrooper extends CardImpl { this.subtype.add("Soltari"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tempest/SpiritMirror.java b/Mage.Sets/src/mage/sets/tempest/SpiritMirror.java index ae520abb0f3..d58ad8b4db7 100644 --- a/Mage.Sets/src/mage/sets/tempest/SpiritMirror.java +++ b/Mage.Sets/src/mage/sets/tempest/SpiritMirror.java @@ -66,7 +66,6 @@ public class SpiritMirror extends CardImpl { super(ownerId, 260, "Spirit Mirror", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "TMP"; - this.color.setWhite(true); // At the beginning of your upkeep, if there are no Reflection tokens on the battlefield, put a 2/2 white Reflection creature token onto the battlefield. this.addAbility(new ConditionalTriggeredAbility( diff --git a/Mage.Sets/src/mage/sets/tempest/StealEnchantment.java b/Mage.Sets/src/mage/sets/tempest/StealEnchantment.java index d8eb0332572..252bfc71896 100644 --- a/Mage.Sets/src/mage/sets/tempest/StealEnchantment.java +++ b/Mage.Sets/src/mage/sets/tempest/StealEnchantment.java @@ -52,7 +52,6 @@ public class StealEnchantment extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant enchantment TargetPermanent auraTarget = new TargetEnchantmentPermanent(); diff --git a/Mage.Sets/src/mage/sets/tempest/TrainedArmodon.java b/Mage.Sets/src/mage/sets/tempest/TrainedArmodon.java index 53d70aadfc1..76717edc49f 100644 --- a/Mage.Sets/src/mage/sets/tempest/TrainedArmodon.java +++ b/Mage.Sets/src/mage/sets/tempest/TrainedArmodon.java @@ -44,7 +44,6 @@ public class TrainedArmodon extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Elephant"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/tempest/WallOfDiffusion.java b/Mage.Sets/src/mage/sets/tempest/WallOfDiffusion.java index f1fc93c98cc..3fd71f710a7 100644 --- a/Mage.Sets/src/mage/sets/tempest/WallOfDiffusion.java +++ b/Mage.Sets/src/mage/sets/tempest/WallOfDiffusion.java @@ -53,7 +53,6 @@ public class WallOfDiffusion extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Wall"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/tempest/Warmth.java b/Mage.Sets/src/mage/sets/tempest/Warmth.java index b15cf59ab5b..5eef210d43f 100644 --- a/Mage.Sets/src/mage/sets/tempest/Warmth.java +++ b/Mage.Sets/src/mage/sets/tempest/Warmth.java @@ -52,7 +52,6 @@ public class Warmth extends CardImpl { super(ownerId, 263, "Warmth", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "TMP"; - this.color.setWhite(true); // Whenever an opponent casts a red spell, you gain 2 life. this.addAbility(new SpellCastOpponentTriggeredAbility(new GainLifeEffect(2), filter, false)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/AcademyResearchers.java b/Mage.Sets/src/mage/sets/tenthedition/AcademyResearchers.java index 5b80d70e3f2..febe7582f76 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/AcademyResearchers.java +++ b/Mage.Sets/src/mage/sets/tenthedition/AcademyResearchers.java @@ -58,7 +58,6 @@ public class AcademyResearchers extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tenthedition/AmbassadorLaquatus.java b/Mage.Sets/src/mage/sets/tenthedition/AmbassadorLaquatus.java index e14dc8c541e..67e493e4622 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/AmbassadorLaquatus.java +++ b/Mage.Sets/src/mage/sets/tenthedition/AmbassadorLaquatus.java @@ -53,7 +53,6 @@ public class AmbassadorLaquatus extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/tenthedition/AnabaBodyguard.java b/Mage.Sets/src/mage/sets/tenthedition/AnabaBodyguard.java index c4f3dbd2b1f..ba3e0af004c 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/AnabaBodyguard.java +++ b/Mage.Sets/src/mage/sets/tenthedition/AnabaBodyguard.java @@ -45,7 +45,6 @@ public class AnabaBodyguard extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Minotaur"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/tenthedition/AngelicWall.java b/Mage.Sets/src/mage/sets/tenthedition/AngelicWall.java index ddcb27e982a..89deb31b804 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/AngelicWall.java +++ b/Mage.Sets/src/mage/sets/tenthedition/AngelicWall.java @@ -46,7 +46,6 @@ public class AngelicWall extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Wall"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/tenthedition/BeaconOfImmortality.java b/Mage.Sets/src/mage/sets/tenthedition/BeaconOfImmortality.java index fd9d54a97e0..b9a3ecc2241 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/BeaconOfImmortality.java +++ b/Mage.Sets/src/mage/sets/tenthedition/BeaconOfImmortality.java @@ -49,7 +49,6 @@ public class BeaconOfImmortality extends CardImpl { super(ownerId, 10, "Beacon of Immortality", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{5}{W}"); this.expansionSetCode = "10E"; - this.color.setWhite(true); // Double target player's life total. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/BenalishKnight.java b/Mage.Sets/src/mage/sets/tenthedition/BenalishKnight.java index bb2a99da825..889a0e5e4a0 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/BenalishKnight.java +++ b/Mage.Sets/src/mage/sets/tenthedition/BenalishKnight.java @@ -47,7 +47,6 @@ public class BenalishKnight extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tenthedition/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/tenthedition/BirdsOfParadise.java index fd66cabb089..042ed6e5126 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/BirdsOfParadise.java +++ b/Mage.Sets/src/mage/sets/tenthedition/BirdsOfParadise.java @@ -47,7 +47,6 @@ public class BirdsOfParadise extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Bird"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tenthedition/CloudElemental.java b/Mage.Sets/src/mage/sets/tenthedition/CloudElemental.java index 1c5ce7b215e..5c0e56e7f22 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/CloudElemental.java +++ b/Mage.Sets/src/mage/sets/tenthedition/CloudElemental.java @@ -46,7 +46,6 @@ public class CloudElemental extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/tenthedition/CrawWurm.java b/Mage.Sets/src/mage/sets/tenthedition/CrawWurm.java index 48d9ccad44e..869dc7ca11c 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/CrawWurm.java +++ b/Mage.Sets/src/mage/sets/tenthedition/CrawWurm.java @@ -44,7 +44,6 @@ public class CrawWurm extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/Cryoclasm.java b/Mage.Sets/src/mage/sets/tenthedition/Cryoclasm.java index 993828969c7..f76c044baa2 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Cryoclasm.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Cryoclasm.java @@ -64,7 +64,6 @@ public class Cryoclasm extends CardImpl { super(ownerId, 195, "Cryoclasm", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "10E"; - this.color.setRed(true); // Destroy target Plains or Island. Cryoclasm deals 3 damage to that land's controller. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Dehydration.java b/Mage.Sets/src/mage/sets/tenthedition/Dehydration.java index 90e05897054..19dc896d43b 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Dehydration.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Dehydration.java @@ -51,7 +51,6 @@ public class Dehydration extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Deluge.java b/Mage.Sets/src/mage/sets/tenthedition/Deluge.java index b196f543785..7e79fb4666e 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Deluge.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Deluge.java @@ -54,7 +54,6 @@ public class Deluge extends CardImpl { super(ownerId, 79, "Deluge", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "10E"; - this.color.setBlue(true); // Tap all creatures without flying. this.getSpellAbility().addEffect(new TapAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Distress.java b/Mage.Sets/src/mage/sets/tenthedition/Distress.java index 6da635c2ee1..2bb897ae08f 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Distress.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Distress.java @@ -53,7 +53,6 @@ public class Distress extends CardImpl { super(ownerId, 136, "Distress", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}{B}"); this.expansionSetCode = "10E"; - this.color.setBlack(true); // Target player reveals his or her hand. You choose a nonland card from it. That player discards that card. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/DrossCrocodile.java b/Mage.Sets/src/mage/sets/tenthedition/DrossCrocodile.java index d87e469a56b..1280c9a78b5 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/DrossCrocodile.java +++ b/Mage.Sets/src/mage/sets/tenthedition/DrossCrocodile.java @@ -45,7 +45,6 @@ public class DrossCrocodile extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Crocodile"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/DuskImp.java b/Mage.Sets/src/mage/sets/tenthedition/DuskImp.java index c6aca887613..f702b7579db 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/DuskImp.java +++ b/Mage.Sets/src/mage/sets/tenthedition/DuskImp.java @@ -45,7 +45,6 @@ public class DuskImp extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Imp"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Fear.java b/Mage.Sets/src/mage/sets/tenthedition/Fear.java index 7477998aad1..2620eec45f4 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Fear.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Fear.java @@ -51,7 +51,6 @@ public class Fear extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/tenthedition/FieldMarshal.java b/Mage.Sets/src/mage/sets/tenthedition/FieldMarshal.java index 402655f9326..6b627a6e702 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/FieldMarshal.java +++ b/Mage.Sets/src/mage/sets/tenthedition/FieldMarshal.java @@ -59,7 +59,6 @@ public class FieldMarshal extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); diff --git a/Mage.Sets/src/mage/sets/tenthedition/FogElemental.java b/Mage.Sets/src/mage/sets/tenthedition/FogElemental.java index f5bd433c08b..b85ee5ba0ee 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/FogElemental.java +++ b/Mage.Sets/src/mage/sets/tenthedition/FogElemental.java @@ -49,7 +49,6 @@ public class FogElemental extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/tenthedition/FugitiveWizard.java b/Mage.Sets/src/mage/sets/tenthedition/FugitiveWizard.java index 02216719be3..1d801e96d21 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/FugitiveWizard.java +++ b/Mage.Sets/src/mage/sets/tenthedition/FugitiveWizard.java @@ -45,7 +45,6 @@ public class FugitiveWizard extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/GaeasHerald.java b/Mage.Sets/src/mage/sets/tenthedition/GaeasHerald.java index b66855520b9..636071363d5 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/GaeasHerald.java +++ b/Mage.Sets/src/mage/sets/tenthedition/GaeasHerald.java @@ -53,7 +53,6 @@ public class GaeasHerald extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tenthedition/GoblinKing.java b/Mage.Sets/src/mage/sets/tenthedition/GoblinKing.java index f0af4dd9383..5826bcb2ab8 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/GoblinKing.java +++ b/Mage.Sets/src/mage/sets/tenthedition/GoblinKing.java @@ -58,7 +58,6 @@ public class GoblinKing extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); diff --git a/Mage.Sets/src/mage/sets/tenthedition/GoblinLore.java b/Mage.Sets/src/mage/sets/tenthedition/GoblinLore.java index 2ca273313fe..fdd8323b002 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/GoblinLore.java +++ b/Mage.Sets/src/mage/sets/tenthedition/GoblinLore.java @@ -45,7 +45,6 @@ public class GoblinLore extends CardImpl { super(ownerId, 208, "Goblin Lore", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "10E"; - this.color.setRed(true); // Draw four cards, then discard three cards at random. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(4)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/GoblinSkyRaider.java b/Mage.Sets/src/mage/sets/tenthedition/GoblinSkyRaider.java index c024fdc5330..8cd26774735 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/GoblinSkyRaider.java +++ b/Mage.Sets/src/mage/sets/tenthedition/GoblinSkyRaider.java @@ -46,7 +46,6 @@ public class GoblinSkyRaider extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tenthedition/GravebornMuse.java b/Mage.Sets/src/mage/sets/tenthedition/GravebornMuse.java index e8ddff4afa2..319da35d127 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/GravebornMuse.java +++ b/Mage.Sets/src/mage/sets/tenthedition/GravebornMuse.java @@ -59,7 +59,6 @@ public class GravebornMuse extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/tenthedition/GrizzlyBears.java b/Mage.Sets/src/mage/sets/tenthedition/GrizzlyBears.java index 70a6b061f01..d8657ce2665 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/GrizzlyBears.java +++ b/Mage.Sets/src/mage/sets/tenthedition/GrizzlyBears.java @@ -44,7 +44,6 @@ public class GrizzlyBears extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Bear"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/HillGiant.java b/Mage.Sets/src/mage/sets/tenthedition/HillGiant.java index bc73a8cd69c..502d01229ce 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/HillGiant.java +++ b/Mage.Sets/src/mage/sets/tenthedition/HillGiant.java @@ -44,7 +44,6 @@ public class HillGiant extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Giant"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/Incinerate.java b/Mage.Sets/src/mage/sets/tenthedition/Incinerate.java index f4cde870267..2f732f4d8bb 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Incinerate.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Incinerate.java @@ -52,7 +52,6 @@ public class Incinerate extends CardImpl { super(ownerId, 213, "Incinerate", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "10E"; - this.color.setRed(true); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/LordOfTheUndead.java b/Mage.Sets/src/mage/sets/tenthedition/LordOfTheUndead.java index 4e26a419747..3f2af9a2387 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/LordOfTheUndead.java +++ b/Mage.Sets/src/mage/sets/tenthedition/LordOfTheUndead.java @@ -64,7 +64,6 @@ public class LordOfTheUndead extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tenthedition/LumengridWarden.java b/Mage.Sets/src/mage/sets/tenthedition/LumengridWarden.java index 1a2a204b9a0..b914a5f85ad 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/LumengridWarden.java +++ b/Mage.Sets/src/mage/sets/tenthedition/LumengridWarden.java @@ -45,7 +45,6 @@ public class LumengridWarden extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/MahamotiDjinn.java b/Mage.Sets/src/mage/sets/tenthedition/MahamotiDjinn.java index 1d0e53a7734..34ed9da53d2 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/MahamotiDjinn.java +++ b/Mage.Sets/src/mage/sets/tenthedition/MahamotiDjinn.java @@ -45,7 +45,6 @@ public class MahamotiDjinn extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Djinn"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Manabarbs.java b/Mage.Sets/src/mage/sets/tenthedition/Manabarbs.java index 98bcae198ef..7a2b51b89ff 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Manabarbs.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Manabarbs.java @@ -48,7 +48,6 @@ public class Manabarbs extends CardImpl { super(ownerId, 218, "Manabarbs", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); this.expansionSetCode = "10E"; - this.color.setRed(true); // Whenever a player taps a land for mana, Manabarbs deals 1 damage to that player. this.addAbility(new TapForManaAllTriggeredAbility( diff --git a/Mage.Sets/src/mage/sets/tenthedition/MarchOfTheMachines.java b/Mage.Sets/src/mage/sets/tenthedition/MarchOfTheMachines.java index 640e869d0be..aed8f101b35 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/MarchOfTheMachines.java +++ b/Mage.Sets/src/mage/sets/tenthedition/MarchOfTheMachines.java @@ -52,7 +52,6 @@ public class MarchOfTheMachines extends CardImpl { super(ownerId, 91, "March of the Machines", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); this.expansionSetCode = "10E"; - this.color.setBlue(true); // Each noncreature artifact is an artifact creature with power and toughness each equal to its converted mana cost. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MarchOfTheMachinesEffect())); diff --git a/Mage.Sets/src/mage/sets/tenthedition/MassOfGhouls.java b/Mage.Sets/src/mage/sets/tenthedition/MassOfGhouls.java index 9a79f934e92..8ae20ddf535 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/MassOfGhouls.java +++ b/Mage.Sets/src/mage/sets/tenthedition/MassOfGhouls.java @@ -45,7 +45,6 @@ public class MassOfGhouls extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/MirriCatWarrior.java b/Mage.Sets/src/mage/sets/tenthedition/MirriCatWarrior.java index a67713084e5..5e1b87042e5 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/MirriCatWarrior.java +++ b/Mage.Sets/src/mage/sets/tenthedition/MirriCatWarrior.java @@ -49,7 +49,6 @@ public class MirriCatWarrior extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Peek.java b/Mage.Sets/src/mage/sets/tenthedition/Peek.java index aef0da4ae0e..1ef7f16dbef 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Peek.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Peek.java @@ -50,7 +50,6 @@ public class Peek extends CardImpl { super(ownerId, 94, "Peek", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "10E"; - this.color.setBlue(true); // Look at target player's hand. this.getSpellAbility().addEffect(new PeekEffect()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Persuasion.java b/Mage.Sets/src/mage/sets/tenthedition/Persuasion.java index c666025f462..ca8b7986000 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Persuasion.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Persuasion.java @@ -52,7 +52,6 @@ public class Persuasion extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/tenthedition/PhageTheUntouchable.java b/Mage.Sets/src/mage/sets/tenthedition/PhageTheUntouchable.java index d9234517c21..b5123c43f47 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/PhageTheUntouchable.java +++ b/Mage.Sets/src/mage/sets/tenthedition/PhageTheUntouchable.java @@ -56,7 +56,6 @@ public class PhageTheUntouchable extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Minion"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/tenthedition/PlagueBeetle.java b/Mage.Sets/src/mage/sets/tenthedition/PlagueBeetle.java index 2b0e0a984d0..3fe59024de0 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/PlagueBeetle.java +++ b/Mage.Sets/src/mage/sets/tenthedition/PlagueBeetle.java @@ -45,7 +45,6 @@ public class PlagueBeetle extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Insect"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Puppeteer.java b/Mage.Sets/src/mage/sets/tenthedition/Puppeteer.java index 5beedc5b748..11b6b357211 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Puppeteer.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Puppeteer.java @@ -54,7 +54,6 @@ public class Puppeteer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tenthedition/RagingGoblin.java b/Mage.Sets/src/mage/sets/tenthedition/RagingGoblin.java index 45abafdf3aa..83c4555cdbd 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/RagingGoblin.java +++ b/Mage.Sets/src/mage/sets/tenthedition/RagingGoblin.java @@ -46,7 +46,6 @@ public class RagingGoblin extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Berserker"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Recollect.java b/Mage.Sets/src/mage/sets/tenthedition/Recollect.java index 7b9e3ae994f..b69189f89f6 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Recollect.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Recollect.java @@ -44,7 +44,6 @@ public class Recollect extends CardImpl { super(ownerId, 289, "Recollect", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "10E"; - this.color.setGreen(true); // Return target card from your graveyard to your hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/RemoveSoul.java b/Mage.Sets/src/mage/sets/tenthedition/RemoveSoul.java index 6bd97720666..214c08ee095 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/RemoveSoul.java +++ b/Mage.Sets/src/mage/sets/tenthedition/RemoveSoul.java @@ -52,7 +52,6 @@ public class RemoveSoul extends CardImpl { super(ownerId, 100, "Remove Soul", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "10E"; - this.color.setBlue(true); this.getSpellAbility().addTarget(new TargetSpell(filter)); this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Righteousness.java b/Mage.Sets/src/mage/sets/tenthedition/Righteousness.java index 3d0445f59ea..2179c9c831b 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Righteousness.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Righteousness.java @@ -49,7 +49,6 @@ public class Righteousness extends CardImpl { super(ownerId, 36, "Righteousness", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "10E"; - this.color.setWhite(true); this.getSpellAbility().addEffect(new BoostTargetEffect(7, 7, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/RockBadger.java b/Mage.Sets/src/mage/sets/tenthedition/RockBadger.java index fd0118e58fa..46392e10c3d 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/RockBadger.java +++ b/Mage.Sets/src/mage/sets/tenthedition/RockBadger.java @@ -46,7 +46,6 @@ public class RockBadger extends CardImpl { this.subtype.add("Badger"); this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/tenthedition/RootwaterCommando.java b/Mage.Sets/src/mage/sets/tenthedition/RootwaterCommando.java index 70be06263ad..86cc2811da6 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/RootwaterCommando.java +++ b/Mage.Sets/src/mage/sets/tenthedition/RootwaterCommando.java @@ -45,7 +45,6 @@ public class RootwaterCommando extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Merfolk"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tenthedition/RuleOfLaw.java b/Mage.Sets/src/mage/sets/tenthedition/RuleOfLaw.java index 3d0f20894e1..ac72282d3cd 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/RuleOfLaw.java +++ b/Mage.Sets/src/mage/sets/tenthedition/RuleOfLaw.java @@ -46,7 +46,6 @@ public class RuleOfLaw extends CardImpl { super(ownerId, 37, "Rule of Law", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "10E"; - this.color.setWhite(true); // Each player can't cast more than one spell each turn. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCastMoreThanOneSpellEffect(TargetController.ANY))); diff --git a/Mage.Sets/src/mage/sets/tenthedition/RushwoodDryad.java b/Mage.Sets/src/mage/sets/tenthedition/RushwoodDryad.java index fc92adb538d..bff37538f45 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/RushwoodDryad.java +++ b/Mage.Sets/src/mage/sets/tenthedition/RushwoodDryad.java @@ -45,7 +45,6 @@ public class RushwoodDryad extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Dryad"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Scalpelexis.java b/Mage.Sets/src/mage/sets/tenthedition/Scalpelexis.java index 2864dda9d66..b1637917c9d 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Scalpelexis.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Scalpelexis.java @@ -55,7 +55,6 @@ public class Scalpelexis extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Beast"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/tenthedition/ScatheZombies.java b/Mage.Sets/src/mage/sets/tenthedition/ScatheZombies.java index 3edd4bf9680..daff880a9a5 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/ScatheZombies.java +++ b/Mage.Sets/src/mage/sets/tenthedition/ScatheZombies.java @@ -44,7 +44,6 @@ public class ScatheZombies extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/SengirVampire.java b/Mage.Sets/src/mage/sets/tenthedition/SengirVampire.java index e2b846008d8..e4ad6626a87 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SengirVampire.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SengirVampire.java @@ -48,7 +48,6 @@ public class SengirVampire extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Vampire"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Shunt.java b/Mage.Sets/src/mage/sets/tenthedition/Shunt.java index 425ecc2b3c2..5f0337e027d 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Shunt.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Shunt.java @@ -52,7 +52,6 @@ public class Shunt extends CardImpl { super(ownerId, 233, "Shunt", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{R}{R}"); this.expansionSetCode = "10E"; - this.color.setRed(true); // Change the target of target spell with a single target. this.getSpellAbility().addEffect(new ChooseNewTargetsTargetEffect(true, true)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Sift.java b/Mage.Sets/src/mage/sets/tenthedition/Sift.java index 4c2f572693b..7e6a339c7eb 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Sift.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Sift.java @@ -44,7 +44,6 @@ public class Sift extends CardImpl { super(ownerId, 108, "Sift", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "10E"; - this.color.setBlue(true); // Draw three cards, then discard a card. this.getSpellAbility().addEffect(new DrawDiscardControllerEffect(3,1)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SkyhunterPatrol.java b/Mage.Sets/src/mage/sets/tenthedition/SkyhunterPatrol.java index 3eb99ef43dc..3a4fd56f9bb 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SkyhunterPatrol.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SkyhunterPatrol.java @@ -47,7 +47,6 @@ public class SkyhunterPatrol extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SkyhunterProwler.java b/Mage.Sets/src/mage/sets/tenthedition/SkyhunterProwler.java index 58154d20281..ed1f1171d5d 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SkyhunterProwler.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SkyhunterProwler.java @@ -47,7 +47,6 @@ public class SkyhunterProwler extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SkyhunterSkirmisher.java b/Mage.Sets/src/mage/sets/tenthedition/SkyhunterSkirmisher.java index 26d61c44620..419fa99c52c 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SkyhunterSkirmisher.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SkyhunterSkirmisher.java @@ -47,7 +47,6 @@ public class SkyhunterSkirmisher extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Soulblast.java b/Mage.Sets/src/mage/sets/tenthedition/Soulblast.java index 0346d2b870d..629a74c5c32 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Soulblast.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Soulblast.java @@ -54,7 +54,6 @@ public class Soulblast extends CardImpl { super(ownerId, 236, "Soulblast", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{R}{R}{R}"); this.expansionSetCode = "10E"; - this.color.setRed(true); // As an additional cost to cast Soulblast, sacrifice all creatures you control. this.getSpellAbility().addCost(new SacrificeAllCost(filter)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SparkElemental.java b/Mage.Sets/src/mage/sets/tenthedition/SparkElemental.java index a9d60a155c9..560330dd285 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SparkElemental.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SparkElemental.java @@ -49,7 +49,6 @@ public class SparkElemental extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SqueeGoblinNabob.java b/Mage.Sets/src/mage/sets/tenthedition/SqueeGoblinNabob.java index 8b5627a1585..d54c39d2910 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SqueeGoblinNabob.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SqueeGoblinNabob.java @@ -50,7 +50,6 @@ public class SqueeGoblinNabob extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tenthedition/StalkingTiger.java b/Mage.Sets/src/mage/sets/tenthedition/StalkingTiger.java index 7b2fa44330f..77ebdc53763 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/StalkingTiger.java +++ b/Mage.Sets/src/mage/sets/tenthedition/StalkingTiger.java @@ -47,7 +47,6 @@ public class StalkingTiger extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Cat"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/tenthedition/StampedingWildebeests.java b/Mage.Sets/src/mage/sets/tenthedition/StampedingWildebeests.java index 17a586d7be3..fa39685730c 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/StampedingWildebeests.java +++ b/Mage.Sets/src/mage/sets/tenthedition/StampedingWildebeests.java @@ -59,7 +59,6 @@ public class StampedingWildebeests extends CardImpl { this.subtype.add("Antelope"); this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SteadfastGuard.java b/Mage.Sets/src/mage/sets/tenthedition/SteadfastGuard.java index 8bab6532663..0cfb1aafcfa 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SteadfastGuard.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SteadfastGuard.java @@ -46,7 +46,6 @@ public class SteadfastGuard extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SuntailHawk.java b/Mage.Sets/src/mage/sets/tenthedition/SuntailHawk.java index 4b5545f75b0..3077f284dea 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SuntailHawk.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SuntailHawk.java @@ -45,7 +45,6 @@ public class SuntailHawk extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Bird"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tenthedition/TellingTime.java b/Mage.Sets/src/mage/sets/tenthedition/TellingTime.java index 5c969995466..7b143838c03 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/TellingTime.java +++ b/Mage.Sets/src/mage/sets/tenthedition/TellingTime.java @@ -55,7 +55,6 @@ public class TellingTime extends CardImpl { super(ownerId, 114, "Telling Time", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "10E"; - this.color.setBlue(true); // Look at the top three cards of your library. // Put one of those cards into your hand, one on top of your library, and one on the bottom of your library. diff --git a/Mage.Sets/src/mage/sets/tenthedition/Terror.java b/Mage.Sets/src/mage/sets/tenthedition/Terror.java index 1d31050c263..c526c48ad9b 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Terror.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Terror.java @@ -56,7 +56,6 @@ public class Terror extends CardImpl { super(ownerId, 182, "Terror", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "10E"; - this.color.setBlack(true); // Destroy target nonartifact, nonblack creature. It can't be regenerated. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/ThrullSurgeon.java b/Mage.Sets/src/mage/sets/tenthedition/ThrullSurgeon.java index d413d3918ec..0b1707279eb 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/ThrullSurgeon.java +++ b/Mage.Sets/src/mage/sets/tenthedition/ThrullSurgeon.java @@ -59,7 +59,6 @@ public class ThrullSurgeon extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Thrull"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tenthedition/ThunderingGiant.java b/Mage.Sets/src/mage/sets/tenthedition/ThunderingGiant.java index e8152e280d3..8e65d09f7e3 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/ThunderingGiant.java +++ b/Mage.Sets/src/mage/sets/tenthedition/ThunderingGiant.java @@ -45,7 +45,6 @@ public class ThunderingGiant extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Giant"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/tenthedition/TimeStop.java b/Mage.Sets/src/mage/sets/tenthedition/TimeStop.java index 0be23b1327f..ec254597fed 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/TimeStop.java +++ b/Mage.Sets/src/mage/sets/tenthedition/TimeStop.java @@ -43,7 +43,6 @@ public class TimeStop extends CardImpl { super(ownerId, 117, "Time Stop", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{4}{U}{U}"); this.expansionSetCode = "10E"; - this.color.setBlue(true); // End the turn. this.getSpellAbility().addEffect(new EndTurnEffect()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/TimeStretch.java b/Mage.Sets/src/mage/sets/tenthedition/TimeStretch.java index 53fb748124b..85a7cfe764f 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/TimeStretch.java +++ b/Mage.Sets/src/mage/sets/tenthedition/TimeStretch.java @@ -48,7 +48,6 @@ public class TimeStretch extends CardImpl { super(ownerId, 118, "Time Stretch", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{8}{U}{U}"); this.expansionSetCode = "10E"; - this.color.setBlue(true); // Target player takes two extra turns after this one. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/TundraWolves.java b/Mage.Sets/src/mage/sets/tenthedition/TundraWolves.java index adb7ade03ba..4e823cb2c53 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/TundraWolves.java +++ b/Mage.Sets/src/mage/sets/tenthedition/TundraWolves.java @@ -45,7 +45,6 @@ public class TundraWolves extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Wolf"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Upwelling.java b/Mage.Sets/src/mage/sets/tenthedition/Upwelling.java index 73ec09aaac8..131e69ac3ac 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Upwelling.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Upwelling.java @@ -54,7 +54,6 @@ public class Upwelling extends CardImpl { super(ownerId, 306, "Upwelling", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}"); this.expansionSetCode = "10E"; - this.color.setGreen(true); // Mana pools don't empty as steps and phases end. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UpwellingRuleEffect())); diff --git a/Mage.Sets/src/mage/sets/tenthedition/ViashinoRunner.java b/Mage.Sets/src/mage/sets/tenthedition/ViashinoRunner.java index 78a68b0a896..965ae9a7c44 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/ViashinoRunner.java +++ b/Mage.Sets/src/mage/sets/tenthedition/ViashinoRunner.java @@ -47,7 +47,6 @@ public class ViashinoRunner extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Viashino"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tenthedition/WallOfAir.java b/Mage.Sets/src/mage/sets/tenthedition/WallOfAir.java index d9c2d5103af..dbe7bb7ee56 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/WallOfAir.java +++ b/Mage.Sets/src/mage/sets/tenthedition/WallOfAir.java @@ -46,7 +46,6 @@ public class WallOfAir extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Wall"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/tenthedition/WallOfSwords.java b/Mage.Sets/src/mage/sets/tenthedition/WallOfSwords.java index f04084610be..3dd9d966708 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/WallOfSwords.java +++ b/Mage.Sets/src/mage/sets/tenthedition/WallOfSwords.java @@ -46,7 +46,6 @@ public class WallOfSwords extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Wall"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/tenthedition/WallOfWood.java b/Mage.Sets/src/mage/sets/tenthedition/WallOfWood.java index 9552b1e2b65..5e817bc0a66 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/WallOfWood.java +++ b/Mage.Sets/src/mage/sets/tenthedition/WallOfWood.java @@ -45,7 +45,6 @@ public class WallOfWood extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Wall"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/tenthedition/WrathOfGod.java b/Mage.Sets/src/mage/sets/tenthedition/WrathOfGod.java index e94a9fd848e..a1257490fec 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/WrathOfGod.java +++ b/Mage.Sets/src/mage/sets/tenthedition/WrathOfGod.java @@ -44,7 +44,6 @@ public class WrathOfGod extends CardImpl { super(ownerId, 61, "Wrath of God", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{W}{W}"); this.expansionSetCode = "10E"; - this.color.setWhite(true); // Destroy all creatures. They can't be regenerated. this.getSpellAbility().addEffect(new DestroyAllEffect(new FilterCreaturePermanent("creatures"), true)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/YouthfulKnight.java b/Mage.Sets/src/mage/sets/tenthedition/YouthfulKnight.java index c80e7851b1c..b629fecf3d0 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/YouthfulKnight.java +++ b/Mage.Sets/src/mage/sets/tenthedition/YouthfulKnight.java @@ -46,7 +46,6 @@ public class YouthfulKnight extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/thedark/BogRats.java b/Mage.Sets/src/mage/sets/thedark/BogRats.java index c9606a7497b..7522c2f1473 100644 --- a/Mage.Sets/src/mage/sets/thedark/BogRats.java +++ b/Mage.Sets/src/mage/sets/thedark/BogRats.java @@ -56,7 +56,6 @@ public class BogRats extends CardImpl { this.expansionSetCode = "DRK"; this.subtype.add("Rat"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/thedark/DustToDust.java b/Mage.Sets/src/mage/sets/thedark/DustToDust.java index 8b499dd68e0..b4fc4731b12 100644 --- a/Mage.Sets/src/mage/sets/thedark/DustToDust.java +++ b/Mage.Sets/src/mage/sets/thedark/DustToDust.java @@ -44,7 +44,6 @@ public class DustToDust extends CardImpl { super(ownerId, 78, "Dust to Dust", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{W}{W}"); this.expansionSetCode = "DRK"; - this.color.setWhite(true); // Exile two target artifacts. this.getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/thedark/GoblinDiggingTeam.java b/Mage.Sets/src/mage/sets/thedark/GoblinDiggingTeam.java index 0b0cbd48622..81b83d9866c 100644 --- a/Mage.Sets/src/mage/sets/thedark/GoblinDiggingTeam.java +++ b/Mage.Sets/src/mage/sets/thedark/GoblinDiggingTeam.java @@ -58,7 +58,6 @@ public class GoblinDiggingTeam extends CardImpl { this.expansionSetCode = "DRK"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/thedark/Inferno.java b/Mage.Sets/src/mage/sets/thedark/Inferno.java index 1f01fa40bfe..92214dbed0b 100644 --- a/Mage.Sets/src/mage/sets/thedark/Inferno.java +++ b/Mage.Sets/src/mage/sets/thedark/Inferno.java @@ -43,7 +43,6 @@ public class Inferno extends CardImpl { super(ownerId, 70, "Inferno", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{5}{R}{R}"); this.expansionSetCode = "DRK"; - this.color.setRed(true); // Inferno deals 6 damage to each creature and each player. this.getSpellAbility().addEffect(new DamageEverythingEffect(6)); diff --git a/Mage.Sets/src/mage/sets/thedark/MarshGas.java b/Mage.Sets/src/mage/sets/thedark/MarshGas.java index 3362dd266a6..b76184bc75e 100644 --- a/Mage.Sets/src/mage/sets/thedark/MarshGas.java +++ b/Mage.Sets/src/mage/sets/thedark/MarshGas.java @@ -44,7 +44,6 @@ public class MarshGas extends CardImpl { super(ownerId, 10, "Marsh Gas", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "DRK"; - this.color.setBlack(true); // All creatures get -2/-0 until end of turn. this.getSpellAbility().addEffect(new BoostAllEffect(-2, 0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/thedark/MarshGoblins.java b/Mage.Sets/src/mage/sets/thedark/MarshGoblins.java index 6994225d8cb..49561a34564 100644 --- a/Mage.Sets/src/mage/sets/thedark/MarshGoblins.java +++ b/Mage.Sets/src/mage/sets/thedark/MarshGoblins.java @@ -45,8 +45,6 @@ public class MarshGoblins extends CardImpl { this.expansionSetCode = "DRK"; this.subtype.add("Goblin"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/thedark/RagMan.java b/Mage.Sets/src/mage/sets/thedark/RagMan.java index b8952949003..b838d7b5188 100644 --- a/Mage.Sets/src/mage/sets/thedark/RagMan.java +++ b/Mage.Sets/src/mage/sets/thedark/RagMan.java @@ -61,7 +61,6 @@ public class RagMan extends CardImpl { this.subtype.add("Human"); this.subtype.add("Minion"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/thedark/ScarwoodGoblins.java b/Mage.Sets/src/mage/sets/thedark/ScarwoodGoblins.java index 1285ac90cab..38ae15beca2 100644 --- a/Mage.Sets/src/mage/sets/thedark/ScarwoodGoblins.java +++ b/Mage.Sets/src/mage/sets/thedark/ScarwoodGoblins.java @@ -44,8 +44,6 @@ public class ScarwoodGoblins extends CardImpl { this.expansionSetCode = "DRK"; this.subtype.add("Goblin"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/theros/AbhorrentOverlord.java b/Mage.Sets/src/mage/sets/theros/AbhorrentOverlord.java index 4c539c8579a..51d1da974d2 100644 --- a/Mage.Sets/src/mage/sets/theros/AbhorrentOverlord.java +++ b/Mage.Sets/src/mage/sets/theros/AbhorrentOverlord.java @@ -56,7 +56,6 @@ public class AbhorrentOverlord extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Demon"); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/theros/AgentOfHorizons.java b/Mage.Sets/src/mage/sets/theros/AgentOfHorizons.java index 59649b28cc5..54004743cce 100644 --- a/Mage.Sets/src/mage/sets/theros/AgentOfHorizons.java +++ b/Mage.Sets/src/mage/sets/theros/AgentOfHorizons.java @@ -50,7 +50,6 @@ public class AgentOfHorizons extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/AgentOfTheFates.java b/Mage.Sets/src/mage/sets/theros/AgentOfTheFates.java index 5fa9c0405d2..df0679d4073 100644 --- a/Mage.Sets/src/mage/sets/theros/AgentOfTheFates.java +++ b/Mage.Sets/src/mage/sets/theros/AgentOfTheFates.java @@ -49,7 +49,6 @@ public class AgentOfTheFates extends CardImpl { this.subtype.add("Human"); this.subtype.add("Assassin"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/AkroanCrusader.java b/Mage.Sets/src/mage/sets/theros/AkroanCrusader.java index c101e2bfd43..f9e0c288ef6 100644 --- a/Mage.Sets/src/mage/sets/theros/AkroanCrusader.java +++ b/Mage.Sets/src/mage/sets/theros/AkroanCrusader.java @@ -50,7 +50,6 @@ public class AkroanCrusader extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/AkroanHoplite.java b/Mage.Sets/src/mage/sets/theros/AkroanHoplite.java index 229d8f86f7c..8506a8de349 100644 --- a/Mage.Sets/src/mage/sets/theros/AkroanHoplite.java +++ b/Mage.Sets/src/mage/sets/theros/AkroanHoplite.java @@ -60,8 +60,6 @@ public class AkroanHoplite extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/AnaxAndCymede.java b/Mage.Sets/src/mage/sets/theros/AnaxAndCymede.java index bf723491c9f..6b89bafcdfc 100644 --- a/Mage.Sets/src/mage/sets/theros/AnaxAndCymede.java +++ b/Mage.Sets/src/mage/sets/theros/AnaxAndCymede.java @@ -58,8 +58,6 @@ public class AnaxAndCymede extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/AngerOfTheGods.java b/Mage.Sets/src/mage/sets/theros/AngerOfTheGods.java index 5c2a208ea0a..923c97bf51d 100644 --- a/Mage.Sets/src/mage/sets/theros/AngerOfTheGods.java +++ b/Mage.Sets/src/mage/sets/theros/AngerOfTheGods.java @@ -47,7 +47,6 @@ public class AngerOfTheGods extends CardImpl { super(ownerId, 112, "Anger of the Gods", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); this.expansionSetCode = "THS"; - this.color.setRed(true); // Anger of the Gods deals 3 damage to each creature. this.getSpellAbility().addEffect(new DamageAllEffect(3, new FilterCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/theros/AnthousaSetessanHero.java b/Mage.Sets/src/mage/sets/theros/AnthousaSetessanHero.java index 6f188e8c227..226f738543a 100644 --- a/Mage.Sets/src/mage/sets/theros/AnthousaSetessanHero.java +++ b/Mage.Sets/src/mage/sets/theros/AnthousaSetessanHero.java @@ -53,7 +53,6 @@ public class AnthousaSetessanHero extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/theros/AqueousForm.java b/Mage.Sets/src/mage/sets/theros/AqueousForm.java index 31a555562fd..e569a055036 100644 --- a/Mage.Sets/src/mage/sets/theros/AqueousForm.java +++ b/Mage.Sets/src/mage/sets/theros/AqueousForm.java @@ -55,7 +55,6 @@ public class AqueousForm extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/theros/ArborColossus.java b/Mage.Sets/src/mage/sets/theros/ArborColossus.java index 397fd27f968..fec2248153d 100644 --- a/Mage.Sets/src/mage/sets/theros/ArborColossus.java +++ b/Mage.Sets/src/mage/sets/theros/ArborColossus.java @@ -62,7 +62,6 @@ public class ArborColossus extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Giant"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/theros/ArenaAthlete.java b/Mage.Sets/src/mage/sets/theros/ArenaAthlete.java index ef251852a85..da32e464868 100644 --- a/Mage.Sets/src/mage/sets/theros/ArenaAthlete.java +++ b/Mage.Sets/src/mage/sets/theros/ArenaAthlete.java @@ -58,7 +58,6 @@ public class ArenaAthlete extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Human"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/ArtisanOfForms.java b/Mage.Sets/src/mage/sets/theros/ArtisanOfForms.java index 4a59843cb4c..87a97f0fdf8 100644 --- a/Mage.Sets/src/mage/sets/theros/ArtisanOfForms.java +++ b/Mage.Sets/src/mage/sets/theros/ArtisanOfForms.java @@ -54,7 +54,6 @@ public class ArtisanOfForms extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java b/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java index 2e6f8106aad..650dfe91f86 100644 --- a/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java +++ b/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java @@ -53,7 +53,6 @@ public class ArtisansSorrow extends CardImpl { super(ownerId, 151, "Artisan's Sorrow", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{G}"); this.expansionSetCode = "THS"; - this.color.setGreen(true); // Destroy target artifact or enchantment. Scry 2. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/AshenRider.java b/Mage.Sets/src/mage/sets/theros/AshenRider.java index 0ab38e6bd79..d151be09529 100644 --- a/Mage.Sets/src/mage/sets/theros/AshenRider.java +++ b/Mage.Sets/src/mage/sets/theros/AshenRider.java @@ -49,8 +49,6 @@ public class AshenRider extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Archon"); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/theros/AshiokNightmareWeaver.java b/Mage.Sets/src/mage/sets/theros/AshiokNightmareWeaver.java index 610bdfd1330..6b8c0c122cd 100644 --- a/Mage.Sets/src/mage/sets/theros/AshiokNightmareWeaver.java +++ b/Mage.Sets/src/mage/sets/theros/AshiokNightmareWeaver.java @@ -73,8 +73,6 @@ public class AshiokNightmareWeaver extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Ashiok"); - this.color.setBlue(true); - this.color.setBlack(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), false)); diff --git a/Mage.Sets/src/mage/sets/theros/AsphodelWanderer.java b/Mage.Sets/src/mage/sets/theros/AsphodelWanderer.java index 37094b7d6f5..d43acebfe0a 100644 --- a/Mage.Sets/src/mage/sets/theros/AsphodelWanderer.java +++ b/Mage.Sets/src/mage/sets/theros/AsphodelWanderer.java @@ -49,7 +49,6 @@ public class AsphodelWanderer extends CardImpl { this.subtype.add("Skeleton"); this.subtype.add("Soldier"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/BalefulEidolon.java b/Mage.Sets/src/mage/sets/theros/BalefulEidolon.java index abdf62df416..7179d92a102 100644 --- a/Mage.Sets/src/mage/sets/theros/BalefulEidolon.java +++ b/Mage.Sets/src/mage/sets/theros/BalefulEidolon.java @@ -53,7 +53,6 @@ public class BalefulEidolon extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/BattlewiseHoplite.java b/Mage.Sets/src/mage/sets/theros/BattlewiseHoplite.java index 5f5fee22c41..7d8e14b7020 100644 --- a/Mage.Sets/src/mage/sets/theros/BattlewiseHoplite.java +++ b/Mage.Sets/src/mage/sets/theros/BattlewiseHoplite.java @@ -51,8 +51,6 @@ public class BattlewiseHoplite extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/BattlewiseValor.java b/Mage.Sets/src/mage/sets/theros/BattlewiseValor.java index be9173b3ce8..0d8eedb4c6f 100644 --- a/Mage.Sets/src/mage/sets/theros/BattlewiseValor.java +++ b/Mage.Sets/src/mage/sets/theros/BattlewiseValor.java @@ -46,7 +46,6 @@ public class BattlewiseValor extends CardImpl { super(ownerId, 1, "Battlewise Valor", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "THS"; - this.color.setWhite(true); // Target creature gets +2/+2 until end of turn. Scry 1. this.getSpellAbility().addEffect(new BoostTargetEffect(2,2, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/theros/BenthicGiant.java b/Mage.Sets/src/mage/sets/theros/BenthicGiant.java index 8b13ee2f64b..da41bb36836 100644 --- a/Mage.Sets/src/mage/sets/theros/BenthicGiant.java +++ b/Mage.Sets/src/mage/sets/theros/BenthicGiant.java @@ -45,7 +45,6 @@ public class BenthicGiant extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Giant"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/theros/BidentOfThassa.java b/Mage.Sets/src/mage/sets/theros/BidentOfThassa.java index 5a8a0bb43b1..ceed96023e6 100644 --- a/Mage.Sets/src/mage/sets/theros/BidentOfThassa.java +++ b/Mage.Sets/src/mage/sets/theros/BidentOfThassa.java @@ -57,7 +57,6 @@ public class BidentOfThassa extends CardImpl { this.expansionSetCode = "THS"; this.supertype.add("Legendary"); - this.color.setBlue(true); // Whenever a creature you control deals combat damage to a player, you may draw a card. this.addAbility(new BidentOfThassaTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/theros/BloodTollHarpy.java b/Mage.Sets/src/mage/sets/theros/BloodTollHarpy.java index bcf2f9428c7..7f4d20bb9a9 100644 --- a/Mage.Sets/src/mage/sets/theros/BloodTollHarpy.java +++ b/Mage.Sets/src/mage/sets/theros/BloodTollHarpy.java @@ -48,7 +48,6 @@ public class BloodTollHarpy extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Harpy"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/BoonOfErebos.java b/Mage.Sets/src/mage/sets/theros/BoonOfErebos.java index a06d2bfd477..74afa663602 100644 --- a/Mage.Sets/src/mage/sets/theros/BoonOfErebos.java +++ b/Mage.Sets/src/mage/sets/theros/BoonOfErebos.java @@ -47,7 +47,6 @@ public class BoonOfErebos extends CardImpl { super(ownerId, 80, "Boon of Erebos", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "THS"; - this.color.setBlack(true); // Target creature gets +2/+0 until end of turn. Regenerate it. You lose 2 life. this.getSpellAbility().addEffect(new BoostTargetEffect(2,0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/theros/BoonSatyr.java b/Mage.Sets/src/mage/sets/theros/BoonSatyr.java index 81f9f392f22..95ddcbe4101 100644 --- a/Mage.Sets/src/mage/sets/theros/BoonSatyr.java +++ b/Mage.Sets/src/mage/sets/theros/BoonSatyr.java @@ -50,7 +50,6 @@ public class BoonSatyr extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Satyr"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/BorderlandMinotaur.java b/Mage.Sets/src/mage/sets/theros/BorderlandMinotaur.java index 413b7369e06..7f29d6ddd38 100644 --- a/Mage.Sets/src/mage/sets/theros/BorderlandMinotaur.java +++ b/Mage.Sets/src/mage/sets/theros/BorderlandMinotaur.java @@ -45,7 +45,6 @@ public class BorderlandMinotaur extends CardImpl { this.subtype.add("Minotaur"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/theros/Boulderfall.java b/Mage.Sets/src/mage/sets/theros/Boulderfall.java index 467a9eadc01..bd225ac9a4f 100644 --- a/Mage.Sets/src/mage/sets/theros/Boulderfall.java +++ b/Mage.Sets/src/mage/sets/theros/Boulderfall.java @@ -44,7 +44,6 @@ public class Boulderfall extends CardImpl { super(ownerId, 115, "Boulderfall", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{6}{R}{R}"); this.expansionSetCode = "THS"; - this.color.setRed(true); // Boulderfall deals 5 damage divided as you choose among any number of target creatures and/or players. this.getSpellAbility().addEffect(new DamageMultiEffect(5)); diff --git a/Mage.Sets/src/mage/sets/theros/BowOfNylea.java b/Mage.Sets/src/mage/sets/theros/BowOfNylea.java index 22b932f7c19..3dcebe80f6d 100644 --- a/Mage.Sets/src/mage/sets/theros/BowOfNylea.java +++ b/Mage.Sets/src/mage/sets/theros/BowOfNylea.java @@ -77,7 +77,6 @@ public class BowOfNylea extends CardImpl { this.expansionSetCode = "THS"; this.supertype.add("Legendary"); - this.color.setGreen(true); // Attacking creatures you control have deathtouch. GainAbilityControlledEffect gainEffect = new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, new FilterAttackingCreature("Attacking creatures"), false); diff --git a/Mage.Sets/src/mage/sets/theros/BreachingHippocamp.java b/Mage.Sets/src/mage/sets/theros/BreachingHippocamp.java index cace4010b5d..db053bdc7f9 100644 --- a/Mage.Sets/src/mage/sets/theros/BreachingHippocamp.java +++ b/Mage.Sets/src/mage/sets/theros/BreachingHippocamp.java @@ -57,7 +57,6 @@ public class BreachingHippocamp extends CardImpl { this.subtype.add("Horse"); this.subtype.add("Fish"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/CavernLampad.java b/Mage.Sets/src/mage/sets/theros/CavernLampad.java index 429588d48d7..3d75d5a5363 100644 --- a/Mage.Sets/src/mage/sets/theros/CavernLampad.java +++ b/Mage.Sets/src/mage/sets/theros/CavernLampad.java @@ -53,7 +53,6 @@ public class CavernLampad extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Nymph"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/CelestialArchon.java b/Mage.Sets/src/mage/sets/theros/CelestialArchon.java index ab577eee323..01b47cc5f03 100644 --- a/Mage.Sets/src/mage/sets/theros/CelestialArchon.java +++ b/Mage.Sets/src/mage/sets/theros/CelestialArchon.java @@ -54,7 +54,6 @@ public class CelestialArchon extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Archon"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/theros/CentaurBattlemaster.java b/Mage.Sets/src/mage/sets/theros/CentaurBattlemaster.java index 6295de215b1..3801626c294 100644 --- a/Mage.Sets/src/mage/sets/theros/CentaurBattlemaster.java +++ b/Mage.Sets/src/mage/sets/theros/CentaurBattlemaster.java @@ -48,7 +48,6 @@ public class CentaurBattlemaster extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java b/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java index 401616dcdaf..a5d3a0e0246 100644 --- a/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java +++ b/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java @@ -96,7 +96,6 @@ public class ChainedToTheRocks extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant Mountain you control TargetPermanent auraTarget = new TargetPermanent(filter); diff --git a/Mage.Sets/src/mage/sets/theros/ChosenByHeliod.java b/Mage.Sets/src/mage/sets/theros/ChosenByHeliod.java index d3934787fdf..a79be597527 100644 --- a/Mage.Sets/src/mage/sets/theros/ChosenByHeliod.java +++ b/Mage.Sets/src/mage/sets/theros/ChosenByHeliod.java @@ -55,7 +55,6 @@ public class ChosenByHeliod extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/theros/ChroniclerOfHeroes.java b/Mage.Sets/src/mage/sets/theros/ChroniclerOfHeroes.java index ef0c8281c70..ab703f25eba 100644 --- a/Mage.Sets/src/mage/sets/theros/ChroniclerOfHeroes.java +++ b/Mage.Sets/src/mage/sets/theros/ChroniclerOfHeroes.java @@ -57,8 +57,6 @@ public class ChroniclerOfHeroes extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Wizard"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/CoastlineChimera.java b/Mage.Sets/src/mage/sets/theros/CoastlineChimera.java index 0e8a9212c47..bc743db02ef 100644 --- a/Mage.Sets/src/mage/sets/theros/CoastlineChimera.java +++ b/Mage.Sets/src/mage/sets/theros/CoastlineChimera.java @@ -50,7 +50,6 @@ public class CoastlineChimera extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Chimera"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/theros/CommuneWithTheGods.java b/Mage.Sets/src/mage/sets/theros/CommuneWithTheGods.java index d69861c23d8..dd65dd81d13 100644 --- a/Mage.Sets/src/mage/sets/theros/CommuneWithTheGods.java +++ b/Mage.Sets/src/mage/sets/theros/CommuneWithTheGods.java @@ -56,7 +56,6 @@ public class CommuneWithTheGods extends CardImpl { super(ownerId, 155, "Commune with the Gods", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "THS"; - this.color.setGreen(true); // Reveal the top five cards of your library. You may put a creature or enchantment card from among them into your hand. Put the rest into your graveyard. this.getSpellAbility().addEffect(new CommuneWithTheGodsEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/CoordinatedAssault.java b/Mage.Sets/src/mage/sets/theros/CoordinatedAssault.java index 96315b07891..cb4aaaf72cf 100644 --- a/Mage.Sets/src/mage/sets/theros/CoordinatedAssault.java +++ b/Mage.Sets/src/mage/sets/theros/CoordinatedAssault.java @@ -48,7 +48,6 @@ public class CoordinatedAssault extends CardImpl { super(ownerId, 116, "Coordinated Assault", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "THS"; - this.color.setRed(true); // Up to two target creatures each get +1/+0 and gain first strike until end of turn. Effect effect = new BoostTargetEffect(1,0, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/sets/theros/CracklingTriton.java b/Mage.Sets/src/mage/sets/theros/CracklingTriton.java index e346bea0cd6..520de8f77c0 100644 --- a/Mage.Sets/src/mage/sets/theros/CracklingTriton.java +++ b/Mage.Sets/src/mage/sets/theros/CracklingTriton.java @@ -52,7 +52,6 @@ public class CracklingTriton extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/CurseOfTheSwine.java b/Mage.Sets/src/mage/sets/theros/CurseOfTheSwine.java index 3a12ca4317e..3eba8d73975 100644 --- a/Mage.Sets/src/mage/sets/theros/CurseOfTheSwine.java +++ b/Mage.Sets/src/mage/sets/theros/CurseOfTheSwine.java @@ -52,7 +52,6 @@ public class CurseOfTheSwine extends CardImpl { super(ownerId, 46, "Curse of the Swine", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{U}{U}"); this.expansionSetCode = "THS"; - this.color.setBlue(true); // Exile X target creatures. For each creature exiled this way, its controller puts a 2/2 green Boar creature token onto the battlefield. this.getSpellAbility().addEffect(new CurseOfTheSwineEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/CutthroatManeuver.java b/Mage.Sets/src/mage/sets/theros/CutthroatManeuver.java index 2d6084f6e39..0b927489b92 100644 --- a/Mage.Sets/src/mage/sets/theros/CutthroatManeuver.java +++ b/Mage.Sets/src/mage/sets/theros/CutthroatManeuver.java @@ -48,7 +48,6 @@ public class CutthroatManeuver extends CardImpl { super(ownerId, 82, "Cutthroat Maneuver", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{B}"); this.expansionSetCode = "THS"; - this.color.setBlack(true); // Up to two target creatures each get +1/+1 and gain lifelink until end of turn. Effect effect = new BoostTargetEffect(1,1, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/sets/theros/DarkBetrayal.java b/Mage.Sets/src/mage/sets/theros/DarkBetrayal.java index e9455993b17..66d785f6be0 100644 --- a/Mage.Sets/src/mage/sets/theros/DarkBetrayal.java +++ b/Mage.Sets/src/mage/sets/theros/DarkBetrayal.java @@ -53,7 +53,6 @@ public class DarkBetrayal extends CardImpl { super(ownerId, 83, "Dark Betrayal", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "THS"; - this.color.setBlack(true); // Destroy target black creature. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/DauntlessOnslaught.java b/Mage.Sets/src/mage/sets/theros/DauntlessOnslaught.java index d06e6dc2289..0d6764b6078 100644 --- a/Mage.Sets/src/mage/sets/theros/DauntlessOnslaught.java +++ b/Mage.Sets/src/mage/sets/theros/DauntlessOnslaught.java @@ -46,7 +46,6 @@ public class DauntlessOnslaught extends CardImpl { super(ownerId, 6, "Dauntless Onslaught", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "THS"; - this.color.setWhite(true); // Up to two target creatures each get +2/+2 until end of turn. Effect effect = new BoostTargetEffect(2,2, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/sets/theros/DaxosOfMeletis.java b/Mage.Sets/src/mage/sets/theros/DaxosOfMeletis.java index a561322d07f..d2023b4d810 100644 --- a/Mage.Sets/src/mage/sets/theros/DaxosOfMeletis.java +++ b/Mage.Sets/src/mage/sets/theros/DaxosOfMeletis.java @@ -72,8 +72,6 @@ public class DaxosOfMeletis extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/DeathbellowRaider.java b/Mage.Sets/src/mage/sets/theros/DeathbellowRaider.java index 51efde48373..f239c663691 100644 --- a/Mage.Sets/src/mage/sets/theros/DeathbellowRaider.java +++ b/Mage.Sets/src/mage/sets/theros/DeathbellowRaider.java @@ -52,7 +52,6 @@ public class DeathbellowRaider extends CardImpl { this.subtype.add("Minotaur"); this.subtype.add("Berserker"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/DecoratedGriffin.java b/Mage.Sets/src/mage/sets/theros/DecoratedGriffin.java index 6491ee3b441..a9072789ee2 100644 --- a/Mage.Sets/src/mage/sets/theros/DecoratedGriffin.java +++ b/Mage.Sets/src/mage/sets/theros/DecoratedGriffin.java @@ -53,7 +53,6 @@ public class DecoratedGriffin extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Griffin"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/DefendTheHearth.java b/Mage.Sets/src/mage/sets/theros/DefendTheHearth.java index 7bc637600b1..e2db75fb257 100644 --- a/Mage.Sets/src/mage/sets/theros/DefendTheHearth.java +++ b/Mage.Sets/src/mage/sets/theros/DefendTheHearth.java @@ -44,7 +44,6 @@ public class DefendTheHearth extends CardImpl { super(ownerId, 156, "Defend the Hearth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "THS"; - this.color.setGreen(true); // Prevent all combat damage that would be dealt to players this turn. this.getSpellAbility().addEffect(new PreventAllDamageToPlayersEffect(Duration.EndOfTurn, true)); diff --git a/Mage.Sets/src/mage/sets/theros/DestructiveRevelry.java b/Mage.Sets/src/mage/sets/theros/DestructiveRevelry.java index c6d3eff004b..9bc8aeda091 100644 --- a/Mage.Sets/src/mage/sets/theros/DestructiveRevelry.java +++ b/Mage.Sets/src/mage/sets/theros/DestructiveRevelry.java @@ -58,8 +58,6 @@ public class DestructiveRevelry extends CardImpl { super(ownerId, 192, "Destructive Revelry", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}{G}"); this.expansionSetCode = "THS"; - this.color.setRed(true); - this.color.setGreen(true); // Destroy target artifact or enchantment. Destructive Revelry deals 2 damage to that permanent's controller. this.getSpellAbility().addEffect(new DestructiveRevelryEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java b/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java index 3b46e08e93c..713044ba4c4 100644 --- a/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java +++ b/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java @@ -62,7 +62,6 @@ public class DiscipleOfPhenax extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/Dissolve.java b/Mage.Sets/src/mage/sets/theros/Dissolve.java index 57463f64bc5..f22097154a6 100644 --- a/Mage.Sets/src/mage/sets/theros/Dissolve.java +++ b/Mage.Sets/src/mage/sets/theros/Dissolve.java @@ -47,7 +47,6 @@ public class Dissolve extends CardImpl { super(ownerId, 47, "Dissolve", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{U}"); this.expansionSetCode = "THS"; - this.color.setBlue(true); // Counter target spell. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/DragonMantle.java b/Mage.Sets/src/mage/sets/theros/DragonMantle.java index 4ce9cd7335a..af8d912deee 100644 --- a/Mage.Sets/src/mage/sets/theros/DragonMantle.java +++ b/Mage.Sets/src/mage/sets/theros/DragonMantle.java @@ -59,7 +59,6 @@ public class DragonMantle extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/theros/ElspethSunsChampion.java b/Mage.Sets/src/mage/sets/theros/ElspethSunsChampion.java index 5b9a2ebf646..ec4d805c92a 100644 --- a/Mage.Sets/src/mage/sets/theros/ElspethSunsChampion.java +++ b/Mage.Sets/src/mage/sets/theros/ElspethSunsChampion.java @@ -67,7 +67,6 @@ public class ElspethSunsChampion extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Elspeth"); - this.color.setWhite(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false)); diff --git a/Mage.Sets/src/mage/sets/theros/EmberSwallower.java b/Mage.Sets/src/mage/sets/theros/EmberSwallower.java index db1181ba97e..ddca6c74f4c 100644 --- a/Mage.Sets/src/mage/sets/theros/EmberSwallower.java +++ b/Mage.Sets/src/mage/sets/theros/EmberSwallower.java @@ -48,7 +48,6 @@ public class EmberSwallower extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/theros/EpharasWarden.java b/Mage.Sets/src/mage/sets/theros/EpharasWarden.java index aa1b8e0d741..c6adf4a34d3 100644 --- a/Mage.Sets/src/mage/sets/theros/EpharasWarden.java +++ b/Mage.Sets/src/mage/sets/theros/EpharasWarden.java @@ -60,7 +60,6 @@ public class EpharasWarden extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/ErebosGodOfTheDead.java b/Mage.Sets/src/mage/sets/theros/ErebosGodOfTheDead.java index 0053b7a5b14..01b1f78cff0 100644 --- a/Mage.Sets/src/mage/sets/theros/ErebosGodOfTheDead.java +++ b/Mage.Sets/src/mage/sets/theros/ErebosGodOfTheDead.java @@ -64,7 +64,6 @@ public class ErebosGodOfTheDead extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("God"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/theros/ErebossEmissary.java b/Mage.Sets/src/mage/sets/theros/ErebossEmissary.java index 9b6a9a7b185..82474a7acf6 100644 --- a/Mage.Sets/src/mage/sets/theros/ErebossEmissary.java +++ b/Mage.Sets/src/mage/sets/theros/ErebossEmissary.java @@ -56,7 +56,6 @@ public class ErebossEmissary extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Snake"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/EvangelOfHeliod.java b/Mage.Sets/src/mage/sets/theros/EvangelOfHeliod.java index 49b1d4304e8..21614846b7b 100644 --- a/Mage.Sets/src/mage/sets/theros/EvangelOfHeliod.java +++ b/Mage.Sets/src/mage/sets/theros/EvangelOfHeliod.java @@ -51,7 +51,6 @@ public class EvangelOfHeliod extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/FabledHero.java b/Mage.Sets/src/mage/sets/theros/FabledHero.java index 892afa491a4..45626438478 100644 --- a/Mage.Sets/src/mage/sets/theros/FabledHero.java +++ b/Mage.Sets/src/mage/sets/theros/FabledHero.java @@ -49,7 +49,6 @@ public class FabledHero extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/FadeIntoAntiquity.java b/Mage.Sets/src/mage/sets/theros/FadeIntoAntiquity.java index 7d6c664f55b..c8219d81ebf 100644 --- a/Mage.Sets/src/mage/sets/theros/FadeIntoAntiquity.java +++ b/Mage.Sets/src/mage/sets/theros/FadeIntoAntiquity.java @@ -53,7 +53,6 @@ public class FadeIntoAntiquity extends CardImpl { super(ownerId, 157, "Fade into Antiquity", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "THS"; - this.color.setGreen(true); // Exile target artifact or enchantment. this.getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/FanaticOfMogis.java b/Mage.Sets/src/mage/sets/theros/FanaticOfMogis.java index 55a61ce63f6..1545afbf97b 100644 --- a/Mage.Sets/src/mage/sets/theros/FanaticOfMogis.java +++ b/Mage.Sets/src/mage/sets/theros/FanaticOfMogis.java @@ -52,7 +52,6 @@ public class FanaticOfMogis extends CardImpl { this.subtype.add("Minotaur"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/FateForetold.java b/Mage.Sets/src/mage/sets/theros/FateForetold.java index 669c0fa76eb..a487109fc9a 100644 --- a/Mage.Sets/src/mage/sets/theros/FateForetold.java +++ b/Mage.Sets/src/mage/sets/theros/FateForetold.java @@ -52,7 +52,6 @@ public class FateForetold extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/theros/FavoredHoplite.java b/Mage.Sets/src/mage/sets/theros/FavoredHoplite.java index 53dd4f39c0f..95e376fb4aa 100644 --- a/Mage.Sets/src/mage/sets/theros/FavoredHoplite.java +++ b/Mage.Sets/src/mage/sets/theros/FavoredHoplite.java @@ -51,7 +51,6 @@ public class FavoredHoplite extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/FelhideMinotaur.java b/Mage.Sets/src/mage/sets/theros/FelhideMinotaur.java index 72aa3fbebc0..a3a1555254d 100644 --- a/Mage.Sets/src/mage/sets/theros/FelhideMinotaur.java +++ b/Mage.Sets/src/mage/sets/theros/FelhideMinotaur.java @@ -44,7 +44,6 @@ public class FelhideMinotaur extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Minotaur"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/theros/FeralInvocation.java b/Mage.Sets/src/mage/sets/theros/FeralInvocation.java index a1e8a3dc2ee..3133e8ab2b9 100644 --- a/Mage.Sets/src/mage/sets/theros/FeralInvocation.java +++ b/Mage.Sets/src/mage/sets/theros/FeralInvocation.java @@ -54,7 +54,6 @@ public class FeralInvocation extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setGreen(true); // Flash this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/theros/FiredrinkerSatyr.java b/Mage.Sets/src/mage/sets/theros/FiredrinkerSatyr.java index 2d4a145f51f..3feb346fdf2 100644 --- a/Mage.Sets/src/mage/sets/theros/FiredrinkerSatyr.java +++ b/Mage.Sets/src/mage/sets/theros/FiredrinkerSatyr.java @@ -58,7 +58,6 @@ public class FiredrinkerSatyr extends CardImpl { this.subtype.add("Satyr"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/FlamespeakerAdept.java b/Mage.Sets/src/mage/sets/theros/FlamespeakerAdept.java index 05777e3d767..519b16ce3d6 100644 --- a/Mage.Sets/src/mage/sets/theros/FlamespeakerAdept.java +++ b/Mage.Sets/src/mage/sets/theros/FlamespeakerAdept.java @@ -54,7 +54,6 @@ public class FlamespeakerAdept extends CardImpl { this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/FleecemaneLion.java b/Mage.Sets/src/mage/sets/theros/FleecemaneLion.java index d486e342626..9a82f0a8b18 100644 --- a/Mage.Sets/src/mage/sets/theros/FleecemaneLion.java +++ b/Mage.Sets/src/mage/sets/theros/FleecemaneLion.java @@ -55,8 +55,6 @@ public class FleecemaneLion extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Cat"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/FleshmadSteed.java b/Mage.Sets/src/mage/sets/theros/FleshmadSteed.java index ecd68c8575c..d5339326074 100644 --- a/Mage.Sets/src/mage/sets/theros/FleshmadSteed.java +++ b/Mage.Sets/src/mage/sets/theros/FleshmadSteed.java @@ -53,7 +53,6 @@ public class FleshmadSteed extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Horse"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/Gainsay.java b/Mage.Sets/src/mage/sets/theros/Gainsay.java index 841843664e7..3a8125cfaff 100644 --- a/Mage.Sets/src/mage/sets/theros/Gainsay.java +++ b/Mage.Sets/src/mage/sets/theros/Gainsay.java @@ -53,7 +53,6 @@ public class Gainsay extends CardImpl { super(ownerId, 49, "Gainsay", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "THS"; - this.color.setBlue(true); // Counter target blue spell. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/GiftOfImmortality.java b/Mage.Sets/src/mage/sets/theros/GiftOfImmortality.java index 29fab265fd6..e2652db7329 100644 --- a/Mage.Sets/src/mage/sets/theros/GiftOfImmortality.java +++ b/Mage.Sets/src/mage/sets/theros/GiftOfImmortality.java @@ -59,7 +59,6 @@ public class GiftOfImmortality extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/theros/GlareOfHeresy.java b/Mage.Sets/src/mage/sets/theros/GlareOfHeresy.java index c12b93a613f..fb0c02497e2 100644 --- a/Mage.Sets/src/mage/sets/theros/GlareOfHeresy.java +++ b/Mage.Sets/src/mage/sets/theros/GlareOfHeresy.java @@ -52,7 +52,6 @@ public class GlareOfHeresy extends CardImpl { super(ownerId, 15, "Glare of Heresy", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{W}"); this.expansionSetCode = "THS"; - this.color.setWhite(true); // Exile target white permanent. this.getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/GodsWilling.java b/Mage.Sets/src/mage/sets/theros/GodsWilling.java index 5ca28be2c67..821ed08b709 100644 --- a/Mage.Sets/src/mage/sets/theros/GodsWilling.java +++ b/Mage.Sets/src/mage/sets/theros/GodsWilling.java @@ -46,7 +46,6 @@ public class GodsWilling extends CardImpl { super(ownerId, 16, "Gods Willing", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "THS"; - this.color.setWhite(true); // Target creature you control gains protection from the color of your choice until end of turn. Scry 1. this.getSpellAbility().addEffect(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/theros/GrayMerchantOfAsphodel.java b/Mage.Sets/src/mage/sets/theros/GrayMerchantOfAsphodel.java index 38bcd012eeb..55aa5d01ca2 100644 --- a/Mage.Sets/src/mage/sets/theros/GrayMerchantOfAsphodel.java +++ b/Mage.Sets/src/mage/sets/theros/GrayMerchantOfAsphodel.java @@ -52,7 +52,6 @@ public class GrayMerchantOfAsphodel extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/theros/HammerOfPurphoros.java b/Mage.Sets/src/mage/sets/theros/HammerOfPurphoros.java index 59de57b22d8..640ee18e60b 100644 --- a/Mage.Sets/src/mage/sets/theros/HammerOfPurphoros.java +++ b/Mage.Sets/src/mage/sets/theros/HammerOfPurphoros.java @@ -60,7 +60,6 @@ public class HammerOfPurphoros extends CardImpl { this.expansionSetCode = "THS"; this.supertype.add("Legendary"); - this.color.setRed(true); // Creatures you control have haste. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/sets/theros/HeliodGodOfTheSun.java b/Mage.Sets/src/mage/sets/theros/HeliodGodOfTheSun.java index bc59cbd86dc..7cdc1f52612 100644 --- a/Mage.Sets/src/mage/sets/theros/HeliodGodOfTheSun.java +++ b/Mage.Sets/src/mage/sets/theros/HeliodGodOfTheSun.java @@ -60,7 +60,6 @@ public class HeliodGodOfTheSun extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("God"); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/theros/HeliodsEmissary.java b/Mage.Sets/src/mage/sets/theros/HeliodsEmissary.java index b20c1ebc7bc..ac866a16f09 100644 --- a/Mage.Sets/src/mage/sets/theros/HeliodsEmissary.java +++ b/Mage.Sets/src/mage/sets/theros/HeliodsEmissary.java @@ -64,7 +64,6 @@ public class HeliodsEmissary extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Elk"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/HerosDownfall.java b/Mage.Sets/src/mage/sets/theros/HerosDownfall.java index c710e11b1e8..638ad81a71d 100644 --- a/Mage.Sets/src/mage/sets/theros/HerosDownfall.java +++ b/Mage.Sets/src/mage/sets/theros/HerosDownfall.java @@ -53,7 +53,6 @@ public class HerosDownfall extends CardImpl { super(ownerId, 90, "Hero's Downfall", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{B}{B}"); this.expansionSetCode = "THS"; - this.color.setBlack(true); // Destroy target creature or planeswalker. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/HopefulEidolon.java b/Mage.Sets/src/mage/sets/theros/HopefulEidolon.java index becd1f03f7b..d35fe02f45d 100644 --- a/Mage.Sets/src/mage/sets/theros/HopefulEidolon.java +++ b/Mage.Sets/src/mage/sets/theros/HopefulEidolon.java @@ -53,7 +53,6 @@ public class HopefulEidolon extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/HorizonChimera.java b/Mage.Sets/src/mage/sets/theros/HorizonChimera.java index 507c0b6c3ec..65abacbadd4 100644 --- a/Mage.Sets/src/mage/sets/theros/HorizonChimera.java +++ b/Mage.Sets/src/mage/sets/theros/HorizonChimera.java @@ -49,8 +49,6 @@ public class HorizonChimera extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Chimera"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/HorizonScholar.java b/Mage.Sets/src/mage/sets/theros/HorizonScholar.java index 65275b9de94..944013fd79c 100644 --- a/Mage.Sets/src/mage/sets/theros/HorizonScholar.java +++ b/Mage.Sets/src/mage/sets/theros/HorizonScholar.java @@ -47,7 +47,6 @@ public class HorizonScholar extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Sphinx"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/theros/HundredHandedOne.java b/Mage.Sets/src/mage/sets/theros/HundredHandedOne.java index 2d266f54ca5..b78a23acb8c 100644 --- a/Mage.Sets/src/mage/sets/theros/HundredHandedOne.java +++ b/Mage.Sets/src/mage/sets/theros/HundredHandedOne.java @@ -55,7 +55,6 @@ public class HundredHandedOne extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Giant"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/theros/HuntTheHunter.java b/Mage.Sets/src/mage/sets/theros/HuntTheHunter.java index 876d1359f2b..eeaa2222a26 100644 --- a/Mage.Sets/src/mage/sets/theros/HuntTheHunter.java +++ b/Mage.Sets/src/mage/sets/theros/HuntTheHunter.java @@ -63,7 +63,6 @@ public class HuntTheHunter extends CardImpl { super(ownerId, 159, "Hunt the Hunter", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{G}"); this.expansionSetCode = "THS"; - this.color.setGreen(true); // Target green creature you control gets +2/+2 until end of turn. It fights target green creature an opponent controls. Effect effect = new BoostTargetEffect(2,2, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/sets/theros/HythoniaTheCruel.java b/Mage.Sets/src/mage/sets/theros/HythoniaTheCruel.java index c01326b6748..6b335eb810d 100644 --- a/Mage.Sets/src/mage/sets/theros/HythoniaTheCruel.java +++ b/Mage.Sets/src/mage/sets/theros/HythoniaTheCruel.java @@ -58,7 +58,6 @@ public class HythoniaTheCruel extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Gorgon"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/theros/IllTemperedCyclops.java b/Mage.Sets/src/mage/sets/theros/IllTemperedCyclops.java index c33ea6299b3..6bc0cba3cab 100644 --- a/Mage.Sets/src/mage/sets/theros/IllTemperedCyclops.java +++ b/Mage.Sets/src/mage/sets/theros/IllTemperedCyclops.java @@ -46,7 +46,6 @@ public class IllTemperedCyclops extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Cyclops"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/InsatiableHarpy.java b/Mage.Sets/src/mage/sets/theros/InsatiableHarpy.java index 04e53184570..69f125a009a 100644 --- a/Mage.Sets/src/mage/sets/theros/InsatiableHarpy.java +++ b/Mage.Sets/src/mage/sets/theros/InsatiableHarpy.java @@ -46,7 +46,6 @@ public class InsatiableHarpy extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Harpy"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/KarametrasAcolyte.java b/Mage.Sets/src/mage/sets/theros/KarametrasAcolyte.java index ab182d9bc86..32db880b516 100644 --- a/Mage.Sets/src/mage/sets/theros/KarametrasAcolyte.java +++ b/Mage.Sets/src/mage/sets/theros/KarametrasAcolyte.java @@ -49,7 +49,6 @@ public class KarametrasAcolyte extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/theros/KeepsakeGorgon.java b/Mage.Sets/src/mage/sets/theros/KeepsakeGorgon.java index afece5a7b94..7af9ffd97ab 100644 --- a/Mage.Sets/src/mage/sets/theros/KeepsakeGorgon.java +++ b/Mage.Sets/src/mage/sets/theros/KeepsakeGorgon.java @@ -62,7 +62,6 @@ public class KeepsakeGorgon extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Gorgon"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/theros/KragmaWarcaller.java b/Mage.Sets/src/mage/sets/theros/KragmaWarcaller.java index 1abc6799c48..e8fbed3f545 100644 --- a/Mage.Sets/src/mage/sets/theros/KragmaWarcaller.java +++ b/Mage.Sets/src/mage/sets/theros/KragmaWarcaller.java @@ -61,8 +61,6 @@ public class KragmaWarcaller extends CardImpl { this.subtype.add("Minotaur"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/LabyrinthChampion.java b/Mage.Sets/src/mage/sets/theros/LabyrinthChampion.java index 63e2f90a364..3738811fc7e 100644 --- a/Mage.Sets/src/mage/sets/theros/LabyrinthChampion.java +++ b/Mage.Sets/src/mage/sets/theros/LabyrinthChampion.java @@ -49,7 +49,6 @@ public class LabyrinthChampion extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/LagonnaBandElder.java b/Mage.Sets/src/mage/sets/theros/LagonnaBandElder.java index f0b713f6d62..5c02f155313 100644 --- a/Mage.Sets/src/mage/sets/theros/LagonnaBandElder.java +++ b/Mage.Sets/src/mage/sets/theros/LagonnaBandElder.java @@ -51,7 +51,6 @@ public class LagonnaBandElder extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Advisor"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/LashOfTheWhip.java b/Mage.Sets/src/mage/sets/theros/LashOfTheWhip.java index 938b8b6b2fe..bd9fe4c1b88 100644 --- a/Mage.Sets/src/mage/sets/theros/LashOfTheWhip.java +++ b/Mage.Sets/src/mage/sets/theros/LashOfTheWhip.java @@ -45,7 +45,6 @@ public class LashOfTheWhip extends CardImpl { super(ownerId, 94, "Lash of the Whip", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{B}"); this.expansionSetCode = "THS"; - this.color.setBlack(true); // Target creature gets -4/-4 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-4,-4, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/theros/LeafcrownDryad.java b/Mage.Sets/src/mage/sets/theros/LeafcrownDryad.java index 519b4b62fe4..204b0d20691 100644 --- a/Mage.Sets/src/mage/sets/theros/LeafcrownDryad.java +++ b/Mage.Sets/src/mage/sets/theros/LeafcrownDryad.java @@ -55,7 +55,6 @@ public class LeafcrownDryad extends CardImpl { this.subtype.add("Nymph"); this.subtype.add("Dryad"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/LeoninSnarecaster.java b/Mage.Sets/src/mage/sets/theros/LeoninSnarecaster.java index 5fe6f484162..3a240e99e70 100644 --- a/Mage.Sets/src/mage/sets/theros/LeoninSnarecaster.java +++ b/Mage.Sets/src/mage/sets/theros/LeoninSnarecaster.java @@ -49,7 +49,6 @@ public class LeoninSnarecaster extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/LightningStrike.java b/Mage.Sets/src/mage/sets/theros/LightningStrike.java index afa94a1912e..6d1bd0c228d 100644 --- a/Mage.Sets/src/mage/sets/theros/LightningStrike.java +++ b/Mage.Sets/src/mage/sets/theros/LightningStrike.java @@ -44,7 +44,6 @@ public class LightningStrike extends CardImpl { super(ownerId, 127, "Lightning Strike", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "THS"; - this.color.setRed(true); // Lightning Strike deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/theros/LoathsomeCatoblepas.java b/Mage.Sets/src/mage/sets/theros/LoathsomeCatoblepas.java index 828b610e98b..eeebbd8a484 100644 --- a/Mage.Sets/src/mage/sets/theros/LoathsomeCatoblepas.java +++ b/Mage.Sets/src/mage/sets/theros/LoathsomeCatoblepas.java @@ -62,7 +62,6 @@ public class LoathsomeCatoblepas extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Beast"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/LostInALabyrinth.java b/Mage.Sets/src/mage/sets/theros/LostInALabyrinth.java index 1e2b024a7e9..1e80dfb316a 100644 --- a/Mage.Sets/src/mage/sets/theros/LostInALabyrinth.java +++ b/Mage.Sets/src/mage/sets/theros/LostInALabyrinth.java @@ -46,7 +46,6 @@ public class LostInALabyrinth extends CardImpl { super(ownerId, 52, "Lost in a Labyrinth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "THS"; - this.color.setBlue(true); // Target creature gets -3/-0 until end of turn. Scry 1. this.getSpellAbility().addEffect(new BoostTargetEffect(-3,-0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/theros/MarchOfTheReturned.java b/Mage.Sets/src/mage/sets/theros/MarchOfTheReturned.java index 4ba1d673803..f2d441daeb7 100644 --- a/Mage.Sets/src/mage/sets/theros/MarchOfTheReturned.java +++ b/Mage.Sets/src/mage/sets/theros/MarchOfTheReturned.java @@ -46,7 +46,6 @@ public class MarchOfTheReturned extends CardImpl { super(ownerId, 96, "March of the Returned", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "THS"; - this.color.setBlack(true); // Return up to two target creature cards from your graveyard to your hand. this.getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/MasterOfWaves.java b/Mage.Sets/src/mage/sets/theros/MasterOfWaves.java index bf0927fcace..e820c099aa3 100644 --- a/Mage.Sets/src/mage/sets/theros/MasterOfWaves.java +++ b/Mage.Sets/src/mage/sets/theros/MasterOfWaves.java @@ -68,7 +68,6 @@ public class MasterOfWaves extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/MedomaiTheAgeless.java b/Mage.Sets/src/mage/sets/theros/MedomaiTheAgeless.java index a0e28781dcf..d65c2a269e2 100644 --- a/Mage.Sets/src/mage/sets/theros/MedomaiTheAgeless.java +++ b/Mage.Sets/src/mage/sets/theros/MedomaiTheAgeless.java @@ -57,8 +57,6 @@ public class MedomaiTheAgeless extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Sphinx"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/theros/MeletisCharlatan.java b/Mage.Sets/src/mage/sets/theros/MeletisCharlatan.java index b925757ca26..366b4010eb7 100644 --- a/Mage.Sets/src/mage/sets/theros/MeletisCharlatan.java +++ b/Mage.Sets/src/mage/sets/theros/MeletisCharlatan.java @@ -67,7 +67,6 @@ public class MeletisCharlatan extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/MessengersSpeed.java b/Mage.Sets/src/mage/sets/theros/MessengersSpeed.java index f518fdb148b..df7991a5fb5 100644 --- a/Mage.Sets/src/mage/sets/theros/MessengersSpeed.java +++ b/Mage.Sets/src/mage/sets/theros/MessengersSpeed.java @@ -57,7 +57,6 @@ public class MessengersSpeed extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/theros/MinotaurSkullcleaver.java b/Mage.Sets/src/mage/sets/theros/MinotaurSkullcleaver.java index d3875ce6aa5..ae1325c42ff 100644 --- a/Mage.Sets/src/mage/sets/theros/MinotaurSkullcleaver.java +++ b/Mage.Sets/src/mage/sets/theros/MinotaurSkullcleaver.java @@ -49,7 +49,6 @@ public class MinotaurSkullcleaver extends CardImpl { this.subtype.add("Minotaur"); this.subtype.add("Berserker"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/MistcutterHydra.java b/Mage.Sets/src/mage/sets/theros/MistcutterHydra.java index 8787d4435b6..d1586f273b6 100644 --- a/Mage.Sets/src/mage/sets/theros/MistcutterHydra.java +++ b/Mage.Sets/src/mage/sets/theros/MistcutterHydra.java @@ -63,7 +63,6 @@ public class MistcutterHydra extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Hydra"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/theros/MogissMarauder.java b/Mage.Sets/src/mage/sets/theros/MogissMarauder.java index 0805153bb05..f7085d01e8e 100644 --- a/Mage.Sets/src/mage/sets/theros/MogissMarauder.java +++ b/Mage.Sets/src/mage/sets/theros/MogissMarauder.java @@ -56,7 +56,6 @@ public class MogissMarauder extends CardImpl { this.subtype.add("Human"); this.subtype.add("Berserker"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/NessianAsp.java b/Mage.Sets/src/mage/sets/theros/NessianAsp.java index 7b7a410df23..31f3aa092ad 100644 --- a/Mage.Sets/src/mage/sets/theros/NessianAsp.java +++ b/Mage.Sets/src/mage/sets/theros/NessianAsp.java @@ -46,7 +46,6 @@ public class NessianAsp extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Snake"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/theros/Nighthowler.java b/Mage.Sets/src/mage/sets/theros/Nighthowler.java index 355bf6bcca1..dbbc54b0d5a 100644 --- a/Mage.Sets/src/mage/sets/theros/Nighthowler.java +++ b/Mage.Sets/src/mage/sets/theros/Nighthowler.java @@ -55,7 +55,6 @@ public class Nighthowler extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/theros/NimbusNaiad.java b/Mage.Sets/src/mage/sets/theros/NimbusNaiad.java index 0167f4dfb76..c04c38f7c68 100644 --- a/Mage.Sets/src/mage/sets/theros/NimbusNaiad.java +++ b/Mage.Sets/src/mage/sets/theros/NimbusNaiad.java @@ -53,7 +53,6 @@ public class NimbusNaiad extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Nymph"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/NyleaGodOfTheHunt.java b/Mage.Sets/src/mage/sets/theros/NyleaGodOfTheHunt.java index 6f05f61d683..22f968648e2 100644 --- a/Mage.Sets/src/mage/sets/theros/NyleaGodOfTheHunt.java +++ b/Mage.Sets/src/mage/sets/theros/NyleaGodOfTheHunt.java @@ -61,7 +61,6 @@ public class NyleaGodOfTheHunt extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("God"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/theros/NyleasDisciple.java b/Mage.Sets/src/mage/sets/theros/NyleasDisciple.java index ecd192f38bb..15a873cea90 100644 --- a/Mage.Sets/src/mage/sets/theros/NyleasDisciple.java +++ b/Mage.Sets/src/mage/sets/theros/NyleasDisciple.java @@ -50,7 +50,6 @@ public class NyleasDisciple extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Archer"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/NyleasEmissary.java b/Mage.Sets/src/mage/sets/theros/NyleasEmissary.java index b346051cbd4..7b2e96e744b 100644 --- a/Mage.Sets/src/mage/sets/theros/NyleasEmissary.java +++ b/Mage.Sets/src/mage/sets/theros/NyleasEmissary.java @@ -53,7 +53,6 @@ public class NyleasEmissary extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Cat"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/NyleasPresence.java b/Mage.Sets/src/mage/sets/theros/NyleasPresence.java index 801c57caac3..12f82025254 100644 --- a/Mage.Sets/src/mage/sets/theros/NyleasPresence.java +++ b/Mage.Sets/src/mage/sets/theros/NyleasPresence.java @@ -68,7 +68,6 @@ public class NyleasPresence extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/theros/ObservantAlseid.java b/Mage.Sets/src/mage/sets/theros/ObservantAlseid.java index 85e3a43ec95..5f205ab055f 100644 --- a/Mage.Sets/src/mage/sets/theros/ObservantAlseid.java +++ b/Mage.Sets/src/mage/sets/theros/ObservantAlseid.java @@ -54,7 +54,6 @@ public class ObservantAlseid extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Nymph"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/Omenspeaker.java b/Mage.Sets/src/mage/sets/theros/Omenspeaker.java index ba84f9a58b7..e22511932a0 100644 --- a/Mage.Sets/src/mage/sets/theros/Omenspeaker.java +++ b/Mage.Sets/src/mage/sets/theros/Omenspeaker.java @@ -47,7 +47,6 @@ public class Omenspeaker extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/OrdealOfErebos.java b/Mage.Sets/src/mage/sets/theros/OrdealOfErebos.java index e5efca75cd0..6e83a7656a6 100644 --- a/Mage.Sets/src/mage/sets/theros/OrdealOfErebos.java +++ b/Mage.Sets/src/mage/sets/theros/OrdealOfErebos.java @@ -59,7 +59,6 @@ public class OrdealOfErebos extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/theros/OrdealOfHeliod.java b/Mage.Sets/src/mage/sets/theros/OrdealOfHeliod.java index 57bd57d8061..19bda410efa 100644 --- a/Mage.Sets/src/mage/sets/theros/OrdealOfHeliod.java +++ b/Mage.Sets/src/mage/sets/theros/OrdealOfHeliod.java @@ -58,7 +58,6 @@ public class OrdealOfHeliod extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/theros/OrdealOfNylea.java b/Mage.Sets/src/mage/sets/theros/OrdealOfNylea.java index c3a6a9cdd11..b4cd256da2c 100644 --- a/Mage.Sets/src/mage/sets/theros/OrdealOfNylea.java +++ b/Mage.Sets/src/mage/sets/theros/OrdealOfNylea.java @@ -60,7 +60,6 @@ public class OrdealOfNylea extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/theros/OrdealOfPurphoros.java b/Mage.Sets/src/mage/sets/theros/OrdealOfPurphoros.java index fb9cdd9bc79..e73072c73c7 100644 --- a/Mage.Sets/src/mage/sets/theros/OrdealOfPurphoros.java +++ b/Mage.Sets/src/mage/sets/theros/OrdealOfPurphoros.java @@ -59,7 +59,6 @@ public class OrdealOfPurphoros extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/theros/OrdealOfThassa.java b/Mage.Sets/src/mage/sets/theros/OrdealOfThassa.java index 31523ea53d5..77fb0d0f603 100644 --- a/Mage.Sets/src/mage/sets/theros/OrdealOfThassa.java +++ b/Mage.Sets/src/mage/sets/theros/OrdealOfThassa.java @@ -58,7 +58,6 @@ public class OrdealOfThassa extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/theros/PeakEruption.java b/Mage.Sets/src/mage/sets/theros/PeakEruption.java index d814351677c..4aa27c573a4 100644 --- a/Mage.Sets/src/mage/sets/theros/PeakEruption.java +++ b/Mage.Sets/src/mage/sets/theros/PeakEruption.java @@ -59,7 +59,6 @@ public class PeakEruption extends CardImpl { super(ownerId, 132, "Peak Eruption", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "THS"; - this.color.setRed(true); // Destroy target Mountain. Peak Eruption deals 3 damage to that land's controller. this.getSpellAbility().addTarget(new TargetLandPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/theros/PhalanxLeader.java b/Mage.Sets/src/mage/sets/theros/PhalanxLeader.java index f1fc4bc6004..59ef6af8dd3 100644 --- a/Mage.Sets/src/mage/sets/theros/PhalanxLeader.java +++ b/Mage.Sets/src/mage/sets/theros/PhalanxLeader.java @@ -50,7 +50,6 @@ public class PhalanxLeader extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/PharikasCure.java b/Mage.Sets/src/mage/sets/theros/PharikasCure.java index dba2b721e30..7a335325756 100644 --- a/Mage.Sets/src/mage/sets/theros/PharikasCure.java +++ b/Mage.Sets/src/mage/sets/theros/PharikasCure.java @@ -45,7 +45,6 @@ public class PharikasCure extends CardImpl { super(ownerId, 100, "Pharika's Cure", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}{B}"); this.expansionSetCode = "THS"; - this.color.setBlack(true); // Pharika's Cure deals 2 damage to target creature and you gain 2 life. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/theros/PharikasMender.java b/Mage.Sets/src/mage/sets/theros/PharikasMender.java index 41559db4b2d..bddb7d1faa4 100644 --- a/Mage.Sets/src/mage/sets/theros/PharikasMender.java +++ b/Mage.Sets/src/mage/sets/theros/PharikasMender.java @@ -59,8 +59,6 @@ public class PharikasMender extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Gorgon"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/PheresBandCentaurs.java b/Mage.Sets/src/mage/sets/theros/PheresBandCentaurs.java index 83d30a0d6c2..0ac3dd3292d 100644 --- a/Mage.Sets/src/mage/sets/theros/PheresBandCentaurs.java +++ b/Mage.Sets/src/mage/sets/theros/PheresBandCentaurs.java @@ -45,7 +45,6 @@ public class PheresBandCentaurs extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(7); } diff --git a/Mage.Sets/src/mage/sets/theros/PolisCrusher.java b/Mage.Sets/src/mage/sets/theros/PolisCrusher.java index 9c387fae356..2d169d80853 100644 --- a/Mage.Sets/src/mage/sets/theros/PolisCrusher.java +++ b/Mage.Sets/src/mage/sets/theros/PolisCrusher.java @@ -69,8 +69,6 @@ public class PolisCrusher extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Cyclops"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/theros/PolukranosWorldEater.java b/Mage.Sets/src/mage/sets/theros/PolukranosWorldEater.java index 1c7ddf1434f..00508cc27f0 100644 --- a/Mage.Sets/src/mage/sets/theros/PolukranosWorldEater.java +++ b/Mage.Sets/src/mage/sets/theros/PolukranosWorldEater.java @@ -81,7 +81,6 @@ public class PolukranosWorldEater extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Hydra"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/theros/PortentOfBetrayal.java b/Mage.Sets/src/mage/sets/theros/PortentOfBetrayal.java index a737c0ba5a1..6bff7e17685 100644 --- a/Mage.Sets/src/mage/sets/theros/PortentOfBetrayal.java +++ b/Mage.Sets/src/mage/sets/theros/PortentOfBetrayal.java @@ -50,7 +50,6 @@ public class PortentOfBetrayal extends CardImpl { super(ownerId, 133, "Portent of Betrayal", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "THS"; - this.color.setRed(true); // Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. Scry 1. this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/theros/PrescientChimera.java b/Mage.Sets/src/mage/sets/theros/PrescientChimera.java index a01070cde4f..269bec66016 100644 --- a/Mage.Sets/src/mage/sets/theros/PrescientChimera.java +++ b/Mage.Sets/src/mage/sets/theros/PrescientChimera.java @@ -57,7 +57,6 @@ public class PrescientChimera extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Chimera"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/theros/PriestOfIroas.java b/Mage.Sets/src/mage/sets/theros/PriestOfIroas.java index 38855b90c2f..219e98606e9 100644 --- a/Mage.Sets/src/mage/sets/theros/PriestOfIroas.java +++ b/Mage.Sets/src/mage/sets/theros/PriestOfIroas.java @@ -54,7 +54,6 @@ public class PriestOfIroas extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/PrognosticSphinx.java b/Mage.Sets/src/mage/sets/theros/PrognosticSphinx.java index 43fd126b474..5709960e587 100644 --- a/Mage.Sets/src/mage/sets/theros/PrognosticSphinx.java +++ b/Mage.Sets/src/mage/sets/theros/PrognosticSphinx.java @@ -56,7 +56,6 @@ public class PrognosticSphinx extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Sphinx"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/theros/ProphetOfKruphix.java b/Mage.Sets/src/mage/sets/theros/ProphetOfKruphix.java index 088e7436664..9ce5d175369 100644 --- a/Mage.Sets/src/mage/sets/theros/ProphetOfKruphix.java +++ b/Mage.Sets/src/mage/sets/theros/ProphetOfKruphix.java @@ -61,8 +61,6 @@ public class ProphetOfKruphix extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java b/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java index 975237a114c..2376ca65ae7 100644 --- a/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java +++ b/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java @@ -59,8 +59,6 @@ public class PsychicIntrusion extends CardImpl { super(ownerId, 200, "Psychic Intrusion", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}{B}"); this.expansionSetCode = "THS"; - this.color.setBlue(true); - this.color.setBlack(true); // Target opponent reveals his or her hand. You choose a nonland card from that player's graveyard or hand and exile it. // You may cast that card for as long as it remains exiled, and you may spend mana as though it were mana of any color diff --git a/Mage.Sets/src/mage/sets/theros/PurphorosGodOfTheForge.java b/Mage.Sets/src/mage/sets/theros/PurphorosGodOfTheForge.java index 2a67a1e8bd4..c1ec31ce04e 100644 --- a/Mage.Sets/src/mage/sets/theros/PurphorosGodOfTheForge.java +++ b/Mage.Sets/src/mage/sets/theros/PurphorosGodOfTheForge.java @@ -66,7 +66,6 @@ public class PurphorosGodOfTheForge extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("God"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/theros/PurphorossEmissary.java b/Mage.Sets/src/mage/sets/theros/PurphorossEmissary.java index 69da9c6fbcb..94f38f8acd9 100644 --- a/Mage.Sets/src/mage/sets/theros/PurphorossEmissary.java +++ b/Mage.Sets/src/mage/sets/theros/PurphorossEmissary.java @@ -53,7 +53,6 @@ public class PurphorossEmissary extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Ox"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java b/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java index b328085bad0..be086dbf367 100644 --- a/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java +++ b/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java @@ -48,7 +48,6 @@ public class RageOfPurphoros extends CardImpl { super(ownerId, 137, "Rage of Purphoros", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{R}"); this.expansionSetCode = "THS"; - this.color.setRed(true); // Rage of Purphoros deals 4 damage to target creature. It can't be regenerated this turn. Scry 1. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); diff --git a/Mage.Sets/src/mage/sets/theros/RagebloodShaman.java b/Mage.Sets/src/mage/sets/theros/RagebloodShaman.java index 5c410d82744..ee2f6a76f92 100644 --- a/Mage.Sets/src/mage/sets/theros/RagebloodShaman.java +++ b/Mage.Sets/src/mage/sets/theros/RagebloodShaman.java @@ -60,7 +60,6 @@ public class RagebloodShaman extends CardImpl { this.subtype.add("Minotaur"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/RayOfDissolution.java b/Mage.Sets/src/mage/sets/theros/RayOfDissolution.java index 0cf356af04e..9372c74f9fc 100644 --- a/Mage.Sets/src/mage/sets/theros/RayOfDissolution.java +++ b/Mage.Sets/src/mage/sets/theros/RayOfDissolution.java @@ -47,7 +47,6 @@ public class RayOfDissolution extends CardImpl { super(ownerId, 27, "Ray of Dissolution", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "THS"; - this.color.setWhite(true); // Destroy target enchantment. You gain 3 life. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/ReadTheBones.java b/Mage.Sets/src/mage/sets/theros/ReadTheBones.java index 64bc2510550..fc476bf83fe 100644 --- a/Mage.Sets/src/mage/sets/theros/ReadTheBones.java +++ b/Mage.Sets/src/mage/sets/theros/ReadTheBones.java @@ -46,7 +46,6 @@ public class ReadTheBones extends CardImpl { super(ownerId, 101, "Read the Bones", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "THS"; - this.color.setBlack(true); // Scry 2, then draw two cards. You lose 2 life. this.getSpellAbility().addEffect(new ScryEffect(2)); diff --git a/Mage.Sets/src/mage/sets/theros/ReaperOfTheWilds.java b/Mage.Sets/src/mage/sets/theros/ReaperOfTheWilds.java index 1ba97f28c5e..b0e38d09ba8 100644 --- a/Mage.Sets/src/mage/sets/theros/ReaperOfTheWilds.java +++ b/Mage.Sets/src/mage/sets/theros/ReaperOfTheWilds.java @@ -53,8 +53,6 @@ public class ReaperOfTheWilds extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Gorgon"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/theros/RescueFromTheUnderworld.java b/Mage.Sets/src/mage/sets/theros/RescueFromTheUnderworld.java index 3640058e174..013fa387eed 100644 --- a/Mage.Sets/src/mage/sets/theros/RescueFromTheUnderworld.java +++ b/Mage.Sets/src/mage/sets/theros/RescueFromTheUnderworld.java @@ -77,7 +77,6 @@ public class RescueFromTheUnderworld extends CardImpl { super(ownerId, 102, "Rescue from the Underworld", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{B}"); this.expansionSetCode = "THS"; - this.color.setBlack(true); // As an additional cost to cast Rescue from the Underworld, sacrifice a creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,new FilterControlledCreaturePermanent("a creature"), false))); diff --git a/Mage.Sets/src/mage/sets/theros/ReturnedCentaur.java b/Mage.Sets/src/mage/sets/theros/ReturnedCentaur.java index 9218be3ffc5..961dea347a4 100644 --- a/Mage.Sets/src/mage/sets/theros/ReturnedCentaur.java +++ b/Mage.Sets/src/mage/sets/theros/ReturnedCentaur.java @@ -49,7 +49,6 @@ public class ReturnedCentaur extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Centaur"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/theros/ReturnedPhalanx.java b/Mage.Sets/src/mage/sets/theros/ReturnedPhalanx.java index 26d9fa0d729..8bb0b4f6748 100644 --- a/Mage.Sets/src/mage/sets/theros/ReturnedPhalanx.java +++ b/Mage.Sets/src/mage/sets/theros/ReturnedPhalanx.java @@ -51,7 +51,6 @@ public class ReturnedPhalanx extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Soldier"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/ReverentHunter.java b/Mage.Sets/src/mage/sets/theros/ReverentHunter.java index 6e1c1daab83..239bd61d30e 100644 --- a/Mage.Sets/src/mage/sets/theros/ReverentHunter.java +++ b/Mage.Sets/src/mage/sets/theros/ReverentHunter.java @@ -50,7 +50,6 @@ public class ReverentHunter extends CardImpl { this.subtype.add("Human"); this.subtype.add("Archer"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/SatyrHedonist.java b/Mage.Sets/src/mage/sets/theros/SatyrHedonist.java index 13f2c38677e..3940305bffc 100644 --- a/Mage.Sets/src/mage/sets/theros/SatyrHedonist.java +++ b/Mage.Sets/src/mage/sets/theros/SatyrHedonist.java @@ -51,7 +51,6 @@ public class SatyrHedonist extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Satyr"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/SatyrPiper.java b/Mage.Sets/src/mage/sets/theros/SatyrPiper.java index 68f3a63f3cc..87fb7deecb8 100644 --- a/Mage.Sets/src/mage/sets/theros/SatyrPiper.java +++ b/Mage.Sets/src/mage/sets/theros/SatyrPiper.java @@ -52,7 +52,6 @@ public class SatyrPiper extends CardImpl { this.subtype.add("Satyr"); this.subtype.add("Rogue"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/SatyrRambler.java b/Mage.Sets/src/mage/sets/theros/SatyrRambler.java index a63cad7cf12..94e8548e972 100644 --- a/Mage.Sets/src/mage/sets/theros/SatyrRambler.java +++ b/Mage.Sets/src/mage/sets/theros/SatyrRambler.java @@ -45,7 +45,6 @@ public class SatyrRambler extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Satyr"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/ScholarOfAthreos.java b/Mage.Sets/src/mage/sets/theros/ScholarOfAthreos.java index 3adb3ccb49f..71153bd036a 100644 --- a/Mage.Sets/src/mage/sets/theros/ScholarOfAthreos.java +++ b/Mage.Sets/src/mage/sets/theros/ScholarOfAthreos.java @@ -52,7 +52,6 @@ public class ScholarOfAthreos extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/theros/Scourgemark.java b/Mage.Sets/src/mage/sets/theros/Scourgemark.java index d96f2843617..a3e998192f6 100644 --- a/Mage.Sets/src/mage/sets/theros/Scourgemark.java +++ b/Mage.Sets/src/mage/sets/theros/Scourgemark.java @@ -55,7 +55,6 @@ public class Scourgemark extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/theros/SeaGodsRevenge.java b/Mage.Sets/src/mage/sets/theros/SeaGodsRevenge.java index 9b0ff9d6a9b..98047d6a48a 100644 --- a/Mage.Sets/src/mage/sets/theros/SeaGodsRevenge.java +++ b/Mage.Sets/src/mage/sets/theros/SeaGodsRevenge.java @@ -45,7 +45,6 @@ public class SeaGodsRevenge extends CardImpl { super(ownerId, 61, "Sea God's Revenge", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{5}{U}"); this.expansionSetCode = "THS"; - this.color.setBlue(true); // Return up to three target creatures to their owners' hands. Scry 1. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/SealockMonster.java b/Mage.Sets/src/mage/sets/theros/SealockMonster.java index 59cf68779c0..d3f31fef7ac 100644 --- a/Mage.Sets/src/mage/sets/theros/SealockMonster.java +++ b/Mage.Sets/src/mage/sets/theros/SealockMonster.java @@ -61,7 +61,6 @@ public class SealockMonster extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Octopus"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/theros/SedgeScorpion.java b/Mage.Sets/src/mage/sets/theros/SedgeScorpion.java index 6dabff3d086..deb4fffb0d4 100644 --- a/Mage.Sets/src/mage/sets/theros/SedgeScorpion.java +++ b/Mage.Sets/src/mage/sets/theros/SedgeScorpion.java @@ -45,7 +45,6 @@ public class SedgeScorpion extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Scorpion"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/SentryOfTheUnderworld.java b/Mage.Sets/src/mage/sets/theros/SentryOfTheUnderworld.java index 778d3b51d43..44dae59fdd2 100644 --- a/Mage.Sets/src/mage/sets/theros/SentryOfTheUnderworld.java +++ b/Mage.Sets/src/mage/sets/theros/SentryOfTheUnderworld.java @@ -53,8 +53,6 @@ public class SentryOfTheUnderworld extends CardImpl { this.subtype.add("Griffin"); this.subtype.add("Skeleton"); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/SetessanBattlePriest.java b/Mage.Sets/src/mage/sets/theros/SetessanBattlePriest.java index 4d0685e7424..53f648395c8 100644 --- a/Mage.Sets/src/mage/sets/theros/SetessanBattlePriest.java +++ b/Mage.Sets/src/mage/sets/theros/SetessanBattlePriest.java @@ -47,7 +47,6 @@ public class SetessanBattlePriest extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/SetessanGriffin.java b/Mage.Sets/src/mage/sets/theros/SetessanGriffin.java index d4df7ef92c1..16899a05564 100644 --- a/Mage.Sets/src/mage/sets/theros/SetessanGriffin.java +++ b/Mage.Sets/src/mage/sets/theros/SetessanGriffin.java @@ -50,7 +50,6 @@ public class SetessanGriffin extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Griffin"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java b/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java index 3dda91ed1bc..90a7c2d6038 100644 --- a/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java +++ b/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java @@ -60,7 +60,6 @@ public class ShipbreakerKraken extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Kraken"); - this.color.setBlue(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/theros/ShipwreckSinger.java b/Mage.Sets/src/mage/sets/theros/ShipwreckSinger.java index 4af74b5aa83..33292851332 100644 --- a/Mage.Sets/src/mage/sets/theros/ShipwreckSinger.java +++ b/Mage.Sets/src/mage/sets/theros/ShipwreckSinger.java @@ -66,8 +66,6 @@ public class ShipwreckSinger extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Siren"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/ShreddingWinds.java b/Mage.Sets/src/mage/sets/theros/ShreddingWinds.java index 60062ead301..c2a5a588edf 100644 --- a/Mage.Sets/src/mage/sets/theros/ShreddingWinds.java +++ b/Mage.Sets/src/mage/sets/theros/ShreddingWinds.java @@ -53,7 +53,6 @@ public class ShreddingWinds extends CardImpl { super(ownerId, 178, "Shredding Winds", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "THS"; - this.color.setGreen(true); // Shredding Winds deals 7 damage to target creature with flying. this.getSpellAbility().addEffect(new DamageTargetEffect(7)); diff --git a/Mage.Sets/src/mage/sets/theros/SilentArtisan.java b/Mage.Sets/src/mage/sets/theros/SilentArtisan.java index 9fe431a06da..495b2db6f61 100644 --- a/Mage.Sets/src/mage/sets/theros/SilentArtisan.java +++ b/Mage.Sets/src/mage/sets/theros/SilentArtisan.java @@ -44,7 +44,6 @@ public class SilentArtisan extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Giant"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/theros/SipOfHemlock.java b/Mage.Sets/src/mage/sets/theros/SipOfHemlock.java index 62d7e48f918..9e28ae1a97b 100644 --- a/Mage.Sets/src/mage/sets/theros/SipOfHemlock.java +++ b/Mage.Sets/src/mage/sets/theros/SipOfHemlock.java @@ -45,7 +45,6 @@ public class SipOfHemlock extends CardImpl { super(ownerId, 106, "Sip of Hemlock", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{B}{B}"); this.expansionSetCode = "THS"; - this.color.setBlack(true); // Destroy target creature. Its controller loses 2 life. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/SoldierOfThePantheon.java b/Mage.Sets/src/mage/sets/theros/SoldierOfThePantheon.java index cef7bf11226..37b0dc4da50 100644 --- a/Mage.Sets/src/mage/sets/theros/SoldierOfThePantheon.java +++ b/Mage.Sets/src/mage/sets/theros/SoldierOfThePantheon.java @@ -59,7 +59,6 @@ public class SoldierOfThePantheon extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/SparkJolt.java b/Mage.Sets/src/mage/sets/theros/SparkJolt.java index 85f5781aca1..80f99c2c15a 100644 --- a/Mage.Sets/src/mage/sets/theros/SparkJolt.java +++ b/Mage.Sets/src/mage/sets/theros/SparkJolt.java @@ -45,7 +45,6 @@ public class SparkJolt extends CardImpl { super(ownerId, 140, "Spark Jolt", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "THS"; - this.color.setRed(true); // Spark Jolt deals 1 damage to target creature or player. Scry 1. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/theros/SpearOfHeliod.java b/Mage.Sets/src/mage/sets/theros/SpearOfHeliod.java index 73509947882..a6e6d45f3ba 100644 --- a/Mage.Sets/src/mage/sets/theros/SpearOfHeliod.java +++ b/Mage.Sets/src/mage/sets/theros/SpearOfHeliod.java @@ -62,7 +62,6 @@ public class SpearOfHeliod extends CardImpl { this.expansionSetCode = "THS"; this.supertype.add("Legendary"); - this.color.setWhite(true); // Creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/theros/SpearpointOread.java b/Mage.Sets/src/mage/sets/theros/SpearpointOread.java index 5285567ee45..6d977e71e83 100644 --- a/Mage.Sets/src/mage/sets/theros/SpearpointOread.java +++ b/Mage.Sets/src/mage/sets/theros/SpearpointOread.java @@ -53,7 +53,6 @@ public class SpearpointOread extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Nymph"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/SpellheartChimera.java b/Mage.Sets/src/mage/sets/theros/SpellheartChimera.java index 47187aa8e50..50b494c6ec1 100644 --- a/Mage.Sets/src/mage/sets/theros/SpellheartChimera.java +++ b/Mage.Sets/src/mage/sets/theros/SpellheartChimera.java @@ -52,8 +52,6 @@ public class SpellheartChimera extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Chimera"); - this.color.setRed(true); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/StaunchHeartedWarrior.java b/Mage.Sets/src/mage/sets/theros/StaunchHeartedWarrior.java index 13e75562049..1f30623670e 100644 --- a/Mage.Sets/src/mage/sets/theros/StaunchHeartedWarrior.java +++ b/Mage.Sets/src/mage/sets/theros/StaunchHeartedWarrior.java @@ -48,7 +48,6 @@ public class StaunchHeartedWarrior extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/SteamAugury.java b/Mage.Sets/src/mage/sets/theros/SteamAugury.java index d55c0665bf6..dfdd983e2fb 100644 --- a/Mage.Sets/src/mage/sets/theros/SteamAugury.java +++ b/Mage.Sets/src/mage/sets/theros/SteamAugury.java @@ -59,8 +59,6 @@ public class SteamAugury extends CardImpl { super(ownerId, 205, "Steam Augury", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{U}{R}"); this.expansionSetCode = "THS"; - this.color.setRed(true); - this.color.setBlue(true); // Reveal the top five cards of your library and separate them into two piles. An opponent chooses one of those piles. Put that pile into your hand and the other into your graveyard. this.getSpellAbility().addEffect(new SteamAuguryEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/StoneshockGiant.java b/Mage.Sets/src/mage/sets/theros/StoneshockGiant.java index 29d6976f9df..bfa37c3fa3b 100644 --- a/Mage.Sets/src/mage/sets/theros/StoneshockGiant.java +++ b/Mage.Sets/src/mage/sets/theros/StoneshockGiant.java @@ -60,7 +60,6 @@ public class StoneshockGiant extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Giant"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/theros/StormbreathDragon.java b/Mage.Sets/src/mage/sets/theros/StormbreathDragon.java index 0af3bb17cb8..c2dead431d9 100644 --- a/Mage.Sets/src/mage/sets/theros/StormbreathDragon.java +++ b/Mage.Sets/src/mage/sets/theros/StormbreathDragon.java @@ -62,7 +62,6 @@ public class StormbreathDragon extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/theros/StymiedHopes.java b/Mage.Sets/src/mage/sets/theros/StymiedHopes.java index 84fd306c19a..e710f080cbf 100644 --- a/Mage.Sets/src/mage/sets/theros/StymiedHopes.java +++ b/Mage.Sets/src/mage/sets/theros/StymiedHopes.java @@ -46,7 +46,6 @@ public class StymiedHopes extends CardImpl { super(ownerId, 64, "Stymied Hopes", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "THS"; - this.color.setBlue(true); // Counter target spell unless its controller pays {1}. Scry 1. this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new GenericManaCost(1))); diff --git a/Mage.Sets/src/mage/sets/theros/SwanSong.java b/Mage.Sets/src/mage/sets/theros/SwanSong.java index bbaf3a4fdf7..b16b7a59770 100644 --- a/Mage.Sets/src/mage/sets/theros/SwanSong.java +++ b/Mage.Sets/src/mage/sets/theros/SwanSong.java @@ -61,7 +61,6 @@ public class SwanSong extends CardImpl { super(ownerId, 65, "Swan Song", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "THS"; - this.color.setBlue(true); // Counter target enchantment, instant or sorcery spell. Its controller puts a 2/2 blue Bird creature token with flying onto the battlefield. this.getSpellAbility().addEffect(new SwanSongEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/SylvanCaryatid.java b/Mage.Sets/src/mage/sets/theros/SylvanCaryatid.java index 4bf377735f1..3fad23601c4 100644 --- a/Mage.Sets/src/mage/sets/theros/SylvanCaryatid.java +++ b/Mage.Sets/src/mage/sets/theros/SylvanCaryatid.java @@ -47,7 +47,6 @@ public class SylvanCaryatid extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Plant"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/ThassasBounty.java b/Mage.Sets/src/mage/sets/theros/ThassasBounty.java index 0a15b078181..660addc5c8d 100644 --- a/Mage.Sets/src/mage/sets/theros/ThassasBounty.java +++ b/Mage.Sets/src/mage/sets/theros/ThassasBounty.java @@ -45,7 +45,6 @@ public class ThassasBounty extends CardImpl { super(ownerId, 67, "Thassa's Bounty", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{5}{U}"); this.expansionSetCode = "THS"; - this.color.setBlue(true); // Draw three cards. Target player puts the top three cards of his or her library into his or her graveyard. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); diff --git a/Mage.Sets/src/mage/sets/theros/ThassasEmissary.java b/Mage.Sets/src/mage/sets/theros/ThassasEmissary.java index 4a89efa27a8..6b92d1cc051 100644 --- a/Mage.Sets/src/mage/sets/theros/ThassasEmissary.java +++ b/Mage.Sets/src/mage/sets/theros/ThassasEmissary.java @@ -56,7 +56,6 @@ public class ThassasEmissary extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Crab"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/TimeToFeed.java b/Mage.Sets/src/mage/sets/theros/TimeToFeed.java index 464e18c6d3b..8af58c918db 100644 --- a/Mage.Sets/src/mage/sets/theros/TimeToFeed.java +++ b/Mage.Sets/src/mage/sets/theros/TimeToFeed.java @@ -75,7 +75,6 @@ public class TimeToFeed extends CardImpl { super(ownerId, 181, "Time to Feed", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "THS"; - this.color.setGreen(true); // Choose target creature an opponent controls. When that creature dies this turn, you gain 3 life. this.getSpellAbility().addEffect(new TimeToFeedTextEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/TitanOfEternalFire.java b/Mage.Sets/src/mage/sets/theros/TitanOfEternalFire.java index 955f59c5445..f8bae09bb3e 100644 --- a/Mage.Sets/src/mage/sets/theros/TitanOfEternalFire.java +++ b/Mage.Sets/src/mage/sets/theros/TitanOfEternalFire.java @@ -56,7 +56,6 @@ public class TitanOfEternalFire extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Giant"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/theros/TitansStrength.java b/Mage.Sets/src/mage/sets/theros/TitansStrength.java index 8283abbc4f0..3510019b68d 100644 --- a/Mage.Sets/src/mage/sets/theros/TitansStrength.java +++ b/Mage.Sets/src/mage/sets/theros/TitansStrength.java @@ -46,7 +46,6 @@ public class TitansStrength extends CardImpl { super(ownerId, 145, "Titan's Strength", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "THS"; - this.color.setRed(true); // Target creature gets +3/+1 until end of turn. Scry 1. this.getSpellAbility().addEffect(new BoostTargetEffect(3,1, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/theros/TormentedHero.java b/Mage.Sets/src/mage/sets/theros/TormentedHero.java index 324f4bb323e..00fec65e307 100644 --- a/Mage.Sets/src/mage/sets/theros/TormentedHero.java +++ b/Mage.Sets/src/mage/sets/theros/TormentedHero.java @@ -51,7 +51,6 @@ public class TormentedHero extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/TravelingPhilosopher.java b/Mage.Sets/src/mage/sets/theros/TravelingPhilosopher.java index 5aefba535db..86c04212dc9 100644 --- a/Mage.Sets/src/mage/sets/theros/TravelingPhilosopher.java +++ b/Mage.Sets/src/mage/sets/theros/TravelingPhilosopher.java @@ -45,7 +45,6 @@ public class TravelingPhilosopher extends CardImpl { this.subtype.add("Human"); this.subtype.add("Advisor"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/theros/TriadOfFates.java b/Mage.Sets/src/mage/sets/theros/TriadOfFates.java index ba3e38cf3b1..2cac3fd65c1 100644 --- a/Mage.Sets/src/mage/sets/theros/TriadOfFates.java +++ b/Mage.Sets/src/mage/sets/theros/TriadOfFates.java @@ -73,8 +73,6 @@ public class TriadOfFates extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/TritonFortuneHunter.java b/Mage.Sets/src/mage/sets/theros/TritonFortuneHunter.java index e68448f57a4..39edf7c53c1 100644 --- a/Mage.Sets/src/mage/sets/theros/TritonFortuneHunter.java +++ b/Mage.Sets/src/mage/sets/theros/TritonFortuneHunter.java @@ -47,7 +47,6 @@ public class TritonFortuneHunter extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/TritonShorethief.java b/Mage.Sets/src/mage/sets/theros/TritonShorethief.java index 8721a6bdf68..e2cf7e6eef3 100644 --- a/Mage.Sets/src/mage/sets/theros/TritonShorethief.java +++ b/Mage.Sets/src/mage/sets/theros/TritonShorethief.java @@ -45,7 +45,6 @@ public class TritonShorethief extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/theros/TwoHeadedCerberus.java b/Mage.Sets/src/mage/sets/theros/TwoHeadedCerberus.java index 4dc6305a2d3..b856c852481 100644 --- a/Mage.Sets/src/mage/sets/theros/TwoHeadedCerberus.java +++ b/Mage.Sets/src/mage/sets/theros/TwoHeadedCerberus.java @@ -45,7 +45,6 @@ public class TwoHeadedCerberus extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Hound"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/TymaretTheMurderKing.java b/Mage.Sets/src/mage/sets/theros/TymaretTheMurderKing.java index 7873940e3bf..759346ced55 100644 --- a/Mage.Sets/src/mage/sets/theros/TymaretTheMurderKing.java +++ b/Mage.Sets/src/mage/sets/theros/TymaretTheMurderKing.java @@ -62,8 +62,6 @@ public class TymaretTheMurderKing extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java b/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java index ad484699c15..f8d73706382 100644 --- a/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java +++ b/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java @@ -54,7 +54,6 @@ public class VanquishTheFoul extends CardImpl { super(ownerId, 35, "Vanquish the Foul", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{5}{W}"); this.expansionSetCode = "THS"; - this.color.setWhite(true); // Destroy target creature with power 4 or greater. Scry 1. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/Vaporkin.java b/Mage.Sets/src/mage/sets/theros/Vaporkin.java index 77e1ccfef4c..e9a463866bb 100644 --- a/Mage.Sets/src/mage/sets/theros/Vaporkin.java +++ b/Mage.Sets/src/mage/sets/theros/Vaporkin.java @@ -46,7 +46,6 @@ public class Vaporkin extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/VipersKiss.java b/Mage.Sets/src/mage/sets/theros/VipersKiss.java index 857b9db489e..9f8b8007516 100644 --- a/Mage.Sets/src/mage/sets/theros/VipersKiss.java +++ b/Mage.Sets/src/mage/sets/theros/VipersKiss.java @@ -55,7 +55,6 @@ public class VipersKiss extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/theros/VoyagesEnd.java b/Mage.Sets/src/mage/sets/theros/VoyagesEnd.java index 31a17fd9f52..79bbe4f0c43 100644 --- a/Mage.Sets/src/mage/sets/theros/VoyagesEnd.java +++ b/Mage.Sets/src/mage/sets/theros/VoyagesEnd.java @@ -45,7 +45,6 @@ public class VoyagesEnd extends CardImpl { super(ownerId, 73, "Voyage's End", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "THS"; - this.color.setBlue(true); // Return target creature to its owner's hand. Scry 1. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/theros/VoyagingSatyr.java b/Mage.Sets/src/mage/sets/theros/VoyagingSatyr.java index 7d3207ab3dc..a5c892cc87c 100644 --- a/Mage.Sets/src/mage/sets/theros/VoyagingSatyr.java +++ b/Mage.Sets/src/mage/sets/theros/VoyagingSatyr.java @@ -52,7 +52,6 @@ public class VoyagingSatyr extends CardImpl { this.subtype.add("Satyr"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/VulpineGoliath.java b/Mage.Sets/src/mage/sets/theros/VulpineGoliath.java index 7ed70563858..a2e963598fd 100644 --- a/Mage.Sets/src/mage/sets/theros/VulpineGoliath.java +++ b/Mage.Sets/src/mage/sets/theros/VulpineGoliath.java @@ -45,7 +45,6 @@ public class VulpineGoliath extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Fox"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/theros/WarriorsLesson.java b/Mage.Sets/src/mage/sets/theros/WarriorsLesson.java index 41711300c1c..7ce37099383 100644 --- a/Mage.Sets/src/mage/sets/theros/WarriorsLesson.java +++ b/Mage.Sets/src/mage/sets/theros/WarriorsLesson.java @@ -49,7 +49,6 @@ public class WarriorsLesson extends CardImpl { super(ownerId, 184, "Warriors' Lesson", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "THS"; - this.color.setGreen(true); // Until end of turn, up to two target creatures you control each gain "Whenever this creature deals combat damage to a player, draw a card." Ability ability = new DealsDamageToAPlayerTriggeredAbility(new DrawCardSourceControllerEffect(1),false); diff --git a/Mage.Sets/src/mage/sets/theros/WavecrashTriton.java b/Mage.Sets/src/mage/sets/theros/WavecrashTriton.java index 36c9a41f975..29ced1cbab5 100644 --- a/Mage.Sets/src/mage/sets/theros/WavecrashTriton.java +++ b/Mage.Sets/src/mage/sets/theros/WavecrashTriton.java @@ -58,7 +58,6 @@ public class WavecrashTriton extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/theros/WildCelebrants.java b/Mage.Sets/src/mage/sets/theros/WildCelebrants.java index d3100ba205d..b7bdc588666 100644 --- a/Mage.Sets/src/mage/sets/theros/WildCelebrants.java +++ b/Mage.Sets/src/mage/sets/theros/WildCelebrants.java @@ -49,7 +49,6 @@ public class WildCelebrants extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Satyr"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/theros/WingsteedRider.java b/Mage.Sets/src/mage/sets/theros/WingsteedRider.java index 922c296a505..6aaefec279f 100644 --- a/Mage.Sets/src/mage/sets/theros/WingsteedRider.java +++ b/Mage.Sets/src/mage/sets/theros/WingsteedRider.java @@ -49,7 +49,6 @@ public class WingsteedRider extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/theros/XenagosTheReveler.java b/Mage.Sets/src/mage/sets/theros/XenagosTheReveler.java index 83115dee508..276a35b4b4a 100644 --- a/Mage.Sets/src/mage/sets/theros/XenagosTheReveler.java +++ b/Mage.Sets/src/mage/sets/theros/XenagosTheReveler.java @@ -70,8 +70,6 @@ public class XenagosTheReveler extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Xenagos"); - this.color.setRed(true); - this.color.setGreen(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), false)); diff --git a/Mage.Sets/src/mage/sets/theros/YokedOx.java b/Mage.Sets/src/mage/sets/theros/YokedOx.java index 6ad4e1f1e3c..d06c268e9fa 100644 --- a/Mage.Sets/src/mage/sets/theros/YokedOx.java +++ b/Mage.Sets/src/mage/sets/theros/YokedOx.java @@ -44,7 +44,6 @@ public class YokedOx extends CardImpl { this.expansionSetCode = "THS"; this.subtype.add("Ox"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/timeshifted/AkromaAngelOfWrath.java b/Mage.Sets/src/mage/sets/timeshifted/AkromaAngelOfWrath.java index 52e0fcb6567..be98aebff36 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/AkromaAngelOfWrath.java +++ b/Mage.Sets/src/mage/sets/timeshifted/AkromaAngelOfWrath.java @@ -56,7 +56,6 @@ public class AkromaAngelOfWrath extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/timeshifted/CallOfTheHerd.java b/Mage.Sets/src/mage/sets/timeshifted/CallOfTheHerd.java index 283356f2050..fb240cd20a2 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/CallOfTheHerd.java +++ b/Mage.Sets/src/mage/sets/timeshifted/CallOfTheHerd.java @@ -48,7 +48,6 @@ public class CallOfTheHerd extends CardImpl { super(ownerId, 74, "Call of the Herd", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "TSB"; - this.color.setGreen(true); // Put a 3/3 green Elephant creature token onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new ElephantToken())); diff --git a/Mage.Sets/src/mage/sets/timeshifted/Darkness.java b/Mage.Sets/src/mage/sets/timeshifted/Darkness.java index 23a93b078f3..66494f637a9 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Darkness.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Darkness.java @@ -45,7 +45,6 @@ public class Darkness extends CardImpl { super(ownerId, 40, "Darkness", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "TSB"; - this.color.setBlack(true); // Prevent all combat damage that would be dealt this turn. this.getSpellAbility().addEffect(new PreventAllDamageByAllEffect(Duration.EndOfTurn, true)); diff --git a/Mage.Sets/src/mage/sets/timeshifted/Dragonstorm.java b/Mage.Sets/src/mage/sets/timeshifted/Dragonstorm.java index e9be6f57fe2..13173c7171f 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Dragonstorm.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Dragonstorm.java @@ -54,7 +54,6 @@ public class Dragonstorm extends CardImpl { super(ownerId, 60, "Dragonstorm", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{8}{R}"); this.expansionSetCode = "TSB"; - this.color.setRed(true); // Search your library for a Dragon permanent card and put it onto the battlefield. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false)); diff --git a/Mage.Sets/src/mage/sets/timeshifted/EssenceSliver.java b/Mage.Sets/src/mage/sets/timeshifted/EssenceSliver.java index e8823c75e5e..3bccc6bf0f8 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/EssenceSliver.java +++ b/Mage.Sets/src/mage/sets/timeshifted/EssenceSliver.java @@ -54,7 +54,6 @@ public class EssenceSliver extends CardImpl { this.expansionSetCode = "TSB"; this.subtype.add("Sliver"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/timeshifted/FieryTemper.java b/Mage.Sets/src/mage/sets/timeshifted/FieryTemper.java index 20a2f8a6bcd..3c2e6ec17da 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/FieryTemper.java +++ b/Mage.Sets/src/mage/sets/timeshifted/FieryTemper.java @@ -47,7 +47,6 @@ public class FieryTemper extends CardImpl { super(ownerId, 62, "Fiery Temper", Rarity.SPECIAL, new CardType[]{CardType.INSTANT}, "{1}{R}{R}"); this.expansionSetCode = "TSB"; - this.color.setRed(true); // Fiery Temper deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/timeshifted/FireWhip.java b/Mage.Sets/src/mage/sets/timeshifted/FireWhip.java index 2f10f27bb02..d46d8763a22 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/FireWhip.java +++ b/Mage.Sets/src/mage/sets/timeshifted/FireWhip.java @@ -59,7 +59,6 @@ public class FireWhip extends CardImpl { this.expansionSetCode = "TSB"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature you control TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/timeshifted/FlyingMen.java b/Mage.Sets/src/mage/sets/timeshifted/FlyingMen.java index e6b2cb94487..54b4dffc641 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/FlyingMen.java +++ b/Mage.Sets/src/mage/sets/timeshifted/FlyingMen.java @@ -45,7 +45,6 @@ public class FlyingMen extends CardImpl { this.expansionSetCode = "TSB"; this.subtype.add("Human"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java b/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java index 5b3798eb373..1722555c430 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java +++ b/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java @@ -51,7 +51,6 @@ public class FuneralCharm extends CardImpl { super(ownerId, 44, "Funeral Charm", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "TSB"; - this.color.setBlack(true); // Choose one - Target player discards a card; or target creature gets +2/-1 until end of turn; or target creature gains swampwalk until end of turn. this.getSpellAbility().addEffect(new DiscardTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/timeshifted/GaeasBlessing.java b/Mage.Sets/src/mage/sets/timeshifted/GaeasBlessing.java index 0dc1ca3492b..fc3f75e23c1 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/GaeasBlessing.java +++ b/Mage.Sets/src/mage/sets/timeshifted/GaeasBlessing.java @@ -55,7 +55,6 @@ public class GaeasBlessing extends CardImpl { super(ownerId, 77, "Gaea's Blessing", Rarity.SPECIAL, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "TSB"; - this.color.setGreen(true); // Target player shuffles up to three target cards from his or her graveyard into his or her library. this.getSpellAbility().addEffect(new GaeasBlessingEffect()); diff --git a/Mage.Sets/src/mage/sets/timeshifted/GhostShip.java b/Mage.Sets/src/mage/sets/timeshifted/GhostShip.java index 15fab0aac5e..ea2f448718f 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/GhostShip.java +++ b/Mage.Sets/src/mage/sets/timeshifted/GhostShip.java @@ -50,7 +50,6 @@ public class GhostShip extends CardImpl { this.expansionSetCode = "TSB"; this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/timeshifted/JasmineBoreal.java b/Mage.Sets/src/mage/sets/timeshifted/JasmineBoreal.java index 970adafcf89..07250107aea 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/JasmineBoreal.java +++ b/Mage.Sets/src/mage/sets/timeshifted/JasmineBoreal.java @@ -45,8 +45,6 @@ public class JasmineBoreal extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/timeshifted/KrosanCloudscraper.java b/Mage.Sets/src/mage/sets/timeshifted/KrosanCloudscraper.java index 6c245a6a515..397c5712d3b 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/KrosanCloudscraper.java +++ b/Mage.Sets/src/mage/sets/timeshifted/KrosanCloudscraper.java @@ -50,7 +50,6 @@ public class KrosanCloudscraper extends CardImpl { this.subtype.add("Beast"); this.subtype.add("Mutant"); - this.color.setGreen(true); this.power = new MageInt(13); this.toughness = new MageInt(13); diff --git a/Mage.Sets/src/mage/sets/timeshifted/MoorishCavalry.java b/Mage.Sets/src/mage/sets/timeshifted/MoorishCavalry.java index fe65605b61e..d570727a1b2 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/MoorishCavalry.java +++ b/Mage.Sets/src/mage/sets/timeshifted/MoorishCavalry.java @@ -46,7 +46,6 @@ public class MoorishCavalry extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/timeshifted/MysticEnforcer.java b/Mage.Sets/src/mage/sets/timeshifted/MysticEnforcer.java index ad4c3f70a4e..ed25bec6c7b 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/MysticEnforcer.java +++ b/Mage.Sets/src/mage/sets/timeshifted/MysticEnforcer.java @@ -63,8 +63,6 @@ public class MysticEnforcer extends CardImpl { this.subtype.add("Nomad"); this.subtype.add("Mystic"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/timeshifted/PsionicBlast.java b/Mage.Sets/src/mage/sets/timeshifted/PsionicBlast.java index 34f49bf563a..9bb753de3c1 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/PsionicBlast.java +++ b/Mage.Sets/src/mage/sets/timeshifted/PsionicBlast.java @@ -50,7 +50,6 @@ public class PsionicBlast extends CardImpl { super(ownerId, 30, "Psionic Blast", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "TSB"; - this.color.setBlue(true); // Psionic Blast deals 4 damage to target creature or player and 2 damage to you. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); diff --git a/Mage.Sets/src/mage/sets/timeshifted/ShadowmageInfiltrator.java b/Mage.Sets/src/mage/sets/timeshifted/ShadowmageInfiltrator.java index 2744d7937f8..0da8df73dcc 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/ShadowmageInfiltrator.java +++ b/Mage.Sets/src/mage/sets/timeshifted/ShadowmageInfiltrator.java @@ -48,8 +48,6 @@ public class ShadowmageInfiltrator extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/timeshifted/SolkanarTheSwampKing.java b/Mage.Sets/src/mage/sets/timeshifted/SolkanarTheSwampKing.java index 4ac990d1eed..d0d9f4bbeb3 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/SolkanarTheSwampKing.java +++ b/Mage.Sets/src/mage/sets/timeshifted/SolkanarTheSwampKing.java @@ -53,9 +53,6 @@ public class SolkanarTheSwampKing extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Demon"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/timeshifted/SpikeFeeder.java b/Mage.Sets/src/mage/sets/timeshifted/SpikeFeeder.java index d294b4bfd3f..470c1caff72 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/SpikeFeeder.java +++ b/Mage.Sets/src/mage/sets/timeshifted/SpikeFeeder.java @@ -56,7 +56,6 @@ public class SpikeFeeder extends CardImpl { this.expansionSetCode = "TSB"; this.subtype.add("Spike"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/timeshifted/Squire.java b/Mage.Sets/src/mage/sets/timeshifted/Squire.java index e2d58a9d19f..b4dc0b884ab 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Squire.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Squire.java @@ -45,7 +45,6 @@ public class Squire extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/timeshifted/StormscapeFamiliar.java b/Mage.Sets/src/mage/sets/timeshifted/StormscapeFamiliar.java index 81c2a71a84b..5d9dd71aeff 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/StormscapeFamiliar.java +++ b/Mage.Sets/src/mage/sets/timeshifted/StormscapeFamiliar.java @@ -60,7 +60,6 @@ public class StormscapeFamiliar extends CardImpl { this.expansionSetCode = "TSB"; this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timeshifted/Stupor.java b/Mage.Sets/src/mage/sets/timeshifted/Stupor.java index 1e9ac8706f0..975872050f2 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Stupor.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Stupor.java @@ -44,7 +44,6 @@ public class Stupor extends CardImpl { super(ownerId, 48, "Stupor", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "TSB"; - this.color.setBlack(true); // Target opponent discards a card at random, then discards a card. this.getSpellAbility().addEffect(new DiscardTargetEffect(1, true)); diff --git a/Mage.Sets/src/mage/sets/timeshifted/SuqAtaLancer.java b/Mage.Sets/src/mage/sets/timeshifted/SuqAtaLancer.java index b2a520bb61f..a8c0cc0dd6f 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/SuqAtaLancer.java +++ b/Mage.Sets/src/mage/sets/timeshifted/SuqAtaLancer.java @@ -47,7 +47,6 @@ public class SuqAtaLancer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/timeshifted/Thallid.java b/Mage.Sets/src/mage/sets/timeshifted/Thallid.java index c538385a046..0a2805cbd52 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Thallid.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Thallid.java @@ -54,7 +54,6 @@ public class Thallid extends CardImpl { this.expansionSetCode = "TSB"; this.subtype.add("Fungus"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timeshifted/TwistedAbomination.java b/Mage.Sets/src/mage/sets/timeshifted/TwistedAbomination.java index 781772bed4b..f76fa92bf3f 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/TwistedAbomination.java +++ b/Mage.Sets/src/mage/sets/timeshifted/TwistedAbomination.java @@ -51,7 +51,6 @@ public class TwistedAbomination extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Mutant"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/timeshifted/Undertaker.java b/Mage.Sets/src/mage/sets/timeshifted/Undertaker.java index 7d84a958cdd..b40cbf5ce27 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Undertaker.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Undertaker.java @@ -56,7 +56,6 @@ public class Undertaker extends CardImpl { this.subtype.add("Human"); this.subtype.add("Spellshaper"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java b/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java index 27c4d289546..71808f02fa0 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java +++ b/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java @@ -55,7 +55,6 @@ public class WallOfRoots extends CardImpl { this.subtype.add("Plant"); this.subtype.add("Wall"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java b/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java index 7b6aadddca7..f0213445272 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java +++ b/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java @@ -62,7 +62,6 @@ public class ZhalfirinCommander extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/timespiral/AmrouScout.java b/Mage.Sets/src/mage/sets/timespiral/AmrouScout.java index 7a84d85fc5b..b5b144feefd 100644 --- a/Mage.Sets/src/mage/sets/timespiral/AmrouScout.java +++ b/Mage.Sets/src/mage/sets/timespiral/AmrouScout.java @@ -63,7 +63,6 @@ public class AmrouScout extends CardImpl { this.subtype.add("Rebel"); this.subtype.add("Scout"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/AmrouSeekers.java b/Mage.Sets/src/mage/sets/timespiral/AmrouSeekers.java index 9eeb508bd1e..2b8cd9f5fae 100644 --- a/Mage.Sets/src/mage/sets/timespiral/AmrouSeekers.java +++ b/Mage.Sets/src/mage/sets/timespiral/AmrouSeekers.java @@ -59,7 +59,6 @@ public class AmrouSeekers extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Rebel"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/timespiral/AngelsGrace.java b/Mage.Sets/src/mage/sets/timespiral/AngelsGrace.java index 7add0e83ce7..f51413dd1f5 100644 --- a/Mage.Sets/src/mage/sets/timespiral/AngelsGrace.java +++ b/Mage.Sets/src/mage/sets/timespiral/AngelsGrace.java @@ -52,7 +52,6 @@ public class AngelsGrace extends CardImpl { super(ownerId, 3, "Angel's Grace", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "TSP"; - this.color.setWhite(true); // Split second this.addAbility(new SplitSecondAbility()); diff --git a/Mage.Sets/src/mage/sets/timespiral/AshcoatBear.java b/Mage.Sets/src/mage/sets/timespiral/AshcoatBear.java index a7d74d7da0d..d34c50dea06 100644 --- a/Mage.Sets/src/mage/sets/timespiral/AshcoatBear.java +++ b/Mage.Sets/src/mage/sets/timespiral/AshcoatBear.java @@ -45,7 +45,6 @@ public class AshcoatBear extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Bear"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/timespiral/AspectOfMongoose.java b/Mage.Sets/src/mage/sets/timespiral/AspectOfMongoose.java index d4535f11cf6..70d95d03c2d 100644 --- a/Mage.Sets/src/mage/sets/timespiral/AspectOfMongoose.java +++ b/Mage.Sets/src/mage/sets/timespiral/AspectOfMongoose.java @@ -57,7 +57,6 @@ public class AspectOfMongoose extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/timespiral/BenalishCavalry.java b/Mage.Sets/src/mage/sets/timespiral/BenalishCavalry.java index 3195166a85b..fc48419f8f1 100644 --- a/Mage.Sets/src/mage/sets/timespiral/BenalishCavalry.java +++ b/Mage.Sets/src/mage/sets/timespiral/BenalishCavalry.java @@ -46,7 +46,6 @@ public class BenalishCavalry extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/timespiral/Bewilder.java b/Mage.Sets/src/mage/sets/timespiral/Bewilder.java index e9feeb08539..728cda4af7f 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Bewilder.java +++ b/Mage.Sets/src/mage/sets/timespiral/Bewilder.java @@ -47,7 +47,6 @@ public class Bewilder extends CardImpl { super(ownerId, 49, "Bewilder", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "TSP"; - this.color.setBlue(true); // Target creature gets -3/-0 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-3, 0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/timespiral/BlazingBladeAskari.java b/Mage.Sets/src/mage/sets/timespiral/BlazingBladeAskari.java index 074ed24c953..de158ab2596 100644 --- a/Mage.Sets/src/mage/sets/timespiral/BlazingBladeAskari.java +++ b/Mage.Sets/src/mage/sets/timespiral/BlazingBladeAskari.java @@ -53,7 +53,6 @@ public class BlazingBladeAskari extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/timespiral/CarefulConsideration.java b/Mage.Sets/src/mage/sets/timespiral/CarefulConsideration.java index bf53663fb89..8470f26e7b2 100644 --- a/Mage.Sets/src/mage/sets/timespiral/CarefulConsideration.java +++ b/Mage.Sets/src/mage/sets/timespiral/CarefulConsideration.java @@ -46,7 +46,6 @@ public class CarefulConsideration extends CardImpl { super(ownerId, 52, "Careful Consideration", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); this.expansionSetCode = "TSP"; - this.color.setBlue(true); // Target player draws four cards, then discards three cards. If you cast this spell during your main phase, instead that player draws four cards, then discards two cards. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( diff --git a/Mage.Sets/src/mage/sets/timespiral/CavalryMaster.java b/Mage.Sets/src/mage/sets/timespiral/CavalryMaster.java index e939d3f834e..8332e72d069 100644 --- a/Mage.Sets/src/mage/sets/timespiral/CavalryMaster.java +++ b/Mage.Sets/src/mage/sets/timespiral/CavalryMaster.java @@ -59,7 +59,6 @@ public class CavalryMaster extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/timespiral/ChildrenOfKorlis.java b/Mage.Sets/src/mage/sets/timespiral/ChildrenOfKorlis.java index 7fe9c28c5d6..0ef07db7a8a 100644 --- a/Mage.Sets/src/mage/sets/timespiral/ChildrenOfKorlis.java +++ b/Mage.Sets/src/mage/sets/timespiral/ChildrenOfKorlis.java @@ -56,7 +56,6 @@ public class ChildrenOfKorlis extends CardImpl { this.subtype.add("Rebel"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/Conflagrate.java b/Mage.Sets/src/mage/sets/timespiral/Conflagrate.java index f22ae3a2442..1294976b01c 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Conflagrate.java +++ b/Mage.Sets/src/mage/sets/timespiral/Conflagrate.java @@ -52,7 +52,6 @@ public class Conflagrate extends CardImpl { super(ownerId, 151, "Conflagrate", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{X}{R}"); this.expansionSetCode = "TSP"; - this.color.setRed(true); // Conflagrate deals X damage divided as you choose among any number of target creatures and/or players. DynamicValue xValue = new ManacostVariableValue(); diff --git a/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java b/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java index cec87765fcf..0221309f2fd 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java +++ b/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java @@ -57,7 +57,6 @@ public class DarkWithering extends CardImpl { super(ownerId, 101, "Dark Withering", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{B}{B}"); this.expansionSetCode = "TSP"; - this.color.setBlack(true); // Destroy target nonblack creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/timespiral/DeepSeaKraken.java b/Mage.Sets/src/mage/sets/timespiral/DeepSeaKraken.java index 00dd1bbd34e..fea5aba999d 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DeepSeaKraken.java +++ b/Mage.Sets/src/mage/sets/timespiral/DeepSeaKraken.java @@ -60,7 +60,6 @@ public class DeepSeaKraken extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Kraken"); - this.color.setBlue(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/timespiral/DrainingWhelk.java b/Mage.Sets/src/mage/sets/timespiral/DrainingWhelk.java index 84bd26505fc..e0f6a85bd05 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DrainingWhelk.java +++ b/Mage.Sets/src/mage/sets/timespiral/DrainingWhelk.java @@ -54,7 +54,6 @@ public class DrainingWhelk extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/DralnuLichLord.java b/Mage.Sets/src/mage/sets/timespiral/DralnuLichLord.java index 089ec737548..abcb883f06a 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DralnuLichLord.java +++ b/Mage.Sets/src/mage/sets/timespiral/DralnuLichLord.java @@ -76,8 +76,6 @@ public class DralnuLichLord extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Wizard"); - this.color.setBlack(true); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java b/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java index 58b8db8c224..deb44b11895 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java +++ b/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java @@ -50,7 +50,6 @@ public class DreadReturn extends CardImpl { super(ownerId, 104, "Dread Return", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{B}{B}"); this.expansionSetCode = "TSP"; - this.color.setBlack(true); // Return target creature card from your graveyard to the battlefield. this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/timespiral/DurkwoodBaloth.java b/Mage.Sets/src/mage/sets/timespiral/DurkwoodBaloth.java index 42a22280d25..76deb7cd24a 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DurkwoodBaloth.java +++ b/Mage.Sets/src/mage/sets/timespiral/DurkwoodBaloth.java @@ -46,7 +46,6 @@ public class DurkwoodBaloth extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/timespiral/DuskriderPeregrine.java b/Mage.Sets/src/mage/sets/timespiral/DuskriderPeregrine.java index c3e414430f0..fcf1d32afb0 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DuskriderPeregrine.java +++ b/Mage.Sets/src/mage/sets/timespiral/DuskriderPeregrine.java @@ -56,7 +56,6 @@ public class DuskriderPeregrine extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Bird"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/timespiral/EmptyTheWarrens.java b/Mage.Sets/src/mage/sets/timespiral/EmptyTheWarrens.java index d155151129e..5397da90d23 100644 --- a/Mage.Sets/src/mage/sets/timespiral/EmptyTheWarrens.java +++ b/Mage.Sets/src/mage/sets/timespiral/EmptyTheWarrens.java @@ -45,7 +45,6 @@ public class EmptyTheWarrens extends CardImpl { super(ownerId, 152, "Empty the Warrens", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "TSP"; - this.color.setRed(true); // Put two 1/1 red Goblin creature tokens onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new GoblinToken(), 2)); diff --git a/Mage.Sets/src/mage/sets/timespiral/ErrantEphemeron.java b/Mage.Sets/src/mage/sets/timespiral/ErrantEphemeron.java index 71ce6d6a7eb..62b84716af9 100644 --- a/Mage.Sets/src/mage/sets/timespiral/ErrantEphemeron.java +++ b/Mage.Sets/src/mage/sets/timespiral/ErrantEphemeron.java @@ -47,7 +47,6 @@ public class ErrantEphemeron extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/timespiral/EternitySnare.java b/Mage.Sets/src/mage/sets/timespiral/EternitySnare.java index d0ff3af8853..b2419f3bb4f 100644 --- a/Mage.Sets/src/mage/sets/timespiral/EternitySnare.java +++ b/Mage.Sets/src/mage/sets/timespiral/EternitySnare.java @@ -54,7 +54,6 @@ public class EternitySnare extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/timespiral/FirewakeSliver.java b/Mage.Sets/src/mage/sets/timespiral/FirewakeSliver.java index 2dfd86128d6..6710cc6e642 100644 --- a/Mage.Sets/src/mage/sets/timespiral/FirewakeSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/FirewakeSliver.java @@ -65,8 +65,6 @@ public class FirewakeSliver extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Sliver"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/Fortify.java b/Mage.Sets/src/mage/sets/timespiral/Fortify.java index 180d6cea20e..8e5fb0262c9 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Fortify.java +++ b/Mage.Sets/src/mage/sets/timespiral/Fortify.java @@ -46,7 +46,6 @@ public class Fortify extends CardImpl { super(ownerId, 19, "Fortify", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "TSP"; - this.color.setWhite(true); // Choose one - Creatures you control get +2/+0 until end of turn; or creatures you control get +0/+2 until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/timespiral/FortuneThief.java b/Mage.Sets/src/mage/sets/timespiral/FortuneThief.java index a0af9efa860..c819fd42304 100644 --- a/Mage.Sets/src/mage/sets/timespiral/FortuneThief.java +++ b/Mage.Sets/src/mage/sets/timespiral/FortuneThief.java @@ -57,7 +57,6 @@ public class FortuneThief extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/GemhideSliver.java b/Mage.Sets/src/mage/sets/timespiral/GemhideSliver.java index efff47ee134..14f173d33c3 100644 --- a/Mage.Sets/src/mage/sets/timespiral/GemhideSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/GemhideSliver.java @@ -53,7 +53,6 @@ public class GemhideSliver extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Sliver"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/Grapeshot.java b/Mage.Sets/src/mage/sets/timespiral/Grapeshot.java index b80bb03ce86..fc40c3f158f 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Grapeshot.java +++ b/Mage.Sets/src/mage/sets/timespiral/Grapeshot.java @@ -45,7 +45,6 @@ public class Grapeshot extends CardImpl { super(ownerId, 160, "Grapeshot", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "TSP"; - this.color.setRed(true); // Grapeshot deals 1 damage to target creature or player. this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java b/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java index 317a6273a74..965454ed47c 100644 --- a/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java +++ b/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java @@ -60,7 +60,6 @@ public class GreaterGargadon extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(9); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java b/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java index 9e8950dada6..c086c8bf41e 100644 --- a/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java +++ b/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java @@ -61,7 +61,6 @@ public class GriffinGuide extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/timespiral/GroundRift.java b/Mage.Sets/src/mage/sets/timespiral/GroundRift.java index 868450ad016..fd3386b4368 100644 --- a/Mage.Sets/src/mage/sets/timespiral/GroundRift.java +++ b/Mage.Sets/src/mage/sets/timespiral/GroundRift.java @@ -57,7 +57,6 @@ public class GroundRift extends CardImpl { super(ownerId, 162, "Ground Rift", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "TSP"; - this.color.setRed(true); // Target creature without flying can't block this turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java b/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java index cfd0014cd2f..fef56e3baa3 100644 --- a/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java @@ -67,8 +67,6 @@ public class HarmonicSliver extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Sliver"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/HavenwoodWurm.java b/Mage.Sets/src/mage/sets/timespiral/HavenwoodWurm.java index c7dff2f3a6c..bd352f1987e 100644 --- a/Mage.Sets/src/mage/sets/timespiral/HavenwoodWurm.java +++ b/Mage.Sets/src/mage/sets/timespiral/HavenwoodWurm.java @@ -46,7 +46,6 @@ public class HavenwoodWurm extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java b/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java index 8de89911f26..099d28eeab8 100644 --- a/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java +++ b/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java @@ -53,7 +53,6 @@ public class IgniteMemories extends CardImpl { super(ownerId, 164, "Ignite Memories", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{R}"); this.expansionSetCode = "TSP"; - this.color.setRed(true); // Target player reveals a card at random from his or her hand. Ignite Memories deals damage to that player equal to that card's converted mana cost. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/timespiral/IronclawBuzzardiers.java b/Mage.Sets/src/mage/sets/timespiral/IronclawBuzzardiers.java index 2f2bfd98d88..281912657f3 100644 --- a/Mage.Sets/src/mage/sets/timespiral/IronclawBuzzardiers.java +++ b/Mage.Sets/src/mage/sets/timespiral/IronclawBuzzardiers.java @@ -61,7 +61,6 @@ public class IronclawBuzzardiers extends CardImpl { this.subtype.add("Orc"); this.subtype.add("Scout"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/timespiral/IvoryGiant.java b/Mage.Sets/src/mage/sets/timespiral/IvoryGiant.java index 8b00a1c4265..b237310af9f 100644 --- a/Mage.Sets/src/mage/sets/timespiral/IvoryGiant.java +++ b/Mage.Sets/src/mage/sets/timespiral/IvoryGiant.java @@ -57,7 +57,6 @@ public class IvoryGiant extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Giant"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java b/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java index 27c415c55b3..f888d6bc407 100644 --- a/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java +++ b/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java @@ -73,7 +73,6 @@ public class JayaBallardTaskMage extends CardImpl { this.subtype.add("Human"); this.subtype.add("Spellshaper"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/timespiral/JeditsDragoons.java b/Mage.Sets/src/mage/sets/timespiral/JeditsDragoons.java index 69f4c0fb63e..12ff5f57b52 100644 --- a/Mage.Sets/src/mage/sets/timespiral/JeditsDragoons.java +++ b/Mage.Sets/src/mage/sets/timespiral/JeditsDragoons.java @@ -48,7 +48,6 @@ public class JeditsDragoons extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java b/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java index 32db0ef21bf..8c434a31c1b 100644 --- a/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java +++ b/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java @@ -56,7 +56,6 @@ public class KrosanGrip extends CardImpl { super(ownerId, 202, "Krosan Grip", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "TSP"; - this.color.setGreen(true); // Split second this.addAbility(new SplitSecondAbility()); diff --git a/Mage.Sets/src/mage/sets/timespiral/LightningAxe.java b/Mage.Sets/src/mage/sets/timespiral/LightningAxe.java index 743b6df8827..28d66aefb56 100644 --- a/Mage.Sets/src/mage/sets/timespiral/LightningAxe.java +++ b/Mage.Sets/src/mage/sets/timespiral/LightningAxe.java @@ -47,7 +47,6 @@ public class LightningAxe extends CardImpl { super(ownerId, 168, "Lightning Axe", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "TSP"; - this.color.setRed(true); // As an additional cost to cast Lightning Axe, discard a card or pay {5}. this.getSpellAbility().addCost(new OrCost(new DiscardCardCost(), new GenericManaCost(5),"discard a card or pay {5}")); diff --git a/Mage.Sets/src/mage/sets/timespiral/LooterIlKor.java b/Mage.Sets/src/mage/sets/timespiral/LooterIlKor.java index 6080125f35b..50d92657baf 100644 --- a/Mage.Sets/src/mage/sets/timespiral/LooterIlKor.java +++ b/Mage.Sets/src/mage/sets/timespiral/LooterIlKor.java @@ -48,7 +48,6 @@ public class LooterIlKor extends CardImpl { this.subtype.add("Kor"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/MangaraOfCorondor.java b/Mage.Sets/src/mage/sets/timespiral/MangaraOfCorondor.java index a6bdfb8da5f..debb7b0e7d3 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MangaraOfCorondor.java +++ b/Mage.Sets/src/mage/sets/timespiral/MangaraOfCorondor.java @@ -53,7 +53,6 @@ public class MangaraOfCorondor extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java b/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java index a848379c069..eb4fac5aba9 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java +++ b/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java @@ -48,7 +48,6 @@ public class MightOfOldKrosa extends CardImpl { super(ownerId, 204, "Might of Old Krosa", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "TSP"; - this.color.setGreen(true); // Target creature gets +2/+2 until end of turn. If you cast this spell during your main phase, that creature gets +4/+4 until end of turn instead. this.getSpellAbility().addEffect(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/sets/timespiral/MightSliver.java b/Mage.Sets/src/mage/sets/timespiral/MightSliver.java index b07d9215a0a..dc7083c9b80 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MightSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/MightSliver.java @@ -56,7 +56,6 @@ public class MightSliver extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Sliver"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/timespiral/MindlashSliver.java b/Mage.Sets/src/mage/sets/timespiral/MindlashSliver.java index d97f8cc1a7b..483408fc324 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MindlashSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/MindlashSliver.java @@ -60,7 +60,6 @@ public class MindlashSliver extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Sliver"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/Mindstab.java b/Mage.Sets/src/mage/sets/timespiral/Mindstab.java index ca2749054f9..eb86937ac0d 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Mindstab.java +++ b/Mage.Sets/src/mage/sets/timespiral/Mindstab.java @@ -46,7 +46,6 @@ public class Mindstab extends CardImpl { super(ownerId, 119, "Mindstab", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{5}{B}"); this.expansionSetCode = "TSP"; - this.color.setBlack(true); // Target player discards three cards. this.getSpellAbility().addEffect(new DiscardTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/timespiral/MoggWarMarshal.java b/Mage.Sets/src/mage/sets/timespiral/MoggWarMarshal.java index f2133c12d56..6b94207f010 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MoggWarMarshal.java +++ b/Mage.Sets/src/mage/sets/timespiral/MoggWarMarshal.java @@ -49,7 +49,6 @@ public class MoggWarMarshal extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/MomentaryBlink.java b/Mage.Sets/src/mage/sets/timespiral/MomentaryBlink.java index a7eacc061e7..f5698a1690c 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MomentaryBlink.java +++ b/Mage.Sets/src/mage/sets/timespiral/MomentaryBlink.java @@ -48,7 +48,6 @@ public class MomentaryBlink extends CardImpl { super(ownerId, 29, "Momentary Blink", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "TSP"; - this.color.setWhite(true); // Exile target creature you control, then return it to the battlefield under its owner's control. this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/timespiral/MysticalTeachings.java b/Mage.Sets/src/mage/sets/timespiral/MysticalTeachings.java index 0de1bbb8ca2..818c182c5f2 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MysticalTeachings.java +++ b/Mage.Sets/src/mage/sets/timespiral/MysticalTeachings.java @@ -61,7 +61,6 @@ public class MysticalTeachings extends CardImpl { super(ownerId, 69, "Mystical Teachings", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "TSP"; - this.color.setBlue(true); // Search your library for an instant card or a card with flash, reveal it, and put it into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true)); diff --git a/Mage.Sets/src/mage/sets/timespiral/NantukoShaman.java b/Mage.Sets/src/mage/sets/timespiral/NantukoShaman.java index 5a36955d15b..73b856158f3 100644 --- a/Mage.Sets/src/mage/sets/timespiral/NantukoShaman.java +++ b/Mage.Sets/src/mage/sets/timespiral/NantukoShaman.java @@ -59,7 +59,6 @@ public class NantukoShaman extends CardImpl { this.subtype.add("Insect"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java b/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java index 1bcd41cb76c..6b4964df67d 100644 --- a/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java +++ b/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java @@ -57,7 +57,6 @@ public class NorinTheWary extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/ParadoxHaze.java b/Mage.Sets/src/mage/sets/timespiral/ParadoxHaze.java index 28aa29a806f..7893c69d3ce 100644 --- a/Mage.Sets/src/mage/sets/timespiral/ParadoxHaze.java +++ b/Mage.Sets/src/mage/sets/timespiral/ParadoxHaze.java @@ -58,7 +58,6 @@ public class ParadoxHaze extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant player TargetPlayer auraTarget = new TargetPlayer(); diff --git a/Mage.Sets/src/mage/sets/timespiral/PardicDragon.java b/Mage.Sets/src/mage/sets/timespiral/PardicDragon.java index 514404a5318..db3e13a78ac 100644 --- a/Mage.Sets/src/mage/sets/timespiral/PardicDragon.java +++ b/Mage.Sets/src/mage/sets/timespiral/PardicDragon.java @@ -65,7 +65,6 @@ public class PardicDragon extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/timespiral/PhantomWurm.java b/Mage.Sets/src/mage/sets/timespiral/PhantomWurm.java index dd07b9e6f92..cfc53ad49ec 100644 --- a/Mage.Sets/src/mage/sets/timespiral/PhantomWurm.java +++ b/Mage.Sets/src/mage/sets/timespiral/PhantomWurm.java @@ -58,7 +58,6 @@ public class PhantomWurm extends CardImpl { this.subtype.add("Wurm"); this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/timespiral/Phthisis.java b/Mage.Sets/src/mage/sets/timespiral/Phthisis.java index b448ca3af79..781213df875 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Phthisis.java +++ b/Mage.Sets/src/mage/sets/timespiral/Phthisis.java @@ -51,7 +51,6 @@ public class Phthisis extends CardImpl { super(ownerId, 122, "Phthisis", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}{B}{B}"); this.expansionSetCode = "TSP"; - this.color.setBlack(true); // Destroy target creature. Its controller loses life equal to its power plus its toughness. this.getSpellAbility().addEffect(new PhthisisEffect()); diff --git a/Mage.Sets/src/mage/sets/timespiral/PlagueSliver.java b/Mage.Sets/src/mage/sets/timespiral/PlagueSliver.java index ea02279635a..95542c96153 100644 --- a/Mage.Sets/src/mage/sets/timespiral/PlagueSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/PlagueSliver.java @@ -60,7 +60,6 @@ public class PlagueSliver extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Sliver"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/timespiral/PullFromEternity.java b/Mage.Sets/src/mage/sets/timespiral/PullFromEternity.java index 70e4307cf11..e69e92e5537 100644 --- a/Mage.Sets/src/mage/sets/timespiral/PullFromEternity.java +++ b/Mage.Sets/src/mage/sets/timespiral/PullFromEternity.java @@ -59,7 +59,6 @@ public class PullFromEternity extends CardImpl { super(ownerId, 35, "Pull from Eternity", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "TSP"; - this.color.setWhite(true); // Put target face-up exiled card into its owner's graveyard. this.getSpellAbility().addEffect(new PullFromEternityEffect()); diff --git a/Mage.Sets/src/mage/sets/timespiral/RiftBolt.java b/Mage.Sets/src/mage/sets/timespiral/RiftBolt.java index b37156cd761..4cebb254a2c 100644 --- a/Mage.Sets/src/mage/sets/timespiral/RiftBolt.java +++ b/Mage.Sets/src/mage/sets/timespiral/RiftBolt.java @@ -46,7 +46,6 @@ public class RiftBolt extends CardImpl { super(ownerId, 176, "Rift Bolt", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "TSP"; - this.color.setRed(true); // Rift Bolt deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java b/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java index f58289791db..221faa6eb4d 100644 --- a/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java +++ b/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java @@ -51,7 +51,6 @@ public class RiftwingCloudskate extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/timespiral/SaffiEriksdotter.java b/Mage.Sets/src/mage/sets/timespiral/SaffiEriksdotter.java index 472967811e1..f1f87c4dca7 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SaffiEriksdotter.java +++ b/Mage.Sets/src/mage/sets/timespiral/SaffiEriksdotter.java @@ -62,8 +62,6 @@ public class SaffiEriksdotter extends CardImpl { this.subtype.add("Human"); this.subtype.add("Scout"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/timespiral/SageOfEpityr.java b/Mage.Sets/src/mage/sets/timespiral/SageOfEpityr.java index 94026ff2804..11247f76813 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SageOfEpityr.java +++ b/Mage.Sets/src/mage/sets/timespiral/SageOfEpityr.java @@ -47,7 +47,6 @@ public class SageOfEpityr extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/Sangrophage.java b/Mage.Sets/src/mage/sets/timespiral/Sangrophage.java index 48f0103e212..9d6f2e2cf1c 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Sangrophage.java +++ b/Mage.Sets/src/mage/sets/timespiral/Sangrophage.java @@ -48,7 +48,6 @@ public class Sangrophage extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/timespiral/ScrybRanger.java b/Mage.Sets/src/mage/sets/timespiral/ScrybRanger.java index 7908c7ca6ed..87abb1d8e25 100644 --- a/Mage.Sets/src/mage/sets/timespiral/ScrybRanger.java +++ b/Mage.Sets/src/mage/sets/timespiral/ScrybRanger.java @@ -66,7 +66,6 @@ public class ScrybRanger extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Faerie"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/SearchForTomorrow.java b/Mage.Sets/src/mage/sets/timespiral/SearchForTomorrow.java index 4ff6fabe37b..e64bd08f245 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SearchForTomorrow.java +++ b/Mage.Sets/src/mage/sets/timespiral/SearchForTomorrow.java @@ -48,7 +48,6 @@ public class SearchForTomorrow extends CardImpl { super(ownerId, 216, "Search for Tomorrow", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "TSP"; - this.color.setGreen(true); // Search your library for a basic land card and put it onto the battlefield. Then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(new FilterBasicLandCard()); diff --git a/Mage.Sets/src/mage/sets/timespiral/SerraAvenger.java b/Mage.Sets/src/mage/sets/timespiral/SerraAvenger.java index acfbf0f6d3d..3c1864195a7 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SerraAvenger.java +++ b/Mage.Sets/src/mage/sets/timespiral/SerraAvenger.java @@ -56,7 +56,6 @@ public class SerraAvenger extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/timespiral/SidewinderSliver.java b/Mage.Sets/src/mage/sets/timespiral/SidewinderSliver.java index db0813015c5..6436e8af8a8 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SidewinderSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/SidewinderSliver.java @@ -58,7 +58,6 @@ public class SidewinderSliver extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Sliver"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/SkulkingKnight.java b/Mage.Sets/src/mage/sets/timespiral/SkulkingKnight.java index 2acd9d095e2..1a2188ca731 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SkulkingKnight.java +++ b/Mage.Sets/src/mage/sets/timespiral/SkulkingKnight.java @@ -48,7 +48,6 @@ public class SkulkingKnight extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Knight"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/timespiral/Snapback.java b/Mage.Sets/src/mage/sets/timespiral/Snapback.java index 5304bd4332b..3e38ae077b4 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Snapback.java +++ b/Mage.Sets/src/mage/sets/timespiral/Snapback.java @@ -52,7 +52,6 @@ public class Snapback extends CardImpl { super(ownerId, 78, "Snapback", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "TSP"; - this.color.setBlue(true); // You may exile a blue card from your hand rather than pay Snapback's mana cost. FilterOwnedCard filterCardInHand = new FilterOwnedCard("a blue card from your hand"); diff --git a/Mage.Sets/src/mage/sets/timespiral/SpellBurst.java b/Mage.Sets/src/mage/sets/timespiral/SpellBurst.java index 30b057a6eda..b19a85293a8 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SpellBurst.java +++ b/Mage.Sets/src/mage/sets/timespiral/SpellBurst.java @@ -51,7 +51,6 @@ public class SpellBurst extends CardImpl { super(ownerId, 79, "Spell Burst", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{U}"); this.expansionSetCode = "TSP"; - this.color.setBlue(true); // Buyback {3} this.addAbility(new BuybackAbility("{3}")); diff --git a/Mage.Sets/src/mage/sets/timespiral/SpinneretSliver.java b/Mage.Sets/src/mage/sets/timespiral/SpinneretSliver.java index dd2d754f47a..a4125f061f9 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SpinneretSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/SpinneretSliver.java @@ -57,7 +57,6 @@ public class SpinneretSliver extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Sliver"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/timespiral/SpiritLoop.java b/Mage.Sets/src/mage/sets/timespiral/SpiritLoop.java index e6c181983a4..3760226eb71 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SpiritLoop.java +++ b/Mage.Sets/src/mage/sets/timespiral/SpiritLoop.java @@ -58,7 +58,6 @@ public class SpiritLoop extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature you control TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/timespiral/SporesowerThallid.java b/Mage.Sets/src/mage/sets/timespiral/SporesowerThallid.java index 0c1777ed282..8cdbce72696 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SporesowerThallid.java +++ b/Mage.Sets/src/mage/sets/timespiral/SporesowerThallid.java @@ -62,7 +62,6 @@ public class SporesowerThallid extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Fungus"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/timespiral/StonebrowKrosanHero.java b/Mage.Sets/src/mage/sets/timespiral/StonebrowKrosanHero.java index 4809d5840b9..dcca88a91a3 100644 --- a/Mage.Sets/src/mage/sets/timespiral/StonebrowKrosanHero.java +++ b/Mage.Sets/src/mage/sets/timespiral/StonebrowKrosanHero.java @@ -58,8 +58,6 @@ public class StonebrowKrosanHero extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/timespiral/SuddenDeath.java b/Mage.Sets/src/mage/sets/timespiral/SuddenDeath.java index 347ade08a9e..cd30be114ac 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SuddenDeath.java +++ b/Mage.Sets/src/mage/sets/timespiral/SuddenDeath.java @@ -47,7 +47,6 @@ public class SuddenDeath extends CardImpl { super(ownerId, 134, "Sudden Death", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{B}{B}"); this.expansionSetCode = "TSP"; - this.color.setBlack(true); // Split second this.addAbility(new SplitSecondAbility()); diff --git a/Mage.Sets/src/mage/sets/timespiral/SuddenShock.java b/Mage.Sets/src/mage/sets/timespiral/SuddenShock.java index 3f0802cd92c..8efafa7006e 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SuddenShock.java +++ b/Mage.Sets/src/mage/sets/timespiral/SuddenShock.java @@ -45,7 +45,6 @@ public class SuddenShock extends CardImpl { super(ownerId, 179, "Sudden Shock", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "TSP"; - this.color.setRed(true); // Split second this.addAbility(new SplitSecondAbility()); diff --git a/Mage.Sets/src/mage/sets/timespiral/SuddenSpoiling.java b/Mage.Sets/src/mage/sets/timespiral/SuddenSpoiling.java index 744fd095545..718a2bf006c 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SuddenSpoiling.java +++ b/Mage.Sets/src/mage/sets/timespiral/SuddenSpoiling.java @@ -55,7 +55,6 @@ public class SuddenSpoiling extends CardImpl { super(ownerId, 135, "Sudden Spoiling", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{B}{B}"); this.expansionSetCode = "TSP"; - this.color.setBlack(true); // Split second this.addAbility(new SplitSecondAbility()); diff --git a/Mage.Sets/src/mage/sets/timespiral/TemporalIsolation.java b/Mage.Sets/src/mage/sets/timespiral/TemporalIsolation.java index 7f1b9b9218d..804e68e1a8b 100644 --- a/Mage.Sets/src/mage/sets/timespiral/TemporalIsolation.java +++ b/Mage.Sets/src/mage/sets/timespiral/TemporalIsolation.java @@ -57,7 +57,6 @@ public class TemporalIsolation extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Aura"); - this.color.setWhite(true); // Flash this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/timespiral/ThallidGerminator.java b/Mage.Sets/src/mage/sets/timespiral/ThallidGerminator.java index ed0b843f631..69727efec1d 100644 --- a/Mage.Sets/src/mage/sets/timespiral/ThallidGerminator.java +++ b/Mage.Sets/src/mage/sets/timespiral/ThallidGerminator.java @@ -66,7 +66,6 @@ public class ThallidGerminator extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Fungus"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/timespiral/ThallidShellDweller.java b/Mage.Sets/src/mage/sets/timespiral/ThallidShellDweller.java index 21aa04f4368..69bd7cf051a 100644 --- a/Mage.Sets/src/mage/sets/timespiral/ThallidShellDweller.java +++ b/Mage.Sets/src/mage/sets/timespiral/ThallidShellDweller.java @@ -54,7 +54,6 @@ public class ThallidShellDweller extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Fungus"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/timespiral/TheloniteHermit.java b/Mage.Sets/src/mage/sets/timespiral/TheloniteHermit.java index 2292ade10ac..dc9e3f03be9 100644 --- a/Mage.Sets/src/mage/sets/timespiral/TheloniteHermit.java +++ b/Mage.Sets/src/mage/sets/timespiral/TheloniteHermit.java @@ -62,7 +62,6 @@ public class TheloniteHermit extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/TraitorsClutch.java b/Mage.Sets/src/mage/sets/timespiral/TraitorsClutch.java index 2bd3496fbea..1d213c7e2ae 100644 --- a/Mage.Sets/src/mage/sets/timespiral/TraitorsClutch.java +++ b/Mage.Sets/src/mage/sets/timespiral/TraitorsClutch.java @@ -53,7 +53,6 @@ public class TraitorsClutch extends CardImpl { super(ownerId, 137, "Traitor's Clutch", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{B}"); this.expansionSetCode = "TSP"; - this.color.setBlack(true); // Target creature gets +1/+0, becomes black, and gains shadow until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(1,0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/timespiral/Trickbind.java b/Mage.Sets/src/mage/sets/timespiral/Trickbind.java index bedf24772f2..a92e9f24ddd 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Trickbind.java +++ b/Mage.Sets/src/mage/sets/timespiral/Trickbind.java @@ -53,7 +53,6 @@ public class Trickbind extends CardImpl { super(ownerId, 88, "Trickbind", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "TSP"; - this.color.setBlue(true); // Split second this.addAbility(new SplitSecondAbility()); diff --git a/Mage.Sets/src/mage/sets/timespiral/TrompTheDomains.java b/Mage.Sets/src/mage/sets/timespiral/TrompTheDomains.java index f017128ef8a..6fbd03506b2 100644 --- a/Mage.Sets/src/mage/sets/timespiral/TrompTheDomains.java +++ b/Mage.Sets/src/mage/sets/timespiral/TrompTheDomains.java @@ -51,7 +51,6 @@ public class TrompTheDomains extends CardImpl { super(ownerId, 230, "Tromp the Domains", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{5}{G}"); this.expansionSetCode = "TSP"; - this.color.setGreen(true); // Domain - Until end of turn, creatures you control gain trample and get +1/+1 for each basic land type among lands you control. Effect effect = new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/sets/timespiral/UrborgSyphonMage.java b/Mage.Sets/src/mage/sets/timespiral/UrborgSyphonMage.java index 1d7b20261b1..c437d0a420a 100644 --- a/Mage.Sets/src/mage/sets/timespiral/UrborgSyphonMage.java +++ b/Mage.Sets/src/mage/sets/timespiral/UrborgSyphonMage.java @@ -55,7 +55,6 @@ public class UrborgSyphonMage extends CardImpl { this.subtype.add("Human"); this.subtype.add("Spellshaper"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/timespiral/VampiricSliver.java b/Mage.Sets/src/mage/sets/timespiral/VampiricSliver.java index 9f42ecb88ae..e8157790d59 100644 --- a/Mage.Sets/src/mage/sets/timespiral/VampiricSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/VampiricSliver.java @@ -59,7 +59,6 @@ public class VampiricSliver extends CardImpl { this.expansionSetCode = "TSP"; this.subtype.add("Sliver"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/timespiral/VolcanicAwakening.java b/Mage.Sets/src/mage/sets/timespiral/VolcanicAwakening.java index a5b3fff7f2e..142267301de 100644 --- a/Mage.Sets/src/mage/sets/timespiral/VolcanicAwakening.java +++ b/Mage.Sets/src/mage/sets/timespiral/VolcanicAwakening.java @@ -45,7 +45,6 @@ public class VolcanicAwakening extends CardImpl { super(ownerId, 186, "Volcanic Awakening", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{R}{R}"); this.expansionSetCode = "TSP"; - this.color.setRed(true); // Destroy target land. this.getSpellAbility().addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/sets/timespiral/WipeAway.java b/Mage.Sets/src/mage/sets/timespiral/WipeAway.java index 74bde676f06..bad10ff4713 100644 --- a/Mage.Sets/src/mage/sets/timespiral/WipeAway.java +++ b/Mage.Sets/src/mage/sets/timespiral/WipeAway.java @@ -45,7 +45,6 @@ public class WipeAway extends CardImpl { super(ownerId, 94, "Wipe Away", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{U}"); this.expansionSetCode = "TSP"; - this.color.setBlue(true); // Split second this.addAbility(new SplitSecondAbility()); diff --git a/Mage.Sets/src/mage/sets/torment/Accelerate.java b/Mage.Sets/src/mage/sets/torment/Accelerate.java index a1b970f9ea5..351222ce026 100644 --- a/Mage.Sets/src/mage/sets/torment/Accelerate.java +++ b/Mage.Sets/src/mage/sets/torment/Accelerate.java @@ -48,7 +48,6 @@ public class Accelerate extends CardImpl { super(ownerId, 90, "Accelerate", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "TOR"; - this.color.setRed(true); // Target creature gains haste until end of turn. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/torment/AcornHarvest.java b/Mage.Sets/src/mage/sets/torment/AcornHarvest.java index 628fb37a9d3..b530862da96 100644 --- a/Mage.Sets/src/mage/sets/torment/AcornHarvest.java +++ b/Mage.Sets/src/mage/sets/torment/AcornHarvest.java @@ -48,7 +48,6 @@ public class AcornHarvest extends CardImpl { super(ownerId, 118, "Acorn Harvest", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "TOR"; - this.color.setGreen(true); // Put two 1/1 green Squirrel creature tokens onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new SquirrelToken(), 2)); diff --git a/Mage.Sets/src/mage/sets/torment/AngelOfRetribution.java b/Mage.Sets/src/mage/sets/torment/AngelOfRetribution.java index 877e30b9005..a3a4bdc423e 100644 --- a/Mage.Sets/src/mage/sets/torment/AngelOfRetribution.java +++ b/Mage.Sets/src/mage/sets/torment/AngelOfRetribution.java @@ -46,7 +46,6 @@ public class AngelOfRetribution extends CardImpl { this.expansionSetCode = "TOR"; this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/torment/Aquamoeba.java b/Mage.Sets/src/mage/sets/torment/Aquamoeba.java index a4ce28b831b..fd7262b5cbd 100644 --- a/Mage.Sets/src/mage/sets/torment/Aquamoeba.java +++ b/Mage.Sets/src/mage/sets/torment/Aquamoeba.java @@ -52,7 +52,6 @@ public class Aquamoeba extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Beast"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/torment/BaskingRootwalla.java b/Mage.Sets/src/mage/sets/torment/BaskingRootwalla.java index cbb7cb817a0..83188dcd2d8 100644 --- a/Mage.Sets/src/mage/sets/torment/BaskingRootwalla.java +++ b/Mage.Sets/src/mage/sets/torment/BaskingRootwalla.java @@ -51,7 +51,6 @@ public class BaskingRootwalla extends CardImpl { this.expansionSetCode = "TOR"; this.subtype.add("Lizard"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/torment/CabalRitual.java b/Mage.Sets/src/mage/sets/torment/CabalRitual.java index 8b5ee50b7d7..d22e660ba42 100644 --- a/Mage.Sets/src/mage/sets/torment/CabalRitual.java +++ b/Mage.Sets/src/mage/sets/torment/CabalRitual.java @@ -46,7 +46,6 @@ public class CabalRitual extends CardImpl { super(ownerId, 51, "Cabal Ritual", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "TOR"; - this.color.setBlack(true); // Add {B}{B}{B} to your mana pool. // Threshold — Add {B}{B}{B}{B}{B} to your mana pool instead if seven or more cards are in your graveyard. diff --git a/Mage.Sets/src/mage/sets/torment/CephalidIllusionist.java b/Mage.Sets/src/mage/sets/torment/CephalidIllusionist.java index bcdb85efc40..b588b137d48 100644 --- a/Mage.Sets/src/mage/sets/torment/CephalidIllusionist.java +++ b/Mage.Sets/src/mage/sets/torment/CephalidIllusionist.java @@ -57,7 +57,6 @@ public class CephalidIllusionist extends CardImpl { this.subtype.add("Cephalid"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/torment/CircularLogic.java b/Mage.Sets/src/mage/sets/torment/CircularLogic.java index 7f06df0ba74..2c32e524093 100644 --- a/Mage.Sets/src/mage/sets/torment/CircularLogic.java +++ b/Mage.Sets/src/mage/sets/torment/CircularLogic.java @@ -54,7 +54,6 @@ public class CircularLogic extends CardImpl { super(ownerId, 33, "Circular Logic", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "TOR"; - this.color.setBlue(true); // Counter target spell unless its controller pays {1} for each card in your graveyard. this.getSpellAbility().addEffect(new CircularLogicCounterUnlessPaysEffect()); diff --git a/Mage.Sets/src/mage/sets/torment/DeepAnalysis.java b/Mage.Sets/src/mage/sets/torment/DeepAnalysis.java index cbb97445284..019f093b517 100644 --- a/Mage.Sets/src/mage/sets/torment/DeepAnalysis.java +++ b/Mage.Sets/src/mage/sets/torment/DeepAnalysis.java @@ -52,7 +52,6 @@ public class DeepAnalysis extends CardImpl { super(ownerId, 36, "Deep Analysis", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "TOR"; - this.color.setBlue(true); // Target player draws two cards. this.getSpellAbility().addEffect(new DrawCardTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/torment/FranticPurification.java b/Mage.Sets/src/mage/sets/torment/FranticPurification.java index 06c523440b5..7a13559d4b2 100644 --- a/Mage.Sets/src/mage/sets/torment/FranticPurification.java +++ b/Mage.Sets/src/mage/sets/torment/FranticPurification.java @@ -55,7 +55,6 @@ public class FranticPurification extends CardImpl { super(ownerId, 6, "Frantic Purification", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "TOR"; - this.color.setWhite(true); // Destroy target enchantment. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/torment/LaquatussChampion.java b/Mage.Sets/src/mage/sets/torment/LaquatussChampion.java index 17991e121fe..028eb831fea 100644 --- a/Mage.Sets/src/mage/sets/torment/LaquatussChampion.java +++ b/Mage.Sets/src/mage/sets/torment/LaquatussChampion.java @@ -58,7 +58,6 @@ public class LaquatussChampion extends CardImpl { this.subtype.add("Nightmare"); this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/torment/LlawanCephalidEmpress.java b/Mage.Sets/src/mage/sets/torment/LlawanCephalidEmpress.java index d120e532d31..97d9d145869 100644 --- a/Mage.Sets/src/mage/sets/torment/LlawanCephalidEmpress.java +++ b/Mage.Sets/src/mage/sets/torment/LlawanCephalidEmpress.java @@ -73,7 +73,6 @@ public class LlawanCephalidEmpress extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Cephalid"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/torment/MajorTeroh.java b/Mage.Sets/src/mage/sets/torment/MajorTeroh.java index c00604cccd7..39b4c1169d7 100644 --- a/Mage.Sets/src/mage/sets/torment/MajorTeroh.java +++ b/Mage.Sets/src/mage/sets/torment/MajorTeroh.java @@ -62,7 +62,6 @@ public class MajorTeroh extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/torment/MesmericFiend.java b/Mage.Sets/src/mage/sets/torment/MesmericFiend.java index b41743dfdc0..22392f4c574 100644 --- a/Mage.Sets/src/mage/sets/torment/MesmericFiend.java +++ b/Mage.Sets/src/mage/sets/torment/MesmericFiend.java @@ -62,7 +62,6 @@ public class MesmericFiend extends CardImpl { this.subtype.add("Nightmare"); this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/torment/NostalgicDreams.java b/Mage.Sets/src/mage/sets/torment/NostalgicDreams.java index 6845c3fcce5..043c8e43114 100644 --- a/Mage.Sets/src/mage/sets/torment/NostalgicDreams.java +++ b/Mage.Sets/src/mage/sets/torment/NostalgicDreams.java @@ -53,7 +53,6 @@ public class NostalgicDreams extends CardImpl { super(ownerId, 135, "Nostalgic Dreams", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{G}{G}"); this.expansionSetCode = "TOR"; - this.color.setGreen(true); // As an additional cost to cast Nostalgic Dreams, discard X cards. this.getSpellAbility().addCost(new DiscardXTargetCost(new FilterCard("cards"), true)); diff --git a/Mage.Sets/src/mage/sets/torment/ObsessiveSearch.java b/Mage.Sets/src/mage/sets/torment/ObsessiveSearch.java index 8fc685259fc..0e0f4e55d69 100644 --- a/Mage.Sets/src/mage/sets/torment/ObsessiveSearch.java +++ b/Mage.Sets/src/mage/sets/torment/ObsessiveSearch.java @@ -46,7 +46,6 @@ public class ObsessiveSearch extends CardImpl { super(ownerId, 43, "Obsessive Search", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "TOR"; - this.color.setBlue(true); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/torment/Overmaster.java b/Mage.Sets/src/mage/sets/torment/Overmaster.java index c2057a3f8a4..136d09e866a 100644 --- a/Mage.Sets/src/mage/sets/torment/Overmaster.java +++ b/Mage.Sets/src/mage/sets/torment/Overmaster.java @@ -54,7 +54,6 @@ public class Overmaster extends CardImpl { super(ownerId, 104, "Overmaster", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "TOR"; - this.color.setRed(true); // The next instant or sorcery spell you cast this turn can't be countered by spells or abilities. this.getSpellAbility().addEffect(new OvermasterEffect()); diff --git a/Mage.Sets/src/mage/sets/torment/PsychoticHaze.java b/Mage.Sets/src/mage/sets/torment/PsychoticHaze.java index 81caa4d5902..719aeb80280 100644 --- a/Mage.Sets/src/mage/sets/torment/PsychoticHaze.java +++ b/Mage.Sets/src/mage/sets/torment/PsychoticHaze.java @@ -46,7 +46,6 @@ public class PsychoticHaze extends CardImpl { super(ownerId, 76, "Psychotic Haze", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}{B}"); this.expansionSetCode = "TOR"; - this.color.setBlack(true); // Psychotic Haze deals 1 damage to each creature and each player. this.getSpellAbility().addEffect(new DamageEverythingEffect(1)); diff --git a/Mage.Sets/src/mage/sets/torment/SoulScourge.java b/Mage.Sets/src/mage/sets/torment/SoulScourge.java index 76a799b9f97..0516f05f3ab 100644 --- a/Mage.Sets/src/mage/sets/torment/SoulScourge.java +++ b/Mage.Sets/src/mage/sets/torment/SoulScourge.java @@ -55,7 +55,6 @@ public class SoulScourge extends CardImpl { this.subtype.add("Nightmare"); this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/torment/ViolentEruption.java b/Mage.Sets/src/mage/sets/torment/ViolentEruption.java index 07240766df6..3377e24df5a 100644 --- a/Mage.Sets/src/mage/sets/torment/ViolentEruption.java +++ b/Mage.Sets/src/mage/sets/torment/ViolentEruption.java @@ -47,7 +47,6 @@ public class ViolentEruption extends CardImpl { super(ownerId, 117, "Violent Eruption", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}{R}{R}"); this.expansionSetCode = "TOR"; - this.color.setRed(true); // Violent Eruption deals 4 damage divided as you choose among any number of target creatures and/or players. this.getSpellAbility().addEffect(new DamageMultiEffect(4)); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Donate.java b/Mage.Sets/src/mage/sets/urzasdestiny/Donate.java index 3c342ccd21d..110d1935f50 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Donate.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Donate.java @@ -53,7 +53,6 @@ public class Donate extends CardImpl { super(ownerId, 31, "Donate", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "UDS"; - this.color.setBlue(true); // Target player gains control of target permanent you control. this.getSpellAbility().addEffect(new DonateEffect()); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/ElvishLookout.java b/Mage.Sets/src/mage/sets/urzasdestiny/ElvishLookout.java index c552a2a6ceb..6051c2793c8 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/ElvishLookout.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/ElvishLookout.java @@ -45,7 +45,6 @@ public class ElvishLookout extends CardImpl { this.expansionSetCode = "UDS"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/GoblinBerserker.java b/Mage.Sets/src/mage/sets/urzasdestiny/GoblinBerserker.java index c31eba5fce6..a8ced80ae0b 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/GoblinBerserker.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/GoblinBerserker.java @@ -47,7 +47,6 @@ public class GoblinBerserker extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Berserker"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/GoliathBeetle.java b/Mage.Sets/src/mage/sets/urzasdestiny/GoliathBeetle.java index fedea614388..5c408d69428 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/GoliathBeetle.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/GoliathBeetle.java @@ -45,7 +45,6 @@ public class GoliathBeetle extends CardImpl { this.expansionSetCode = "UDS"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/HeartWarden.java b/Mage.Sets/src/mage/sets/urzasdestiny/HeartWarden.java index fd9da08a7d9..68d8566863b 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/HeartWarden.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/HeartWarden.java @@ -53,7 +53,6 @@ public class HeartWarden extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java b/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java index dbc702184f7..3431f009adb 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java @@ -58,7 +58,6 @@ public class KeldonVandals extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/MultanisDecree.java b/Mage.Sets/src/mage/sets/urzasdestiny/MultanisDecree.java index 8af633168c7..b0d3bb228e9 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/MultanisDecree.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/MultanisDecree.java @@ -50,7 +50,6 @@ public class MultanisDecree extends CardImpl { super(ownerId, 114, "Multani's Decree", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "UDS"; - this.color.setGreen(true); // Destroy all enchantments. You gain 2 life for each enchantment destroyed this way. this.getSpellAbility().addEffect(new MultanisDecreeDestroyEffect()); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Opalescence.java b/Mage.Sets/src/mage/sets/urzasdestiny/Opalescence.java index f7d78f067d9..977547a474a 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Opalescence.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Opalescence.java @@ -58,7 +58,6 @@ public class Opalescence extends CardImpl { super(ownerId, 13, "Opalescence", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "UDS"; - this.color.setWhite(true); // Each other non-Aura enchantment is a creature with power and toughness each equal to its converted mana cost. It's still an enchantment. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OpalescenceEffect())); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/PatternOfRebirth.java b/Mage.Sets/src/mage/sets/urzasdestiny/PatternOfRebirth.java index 17598a62464..017063b773e 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/PatternOfRebirth.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/PatternOfRebirth.java @@ -54,7 +54,6 @@ public class PatternOfRebirth extends CardImpl { this.expansionSetCode = "UDS"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/PlatedSpider.java b/Mage.Sets/src/mage/sets/urzasdestiny/PlatedSpider.java index 37b5d4b5c35..b4e9c01cd41 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/PlatedSpider.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/PlatedSpider.java @@ -45,7 +45,6 @@ public class PlatedSpider extends CardImpl { this.expansionSetCode = "UDS"; this.subtype.add("Spider"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/PlowUnder.java b/Mage.Sets/src/mage/sets/urzasdestiny/PlowUnder.java index 3521f91d57a..dbcc4245542 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/PlowUnder.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/PlowUnder.java @@ -45,7 +45,6 @@ public class PlowUnder extends CardImpl { super(ownerId, 117, "Plow Under", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); this.expansionSetCode = "UDS"; - this.color.setGreen(true); // Put two target lands on top of their owners' libraries. this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/RayneAcademyChancellor.java b/Mage.Sets/src/mage/sets/urzasdestiny/RayneAcademyChancellor.java index 5bba7db8061..d94ad90e34e 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/RayneAcademyChancellor.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/RayneAcademyChancellor.java @@ -56,7 +56,6 @@ public class RayneAcademyChancellor extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Replenish.java b/Mage.Sets/src/mage/sets/urzasdestiny/Replenish.java index ae71adaecf2..ec46d722ec8 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Replenish.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Replenish.java @@ -51,7 +51,6 @@ public class Replenish extends CardImpl { super(ownerId, 15, "Replenish", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{W}"); this.expansionSetCode = "UDS"; - this.color.setWhite(true); // Return all enchantment cards from your graveyard to the battlefield. this.getSpellAbility().addEffect(new ReplenishEffect()); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/SigilOfSleep.java b/Mage.Sets/src/mage/sets/urzasdestiny/SigilOfSleep.java index 29bf47f6acd..fac417a452e 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/SigilOfSleep.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/SigilOfSleep.java @@ -57,7 +57,6 @@ public class SigilOfSleep extends CardImpl { this.expansionSetCode = "UDS"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Solidarity.java b/Mage.Sets/src/mage/sets/urzasdestiny/Solidarity.java index ff1ea95a7a3..4e998d101be 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Solidarity.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Solidarity.java @@ -45,7 +45,6 @@ public class Solidarity extends CardImpl { super(ownerId, 20, "Solidarity", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "UDS"; - this.color.setWhite(true); // Creatures you control get +0/+5 until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(0, 5, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/SquirmingMass.java b/Mage.Sets/src/mage/sets/urzasdestiny/SquirmingMass.java index 86afecbdadc..790ba7c2ede 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/SquirmingMass.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/SquirmingMass.java @@ -45,7 +45,6 @@ public class SquirmingMass extends CardImpl { this.expansionSetCode = "UDS"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/TormentedAngel.java b/Mage.Sets/src/mage/sets/urzasdestiny/TormentedAngel.java index 0d8a72870f9..f1185c49e2e 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/TormentedAngel.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/TormentedAngel.java @@ -45,7 +45,6 @@ public class TormentedAngel extends CardImpl { this.expansionSetCode = "UDS"; this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Treachery.java b/Mage.Sets/src/mage/sets/urzasdestiny/Treachery.java index 982904f2bef..0b2b58a5a35 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Treachery.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Treachery.java @@ -55,7 +55,6 @@ public class Treachery extends CardImpl { this.expansionSetCode = "UDS"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/WildColos.java b/Mage.Sets/src/mage/sets/urzasdestiny/WildColos.java index 4fadcd1f51c..7dd4a74b391 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/WildColos.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/WildColos.java @@ -46,7 +46,6 @@ public class WildColos extends CardImpl { this.subtype.add("Goat"); this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Anthroplasm.java b/Mage.Sets/src/mage/sets/urzaslegacy/Anthroplasm.java index 4d7b8655300..09abe519993 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Anthroplasm.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Anthroplasm.java @@ -57,7 +57,6 @@ public class Anthroplasm extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Shapeshifter"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/AuraFlux.java b/Mage.Sets/src/mage/sets/urzaslegacy/AuraFlux.java index a251e63bd4e..ae5e85b7673 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/AuraFlux.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/AuraFlux.java @@ -55,7 +55,6 @@ public class AuraFlux extends CardImpl { super(ownerId, 27, "Aura Flux", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "ULG"; - this.color.setBlue(true); // Other enchantments have "At the beginning of your upkeep, sacrifice this enchantment unless you pay {2}." Ability gainedAbility = new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new GenericManaCost(2)), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BlessedReversal.java b/Mage.Sets/src/mage/sets/urzaslegacy/BlessedReversal.java index 9ceef83205a..5171d3e3b9a 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BlessedReversal.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BlessedReversal.java @@ -49,7 +49,6 @@ public class BlessedReversal extends CardImpl { super(ownerId, 2, "Blessed Reversal", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "ULG"; - this.color.setWhite(true); // You gain 3 life for each creature attacking you. this.getSpellAbility().addEffect(new GainLifeEffect(new BlessedReversalCount())); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java b/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java index 88a869ede74..17f777436a1 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java @@ -54,7 +54,6 @@ public class BrinkOfMadness extends CardImpl { super(ownerId, 50, "Brink of Madness", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "ULG"; - this.color.setBlack(true); // At the beginning of your upkeep, if you have no cards in hand, sacrifice Brink of Madness and target opponent discards his or her hand. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BurstOfEnergy.java b/Mage.Sets/src/mage/sets/urzaslegacy/BurstOfEnergy.java index f6991e6c53d..d7b8e5402bf 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BurstOfEnergy.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BurstOfEnergy.java @@ -44,7 +44,6 @@ public class BurstOfEnergy extends CardImpl { super(ownerId, 3, "Burst of Energy", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "ULG"; - this.color.setWhite(true); // Untap target permanent. this.getSpellAbility().addEffect(new UntapTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/CloudOfFaeries.java b/Mage.Sets/src/mage/sets/urzaslegacy/CloudOfFaeries.java index 181f8a31357..837fb34c7de 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/CloudOfFaeries.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/CloudOfFaeries.java @@ -49,7 +49,6 @@ public class CloudOfFaeries extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Faerie"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/CropRotation.java b/Mage.Sets/src/mage/sets/urzaslegacy/CropRotation.java index 75ab3fcf255..58c4dacbd69 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/CropRotation.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/CropRotation.java @@ -52,7 +52,6 @@ public class CropRotation extends CardImpl { super(ownerId, 98, "Crop Rotation", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "ULG"; - this.color.setGreen(true); // As an additional cost to cast Crop Rotation, sacrifice a land. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DefenseOfTheHeart.java b/Mage.Sets/src/mage/sets/urzaslegacy/DefenseOfTheHeart.java index 708731c7063..df2c78b886b 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/DefenseOfTheHeart.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/DefenseOfTheHeart.java @@ -54,7 +54,6 @@ public class DefenseOfTheHeart extends CardImpl { super(ownerId, 100, "Defense of the Heart", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}"); this.expansionSetCode = "ULG"; - this.color.setGreen(true); // At the beginning of your upkeep, if an opponent controls three or more creatures, sacrifice Defense of the Heart, search your library for up to two creature cards, and put those cards onto the battlefield. Then shuffle your library. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DerangedHermit.java b/Mage.Sets/src/mage/sets/urzaslegacy/DerangedHermit.java index 0a71d3a8378..42688dded0d 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/DerangedHermit.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/DerangedHermit.java @@ -60,7 +60,6 @@ public class DerangedHermit extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/EngineeredPlague.java b/Mage.Sets/src/mage/sets/urzaslegacy/EngineeredPlague.java index 3bc84d21d42..cb30ebba8db 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/EngineeredPlague.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/EngineeredPlague.java @@ -49,7 +49,6 @@ public class EngineeredPlague extends CardImpl { super(ownerId, 51, "Engineered Plague", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "ULG"; - this.color.setBlack(true); // As Engineered Plague enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.UnboostCreature))); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java b/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java index 0c6ed5bd25d..d26ecbdcd7e 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java @@ -51,7 +51,6 @@ public class Erase extends CardImpl { super(ownerId, 7, "Erase", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "ULG"; - this.color.setWhite(true); } @Override diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Eviscerator.java b/Mage.Sets/src/mage/sets/urzaslegacy/Eviscerator.java index 5a09c0a3327..0ea69533f4a 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Eviscerator.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Eviscerator.java @@ -56,7 +56,6 @@ public class Eviscerator extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ExpendableTroops.java b/Mage.Sets/src/mage/sets/urzaslegacy/ExpendableTroops.java index 6e937c0346f..6f69a92c12a 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ExpendableTroops.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ExpendableTroops.java @@ -54,7 +54,6 @@ public class ExpendableTroops extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/FogOfGnats.java b/Mage.Sets/src/mage/sets/urzaslegacy/FogOfGnats.java index ded6a3cd77e..78b09e29abc 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/FogOfGnats.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/FogOfGnats.java @@ -49,7 +49,6 @@ public class FogOfGnats extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Insect"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/FranticSearch.java b/Mage.Sets/src/mage/sets/urzaslegacy/FranticSearch.java index 93e608ab8f1..0e55fbc4045 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/FranticSearch.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/FranticSearch.java @@ -44,7 +44,6 @@ public class FranticSearch extends CardImpl { super(ownerId, 32, "Frantic Search", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "ULG"; - this.color.setBlue(true); // Draw two cards, then discard two cards. Untap up to three lands. this.getSpellAbility().addEffect(new DrawDiscardControllerEffect(2, 2)); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GangOfElk.java b/Mage.Sets/src/mage/sets/urzaslegacy/GangOfElk.java index f493b3e7d7a..1d3ac6bc20f 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/GangOfElk.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/GangOfElk.java @@ -49,7 +49,6 @@ public class GangOfElk extends CardImpl { this.subtype.add("Elk"); this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GhituWarCry.java b/Mage.Sets/src/mage/sets/urzaslegacy/GhituWarCry.java index 2bb3ca6f39f..05682140c7f 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/GhituWarCry.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/GhituWarCry.java @@ -49,7 +49,6 @@ public class GhituWarCry extends CardImpl { super(ownerId, 78, "Ghitu War Cry", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "ULG"; - this.color.setRed(true); // {R}: Target creature gets +1/+0 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GoblinMedics.java b/Mage.Sets/src/mage/sets/urzaslegacy/GoblinMedics.java index 42dccbd6a81..94df69ca9ab 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/GoblinMedics.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/GoblinMedics.java @@ -49,7 +49,6 @@ public class GoblinMedics extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GoblinWelder.java b/Mage.Sets/src/mage/sets/urzaslegacy/GoblinWelder.java index f5f6a7c1fe0..d9ccd3e001c 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/GoblinWelder.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/GoblinWelder.java @@ -60,7 +60,6 @@ public class GoblinWelder extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Artificer"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GraniteGrip.java b/Mage.Sets/src/mage/sets/urzaslegacy/GraniteGrip.java index 33810887e78..4200d47dbfb 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/GraniteGrip.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/GraniteGrip.java @@ -60,7 +60,6 @@ public class GraniteGrip extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/HarmonicConvergence.java b/Mage.Sets/src/mage/sets/urzaslegacy/HarmonicConvergence.java index af7505f1094..82ea107fc19 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/HarmonicConvergence.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/HarmonicConvergence.java @@ -56,7 +56,6 @@ public class HarmonicConvergence extends CardImpl { super(ownerId, 103, "Harmonic Convergence", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "ULG"; - this.color.setGreen(true); // Put all enchantments on top of their owners' libraries. this.getSpellAbility().addEffect(new HarmonicConvergenceEffect()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/HopeAndGlory.java b/Mage.Sets/src/mage/sets/urzaslegacy/HopeAndGlory.java index 5af346d6fe3..102d5aac40e 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/HopeAndGlory.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/HopeAndGlory.java @@ -47,7 +47,6 @@ public class HopeAndGlory extends CardImpl { super(ownerId, 9, "Hope and Glory", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "ULG"; - this.color.setWhite(true); // Untap two target creatures. Each of them gets +1/+1 until end of turn. this.getSpellAbility().addEffect(new UntapTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ImpendingDisaster.java b/Mage.Sets/src/mage/sets/urzaslegacy/ImpendingDisaster.java index a4c6cbb95bd..c83208bd9f0 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ImpendingDisaster.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ImpendingDisaster.java @@ -54,7 +54,6 @@ public class ImpendingDisaster extends CardImpl { super(ownerId, 82, "Impending Disaster", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); this.expansionSetCode = "ULG"; - this.color.setRed(true); // At the beginning of your upkeep, if there are seven or more lands on the battlefield, sacrifice Impending Disaster and destroy all lands. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Intervene.java b/Mage.Sets/src/mage/sets/urzaslegacy/Intervene.java index 2ad67884b61..2713856744f 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Intervene.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Intervene.java @@ -56,7 +56,6 @@ public class Intervene extends CardImpl { super(ownerId, 33, "Intervene", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "ULG"; - this.color.setBlue(true); // Counter target spell that targets a creature. this.getSpellAbility().addTarget(new InterveneTargetSpell()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/IronWill.java b/Mage.Sets/src/mage/sets/urzaslegacy/IronWill.java index be7a4c3ed1b..4a7c9895bb6 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/IronWill.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/IronWill.java @@ -47,7 +47,6 @@ public class IronWill extends CardImpl { super(ownerId, 10, "Iron Will", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "ULG"; - this.color.setWhite(true); // Target creature gets +0/+4 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(0, 4, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java b/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java index 4a9126ca956..eedda4c1e84 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java @@ -60,7 +60,6 @@ public class KingCrab extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Crab"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Knighthood.java b/Mage.Sets/src/mage/sets/urzaslegacy/Knighthood.java index ebe2d3cb911..24268cf800e 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Knighthood.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Knighthood.java @@ -48,7 +48,6 @@ public class Knighthood extends CardImpl { super(ownerId, 12, "Knighthood", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "ULG"; - this.color.setWhite(true); // Creatures you control have first strike. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MartyrsCause.java b/Mage.Sets/src/mage/sets/urzaslegacy/MartyrsCause.java index c163e236d58..843bf925b32 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/MartyrsCause.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/MartyrsCause.java @@ -51,7 +51,6 @@ public class MartyrsCause extends CardImpl { super(ownerId, 13, "Martyr's Cause", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "ULG"; - this.color.setWhite(true); // Sacrifice a creature: The next time a source of your choice would deal damage to target creature or player this turn, prevent that damage. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(new FilterControlledCreaturePermanent("a creature")))); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Miscalculation.java b/Mage.Sets/src/mage/sets/urzaslegacy/Miscalculation.java index 5e422f867f7..2c024306347 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Miscalculation.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Miscalculation.java @@ -47,7 +47,6 @@ public class Miscalculation extends CardImpl { super(ownerId, 36, "Miscalculation", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "ULG"; - this.color.setBlue(true); // Counter target spell unless its controller pays {2}. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java b/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java index 645eec97f78..c98e7d98caa 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java @@ -63,7 +63,6 @@ public class MoltenHydra extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Hydra"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MotherOfRunes.java b/Mage.Sets/src/mage/sets/urzaslegacy/MotherOfRunes.java index fd04c950a02..b9d6b5ca49c 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/MotherOfRunes.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/MotherOfRunes.java @@ -52,7 +52,6 @@ public class MotherOfRunes extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MultanisAcolyte.java b/Mage.Sets/src/mage/sets/urzaslegacy/MultanisAcolyte.java index 19d62ead428..41b0e759be5 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/MultanisAcolyte.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/MultanisAcolyte.java @@ -47,7 +47,6 @@ public class MultanisAcolyte extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/NoMercy.java b/Mage.Sets/src/mage/sets/urzaslegacy/NoMercy.java index 4103cc3b5b3..c65884d1698 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/NoMercy.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/NoMercy.java @@ -51,7 +51,6 @@ public class NoMercy extends CardImpl { super(ownerId, 56, "No Mercy", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "ULG"; - this.color.setBlack(true); // Whenever a creature deals damage to you, destroy it. this.addAbility(new NoMercyTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Opportunity.java b/Mage.Sets/src/mage/sets/urzaslegacy/Opportunity.java index 7e7396dcc3d..4e89d025827 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Opportunity.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Opportunity.java @@ -44,7 +44,6 @@ public class Opportunity extends CardImpl { super(ownerId, 37, "Opportunity", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{U}{U}"); this.expansionSetCode = "ULG"; - this.color.setBlue(true); // Target player draws four cards. this.getSpellAbility().addEffect(new DrawCardTargetEffect(4)); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Ostracize.java b/Mage.Sets/src/mage/sets/urzaslegacy/Ostracize.java index 9066035620a..958d28818c2 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Ostracize.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Ostracize.java @@ -45,7 +45,6 @@ public class Ostracize extends CardImpl { super(ownerId, 57, "Ostracize", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "ULG"; - this.color.setBlack(true); // Target opponent reveals his or her hand. You choose a creature card from it. That player discards that card. this.getSpellAbility().addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Palinchron.java b/Mage.Sets/src/mage/sets/urzaslegacy/Palinchron.java index fd887c3065a..9eb08da7376 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Palinchron.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Palinchron.java @@ -51,7 +51,6 @@ public class Palinchron extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java b/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java index 42904654103..bd0950054b3 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java @@ -55,7 +55,6 @@ public class Parch extends CardImpl { super(ownerId, 86, "Parch", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "ULG"; - this.color.setRed(true); // Choose one - Parch deals 2 damage to target creature or player; or Parch deals 4 damage to target blue creature. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PeaceAndQuiet.java b/Mage.Sets/src/mage/sets/urzaslegacy/PeaceAndQuiet.java index 62387799eee..7d7d6682aac 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PeaceAndQuiet.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PeaceAndQuiet.java @@ -45,7 +45,6 @@ public class PeaceAndQuiet extends CardImpl { super(ownerId, 17, "Peace and Quiet", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "ULG"; - this.color.setWhite(true); // Destroy two target enchantments. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianBroodlings.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianBroodlings.java index 1d51fd44f77..5216d09ddd5 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianBroodlings.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianBroodlings.java @@ -52,7 +52,6 @@ public class PhyrexianBroodlings extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Minion"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDebaser.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDebaser.java index 2ab629da34f..9e3a03136f5 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDebaser.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDebaser.java @@ -53,7 +53,6 @@ public class PhyrexianDebaser extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Carrier"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDefiler.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDefiler.java index 1f374de2638..4338f985420 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDefiler.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDefiler.java @@ -52,7 +52,6 @@ public class PhyrexianDefiler extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Carrier"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDenouncer.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDenouncer.java index 31fcdfbad58..789b8cbc8b4 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDenouncer.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDenouncer.java @@ -52,7 +52,6 @@ public class PhyrexianDenouncer extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Carrier"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianPlaguelord.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianPlaguelord.java index e67db45705d..2b025bae55f 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianPlaguelord.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianPlaguelord.java @@ -54,7 +54,6 @@ public class PhyrexianPlaguelord extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Carrier"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianReclamation.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianReclamation.java index 6c72107be78..bcd3217a815 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianReclamation.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianReclamation.java @@ -50,7 +50,6 @@ public class PhyrexianReclamation extends CardImpl { super(ownerId, 63, "Phyrexian Reclamation", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "ULG"; - this.color.setBlack(true); // {1}{B}, Pay 2 life: Return target creature card from your graveyard to your hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{1}{B}")); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PlanarCollapse.java b/Mage.Sets/src/mage/sets/urzaslegacy/PlanarCollapse.java index 4390009c6db..903f2cab054 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PlanarCollapse.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PlanarCollapse.java @@ -53,7 +53,6 @@ public class PlanarCollapse extends CardImpl { super(ownerId, 18, "Planar Collapse", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "ULG"; - this.color.setWhite(true); // At the beginning of your upkeep, if there are four or more creatures on the battlefield, sacrifice Planar Collapse and destroy all creatures. They can't be regenerated. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Purify.java b/Mage.Sets/src/mage/sets/urzaslegacy/Purify.java index 455c40dd0ab..a860cc554f1 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Purify.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Purify.java @@ -54,7 +54,6 @@ public class Purify extends CardImpl { super(ownerId, 19, "Purify", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{W}{W}"); this.expansionSetCode = "ULG"; - this.color.setWhite(true); // Destroy all artifacts and enchantments. this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PygmyPyrosaur.java b/Mage.Sets/src/mage/sets/urzaslegacy/PygmyPyrosaur.java index 0239548ae38..d9ca5a60c3b 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PygmyPyrosaur.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PygmyPyrosaur.java @@ -50,7 +50,6 @@ public class PygmyPyrosaur extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Lizard"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RackAndRuin.java b/Mage.Sets/src/mage/sets/urzaslegacy/RackAndRuin.java index 03e3e2867ba..0a867cc20f3 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RackAndRuin.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RackAndRuin.java @@ -44,7 +44,6 @@ public class RackAndRuin extends CardImpl { super(ownerId, 89, "Rack and Ruin", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "ULG"; - this.color.setRed(true); // Destroy two target artifacts. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantArchangel.java b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantArchangel.java index 24daf93de76..064b0b180dd 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantArchangel.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantArchangel.java @@ -64,7 +64,6 @@ public class RadiantArchangel extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsDragoons.java b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsDragoons.java index 56606971520..60a8269f851 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsDragoons.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsDragoons.java @@ -48,7 +48,6 @@ public class RadiantsDragoons extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java index 2ed53dd33df..08c1212f4f7 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java @@ -53,7 +53,6 @@ public class RadiantsJudgment extends CardImpl { super(ownerId, 22, "Radiant's Judgment", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "ULG"; - this.color.setWhite(true); // Destroy target creature with power 4 or greater. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java b/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java index d8b4e5aa23b..f59afc7af7b 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java @@ -54,7 +54,6 @@ public class Rancor extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RankAndFile.java b/Mage.Sets/src/mage/sets/urzaslegacy/RankAndFile.java index a6034663e5e..d395429e9f1 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RankAndFile.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RankAndFile.java @@ -56,7 +56,6 @@ public class RankAndFile extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RavenFamiliar.java b/Mage.Sets/src/mage/sets/urzaslegacy/RavenFamiliar.java index b8de7cfd8f8..4ad677fd27d 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RavenFamiliar.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RavenFamiliar.java @@ -61,7 +61,6 @@ public class RavenFamiliar extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Rebuild.java b/Mage.Sets/src/mage/sets/urzaslegacy/Rebuild.java index deb473917a5..661ad418959 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Rebuild.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Rebuild.java @@ -52,7 +52,6 @@ public class Rebuild extends CardImpl { super(ownerId, 40, "Rebuild", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "ULG"; - this.color.setBlue(true); // Return all artifacts to their owners' hands. this.getSpellAbility().addEffect(new RebuildEffect()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Repopulate.java b/Mage.Sets/src/mage/sets/urzaslegacy/Repopulate.java index 9fdb8a929f4..ce77cf6bc10 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Repopulate.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Repopulate.java @@ -55,7 +55,6 @@ public class Repopulate extends CardImpl { super(ownerId, 111, "Repopulate", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "ULG"; - this.color.setGreen(true); // Shuffle all creature cards from target player's graveyard into that player's library. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java b/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java index be83df34618..b0e4770c0c6 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java @@ -52,7 +52,6 @@ public class Rivalry extends CardImpl { super(ownerId, 90, "Rivalry", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "ULG"; - this.color.setRed(true); // At the beginning of each player's upkeep, if that player controls more lands than each other player, Rivalry deals 2 damage to him or her. this.addAbility(new RivalryTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SecondChance.java b/Mage.Sets/src/mage/sets/urzaslegacy/SecondChance.java index 11b3df7f0ab..e275e3d2523 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SecondChance.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SecondChance.java @@ -53,7 +53,6 @@ public class SecondChance extends CardImpl { super(ownerId, 41, "Second Chance", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "ULG"; - this.color.setBlue(true); // At the beginning of your upkeep, if you have 5 or less life, sacrifice Second Chance and take an extra turn after this one. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ShivanPhoenix.java b/Mage.Sets/src/mage/sets/urzaslegacy/ShivanPhoenix.java index cf2be47b526..a6f507f10cf 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ShivanPhoenix.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ShivanPhoenix.java @@ -47,7 +47,6 @@ public class ShivanPhoenix extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Phoenix"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SickAndTired.java b/Mage.Sets/src/mage/sets/urzaslegacy/SickAndTired.java index c3102e4909a..9470a64f558 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SickAndTired.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SickAndTired.java @@ -45,7 +45,6 @@ public class SickAndTired extends CardImpl { super(ownerId, 66, "Sick and Tired", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "ULG"; - this.color.setBlack(true); // Two target creatures each get -1/-1 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-1, -1, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java b/Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java index da6bbaa3705..2d3aa054eee 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java @@ -47,7 +47,6 @@ public class SilkNet extends CardImpl { super(ownerId, 112, "Silk Net", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "ULG"; - this.color.setGreen(true); // Target creature gets +1/+1 and gains reach until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SimianGrunts.java b/Mage.Sets/src/mage/sets/urzaslegacy/SimianGrunts.java index 3262d530925..c31476477d5 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SimianGrunts.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SimianGrunts.java @@ -46,7 +46,6 @@ public class SimianGrunts extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Ape"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SleepersGuile.java b/Mage.Sets/src/mage/sets/urzaslegacy/SleepersGuile.java index 784a0fc0151..66df267f93d 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SleepersGuile.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SleepersGuile.java @@ -56,7 +56,6 @@ public class SleepersGuile extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SlowMotion.java b/Mage.Sets/src/mage/sets/urzaslegacy/SlowMotion.java index 73995b8b802..0f98a4ef562 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SlowMotion.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SlowMotion.java @@ -60,7 +60,6 @@ public class SlowMotion extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Sluggishness.java b/Mage.Sets/src/mage/sets/urzaslegacy/Sluggishness.java index 64595c87186..b5919405692 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Sluggishness.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Sluggishness.java @@ -56,7 +56,6 @@ public class Sluggishness extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Snap.java b/Mage.Sets/src/mage/sets/urzaslegacy/Snap.java index db185a648b8..9fd984b1e3a 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Snap.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Snap.java @@ -45,7 +45,6 @@ public class Snap extends CardImpl { super(ownerId, 43, "Snap", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "ULG"; - this.color.setBlue(true); // Return target creature to its owner's hand. Untap up to two lands. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Subversion.java b/Mage.Sets/src/mage/sets/urzaslegacy/Subversion.java index 737a6b75636..fde0063d058 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Subversion.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Subversion.java @@ -49,7 +49,6 @@ public class Subversion extends CardImpl { super(ownerId, 68, "Subversion", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{B}"); this.expansionSetCode = "ULG"; - this.color.setBlack(true); // At the beginning of your upkeep, each opponent loses 1 life. You gain life equal to the life lost this way. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SubversionEffect(), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SustainerOfTheRealm.java b/Mage.Sets/src/mage/sets/urzaslegacy/SustainerOfTheRealm.java index 01a069a5c29..6d274d3b742 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SustainerOfTheRealm.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SustainerOfTheRealm.java @@ -48,7 +48,6 @@ public class SustainerOfTheRealm extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/TetheredSkirge.java b/Mage.Sets/src/mage/sets/urzaslegacy/TetheredSkirge.java index e0e25827e7f..1220d51b906 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/TetheredSkirge.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/TetheredSkirge.java @@ -47,7 +47,6 @@ public class TetheredSkirge extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Imp"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ThornwindFaeries.java b/Mage.Sets/src/mage/sets/urzaslegacy/ThornwindFaeries.java index 0e9396e9332..db2a610aa65 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ThornwindFaeries.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ThornwindFaeries.java @@ -51,7 +51,6 @@ public class ThornwindFaeries extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Faerie"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Tinker.java b/Mage.Sets/src/mage/sets/urzaslegacy/Tinker.java index dfc9c6c1d1a..d546d5f912f 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Tinker.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Tinker.java @@ -55,7 +55,6 @@ public class Tinker extends CardImpl { super(ownerId, 45, "Tinker", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "ULG"; - this.color.setBlue(true); // As an additional cost to cast Tinker, sacrifice an artifact. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/TragicPoet.java b/Mage.Sets/src/mage/sets/urzaslegacy/TragicPoet.java index 868e1a094d1..4196423301e 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/TragicPoet.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/TragicPoet.java @@ -59,7 +59,6 @@ public class TragicPoet extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Human"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/TreefolkMystic.java b/Mage.Sets/src/mage/sets/urzaslegacy/TreefolkMystic.java index 85256f72387..49a574c82d9 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/TreefolkMystic.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/TreefolkMystic.java @@ -53,7 +53,6 @@ public class TreefolkMystic extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Treefolk"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Unearth.java b/Mage.Sets/src/mage/sets/urzaslegacy/Unearth.java index 08e290dab91..219cf6734b4 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Unearth.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Unearth.java @@ -56,7 +56,6 @@ public class Unearth extends CardImpl { super(ownerId, 72, "Unearth", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "ULG"; - this.color.setBlack(true); // Return target creature card with converted mana cost 3 or less from your graveyard to the battlefield. this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoCutthroat.java b/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoCutthroat.java index 8cb72d9f45f..66ed40005b8 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoCutthroat.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoCutthroat.java @@ -47,7 +47,6 @@ public class ViashinoCutthroat extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Viashino"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoHeretic.java b/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoHeretic.java index dc343424484..4572ec8cfa7 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoHeretic.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoHeretic.java @@ -57,7 +57,6 @@ public class ViashinoHeretic extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Viashino"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoSandscout.java b/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoSandscout.java index 2aad8c0b0bd..3bd1fc5154f 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoSandscout.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoSandscout.java @@ -48,7 +48,6 @@ public class ViashinoSandscout extends CardImpl { this.subtype.add("Viashino"); this.subtype.add("Scout"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/VigilantDrake.java b/Mage.Sets/src/mage/sets/urzaslegacy/VigilantDrake.java index 59251f23e60..a1c6b972d2c 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/VigilantDrake.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/VigilantDrake.java @@ -49,7 +49,6 @@ public class VigilantDrake extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedElf.java b/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedElf.java index ceb24d8a8ab..25985872da0 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedElf.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedElf.java @@ -52,7 +52,6 @@ public class WeatherseedElf extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedFaeries.java b/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedFaeries.java index 6336d838607..c579a26cfbb 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedFaeries.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedFaeries.java @@ -55,7 +55,6 @@ public class WeatherseedFaeries extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Faerie"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedTreefolk.java b/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedTreefolk.java index 55d90bbebed..a8c95f627e4 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedTreefolk.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedTreefolk.java @@ -47,7 +47,6 @@ public class WeatherseedTreefolk extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Treefolk"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java b/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java index 99ab3270c48..d8285898f07 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java @@ -53,7 +53,6 @@ public class WingSnare extends CardImpl { super(ownerId, 117, "Wing Snare", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "ULG"; - this.color.setGreen(true); // Destroy target creature with flying. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaScion.java b/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaScion.java index dacf8d5cc8b..7568d97e291 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaScion.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaScion.java @@ -46,7 +46,6 @@ public class YavimayaScion extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Treefolk"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/urzassaga/ArcaneLaboratory.java b/Mage.Sets/src/mage/sets/urzassaga/ArcaneLaboratory.java index 210d5f913d1..8e362479b25 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ArcaneLaboratory.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ArcaneLaboratory.java @@ -47,7 +47,6 @@ public class ArcaneLaboratory extends CardImpl { super(ownerId, 60, "Arcane Laboratory", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "USG"; - this.color.setBlue(true); // Each player can't cast more than one spell each turn. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCastMoreThanOneSpellEffect(TargetController.ANY))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/ArgothianEnchantress.java b/Mage.Sets/src/mage/sets/urzassaga/ArgothianEnchantress.java index 100ba39fc26..f5750dfc20b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ArgothianEnchantress.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ArgothianEnchantress.java @@ -56,7 +56,6 @@ public class ArgothianEnchantress extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/BackToBasics.java b/Mage.Sets/src/mage/sets/urzassaga/BackToBasics.java index ef970b0d5f3..241aa9dab9f 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BackToBasics.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BackToBasics.java @@ -56,7 +56,6 @@ public class BackToBasics extends CardImpl { super(ownerId, 62, "Back to Basics", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "USG"; - this.color.setBlue(true); // Nonbasic lands don't untap during their controllers' untap steps. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepAllEffect(Duration.WhileOnBattlefield, TargetController.ANY, filter))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Breach.java b/Mage.Sets/src/mage/sets/urzassaga/Breach.java index 91170e72b01..a8d1e8bc2af 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Breach.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Breach.java @@ -48,7 +48,6 @@ public class Breach extends CardImpl { super(ownerId, 120, "Breach", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "USG"; - this.color.setBlack(true); // Target creature gets +2/+0 and gains fear until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(2, 0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java b/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java index e635305beb3..a259a8fa1df 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java @@ -52,7 +52,6 @@ public class BrilliantHalo extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java b/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java index 0969dfbbd70..8d9e96a1433 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java @@ -58,7 +58,6 @@ public class CarpetOfFlowers extends CardImpl { super(ownerId, 240, "Carpet of Flowers", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "USG"; - this.color.setGreen(true); // At the beginning of each of your main phases, if you haven't added mana to your mana pool with this ability this turn, you may add up to X mana of any one color to your mana pool, where X is the number of Islands target opponent controls. this.addAbility(new CarpetOfFlowersTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Catastrophe.java b/Mage.Sets/src/mage/sets/urzassaga/Catastrophe.java index 1e868a863eb..517a6bfbb0a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Catastrophe.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Catastrophe.java @@ -50,7 +50,6 @@ public class Catastrophe extends CardImpl { super(ownerId, 6, "Catastrophe", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{W}{W}"); this.expansionSetCode = "USG"; - this.color.setWhite(true); // Destroy all lands or all creatures. Creatures destroyed this way can't be regenerated. this.getSpellAbility().addEffect(new CatastropheEffect()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/CloakOfMists.java b/Mage.Sets/src/mage/sets/urzassaga/CloakOfMists.java index df3e1566711..d2a0baf97e8 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CloakOfMists.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CloakOfMists.java @@ -52,7 +52,6 @@ public class CloakOfMists extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Confiscate.java b/Mage.Sets/src/mage/sets/urzassaga/Confiscate.java index 6fd4be6526c..071e9d1386a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Confiscate.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Confiscate.java @@ -52,7 +52,6 @@ public class Confiscate extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant permanent TargetPermanent auraTarget = new TargetPermanent(); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Congregate.java b/Mage.Sets/src/mage/sets/urzassaga/Congregate.java index b10dc033621..410c978a396 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Congregate.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Congregate.java @@ -46,7 +46,6 @@ public class Congregate extends CardImpl { super(ownerId, 8, "Congregate", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "USG"; - this.color.setWhite(true); // Target player gains 2 life for each creature on the battlefield. this.getSpellAbility().addEffect(new GainLifeTargetEffect(new PermanentsOnBattlefieldCount(new FilterCreaturePermanent("creature on the battlefield"), 2))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/DiabolicServitude.java b/Mage.Sets/src/mage/sets/urzassaga/DiabolicServitude.java index c29a70dcbe5..7ed0e911167 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/DiabolicServitude.java +++ b/Mage.Sets/src/mage/sets/urzassaga/DiabolicServitude.java @@ -61,7 +61,6 @@ public class DiabolicServitude extends CardImpl { super(ownerId, 130, "Diabolic Servitude", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}"); this.expansionSetCode = "USG"; - this.color.setBlack(true); // When Diabolic Servitude enters the battlefield, return target creature card from your graveyard to the battlefield. Ability ability = new EntersBattlefieldTriggeredAbility(new DiabolicServitudeReturnCreatureEffect()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/DisruptiveStudent.java b/Mage.Sets/src/mage/sets/urzassaga/DisruptiveStudent.java index 283437833aa..574eaa9772f 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/DisruptiveStudent.java +++ b/Mage.Sets/src/mage/sets/urzassaga/DisruptiveStudent.java @@ -53,7 +53,6 @@ public class DisruptiveStudent extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Dromosaur.java b/Mage.Sets/src/mage/sets/urzassaga/Dromosaur.java index 329446da92b..e5e96b23ab5 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Dromosaur.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Dromosaur.java @@ -47,7 +47,6 @@ public class Dromosaur extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Lizard"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzassaga/EliteArchers.java b/Mage.Sets/src/mage/sets/urzassaga/EliteArchers.java index 0d632e0b684..d23805a1f43 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/EliteArchers.java +++ b/Mage.Sets/src/mage/sets/urzassaga/EliteArchers.java @@ -53,7 +53,6 @@ public class EliteArchers extends CardImpl { this.subtype.add("Soldier"); this.subtype.add("Archer"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzassaga/ElvishLyrist.java b/Mage.Sets/src/mage/sets/urzassaga/ElvishLyrist.java index 6367d869582..1aa8ab6d140 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ElvishLyrist.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ElvishLyrist.java @@ -54,7 +54,6 @@ public class ElvishLyrist extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java b/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java index fddcd2a328f..4cd41052101 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java +++ b/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java @@ -52,7 +52,6 @@ public class EnergyField extends CardImpl { super(ownerId, 73, "Energy Field", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "USG"; - this.color.setBlue(true); // Prevent all damage that would be dealt to you by sources you don't control. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EnergyFieldEffect())); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Exhume.java b/Mage.Sets/src/mage/sets/urzassaga/Exhume.java index 26f901d14a1..4b853980dd8 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Exhume.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Exhume.java @@ -52,7 +52,6 @@ public class Exhume extends CardImpl { super(ownerId, 134, "Exhume", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "USG"; - this.color.setBlack(true); // Each player puts a creature card from his or her graveyard onto the battlefield. this.getSpellAbility().addEffect(new ExhumeEffect()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Exploration.java b/Mage.Sets/src/mage/sets/urzassaga/Exploration.java index e2f5507cb35..728ec704f30 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Exploration.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Exploration.java @@ -46,7 +46,6 @@ public class Exploration extends CardImpl { super(ownerId, 250, "Exploration", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "USG"; - this.color.setGreen(true); // You may play an additional land on each of your turns. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/sets/urzassaga/Falter.java b/Mage.Sets/src/mage/sets/urzassaga/Falter.java index b437f98ebf3..81d9c10d34f 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Falter.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Falter.java @@ -54,7 +54,6 @@ public class Falter extends CardImpl { super(ownerId, 184, "Falter", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "USG"; - this.color.setRed(true); // Creatures without flying can't block this turn. this.getSpellAbility().addEffect(new CantBlockAllEffect(filter, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Fecundity.java b/Mage.Sets/src/mage/sets/urzassaga/Fecundity.java index 79062b4e4b6..5de2da03f66 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Fecundity.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Fecundity.java @@ -50,7 +50,6 @@ public class Fecundity extends CardImpl { super(ownerId, 251, "Fecundity", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "USG"; - this.color.setGreen(true); // Whenever a creature dies, that creature's controller may draw a card. this.addAbility(new DiesCreatureTriggeredAbility(new FecundityEffect(), false, false, true)); diff --git a/Mage.Sets/src/mage/sets/urzassaga/FertileGround.java b/Mage.Sets/src/mage/sets/urzassaga/FertileGround.java index 83aafe645c2..d04f5289298 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/FertileGround.java +++ b/Mage.Sets/src/mage/sets/urzassaga/FertileGround.java @@ -58,7 +58,6 @@ public class FertileGround extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/urzassaga/FogBank.java b/Mage.Sets/src/mage/sets/urzassaga/FogBank.java index 43856e68dd0..7e407d778ec 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/FogBank.java +++ b/Mage.Sets/src/mage/sets/urzassaga/FogBank.java @@ -53,7 +53,6 @@ public class FogBank extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Wall"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Gamble.java b/Mage.Sets/src/mage/sets/urzassaga/Gamble.java index 9a2ee3b0b6d..d73b8bc5601 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Gamble.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Gamble.java @@ -46,7 +46,6 @@ public class Gamble extends CardImpl { super(ownerId, 188, "Gamble", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "USG"; - this.color.setRed(true); // Search your library for a card, put that card into your hand, discard a card at random, then shuffle your library. Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true); diff --git a/Mage.Sets/src/mage/sets/urzassaga/GildedDrake.java b/Mage.Sets/src/mage/sets/urzassaga/GildedDrake.java index 23a94b1e81b..15260879449 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GildedDrake.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GildedDrake.java @@ -65,7 +65,6 @@ public class GildedDrake extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinCadets.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinCadets.java index a45be6b518f..90da6599d58 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GoblinCadets.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinCadets.java @@ -54,7 +54,6 @@ public class GoblinCadets extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinLackey.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinLackey.java index ae83f9269a7..2c40cec9c20 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GoblinLackey.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinLackey.java @@ -56,7 +56,6 @@ public class GoblinLackey extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinMatron.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinMatron.java index 512d85ad784..25a0bfc2805 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GoblinMatron.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinMatron.java @@ -55,7 +55,6 @@ public class GoblinMatron extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinOffensive.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinOffensive.java index 3794767a274..4d11aa29eec 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GoblinOffensive.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinOffensive.java @@ -46,7 +46,6 @@ public class GoblinOffensive extends CardImpl { super(ownerId, 192, "Goblin Offensive", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{1}{R}{R}"); this.expansionSetCode = "USG"; - this.color.setRed(true); // Put X 1/1 red Goblin creature tokens onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new GoblinToken(), new ManacostVariableValue())); diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinRaider.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinRaider.java index 31bb8eb5897..8419e525153 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GoblinRaider.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinRaider.java @@ -46,7 +46,6 @@ public class GoblinRaider extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Hibernation.java b/Mage.Sets/src/mage/sets/urzassaga/Hibernation.java index a6799fc984c..351e75251c2 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Hibernation.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Hibernation.java @@ -52,7 +52,6 @@ public class Hibernation extends CardImpl { super(ownerId, 79, "Hibernation", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "USG"; - this.color.setBlue(true); // Return all green permanents to their owners' hands. this.getSpellAbility().addEffect(new HibernationEffect()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/HollowDogs.java b/Mage.Sets/src/mage/sets/urzassaga/HollowDogs.java index c9ad8166fdf..6652a0905d4 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/HollowDogs.java +++ b/Mage.Sets/src/mage/sets/urzassaga/HollowDogs.java @@ -49,7 +49,6 @@ public class HollowDogs extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Hound"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzassaga/IllGottenGains.java b/Mage.Sets/src/mage/sets/urzassaga/IllGottenGains.java index da67c82e8e5..e4899307daa 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/IllGottenGains.java +++ b/Mage.Sets/src/mage/sets/urzassaga/IllGottenGains.java @@ -54,7 +54,6 @@ public class IllGottenGains extends CardImpl { super(ownerId, 138, "Ill-Gotten Gains", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{B}{B}"); this.expansionSetCode = "USG"; - this.color.setBlack(true); // Exile Ill-Gotten Gains. this.getSpellAbility().addEffect(ExileSpellEffect.getInstance()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java b/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java index 4da9e11dd7f..8288825cfc1 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java +++ b/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java @@ -60,7 +60,6 @@ public class IntrepidHero extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/LingeringMirage.java b/Mage.Sets/src/mage/sets/urzassaga/LingeringMirage.java index eed156c8cea..b3b0b0bf692 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/LingeringMirage.java +++ b/Mage.Sets/src/mage/sets/urzassaga/LingeringMirage.java @@ -55,7 +55,6 @@ public class LingeringMirage extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Meltdown.java b/Mage.Sets/src/mage/sets/urzassaga/Meltdown.java index ef94961a4e0..dbf5ac943ac 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Meltdown.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Meltdown.java @@ -47,7 +47,6 @@ public class Meltdown extends CardImpl { super(ownerId, 203, "Meltdown", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{R}"); this.expansionSetCode = "USG"; - this.color.setRed(true); // Destroy each artifact with converted mana cost X or less. this.getSpellAbility().addEffect(new MeltdownEffect()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Morphling.java b/Mage.Sets/src/mage/sets/urzassaga/Morphling.java index c8ab51a8bfe..547e3ccffa2 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Morphling.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Morphling.java @@ -52,7 +52,6 @@ public class Morphling extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Shapeshifter"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Oppression.java b/Mage.Sets/src/mage/sets/urzassaga/Oppression.java index 21ccb305f09..5c626c2089e 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Oppression.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Oppression.java @@ -53,7 +53,6 @@ public class Oppression extends CardImpl { super(ownerId, 143, "Oppression", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}"); this.expansionSetCode = "USG"; - this.color.setBlack(true); // Whenever a player casts a spell, that player discards a card. this.addAbility(new OppressionTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/OrderOfYawgmoth.java b/Mage.Sets/src/mage/sets/urzassaga/OrderOfYawgmoth.java index d99fb3d33ed..daf2960d93a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/OrderOfYawgmoth.java +++ b/Mage.Sets/src/mage/sets/urzassaga/OrderOfYawgmoth.java @@ -48,7 +48,6 @@ public class OrderOfYawgmoth extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Knight"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzassaga/PegasusCharger.java b/Mage.Sets/src/mage/sets/urzassaga/PegasusCharger.java index 0f17669b839..6e4dc80753f 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/PegasusCharger.java +++ b/Mage.Sets/src/mage/sets/urzassaga/PegasusCharger.java @@ -46,7 +46,6 @@ public class PegasusCharger extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Pegasus"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/PendrellDrake.java b/Mage.Sets/src/mage/sets/urzassaga/PendrellDrake.java index f0e608d96a0..682aae070f4 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/PendrellDrake.java +++ b/Mage.Sets/src/mage/sets/urzassaga/PendrellDrake.java @@ -47,7 +47,6 @@ public class PendrellDrake extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzassaga/PeregrineDrake.java b/Mage.Sets/src/mage/sets/urzassaga/PeregrineDrake.java index b4e818ab40e..2310c4bbfae 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/PeregrineDrake.java +++ b/Mage.Sets/src/mage/sets/urzassaga/PeregrineDrake.java @@ -47,7 +47,6 @@ public class PeregrineDrake extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Persecute.java b/Mage.Sets/src/mage/sets/urzassaga/Persecute.java index 5d7d1f76302..dccaf70e7d6 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Persecute.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Persecute.java @@ -52,7 +52,6 @@ public class Persecute extends CardImpl { super(ownerId, 146, "Persecute", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{B}{B}"); this.expansionSetCode = "USG"; - this.color.setBlack(true); // Choose a color. Target player reveals his or her hand and discards all cards of that color. this.getSpellAbility().addEffect(new PersecuteEffect()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/PriestOfGix.java b/Mage.Sets/src/mage/sets/urzassaga/PriestOfGix.java index 88c4be17e6d..9b0dcd6ab1c 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/PriestOfGix.java +++ b/Mage.Sets/src/mage/sets/urzassaga/PriestOfGix.java @@ -49,7 +49,6 @@ public class PriestOfGix extends CardImpl { this.subtype.add("Cleric"); this.subtype.add("Minion"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/RainOfFilth.java b/Mage.Sets/src/mage/sets/urzassaga/RainOfFilth.java index 9a2f4c11975..e426fb147ff 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/RainOfFilth.java +++ b/Mage.Sets/src/mage/sets/urzassaga/RainOfFilth.java @@ -51,7 +51,6 @@ public class RainOfFilth extends CardImpl { super(ownerId, 151, "Rain of Filth", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "USG"; - this.color.setBlack(true); // Until end of turn, lands you control gain "Sacrifice this land: Add {B} to your mana pool." ManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/RavenousSkirge.java b/Mage.Sets/src/mage/sets/urzassaga/RavenousSkirge.java index 4a1c32b2b49..7725405ec12 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/RavenousSkirge.java +++ b/Mage.Sets/src/mage/sets/urzassaga/RavenousSkirge.java @@ -49,7 +49,6 @@ public class RavenousSkirge extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Imp"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Raze.java b/Mage.Sets/src/mage/sets/urzassaga/Raze.java index 8b45e3946c2..f028cc6c4cd 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Raze.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Raze.java @@ -47,7 +47,6 @@ public class Raze extends CardImpl { super(ownerId, 207, "Raze", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "USG"; - this.color.setRed(true); // As an additional cost to cast Raze, sacrifice a land. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledPermanent(1,1, new FilterControlledLandPermanent(), true))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Redeem.java b/Mage.Sets/src/mage/sets/urzassaga/Redeem.java index 8b9e358679c..66c49398fe3 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Redeem.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Redeem.java @@ -45,7 +45,6 @@ public class Redeem extends CardImpl { super(ownerId, 33, "Redeem", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "USG"; - this.color.setWhite(true); // Prevent all damage that would be dealt this turn to up to two target creatures. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Reflexes.java b/Mage.Sets/src/mage/sets/urzassaga/Reflexes.java index 9bb707103c3..bbf5a644ed4 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Reflexes.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Reflexes.java @@ -51,7 +51,6 @@ public class Reflexes extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Rewind.java b/Mage.Sets/src/mage/sets/urzassaga/Rewind.java index 9c5661daf45..8cf1f97b630 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Rewind.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Rewind.java @@ -45,7 +45,6 @@ public class Rewind extends CardImpl { super(ownerId, 93, "Rewind", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); this.expansionSetCode = "USG"; - this.color.setBlue(true); // Counter target spell. Untap up to four lands. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/SandbarMerfolk.java b/Mage.Sets/src/mage/sets/urzassaga/SandbarMerfolk.java index 81c53f47255..065b4bc2985 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SandbarMerfolk.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SandbarMerfolk.java @@ -46,7 +46,6 @@ public class SandbarMerfolk extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Merfolk"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/SandbarSerpent.java b/Mage.Sets/src/mage/sets/urzassaga/SandbarSerpent.java index f1d6ed3ad57..dc7694f6d28 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SandbarSerpent.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SandbarSerpent.java @@ -46,7 +46,6 @@ public class SandbarSerpent extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Serpent"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Scald.java b/Mage.Sets/src/mage/sets/urzassaga/Scald.java index eafb6077c42..abe0e9e698f 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Scald.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Scald.java @@ -53,7 +53,6 @@ public class Scald extends CardImpl { super(ownerId, 211, "Scald", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); this.expansionSetCode = "USG"; - this.color.setRed(true); // Whenever a player taps an Island for mana, Scald deals 1 damage to that player. this.addAbility(new TapForManaAllTriggeredAbility( diff --git a/Mage.Sets/src/mage/sets/urzassaga/SerraAvatar.java b/Mage.Sets/src/mage/sets/urzassaga/SerraAvatar.java index 191e1877ad6..65193dedfd4 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SerraAvatar.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SerraAvatar.java @@ -51,7 +51,6 @@ public class SerraAvatar extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Avatar"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/urzassaga/SerraZealot.java b/Mage.Sets/src/mage/sets/urzassaga/SerraZealot.java index 84c7312c189..55097e51fec 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SerraZealot.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SerraZealot.java @@ -46,7 +46,6 @@ public class SerraZealot extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/ShimmeringBarrier.java b/Mage.Sets/src/mage/sets/urzassaga/ShimmeringBarrier.java index 31b5f49e755..09bdc98e030 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ShimmeringBarrier.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ShimmeringBarrier.java @@ -48,7 +48,6 @@ public class ShimmeringBarrier extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Wall"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzassaga/ShowAndTell.java b/Mage.Sets/src/mage/sets/urzassaga/ShowAndTell.java index 139b08a3bab..367ea5e0265 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ShowAndTell.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ShowAndTell.java @@ -56,7 +56,6 @@ public class ShowAndTell extends CardImpl { super(ownerId, 96, "Show and Tell", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "USG"; - this.color.setBlue(true); // Each player may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield. this.getSpellAbility().addEffect(new ShowAndTellEffect()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Sicken.java b/Mage.Sets/src/mage/sets/urzassaga/Sicken.java index 6b8448f676d..3f2a328cdd2 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Sicken.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Sicken.java @@ -52,7 +52,6 @@ public class Sicken extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzassaga/SneakAttack.java b/Mage.Sets/src/mage/sets/urzassaga/SneakAttack.java index 7c92c489747..c06fc177a5a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SneakAttack.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SneakAttack.java @@ -62,7 +62,6 @@ public class SneakAttack extends CardImpl { super(ownerId, 218, "Sneak Attack", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); this.expansionSetCode = "USG"; - this.color.setRed(true); // {R}: You may put a creature card from your hand onto the battlefield. That creature gains haste. Sacrifice the creature at the beginning of the next end step. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SneakAttackEffect(), new ManaCostsImpl("{R}"))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/SpreadingAlgae.java b/Mage.Sets/src/mage/sets/urzassaga/SpreadingAlgae.java index ebfe789339a..f5fcb1bdd76 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SpreadingAlgae.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SpreadingAlgae.java @@ -66,7 +66,6 @@ public class SpreadingAlgae extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant Swamp diff --git a/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java b/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java index 81e770583fb..801b94f5e05 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java @@ -60,7 +60,6 @@ public class SternProctor extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Telepathy.java b/Mage.Sets/src/mage/sets/urzassaga/Telepathy.java index 641eb07adee..b24a9e4b0fa 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Telepathy.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Telepathy.java @@ -48,7 +48,6 @@ public class Telepathy extends CardImpl { super(ownerId, 102, "Telepathy", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{U}"); this.expansionSetCode = "USG"; - this.color.setBlue(true); // Your opponents play with their hands revealed. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OpponentsPlayWithTheTopCardRevealedEffect())); diff --git a/Mage.Sets/src/mage/sets/urzassaga/TimeSpiral.java b/Mage.Sets/src/mage/sets/urzassaga/TimeSpiral.java index 4aaaecf5441..1b19a828190 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/TimeSpiral.java +++ b/Mage.Sets/src/mage/sets/urzassaga/TimeSpiral.java @@ -51,7 +51,6 @@ public class TimeSpiral extends CardImpl { super(ownerId, 103, "Time Spiral", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{U}{U}"); this.expansionSetCode = "USG"; - this.color.setBlue(true); // Exile Time Spiral. Each player shuffles his or her graveyard and hand into his or her library, then draws seven cards. You untap up to six lands. this.getSpellAbility().addEffect(ExileSpellEffect.getInstance()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/TolarianWinds.java b/Mage.Sets/src/mage/sets/urzassaga/TolarianWinds.java index 9711b313d1a..ed619372f8c 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/TolarianWinds.java +++ b/Mage.Sets/src/mage/sets/urzassaga/TolarianWinds.java @@ -49,7 +49,6 @@ public class TolarianWinds extends CardImpl { super(ownerId, 104, "Tolarian Winds", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "USG"; - this.color.setBlue(true); // Discard all the cards in your hand, then draw that many cards. this.getSpellAbility().addEffect(new TolarianWindsEffect()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/VernalBloom.java b/Mage.Sets/src/mage/sets/urzassaga/VernalBloom.java index 5981568b8f1..67bcb650a96 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/VernalBloom.java +++ b/Mage.Sets/src/mage/sets/urzassaga/VernalBloom.java @@ -54,7 +54,6 @@ public class VernalBloom extends CardImpl { super(ownerId, 281, "Vernal Bloom", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}"); this.expansionSetCode = "USG"; - this.color.setGreen(true); // Whenever a Forest is tapped for mana, its controller adds {G} to his or her mana pool. this.addAbility(new TapForManaAllTriggeredManaAbility( diff --git a/Mage.Sets/src/mage/sets/urzassaga/Windfall.java b/Mage.Sets/src/mage/sets/urzassaga/Windfall.java index 96c9939e6ae..4b398342cfd 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Windfall.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Windfall.java @@ -48,7 +48,6 @@ public class Windfall extends CardImpl { super(ownerId, 111, "Windfall", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "USG"; - this.color.setBlue(true); // Each player discards his or her hand, then draws cards equal to the greatest number of cards a player discarded this way. this.getSpellAbility().addEffect(new WindfallEffect()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Worship.java b/Mage.Sets/src/mage/sets/urzassaga/Worship.java index 49bc765e05e..0053b2fcbe8 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Worship.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Worship.java @@ -49,7 +49,6 @@ public class Worship extends CardImpl { super(ownerId, 57, "Worship", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "USG"; - this.color.setWhite(true); // If you control a creature, damage that would reduce your life total to less than 1 reduces it to 1 instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WorshipReplacementEffect())); diff --git a/Mage.Sets/src/mage/sets/urzassaga/YawgmothsWill.java b/Mage.Sets/src/mage/sets/urzassaga/YawgmothsWill.java index 48c3b88706e..5f20f765e6a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/YawgmothsWill.java +++ b/Mage.Sets/src/mage/sets/urzassaga/YawgmothsWill.java @@ -58,7 +58,6 @@ public class YawgmothsWill extends CardImpl { super(ownerId, 171, "Yawgmoth's Will", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "USG"; - this.color.setBlack(true); // Until end of turn, you may play cards from your graveyard. this.getSpellAbility().addEffect(new CanPlayCardsFromGraveyardEffect()); diff --git a/Mage.Sets/src/mage/sets/venservskoth/GalepowderMage.java b/Mage.Sets/src/mage/sets/venservskoth/GalepowderMage.java index 5e425bf4f23..7a843471387 100644 --- a/Mage.Sets/src/mage/sets/venservskoth/GalepowderMage.java +++ b/Mage.Sets/src/mage/sets/venservskoth/GalepowderMage.java @@ -67,7 +67,6 @@ public class GalepowderMage extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Wizard"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BragoKingEternal.java b/Mage.Sets/src/mage/sets/vintagemasters/BragoKingEternal.java index 8e44b78f785..bf7928bf32b 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/BragoKingEternal.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/BragoKingEternal.java @@ -57,8 +57,6 @@ public class BragoKingEternal extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ChainersEdict.java b/Mage.Sets/src/mage/sets/vintagemasters/ChainersEdict.java index 6856e7d5c72..ae481e57abe 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/ChainersEdict.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/ChainersEdict.java @@ -48,7 +48,6 @@ public class ChainersEdict extends CardImpl { super(ownerId, 108, "Chainer's Edict", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "VMA"; - this.color.setBlack(true); // Target player sacrifices a creature. this.getSpellAbility().addEffect(new SacrificeEffect(new FilterCreaturePermanent(), 1, "Target player")); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ChaosWarp.java b/Mage.Sets/src/mage/sets/vintagemasters/ChaosWarp.java index 5186fc4ebf0..96230a129e5 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/ChaosWarp.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/ChaosWarp.java @@ -56,7 +56,6 @@ public class ChaosWarp extends CardImpl { super(ownerId, 154, "Chaos Warp", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "VMA"; - this.color.setRed(true); // The owner of target permanent shuffles it into his or her library, this.getSpellAbility().addEffect(new ChaosWarpShuffleIntoLibraryEffect()); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ClawsOfWirewood.java b/Mage.Sets/src/mage/sets/vintagemasters/ClawsOfWirewood.java index d8b750f9436..e65bfab7e74 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/ClawsOfWirewood.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/ClawsOfWirewood.java @@ -56,7 +56,6 @@ public class ClawsOfWirewood extends CardImpl { super(ownerId, 201, "Claws of Wirewood", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "VMA"; - this.color.setGreen(true); // Claws of Wirewood deals 3 damage to each creature with flying and each player. this.getSpellAbility().addEffect(new DamageAllEffect(3, filter)); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/CouncilsJudgment.java b/Mage.Sets/src/mage/sets/vintagemasters/CouncilsJudgment.java index bb818127be1..09ab30df414 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/CouncilsJudgment.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/CouncilsJudgment.java @@ -58,7 +58,6 @@ public class CouncilsJudgment extends CardImpl { super(ownerId, 20, "Council's Judgment", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{W}{W}"); this.expansionSetCode = "VMA"; - this.color.setWhite(true); // Will of the council - Starting with you, each player votes for a nonland permanent you don't control. Exile each permanent with the most votes or tied for most votes. this.getSpellAbility().addEffect(new CouncilsJudgmentEffect()); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/CruelBargain.java b/Mage.Sets/src/mage/sets/vintagemasters/CruelBargain.java index d893b58156d..66b139eaee3 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/CruelBargain.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/CruelBargain.java @@ -45,7 +45,6 @@ public class CruelBargain extends CardImpl { super(ownerId, 111, "Cruel Bargain", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{B}{B}{B}"); this.expansionSetCode = "VMA"; - this.color.setBlack(true); // Draw four cards. You lose half your life, rounded up. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(4)); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/DecreeOfJustice.java b/Mage.Sets/src/mage/sets/vintagemasters/DecreeOfJustice.java index 0f01672e099..247b5ecf8b7 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/DecreeOfJustice.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/DecreeOfJustice.java @@ -58,7 +58,6 @@ public class DecreeOfJustice extends CardImpl { super(ownerId, 22, "Decree of Justice", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{X}{2}{W}{W}"); this.expansionSetCode = "VMA"; - this.color.setWhite(true); // Put X 4/4 white Angel creature tokens with flying onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new AngelToken("C14"), new ManacostVariableValue())); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/DeftbladeElite.java b/Mage.Sets/src/mage/sets/vintagemasters/DeftbladeElite.java index b2bf080f18f..3e8dfe32ea2 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/DeftbladeElite.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/DeftbladeElite.java @@ -54,7 +54,6 @@ public class DeftbladeElite extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/EmpyrialArmor.java b/Mage.Sets/src/mage/sets/vintagemasters/EmpyrialArmor.java index 71af58a0add..3151ba4fa84 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/EmpyrialArmor.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/EmpyrialArmor.java @@ -55,7 +55,6 @@ public class EmpyrialArmor extends CardImpl { this.expansionSetCode = "VMA"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Eureka.java b/Mage.Sets/src/mage/sets/vintagemasters/Eureka.java index b530d5e34dd..6d6d850e44e 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/Eureka.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/Eureka.java @@ -53,7 +53,6 @@ public class Eureka extends CardImpl { super(ownerId, 208, "Eureka", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{2}{G}{G}"); this.expansionSetCode = "VMA"; - this.color.setGreen(true); // Starting with you, each player may put a permanent card from his or her hand onto the battlefield. Repeat this process until no one puts a card onto the battlefield. this.getSpellAbility().addEffect(new EurekaEffect()); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GildedLight.java b/Mage.Sets/src/mage/sets/vintagemasters/GildedLight.java index b2697e47bde..ac4a9effe9c 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/GildedLight.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/GildedLight.java @@ -47,7 +47,6 @@ public class GildedLight extends CardImpl { super(ownerId, 29, "Gilded Light", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "VMA"; - this.color.setWhite(true); // You gain shroud until end of turn. this.getSpellAbility().addEffect(new GainAbilityControllerEffect(ShroudAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GoblinCommando.java b/Mage.Sets/src/mage/sets/vintagemasters/GoblinCommando.java index e64f72f81bc..37c0ebab607 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/GoblinCommando.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/GoblinCommando.java @@ -48,7 +48,6 @@ public class GoblinCommando extends CardImpl { this.expansionSetCode = "VMA"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GoblinGeneral.java b/Mage.Sets/src/mage/sets/vintagemasters/GoblinGeneral.java index 601ebd7d548..e82cdee4224 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/GoblinGeneral.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/GoblinGeneral.java @@ -56,7 +56,6 @@ public class GoblinGeneral extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GoblinSettler.java b/Mage.Sets/src/mage/sets/vintagemasters/GoblinSettler.java index 914f5b2af6a..b925bac44c2 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/GoblinSettler.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/GoblinSettler.java @@ -48,7 +48,6 @@ public class GoblinSettler extends CardImpl { this.expansionSetCode = "VMA"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/HulkingGoblin.java b/Mage.Sets/src/mage/sets/vintagemasters/HulkingGoblin.java index e64ae2d4344..dc3f9047711 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/HulkingGoblin.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/HulkingGoblin.java @@ -45,7 +45,6 @@ public class HulkingGoblin extends CardImpl { this.expansionSetCode = "VMA"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/KrosanVorine.java b/Mage.Sets/src/mage/sets/vintagemasters/KrosanVorine.java index 2fb995b9691..6a8f5bd509f 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/KrosanVorine.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/KrosanVorine.java @@ -49,7 +49,6 @@ public class KrosanVorine extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ManaDrain.java b/Mage.Sets/src/mage/sets/vintagemasters/ManaDrain.java index 4e794b2e846..16cc9baccb3 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/ManaDrain.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/ManaDrain.java @@ -55,7 +55,6 @@ public class ManaDrain extends CardImpl { super(ownerId, 78, "Mana Drain", Rarity.MYTHIC, new CardType[]{CardType.INSTANT}, "{U}{U}"); this.expansionSetCode = "VMA"; - this.color.setBlue(true); // Counter target spell. At the beginning of your next main phase, add {X} to your mana pool, where X is that spell's converted mana cost. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/MarchesaTheBlackRose.java b/Mage.Sets/src/mage/sets/vintagemasters/MarchesaTheBlackRose.java index 8dcff4bfb95..8c08e541eed 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/MarchesaTheBlackRose.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/MarchesaTheBlackRose.java @@ -67,9 +67,6 @@ public class MarchesaTheBlackRose extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/MindsDesire.java b/Mage.Sets/src/mage/sets/vintagemasters/MindsDesire.java index 4ea05dfb29e..28ae81dca87 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/MindsDesire.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/MindsDesire.java @@ -55,7 +55,6 @@ public class MindsDesire extends CardImpl { super(ownerId, 80, "Mind's Desire", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{U}{U}"); this.expansionSetCode = "VMA"; - this.color.setBlue(true); // Shuffle your library. Then exile the top card of your library. Until end of turn, you may play that card without paying its mana cost. this.getSpellAbility().addEffect(new MindsDesireEffect()); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/MistmoonGriffin.java b/Mage.Sets/src/mage/sets/vintagemasters/MistmoonGriffin.java index 4b2b4e325f0..d6f979dca39 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/MistmoonGriffin.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/MistmoonGriffin.java @@ -54,7 +54,6 @@ public class MistmoonGriffin extends CardImpl { this.expansionSetCode = "VMA"; this.subtype.add("Griffin"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/NaturesRuin.java b/Mage.Sets/src/mage/sets/vintagemasters/NaturesRuin.java index 82c83050fbb..cc0bb202b0e 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/NaturesRuin.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/NaturesRuin.java @@ -54,7 +54,6 @@ public class NaturesRuin extends CardImpl { super(ownerId, 129, "Nature's Ruin", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "VMA"; - this.color.setBlack(true); // Destroy all green creatures. this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/PillagingHorde.java b/Mage.Sets/src/mage/sets/vintagemasters/PillagingHorde.java index e09cc74791b..a844a01d898 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/PillagingHorde.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/PillagingHorde.java @@ -48,7 +48,6 @@ public class PillagingHorde extends CardImpl { this.subtype.add("Human"); this.subtype.add("Barbarian"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Psychatog.java b/Mage.Sets/src/mage/sets/vintagemasters/Psychatog.java index 9a528d950bf..cd6399094d1 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/Psychatog.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/Psychatog.java @@ -52,8 +52,6 @@ public class Psychatog extends CardImpl { this.expansionSetCode = "VMA"; this.subtype.add("Atog"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ScourgeOfTheThrone.java b/Mage.Sets/src/mage/sets/vintagemasters/ScourgeOfTheThrone.java index 6701b28c3f7..c58c72fd7bd 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/ScourgeOfTheThrone.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/ScourgeOfTheThrone.java @@ -62,7 +62,6 @@ public class ScourgeOfTheThrone extends CardImpl { this.expansionSetCode = "VMA"; this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SerendibEfreet.java b/Mage.Sets/src/mage/sets/vintagemasters/SerendibEfreet.java index 608193f0c28..c776f2cc471 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/SerendibEfreet.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/SerendibEfreet.java @@ -48,7 +48,6 @@ public class SerendibEfreet extends CardImpl { this.expansionSetCode = "VMA"; this.subtype.add("Efreet"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ShivanWurm.java b/Mage.Sets/src/mage/sets/vintagemasters/ShivanWurm.java index e0adf1d40df..2230c63184e 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/ShivanWurm.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/ShivanWurm.java @@ -59,8 +59,6 @@ public class ShivanWurm extends CardImpl { this.expansionSetCode = "VMA"; this.subtype.add("Wurm"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SparkSpray.java b/Mage.Sets/src/mage/sets/vintagemasters/SparkSpray.java index 8d60f693f64..c309a26d927 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/SparkSpray.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/SparkSpray.java @@ -46,7 +46,6 @@ public class SparkSpray extends CardImpl { super(ownerId, 188, "Spark Spray", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "VMA"; - this.color.setRed(true); // Spark Spray deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/StoicChampion.java b/Mage.Sets/src/mage/sets/vintagemasters/StoicChampion.java index 283cbbe8cb2..e7bf1d6f949 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/StoicChampion.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/StoicChampion.java @@ -48,7 +48,6 @@ public class StoicChampion extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/TerohsFaithful.java b/Mage.Sets/src/mage/sets/vintagemasters/TerohsFaithful.java index 935d17840c3..260cf171104 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/TerohsFaithful.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/TerohsFaithful.java @@ -47,7 +47,6 @@ public class TerohsFaithful extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/YawgmothsBargain.java b/Mage.Sets/src/mage/sets/vintagemasters/YawgmothsBargain.java index 0550994237d..4675ded9025 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/YawgmothsBargain.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/YawgmothsBargain.java @@ -48,7 +48,6 @@ public class YawgmothsBargain extends CardImpl { super(ownerId, 147, "Yawgmoth's Bargain", Rarity.MYTHIC, new CardType[]{CardType.ENCHANTMENT}, "{4}{B}{B}"); this.expansionSetCode = "VMA"; - this.color.setBlack(true); // Skip your draw step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); diff --git a/Mage.Sets/src/mage/sets/visions/Breezekeeper.java b/Mage.Sets/src/mage/sets/visions/Breezekeeper.java index 9995a1548ea..740ba6f3793 100644 --- a/Mage.Sets/src/mage/sets/visions/Breezekeeper.java +++ b/Mage.Sets/src/mage/sets/visions/Breezekeeper.java @@ -46,7 +46,6 @@ public class Breezekeeper extends CardImpl { this.expansionSetCode = "VIS"; this.subtype.add("Djinn"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/visions/CityOfSolitude.java b/Mage.Sets/src/mage/sets/visions/CityOfSolitude.java index 16836860f92..2bac394e602 100644 --- a/Mage.Sets/src/mage/sets/visions/CityOfSolitude.java +++ b/Mage.Sets/src/mage/sets/visions/CityOfSolitude.java @@ -51,7 +51,6 @@ public class CityOfSolitude extends CardImpl { super(ownerId, 52, "City of Solitude", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "VIS"; - this.color.setGreen(true); // Players can cast spells and activate abilities only during their own turns. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CityOfSolitudeEffect())); diff --git a/Mage.Sets/src/mage/sets/visions/Coercion.java b/Mage.Sets/src/mage/sets/visions/Coercion.java index 5d1ef12e92a..9846faca54c 100644 --- a/Mage.Sets/src/mage/sets/visions/Coercion.java +++ b/Mage.Sets/src/mage/sets/visions/Coercion.java @@ -44,7 +44,6 @@ public class Coercion extends CardImpl { super(ownerId, 4, "Coercion", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "VIS"; - this.color.setBlack(true); // Target opponent reveals his or her hand. You choose a card from it. That player discards that card. this.getSpellAbility().addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/sets/visions/DarajaGriffin.java b/Mage.Sets/src/mage/sets/visions/DarajaGriffin.java index b61e74da054..40916951cdf 100644 --- a/Mage.Sets/src/mage/sets/visions/DarajaGriffin.java +++ b/Mage.Sets/src/mage/sets/visions/DarajaGriffin.java @@ -60,7 +60,6 @@ public class DarajaGriffin extends CardImpl { this.expansionSetCode = "VIS"; this.subtype.add("Griffin"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/visions/Desertion.java b/Mage.Sets/src/mage/sets/visions/Desertion.java index 87d9fd287a6..728c4856058 100644 --- a/Mage.Sets/src/mage/sets/visions/Desertion.java +++ b/Mage.Sets/src/mage/sets/visions/Desertion.java @@ -56,7 +56,6 @@ public class Desertion extends CardImpl { super(ownerId, 30, "Desertion", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); this.expansionSetCode = "VIS"; - this.color.setBlue(true); // Counter target spell. If an artifact or creature spell is countered this way, put that card onto the battlefield under your control instead of into its owner's graveyard. this.getSpellAbility().addEffect(new DesertionEffect()); diff --git a/Mage.Sets/src/mage/sets/visions/Equipoise.java b/Mage.Sets/src/mage/sets/visions/Equipoise.java index 99288a48507..b086fc05d51 100644 --- a/Mage.Sets/src/mage/sets/visions/Equipoise.java +++ b/Mage.Sets/src/mage/sets/visions/Equipoise.java @@ -57,7 +57,6 @@ public class Equipoise extends CardImpl { super(ownerId, 103, "Equipoise", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "VIS"; - this.color.setWhite(true); // At the beginning of your upkeep, for each land target player controls in excess of the number you control, choose a land he or she controls, then the chosen permanents phase out. Repeat this process for artifacts and creatures. Ability ability = new BeginningOfUpkeepTriggeredAbility(new EquipoiseEffect(), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/visions/FemerefEnchantress.java b/Mage.Sets/src/mage/sets/visions/FemerefEnchantress.java index a09bcb2dd2f..2acd2cc1f37 100644 --- a/Mage.Sets/src/mage/sets/visions/FemerefEnchantress.java +++ b/Mage.Sets/src/mage/sets/visions/FemerefEnchantress.java @@ -49,8 +49,6 @@ public class FemerefEnchantress extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/visions/Fireblast.java b/Mage.Sets/src/mage/sets/visions/Fireblast.java index 131ddc9c722..094e010f0cc 100644 --- a/Mage.Sets/src/mage/sets/visions/Fireblast.java +++ b/Mage.Sets/src/mage/sets/visions/Fireblast.java @@ -56,7 +56,6 @@ public class Fireblast extends CardImpl { super(ownerId, 79, "Fireblast", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{R}{R}"); this.expansionSetCode = "VIS"; - this.color.setRed(true); // You may sacrifice two Mountains rather than pay Fireblast's mana cost. this.addAbility(new AlternativeCostSourceAbility(new SacrificeTargetCost(new TargetControlledPermanent(2, 2, filter, true)))); diff --git a/Mage.Sets/src/mage/sets/visions/FreewindFalcon.java b/Mage.Sets/src/mage/sets/visions/FreewindFalcon.java index e8d19b0e1ba..9d3dd44e269 100644 --- a/Mage.Sets/src/mage/sets/visions/FreewindFalcon.java +++ b/Mage.Sets/src/mage/sets/visions/FreewindFalcon.java @@ -55,7 +55,6 @@ public class FreewindFalcon extends CardImpl { this.expansionSetCode = "VIS"; this.subtype.add("Bird"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/visions/GoblinRecruiter.java b/Mage.Sets/src/mage/sets/visions/GoblinRecruiter.java index 9e5507b3692..b278362bbc4 100644 --- a/Mage.Sets/src/mage/sets/visions/GoblinRecruiter.java +++ b/Mage.Sets/src/mage/sets/visions/GoblinRecruiter.java @@ -58,7 +58,6 @@ public class GoblinRecruiter extends CardImpl { this.expansionSetCode = "VIS"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/visions/HulkingCyclops.java b/Mage.Sets/src/mage/sets/visions/HulkingCyclops.java index 8197f756ed9..eff8b4a9ec7 100644 --- a/Mage.Sets/src/mage/sets/visions/HulkingCyclops.java +++ b/Mage.Sets/src/mage/sets/visions/HulkingCyclops.java @@ -45,7 +45,6 @@ public class HulkingCyclops extends CardImpl { this.expansionSetCode = "VIS"; this.subtype.add("Cyclops"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/visions/Impulse.java b/Mage.Sets/src/mage/sets/visions/Impulse.java index 0af5208dd4b..a259fd3b8e1 100644 --- a/Mage.Sets/src/mage/sets/visions/Impulse.java +++ b/Mage.Sets/src/mage/sets/visions/Impulse.java @@ -46,7 +46,6 @@ public class Impulse extends CardImpl { super(ownerId, 34, "Impulse", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "VIS"; - this.color.setBlue(true); // Look at the top four cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order. this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect(new StaticValue(4), false, new StaticValue(1), new FilterCard(), Zone.LIBRARY, false, false)); diff --git a/Mage.Sets/src/mage/sets/visions/ManOWar.java b/Mage.Sets/src/mage/sets/visions/ManOWar.java index d2d3c2bb607..cb8f6968c76 100644 --- a/Mage.Sets/src/mage/sets/visions/ManOWar.java +++ b/Mage.Sets/src/mage/sets/visions/ManOWar.java @@ -48,7 +48,6 @@ public class ManOWar extends CardImpl { this.expansionSetCode = "VIS"; this.subtype.add("Jellyfish"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/visions/MiraculousRecovery.java b/Mage.Sets/src/mage/sets/visions/MiraculousRecovery.java index 5c1d325e984..f9703e7610c 100644 --- a/Mage.Sets/src/mage/sets/visions/MiraculousRecovery.java +++ b/Mage.Sets/src/mage/sets/visions/MiraculousRecovery.java @@ -52,7 +52,6 @@ public class MiraculousRecovery extends CardImpl { super(ownerId, 113, "Miraculous Recovery", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{W}"); this.expansionSetCode = "VIS"; - this.color.setWhite(true); // Return target creature card from your graveyard to the battlefield. Put a +1/+1 counter on it. this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/visions/NaturalOrder.java b/Mage.Sets/src/mage/sets/visions/NaturalOrder.java index 0e6a36aaef3..a5f6bd5f97a 100644 --- a/Mage.Sets/src/mage/sets/visions/NaturalOrder.java +++ b/Mage.Sets/src/mage/sets/visions/NaturalOrder.java @@ -58,7 +58,6 @@ public class NaturalOrder extends CardImpl { super(ownerId, 64, "Natural Order", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{G}{G}"); this.expansionSetCode = "VIS"; - this.color.setGreen(true); // As an additional cost to cast Natural Order, sacrifice a green creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,filter, true))); diff --git a/Mage.Sets/src/mage/sets/visions/Necromancy.java b/Mage.Sets/src/mage/sets/visions/Necromancy.java index 1bab39b2ee5..3c4b60e43d5 100644 --- a/Mage.Sets/src/mage/sets/visions/Necromancy.java +++ b/Mage.Sets/src/mage/sets/visions/Necromancy.java @@ -76,7 +76,6 @@ public class Necromancy extends CardImpl { super(ownerId, 14, "Necromancy", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "VIS"; - this.color.setBlack(true); // You may cast Necromancy as though it had flash. If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step. this.addAbility(new SimpleStaticAbility(Zone.ALL, new CastSourceAsThoughItHadFlashEffect(this, Duration.EndOfGame, true))); diff --git a/Mage.Sets/src/mage/sets/visions/Necrosavant.java b/Mage.Sets/src/mage/sets/visions/Necrosavant.java index 612e70f6366..26ac18de9d6 100644 --- a/Mage.Sets/src/mage/sets/visions/Necrosavant.java +++ b/Mage.Sets/src/mage/sets/visions/Necrosavant.java @@ -54,7 +54,6 @@ public class Necrosavant extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Giant"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/visions/PantherWarriors.java b/Mage.Sets/src/mage/sets/visions/PantherWarriors.java index 70728683bf7..97ca0527f05 100644 --- a/Mage.Sets/src/mage/sets/visions/PantherWarriors.java +++ b/Mage.Sets/src/mage/sets/visions/PantherWarriors.java @@ -45,7 +45,6 @@ public class PantherWarriors extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/visions/Python.java b/Mage.Sets/src/mage/sets/visions/Python.java index 260cbbb7116..51bf4a849da 100644 --- a/Mage.Sets/src/mage/sets/visions/Python.java +++ b/Mage.Sets/src/mage/sets/visions/Python.java @@ -44,7 +44,6 @@ public class Python extends CardImpl { this.expansionSetCode = "VIS"; this.subtype.add("Snake"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/visions/QuirionRanger.java b/Mage.Sets/src/mage/sets/visions/QuirionRanger.java index d27e189990b..9bf3f07184f 100644 --- a/Mage.Sets/src/mage/sets/visions/QuirionRanger.java +++ b/Mage.Sets/src/mage/sets/visions/QuirionRanger.java @@ -59,7 +59,6 @@ public class QuirionRanger extends CardImpl { this.expansionSetCode = "VIS"; this.subtype.add("Elf"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/visions/Remedy.java b/Mage.Sets/src/mage/sets/visions/Remedy.java index 8771d1d08ce..e03a2b3eb76 100644 --- a/Mage.Sets/src/mage/sets/visions/Remedy.java +++ b/Mage.Sets/src/mage/sets/visions/Remedy.java @@ -45,7 +45,6 @@ public class Remedy extends CardImpl { super(ownerId, 117, "Remedy", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "VIS"; - this.color.setWhite(true); // Prevent the next 5 damage that would be dealt this turn to any number of target creatures and/or players, divided as you choose. this.getSpellAbility().addEffect(new PreventDamageToTargetMultiAmountEffect(Duration.EndOfTurn, 5)); diff --git a/Mage.Sets/src/mage/sets/visions/ResistanceFighter.java b/Mage.Sets/src/mage/sets/visions/ResistanceFighter.java index 42e6477a52c..30073154a25 100644 --- a/Mage.Sets/src/mage/sets/visions/ResistanceFighter.java +++ b/Mage.Sets/src/mage/sets/visions/ResistanceFighter.java @@ -52,7 +52,6 @@ public class ResistanceFighter extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/visions/ScalebanesElite.java b/Mage.Sets/src/mage/sets/visions/ScalebanesElite.java index dcf07583bba..5af5ca35857 100644 --- a/Mage.Sets/src/mage/sets/visions/ScalebanesElite.java +++ b/Mage.Sets/src/mage/sets/visions/ScalebanesElite.java @@ -54,8 +54,6 @@ public class ScalebanesElite extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/visions/ShriekingDrake.java b/Mage.Sets/src/mage/sets/visions/ShriekingDrake.java index 9dc4bbaf918..ed1b98a70c2 100644 --- a/Mage.Sets/src/mage/sets/visions/ShriekingDrake.java +++ b/Mage.Sets/src/mage/sets/visions/ShriekingDrake.java @@ -48,7 +48,6 @@ public class ShriekingDrake extends CardImpl { this.expansionSetCode = "VIS"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/visions/SpittingDrake.java b/Mage.Sets/src/mage/sets/visions/SpittingDrake.java index 32535618685..dc05373a815 100644 --- a/Mage.Sets/src/mage/sets/visions/SpittingDrake.java +++ b/Mage.Sets/src/mage/sets/visions/SpittingDrake.java @@ -50,7 +50,6 @@ public class SpittingDrake extends CardImpl { this.expansionSetCode = "VIS"; this.subtype.add("Drake"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/visions/TempestDrake.java b/Mage.Sets/src/mage/sets/visions/TempestDrake.java index 0580dba3382..636a4f16380 100644 --- a/Mage.Sets/src/mage/sets/visions/TempestDrake.java +++ b/Mage.Sets/src/mage/sets/visions/TempestDrake.java @@ -46,8 +46,6 @@ public class TempestDrake extends CardImpl { this.expansionSetCode = "VIS"; this.subtype.add("Drake"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/visions/UktabiOrangutan.java b/Mage.Sets/src/mage/sets/visions/UktabiOrangutan.java index 525b5011b1b..77adbcfbb2d 100644 --- a/Mage.Sets/src/mage/sets/visions/UktabiOrangutan.java +++ b/Mage.Sets/src/mage/sets/visions/UktabiOrangutan.java @@ -48,7 +48,6 @@ public class UktabiOrangutan extends CardImpl { this.expansionSetCode = "VIS"; this.subtype.add("Ape"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/visions/VampiricTutor.java b/Mage.Sets/src/mage/sets/visions/VampiricTutor.java index 2640ba55672..081c101b19e 100644 --- a/Mage.Sets/src/mage/sets/visions/VampiricTutor.java +++ b/Mage.Sets/src/mage/sets/visions/VampiricTutor.java @@ -45,7 +45,6 @@ public class VampiricTutor extends CardImpl { super(ownerId, 22, "Vampiric Tutor", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "VIS"; - this.color.setBlack(true); // Search your library for a card, then shuffle your library and put that card on top of it. You lose 2 life. this.getSpellAbility().addEffect(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(), false, true)); diff --git a/Mage.Sets/src/mage/sets/visions/Warthog.java b/Mage.Sets/src/mage/sets/visions/Warthog.java index 7f556c4324e..ebb4976be8e 100644 --- a/Mage.Sets/src/mage/sets/visions/Warthog.java +++ b/Mage.Sets/src/mage/sets/visions/Warthog.java @@ -45,7 +45,6 @@ public class Warthog extends CardImpl { this.expansionSetCode = "VIS"; this.subtype.add("Boar"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/weatherlight/Abduction.java b/Mage.Sets/src/mage/sets/weatherlight/Abduction.java index 7352dda63e0..cd07ba0583b 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/Abduction.java +++ b/Mage.Sets/src/mage/sets/weatherlight/Abduction.java @@ -55,7 +55,6 @@ public class Abduction extends CardImpl { this.expansionSetCode = "WTH"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/weatherlight/AncestralKnowledge.java b/Mage.Sets/src/mage/sets/weatherlight/AncestralKnowledge.java index 0e716cb7d8c..dd01ab86cc2 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/AncestralKnowledge.java +++ b/Mage.Sets/src/mage/sets/weatherlight/AncestralKnowledge.java @@ -58,7 +58,6 @@ public class AncestralKnowledge extends CardImpl { super(ownerId, 32, "Ancestral Knowledge", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "WTH"; - this.color.setBlue(true); // Cumulative upkeep {1} this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); diff --git a/Mage.Sets/src/mage/sets/weatherlight/AuraOfSilence.java b/Mage.Sets/src/mage/sets/weatherlight/AuraOfSilence.java index 5c9a7b6249b..66627a149a1 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/AuraOfSilence.java +++ b/Mage.Sets/src/mage/sets/weatherlight/AuraOfSilence.java @@ -67,7 +67,6 @@ public class AuraOfSilence extends CardImpl { super(ownerId, 123, "Aura of Silence", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}{W}"); this.expansionSetCode = "WTH"; - this.color.setWhite(true); // Artifact and enchantment spells your opponents cast cost {2} more to cast. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AuraOfSilenceCostModificationEffect())); diff --git a/Mage.Sets/src/mage/sets/weatherlight/CallOfTheWild.java b/Mage.Sets/src/mage/sets/weatherlight/CallOfTheWild.java index 6178aa89ecd..f4f13334e9e 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/CallOfTheWild.java +++ b/Mage.Sets/src/mage/sets/weatherlight/CallOfTheWild.java @@ -54,7 +54,6 @@ public class CallOfTheWild extends CardImpl { super(ownerId, 64, "Call of the Wild", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); this.expansionSetCode = "WTH"; - this.color.setGreen(true); // {2}{G}{G}: Reveal the top card of your library. If it's a creature card, put it onto the battlefield. Otherwise, put it into your graveyard. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CallOfTheWildEffect(), new ManaCostsImpl("{2}{G}{G}"))); diff --git a/Mage.Sets/src/mage/sets/weatherlight/DenseFoliage.java b/Mage.Sets/src/mage/sets/weatherlight/DenseFoliage.java index 69ab00d81d9..c44595e14a7 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/DenseFoliage.java +++ b/Mage.Sets/src/mage/sets/weatherlight/DenseFoliage.java @@ -48,7 +48,6 @@ public class DenseFoliage extends CardImpl { super(ownerId, 66, "Dense Foliage", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "WTH"; - this.color.setGreen(true); // Creatures can't be the targets of spells. CantBeTargetedAllEffect cantTargetEffect = new CantBeTargetedAllEffect(new FilterCreaturePermanent("Creatures"), new FilterSpell("spells"), Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/sets/weatherlight/Doomsday.java b/Mage.Sets/src/mage/sets/weatherlight/Doomsday.java index db3035c7ca7..518336e86b3 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/Doomsday.java +++ b/Mage.Sets/src/mage/sets/weatherlight/Doomsday.java @@ -54,7 +54,6 @@ public class Doomsday extends CardImpl { super(ownerId, 8, "Doomsday", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{B}{B}{B}"); this.expansionSetCode = "WTH"; - this.color.setBlack(true); // Search your library and graveyard for five cards and exile the rest. Put the chosen cards on top of your library in any order. You lose half your life, rounded up. this.getSpellAbility().addEffect(new DoomsdayEffect()); diff --git a/Mage.Sets/src/mage/sets/weatherlight/FatalBlow.java b/Mage.Sets/src/mage/sets/weatherlight/FatalBlow.java index e0182ddf483..16380e06cd1 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/FatalBlow.java +++ b/Mage.Sets/src/mage/sets/weatherlight/FatalBlow.java @@ -52,7 +52,6 @@ public class FatalBlow extends CardImpl { super(ownerId, 9, "Fatal Blow", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "WTH"; - this.color.setBlack(true); // Destroy target creature that was dealt damage this turn. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/weatherlight/Firestorm.java b/Mage.Sets/src/mage/sets/weatherlight/Firestorm.java index 3062a9d894e..86bcd2f9c85 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/Firestorm.java +++ b/Mage.Sets/src/mage/sets/weatherlight/Firestorm.java @@ -54,7 +54,6 @@ public class Firestorm extends CardImpl { super(ownerId, 101, "Firestorm", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "WTH"; - this.color.setRed(true); // As an additional cost to cast Firestorm, discard X cards. this.getSpellAbility().addCost(new DiscardXTargetCost(new FilterCard("cards"), true)); diff --git a/Mage.Sets/src/mage/sets/weatherlight/FitOfRage.java b/Mage.Sets/src/mage/sets/weatherlight/FitOfRage.java index c355fb9e74e..08dc3510ba4 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/FitOfRage.java +++ b/Mage.Sets/src/mage/sets/weatherlight/FitOfRage.java @@ -47,7 +47,6 @@ public class FitOfRage extends CardImpl { super(ownerId, 102, "Fit of Rage", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "WTH"; - this.color.setRed(true); // Target creature gets +3/+3 and gains first strike until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/weatherlight/GoblinVandal.java b/Mage.Sets/src/mage/sets/weatherlight/GoblinVandal.java index f3a4a3366df..9e2dee19ebd 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/GoblinVandal.java +++ b/Mage.Sets/src/mage/sets/weatherlight/GoblinVandal.java @@ -62,7 +62,6 @@ public class GoblinVandal extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Rogue"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/weatherlight/LavaHounds.java b/Mage.Sets/src/mage/sets/weatherlight/LavaHounds.java index 3e2dff9c632..8fb8a685be9 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/LavaHounds.java +++ b/Mage.Sets/src/mage/sets/weatherlight/LavaHounds.java @@ -47,7 +47,6 @@ public class LavaHounds extends CardImpl { this.expansionSetCode = "WTH"; this.subtype.add("Hound"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/weatherlight/LlanowarDruid.java b/Mage.Sets/src/mage/sets/weatherlight/LlanowarDruid.java index 00f3f8baf30..f82007c5dff 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/LlanowarDruid.java +++ b/Mage.Sets/src/mage/sets/weatherlight/LlanowarDruid.java @@ -57,7 +57,6 @@ public class LlanowarDruid extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/weatherlight/MaraxusOfKeld.java b/Mage.Sets/src/mage/sets/weatherlight/MaraxusOfKeld.java index 83dc4abe9ab..b0a87f7c75d 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/MaraxusOfKeld.java +++ b/Mage.Sets/src/mage/sets/weatherlight/MaraxusOfKeld.java @@ -66,7 +66,6 @@ public class MaraxusOfKeld extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/weatherlight/MischievousPoltergeist.java b/Mage.Sets/src/mage/sets/weatherlight/MischievousPoltergeist.java index a29f8d31817..f60e1b6180a 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/MischievousPoltergeist.java +++ b/Mage.Sets/src/mage/sets/weatherlight/MischievousPoltergeist.java @@ -49,7 +49,6 @@ public class MischievousPoltergeist extends CardImpl { this.expansionSetCode = "WTH"; this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/weatherlight/OrcishSettlers.java b/Mage.Sets/src/mage/sets/weatherlight/OrcishSettlers.java index 6333690c909..ae3b08f528e 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/OrcishSettlers.java +++ b/Mage.Sets/src/mage/sets/weatherlight/OrcishSettlers.java @@ -60,7 +60,6 @@ public class OrcishSettlers extends CardImpl { this.expansionSetCode = "WTH"; this.subtype.add("Orc"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/weatherlight/Peacekeeper.java b/Mage.Sets/src/mage/sets/weatherlight/Peacekeeper.java index 9ab607e8307..8b866432dcc 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/Peacekeeper.java +++ b/Mage.Sets/src/mage/sets/weatherlight/Peacekeeper.java @@ -56,7 +56,6 @@ public class Peacekeeper extends CardImpl { this.expansionSetCode = "WTH"; this.subtype.add("Human"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/weatherlight/PendrellMists.java b/Mage.Sets/src/mage/sets/weatherlight/PendrellMists.java index 9c954438c0e..49c7d3f3a10 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/PendrellMists.java +++ b/Mage.Sets/src/mage/sets/weatherlight/PendrellMists.java @@ -52,7 +52,6 @@ public class PendrellMists extends CardImpl { super(ownerId, 47, "Pendrell Mists", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); this.expansionSetCode = "WTH"; - this.color.setBlue(true); // All creatures have "At the beginning of your upkeep, sacrifice this creature unless you pay {1}." Ability gainedAbility = new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new GenericManaCost(1)), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/weatherlight/RedwoodTreefolk.java b/Mage.Sets/src/mage/sets/weatherlight/RedwoodTreefolk.java index cea1e6416eb..fbf51e80cd3 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/RedwoodTreefolk.java +++ b/Mage.Sets/src/mage/sets/weatherlight/RedwoodTreefolk.java @@ -44,7 +44,6 @@ public class RedwoodTreefolk extends CardImpl { this.expansionSetCode = "WTH"; this.subtype.add("Treefolk"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(6); } diff --git a/Mage.Sets/src/mage/sets/weatherlight/Relearn.java b/Mage.Sets/src/mage/sets/weatherlight/Relearn.java index c191d1b80ab..5ad959aaec5 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/Relearn.java +++ b/Mage.Sets/src/mage/sets/weatherlight/Relearn.java @@ -55,7 +55,6 @@ public class Relearn extends CardImpl { super(ownerId, 51, "Relearn", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{U}{U}"); this.expansionSetCode = "WTH"; - this.color.setBlue(true); // Return target instant or sorcery card from your graveyard to your hand. this.getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/weatherlight/Serenity.java b/Mage.Sets/src/mage/sets/weatherlight/Serenity.java index acfb19326fc..81c076a6128 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/Serenity.java +++ b/Mage.Sets/src/mage/sets/weatherlight/Serenity.java @@ -56,7 +56,6 @@ public class Serenity extends CardImpl { super(ownerId, 140, "Serenity", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "WTH"; - this.color.setWhite(true); // At the beginning of your upkeep, destroy all artifacts and enchantments. They can't be regenerated. Effect effect = new DestroyAllEffect(new FilterPermanent(filter), true); diff --git a/Mage.Sets/src/mage/sets/weatherlight/ShadowRider.java b/Mage.Sets/src/mage/sets/weatherlight/ShadowRider.java index 9b9866974c1..809c6a7a05e 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/ShadowRider.java +++ b/Mage.Sets/src/mage/sets/weatherlight/ShadowRider.java @@ -46,7 +46,6 @@ public class ShadowRider extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Knight"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/weatherlight/Tariff.java b/Mage.Sets/src/mage/sets/weatherlight/Tariff.java index 56637675f10..5c9b1109489 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/Tariff.java +++ b/Mage.Sets/src/mage/sets/weatherlight/Tariff.java @@ -61,7 +61,6 @@ public class Tariff extends CardImpl { super(ownerId, 144, "Tariff", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{W}"); this.expansionSetCode = "WTH"; - this.color.setWhite(true); // Each player sacrifices the creature he or she controls with the highest converted mana cost unless he or she pays that creature's mana cost. If two or more creatures a player controls are tied for highest cost, that player chooses one. this.getSpellAbility().addEffect(new TariffEffect()); diff --git a/Mage.Sets/src/mage/sets/weatherlight/TolarianDrake.java b/Mage.Sets/src/mage/sets/weatherlight/TolarianDrake.java index 928db7ac9b1..d235b884073 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/TolarianDrake.java +++ b/Mage.Sets/src/mage/sets/weatherlight/TolarianDrake.java @@ -46,7 +46,6 @@ public class TolarianDrake extends CardImpl { this.expansionSetCode = "WTH"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/weatherlight/TranquilGrove.java b/Mage.Sets/src/mage/sets/weatherlight/TranquilGrove.java index 30ba59bdac4..7a0cbe68b65 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/TranquilGrove.java +++ b/Mage.Sets/src/mage/sets/weatherlight/TranquilGrove.java @@ -55,7 +55,6 @@ public class TranquilGrove extends CardImpl { super(ownerId, 84, "Tranquil Grove", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "WTH"; - this.color.setGreen(true); // {1}{G}{G}: Destroy all other enchantments. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter), new ManaCostsImpl("{1}{G}{G}"))); diff --git a/Mage.Sets/src/mage/sets/weatherlight/UktabiEfreet.java b/Mage.Sets/src/mage/sets/weatherlight/UktabiEfreet.java index e15b1dd095d..7515b6b2cb9 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/UktabiEfreet.java +++ b/Mage.Sets/src/mage/sets/weatherlight/UktabiEfreet.java @@ -46,7 +46,6 @@ public class UktabiEfreet extends CardImpl { this.expansionSetCode = "WTH"; this.subtype.add("Efreet"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/weatherlight/Vitalize.java b/Mage.Sets/src/mage/sets/weatherlight/Vitalize.java index e481fa93804..8ce910a4559 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/Vitalize.java +++ b/Mage.Sets/src/mage/sets/weatherlight/Vitalize.java @@ -44,7 +44,6 @@ public class Vitalize extends CardImpl { super(ownerId, 87, "Vitalize", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "WTH"; - this.color.setGreen(true); // Untap all creatures you control. this.getSpellAbility().addEffect(new UntapAllControllerEffect(new FilterCreaturePermanent(), "Untap all creatures you control")); diff --git a/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java b/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java index f1e7cba48ff..f187445f701 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java +++ b/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java @@ -56,7 +56,6 @@ public class AEtherTradewinds extends CardImpl { super(ownerId, 24, "AEther Tradewinds", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "WWK"; - this.color.setBlue(true); // Return target permanent you control and target permanent you don't control to their owners' hands. this.getSpellAbility().addTarget(new TargetControlledPermanent()); diff --git a/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java b/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java index a6e87bccd06..2d950a4480b 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java +++ b/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java @@ -65,7 +65,6 @@ public class AdmonitionAngel extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/worldwake/AgadeemOccultist.java b/Mage.Sets/src/mage/sets/worldwake/AgadeemOccultist.java index bed50ea858c..7deedb8ceb2 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AgadeemOccultist.java +++ b/Mage.Sets/src/mage/sets/worldwake/AgadeemOccultist.java @@ -60,7 +60,6 @@ public class AgadeemOccultist extends CardImpl { this.subtype.add("Shaman"); this.subtype.add("Ally"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/worldwake/AkoumBattlesinger.java b/Mage.Sets/src/mage/sets/worldwake/AkoumBattlesinger.java index 6f51e4a5601..3ea7e593bdb 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AkoumBattlesinger.java +++ b/Mage.Sets/src/mage/sets/worldwake/AkoumBattlesinger.java @@ -63,7 +63,6 @@ public class AkoumBattlesinger extends CardImpl { this.subtype.add("Berserker"); this.subtype.add("Ally"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/AnowonTheRuinSage.java b/Mage.Sets/src/mage/sets/worldwake/AnowonTheRuinSage.java index 6c1a8c19186..129fdbc2bbe 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AnowonTheRuinSage.java +++ b/Mage.Sets/src/mage/sets/worldwake/AnowonTheRuinSage.java @@ -58,7 +58,6 @@ public class AnowonTheRuinSage extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Shaman"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/worldwake/ApexHawks.java b/Mage.Sets/src/mage/sets/worldwake/ApexHawks.java index 501663be122..efc0e965b21 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ApexHawks.java +++ b/Mage.Sets/src/mage/sets/worldwake/ApexHawks.java @@ -50,7 +50,6 @@ public class ApexHawks extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Bird"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java b/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java index 24c6490e1aa..fb6b00709c6 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java +++ b/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java @@ -56,7 +56,6 @@ public class ArchonOfRedemption extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Archon"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/worldwake/AvengerOfZendikar.java b/Mage.Sets/src/mage/sets/worldwake/AvengerOfZendikar.java index 58180a6105b..2bf8fa25693 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AvengerOfZendikar.java +++ b/Mage.Sets/src/mage/sets/worldwake/AvengerOfZendikar.java @@ -63,7 +63,6 @@ public class AvengerOfZendikar extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/worldwake/BazaarTrader.java b/Mage.Sets/src/mage/sets/worldwake/BazaarTrader.java index c583628c5be..217f44fa9ad 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BazaarTrader.java +++ b/Mage.Sets/src/mage/sets/worldwake/BazaarTrader.java @@ -70,7 +70,6 @@ public class BazaarTrader extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/BojukaBrigand.java b/Mage.Sets/src/mage/sets/worldwake/BojukaBrigand.java index afaaef4ae51..c30f1ad1624 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BojukaBrigand.java +++ b/Mage.Sets/src/mage/sets/worldwake/BojukaBrigand.java @@ -50,7 +50,6 @@ public class BojukaBrigand extends CardImpl { this.subtype.add("Warrior"); this.subtype.add("Ally"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java b/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java index 52796725118..039cd486a62 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java +++ b/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java @@ -66,7 +66,6 @@ public class BrinkOfDisaster extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature or land TargetPermanent auraTarget = new TargetPermanent(); diff --git a/Mage.Sets/src/mage/sets/worldwake/ButcherOfMalakir.java b/Mage.Sets/src/mage/sets/worldwake/ButcherOfMalakir.java index 073b4d39e19..e59f8933ed3 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ButcherOfMalakir.java +++ b/Mage.Sets/src/mage/sets/worldwake/ButcherOfMalakir.java @@ -57,7 +57,6 @@ public class ButcherOfMalakir extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/worldwake/CalciteSnapper.java b/Mage.Sets/src/mage/sets/worldwake/CalciteSnapper.java index 3c3ad4848c9..d4e4285ab96 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CalciteSnapper.java +++ b/Mage.Sets/src/mage/sets/worldwake/CalciteSnapper.java @@ -48,7 +48,6 @@ public class CalciteSnapper extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Turtle"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/worldwake/CanopyCover.java b/Mage.Sets/src/mage/sets/worldwake/CanopyCover.java index 84e512feb84..ca6ca52f355 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CanopyCover.java +++ b/Mage.Sets/src/mage/sets/worldwake/CanopyCover.java @@ -69,7 +69,6 @@ public class CanopyCover extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/worldwake/CausticCrawler.java b/Mage.Sets/src/mage/sets/worldwake/CausticCrawler.java index a7019040d0d..02be7b705a6 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CausticCrawler.java +++ b/Mage.Sets/src/mage/sets/worldwake/CausticCrawler.java @@ -48,7 +48,6 @@ public class CausticCrawler extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Insect"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/worldwake/ChainReaction.java b/Mage.Sets/src/mage/sets/worldwake/ChainReaction.java index 00f3e83aebb..6b938d5b9c0 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ChainReaction.java +++ b/Mage.Sets/src/mage/sets/worldwake/ChainReaction.java @@ -46,7 +46,6 @@ public class ChainReaction extends CardImpl { super(ownerId, 74, "Chain Reaction", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); this.expansionSetCode = "WWK"; - this.color.setRed(true); // Chain Reaction deals X damage to each creature, where X is the number of creatures on the battlefield. Effect effect = new DamageAllEffect(new PermanentsOnBattlefieldCount(new FilterCreaturePermanent()), new FilterCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/worldwake/CorruptedZendikon.java b/Mage.Sets/src/mage/sets/worldwake/CorruptedZendikon.java index d8683bb38eb..2c1c64681f2 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CorruptedZendikon.java +++ b/Mage.Sets/src/mage/sets/worldwake/CorruptedZendikon.java @@ -54,7 +54,6 @@ public class CorruptedZendikon extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant land // Enchanted land is a 3/3 black Ooze creature. It's still a land. diff --git a/Mage.Sets/src/mage/sets/worldwake/CrusherZendikon.java b/Mage.Sets/src/mage/sets/worldwake/CrusherZendikon.java index c70752bb6fb..b49c094fa86 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CrusherZendikon.java +++ b/Mage.Sets/src/mage/sets/worldwake/CrusherZendikon.java @@ -55,7 +55,6 @@ public class CrusherZendikon extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/worldwake/DeadReckoning.java b/Mage.Sets/src/mage/sets/worldwake/DeadReckoning.java index 309759e2acf..fcae572f925 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DeadReckoning.java +++ b/Mage.Sets/src/mage/sets/worldwake/DeadReckoning.java @@ -54,7 +54,6 @@ public class DeadReckoning extends CardImpl { super(ownerId, 56, "Dead Reckoning", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}{B}"); this.expansionSetCode = "WWK"; - this.color.setBlack(true); // You may put target creature card from your graveyard on top of your library. If you do, Dead Reckoning deals damage equal to that card's power to target creature. this.getSpellAbility().addEffect(new DeadReckoningEffect()); diff --git a/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java b/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java index dec3e13a145..e2fd72a1fac 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java +++ b/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java @@ -56,7 +56,6 @@ public class DeathforgeShaman extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/worldwake/DeathsShadow.java b/Mage.Sets/src/mage/sets/worldwake/DeathsShadow.java index 0f8e11775b9..06208b8a2b3 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DeathsShadow.java +++ b/Mage.Sets/src/mage/sets/worldwake/DeathsShadow.java @@ -51,7 +51,6 @@ public class DeathsShadow extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Avatar"); - this.color.setBlack(true); this.power = new MageInt(13); this.toughness = new MageInt(13); diff --git a/Mage.Sets/src/mage/sets/worldwake/DragonmasterOutcast.java b/Mage.Sets/src/mage/sets/worldwake/DragonmasterOutcast.java index 736fe6d5cc3..e0c43a32e08 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DragonmasterOutcast.java +++ b/Mage.Sets/src/mage/sets/worldwake/DragonmasterOutcast.java @@ -63,7 +63,6 @@ public class DragonmasterOutcast extends CardImpl { this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/EnclaveElite.java b/Mage.Sets/src/mage/sets/worldwake/EnclaveElite.java index 1e149239756..9463f570f61 100644 --- a/Mage.Sets/src/mage/sets/worldwake/EnclaveElite.java +++ b/Mage.Sets/src/mage/sets/worldwake/EnclaveElite.java @@ -51,7 +51,6 @@ public class EnclaveElite extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/worldwake/FeralContest.java b/Mage.Sets/src/mage/sets/worldwake/FeralContest.java index c6a4fd8493d..f0af7b313e4 100644 --- a/Mage.Sets/src/mage/sets/worldwake/FeralContest.java +++ b/Mage.Sets/src/mage/sets/worldwake/FeralContest.java @@ -53,7 +53,6 @@ public class FeralContest extends CardImpl { super(ownerId, 100, "Feral Contest", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "WWK"; - this.color.setGreen(true); // Put a +1/+1 counter on target creature you control. this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); diff --git a/Mage.Sets/src/mage/sets/worldwake/GnarlidPack.java b/Mage.Sets/src/mage/sets/worldwake/GnarlidPack.java index 973b8154576..ae1355098b7 100644 --- a/Mage.Sets/src/mage/sets/worldwake/GnarlidPack.java +++ b/Mage.Sets/src/mage/sets/worldwake/GnarlidPack.java @@ -49,7 +49,6 @@ public class GnarlidPack extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/worldwake/GraypeltHunter.java b/Mage.Sets/src/mage/sets/worldwake/GraypeltHunter.java index b28d69a3233..5d0346707e3 100644 --- a/Mage.Sets/src/mage/sets/worldwake/GraypeltHunter.java +++ b/Mage.Sets/src/mage/sets/worldwake/GraypeltHunter.java @@ -50,7 +50,6 @@ public class GraypeltHunter extends CardImpl { this.subtype.add("Warrior"); this.subtype.add("Ally"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/worldwake/GrotagThrasher.java b/Mage.Sets/src/mage/sets/worldwake/GrotagThrasher.java index 710503a8df6..bf4e9333886 100644 --- a/Mage.Sets/src/mage/sets/worldwake/GrotagThrasher.java +++ b/Mage.Sets/src/mage/sets/worldwake/GrotagThrasher.java @@ -49,7 +49,6 @@ public class GrotagThrasher extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Lizard"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/worldwake/GuardianZendikon.java b/Mage.Sets/src/mage/sets/worldwake/GuardianZendikon.java index 9e06934fcdb..17ec3917ac6 100644 --- a/Mage.Sets/src/mage/sets/worldwake/GuardianZendikon.java +++ b/Mage.Sets/src/mage/sets/worldwake/GuardianZendikon.java @@ -55,7 +55,6 @@ public class GuardianZendikon extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant land // Enchanted land is a 2/6 white Wall creature with defender. It's still a land. diff --git a/Mage.Sets/src/mage/sets/worldwake/HadaFreeblade.java b/Mage.Sets/src/mage/sets/worldwake/HadaFreeblade.java index fac00645f77..9dd88d5df3e 100644 --- a/Mage.Sets/src/mage/sets/worldwake/HadaFreeblade.java +++ b/Mage.Sets/src/mage/sets/worldwake/HadaFreeblade.java @@ -49,7 +49,6 @@ public class HadaFreeblade extends CardImpl { this.subtype.add("Soldier"); this.subtype.add("Ally"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/HalimarExcavator.java b/Mage.Sets/src/mage/sets/worldwake/HalimarExcavator.java index 5e378f28dac..ccd23074c5d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/HalimarExcavator.java +++ b/Mage.Sets/src/mage/sets/worldwake/HalimarExcavator.java @@ -63,7 +63,6 @@ public class HalimarExcavator extends CardImpl { this.subtype.add("Wizard"); this.subtype.add("Ally"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); Ability ability = new AllyEntersBattlefieldTriggeredAbility(new PutLibraryIntoGraveTargetEffect(new PermanentsOnBattlefieldCount(filter)), false); diff --git a/Mage.Sets/src/mage/sets/worldwake/HarabazDruid.java b/Mage.Sets/src/mage/sets/worldwake/HarabazDruid.java index 6150dcd02b7..b6eaca60c4d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/HarabazDruid.java +++ b/Mage.Sets/src/mage/sets/worldwake/HarabazDruid.java @@ -57,7 +57,6 @@ public class HarabazDruid extends CardImpl { this.subtype.add("Druid"); this.subtype.add("Ally"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java b/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java index 1ecadd8547b..4a5cb44f09c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java +++ b/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java @@ -67,7 +67,6 @@ public class JoragaWarcaller extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/JwariShapeshifter.java b/Mage.Sets/src/mage/sets/worldwake/JwariShapeshifter.java index d94796c9d1c..c436a967e92 100644 --- a/Mage.Sets/src/mage/sets/worldwake/JwariShapeshifter.java +++ b/Mage.Sets/src/mage/sets/worldwake/JwariShapeshifter.java @@ -62,7 +62,6 @@ public class JwariShapeshifter extends CardImpl { this.subtype.add("Shapeshifter"); this.subtype.add("Ally"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java b/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java index a0690be87c4..4a762bce956 100644 --- a/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java +++ b/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java @@ -57,7 +57,6 @@ public class KalastriaHighborn extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Shaman"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java b/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java index 1c20e857793..851dfe2e561 100644 --- a/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java +++ b/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java @@ -60,7 +60,6 @@ public class KazuulTyrantOfTheCliffs extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/worldwake/MarshalsAnthem.java b/Mage.Sets/src/mage/sets/worldwake/MarshalsAnthem.java index 45cd29a275e..a86eb44cc24 100644 --- a/Mage.Sets/src/mage/sets/worldwake/MarshalsAnthem.java +++ b/Mage.Sets/src/mage/sets/worldwake/MarshalsAnthem.java @@ -66,7 +66,6 @@ public class MarshalsAnthem extends CardImpl { super(ownerId, 15, "Marshal's Anthem", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "WWK"; - this.color.setWhite(true); // Multikicker {1}{W} this.addAbility(new MultikickerAbility("{1}{W}")); diff --git a/Mage.Sets/src/mage/sets/worldwake/MiresToll.java b/Mage.Sets/src/mage/sets/worldwake/MiresToll.java index 01f2dd2e006..eb8eb1a684d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/MiresToll.java +++ b/Mage.Sets/src/mage/sets/worldwake/MiresToll.java @@ -56,7 +56,6 @@ public class MiresToll extends CardImpl { super(ownerId, 60, "Mire's Toll", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "WWK"; - this.color.setBlack(true); // Target player reveals a number of cards from his or her hand equal to the number of Swamps you control. You choose one of them. That player discards that card. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java b/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java index c2bd4cc1d8d..f2715848f53 100644 --- a/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java +++ b/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java @@ -56,7 +56,6 @@ public class MordantDragon extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/worldwake/MysteriesOfTheDeep.java b/Mage.Sets/src/mage/sets/worldwake/MysteriesOfTheDeep.java index c1297bdb4b2..19a28ff6d7d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/MysteriesOfTheDeep.java +++ b/Mage.Sets/src/mage/sets/worldwake/MysteriesOfTheDeep.java @@ -46,7 +46,6 @@ public class MysteriesOfTheDeep extends CardImpl { super(ownerId, 33, "Mysteries of the Deep", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{U}"); this.expansionSetCode = "WWK"; - this.color.setBlue(true); // Draw two cards. // Landfall - If you had a land enter the battlefield under your control this turn, draw three cards instead. diff --git a/Mage.Sets/src/mage/sets/worldwake/NemesisTrap.java b/Mage.Sets/src/mage/sets/worldwake/NemesisTrap.java index c1dd580d1ce..5665494edbe 100644 --- a/Mage.Sets/src/mage/sets/worldwake/NemesisTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/NemesisTrap.java @@ -71,7 +71,6 @@ public class NemesisTrap extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Trap"); - this.color.setBlack(true); // If a white creature is attacking, you may pay {B}{B} rather than pay Nemesis Trap's mana cost. this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{B}{B}"), new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 0, false))); diff --git a/Mage.Sets/src/mage/sets/worldwake/NovablastWurm.java b/Mage.Sets/src/mage/sets/worldwake/NovablastWurm.java index 534f25fd93d..f456ece1bfa 100644 --- a/Mage.Sets/src/mage/sets/worldwake/NovablastWurm.java +++ b/Mage.Sets/src/mage/sets/worldwake/NovablastWurm.java @@ -56,8 +56,6 @@ public class NovablastWurm extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Wurm"); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/worldwake/PerimeterCaptain.java b/Mage.Sets/src/mage/sets/worldwake/PerimeterCaptain.java index 229ef26755e..af06de30b30 100644 --- a/Mage.Sets/src/mage/sets/worldwake/PerimeterCaptain.java +++ b/Mage.Sets/src/mage/sets/worldwake/PerimeterCaptain.java @@ -54,7 +54,6 @@ public class PerimeterCaptain extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java b/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java index 74d476c2018..27d3d4f059e 100644 --- a/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java @@ -58,7 +58,6 @@ public class PermafrostTrap extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Trap"); - this.color.setBlue(true); // If an opponent had a green creature enter the battlefield under his or her control this turn, you may pay {U} rather than pay Permafrost Trap's mana cost. this.getSpellAbility().addAlternativeCost(new PermafrostTrapAlternativeCost()); diff --git a/Mage.Sets/src/mage/sets/worldwake/PulseTracker.java b/Mage.Sets/src/mage/sets/worldwake/PulseTracker.java index 2ba26b17cf9..22f2cd806f5 100644 --- a/Mage.Sets/src/mage/sets/worldwake/PulseTracker.java +++ b/Mage.Sets/src/mage/sets/worldwake/PulseTracker.java @@ -52,7 +52,6 @@ public class PulseTracker extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/QuagVampires.java b/Mage.Sets/src/mage/sets/worldwake/QuagVampires.java index 0c6da5b8612..4db3ecbe9c8 100644 --- a/Mage.Sets/src/mage/sets/worldwake/QuagVampires.java +++ b/Mage.Sets/src/mage/sets/worldwake/QuagVampires.java @@ -51,7 +51,6 @@ public class QuagVampires extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/QuestForRenewal.java b/Mage.Sets/src/mage/sets/worldwake/QuestForRenewal.java index e207de80c83..0e54dc6ac14 100644 --- a/Mage.Sets/src/mage/sets/worldwake/QuestForRenewal.java +++ b/Mage.Sets/src/mage/sets/worldwake/QuestForRenewal.java @@ -53,7 +53,6 @@ public class QuestForRenewal extends CardImpl { super(ownerId, 110, "Quest for Renewal", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "WWK"; - this.color.setGreen(true); // Whenever a creature you control becomes tapped, you may put a quest counter on Quest for Renewal. this.addAbility(new BecomesTappedCreatureControlledTriggeredAbility(new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true)); diff --git a/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java b/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java index 8c0046c8f05..8783bd5f6f7 100644 --- a/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java +++ b/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java @@ -67,7 +67,6 @@ public class QuestForTheGoblinLord extends CardImpl { super(ownerId, 86, "Quest for the Goblin Lord", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{R}"); this.expansionSetCode = "WWK"; - this.color.setRed(true); // Whenever a Goblin enters the battlefield under your control, you may put a quest counter on Quest for the Goblin Lord. this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), goblinFilter, true)); diff --git a/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java b/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java index 1ab9ba577a0..bb0c4500441 100644 --- a/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java +++ b/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java @@ -55,7 +55,6 @@ public class QuestForTheNihilStone extends CardImpl { super(ownerId, 64, "Quest for the Nihil Stone", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "WWK"; - this.color.setBlack(true); // Whenever an opponent discards a card, you may put a quest counter on Quest for the Nihil Stone. this.addAbility(new QuestForTheNihilStoneTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/worldwake/QuestForUlasTemple.java b/Mage.Sets/src/mage/sets/worldwake/QuestForUlasTemple.java index adbb20b4c4a..9699ac73805 100644 --- a/Mage.Sets/src/mage/sets/worldwake/QuestForUlasTemple.java +++ b/Mage.Sets/src/mage/sets/worldwake/QuestForUlasTemple.java @@ -58,7 +58,6 @@ public class QuestForUlasTemple extends CardImpl { super(ownerId, 35, "Quest for Ula's Temple", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{U}"); this.expansionSetCode = "WWK"; - this.color.setBlue(true); // At the beginning of your upkeep, you may look at the top card of your library. If it's a creature card, you may reveal it and put a quest counter on Quest for Ula's Temple. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new QuestForUlasTempleEffect(), TargetController.YOU, true)); diff --git a/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java b/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java index b5b0983399e..8064807857f 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java @@ -60,7 +60,6 @@ public class RefractionTrap extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Trap"); - this.color.setWhite(true); // If an opponent cast a red instant or sorcery spell this turn, you may pay {W} rather than pay Refraction Trap's mana cost. this.getSpellAbility().addAlternativeCost(new RefractionTrapAlternativeCost()); diff --git a/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java b/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java index 89345c036e1..890df85a5a4 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java +++ b/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java @@ -47,7 +47,6 @@ public class RestForTheWeary extends CardImpl { super(ownerId, 18, "Rest for the Weary", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "WWK"; - this.color.setWhite(true); // Target player gains 4 life. // Landfall - If you had a land enter the battlefield under your control this turn, that player gains 8 life instead. diff --git a/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java b/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java index 953c4ff704a..573cb143468 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java @@ -65,7 +65,6 @@ public class RicochetTrap extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Trap"); - this.color.setRed(true); // If an opponent cast a blue spell this turn, you may pay {R} rather than pay Ricochet Trap's mana cost. this.getSpellAbility().addAlternativeCost(new RicochetTrapAlternativeCost()); diff --git a/Mage.Sets/src/mage/sets/worldwake/RoilingTerrain.java b/Mage.Sets/src/mage/sets/worldwake/RoilingTerrain.java index 7e9b97d9d06..6a709b65662 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RoilingTerrain.java +++ b/Mage.Sets/src/mage/sets/worldwake/RoilingTerrain.java @@ -52,7 +52,6 @@ public class RoilingTerrain extends CardImpl { super(ownerId, 88, "Roiling Terrain", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); this.expansionSetCode = "WWK"; - this.color.setRed(true); // Destroy target land, then Roiling Terrain deals damage to that land's controller equal to the number of land cards in that player's graveyard. this.getSpellAbility().addEffect(new RoilingTerrainEffect()); diff --git a/Mage.Sets/src/mage/sets/worldwake/RuinGhost.java b/Mage.Sets/src/mage/sets/worldwake/RuinGhost.java index 87c20f86648..2d147cd5322 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RuinGhost.java +++ b/Mage.Sets/src/mage/sets/worldwake/RuinGhost.java @@ -61,7 +61,6 @@ public class RuinGhost extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java b/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java index cec515478b6..00283f78fe0 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java +++ b/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java @@ -64,7 +64,6 @@ public class RumblingAftershocks extends CardImpl { super(ownerId, 89, "Rumbling Aftershocks", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}"); this.expansionSetCode = "WWK"; - this.color.setRed(true); // Whenever you cast a kicked spell, you may have Rumbling Aftershocks deal damage to target creature or player equal to the number of times that spell was kicked. Ability ability = new RumblingAftershocksTriggeredAbility(); diff --git a/Mage.Sets/src/mage/sets/worldwake/RuthlessCullblade.java b/Mage.Sets/src/mage/sets/worldwake/RuthlessCullblade.java index e32fbb7f6b1..9a8a12f7693 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RuthlessCullblade.java +++ b/Mage.Sets/src/mage/sets/worldwake/RuthlessCullblade.java @@ -51,7 +51,6 @@ public class RuthlessCullblade extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java b/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java index 63dc009c1d3..6239aa22a39 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java +++ b/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java @@ -57,7 +57,6 @@ public class ScribNibblers extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Rat"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/SelectiveMemory.java b/Mage.Sets/src/mage/sets/worldwake/SelectiveMemory.java index aeac7969931..eb883dbc960 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SelectiveMemory.java +++ b/Mage.Sets/src/mage/sets/worldwake/SelectiveMemory.java @@ -50,7 +50,6 @@ public class SelectiveMemory extends CardImpl { super(ownerId, 37, "Selective Memory", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "WWK"; - this.color.setBlue(true); // Search your library for any number of nonland cards and exile them. Then shuffle your library. this.getSpellAbility().addEffect(new SelectiveMemoryEffect()); diff --git a/Mage.Sets/src/mage/sets/worldwake/ShorelineSalvager.java b/Mage.Sets/src/mage/sets/worldwake/ShorelineSalvager.java index 961a60b198b..f452d321786 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ShorelineSalvager.java +++ b/Mage.Sets/src/mage/sets/worldwake/ShorelineSalvager.java @@ -60,7 +60,6 @@ public class ShorelineSalvager extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Surrakar"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/worldwake/SkitterOfLizards.java b/Mage.Sets/src/mage/sets/worldwake/SkitterOfLizards.java index 20302337d96..1ab0d83a397 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SkitterOfLizards.java +++ b/Mage.Sets/src/mage/sets/worldwake/SkitterOfLizards.java @@ -50,7 +50,6 @@ public class SkitterOfLizards extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Lizard"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java b/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java index 511d035bf7a..2a4d6737def 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java +++ b/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java @@ -58,7 +58,6 @@ public class SlaveringNulls extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Zombie"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/SlingbowTrap.java b/Mage.Sets/src/mage/sets/worldwake/SlingbowTrap.java index 37abbb3bc83..c91558c586a 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SlingbowTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/SlingbowTrap.java @@ -61,7 +61,6 @@ public class SlingbowTrap extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Trap"); - this.color.setGreen(true); // If a black creature with flying is attacking, you may pay {G} rather than pay Slingbow Trap's mana cost. this.getSpellAbility().addAlternativeCost(new SlingbowTrapAlternativeCost()); diff --git a/Mage.Sets/src/mage/sets/worldwake/Smother.java b/Mage.Sets/src/mage/sets/worldwake/Smother.java index 0050b199de7..e9afc6f33f1 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Smother.java +++ b/Mage.Sets/src/mage/sets/worldwake/Smother.java @@ -53,7 +53,6 @@ public class Smother extends CardImpl { super(ownerId, 68, "Smother", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "WWK"; - this.color.setBlack(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/worldwake/SpellContortion.java b/Mage.Sets/src/mage/sets/worldwake/SpellContortion.java index b026a3ab4a1..34f6469cde4 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SpellContortion.java +++ b/Mage.Sets/src/mage/sets/worldwake/SpellContortion.java @@ -50,7 +50,6 @@ public class SpellContortion extends CardImpl { super(ownerId, 38, "Spell Contortion", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "WWK"; - this.color.setBlue(true); // Multikicker {1}{U} this.addAbility(new MultikickerAbility("{1}{U}")); diff --git a/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java b/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java index e6f9c458e76..6645440db61 100644 --- a/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java +++ b/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java @@ -54,7 +54,6 @@ public class StrengthOfTheTajuru extends CardImpl { super(ownerId, 113, "Strength of the Tajuru", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{G}{G}"); this.expansionSetCode = "WWK"; - this.color.setGreen(true); // Multikicker (You may pay an additional {1} any number of times as you cast this spell.) diff --git a/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java b/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java index 1b997d8135d..e023a8c2ecb 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java +++ b/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java @@ -56,7 +56,6 @@ public class SurrakarBanisher extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Surrakar"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/worldwake/Terastodon.java b/Mage.Sets/src/mage/sets/worldwake/Terastodon.java index d0564834210..3192537315c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Terastodon.java +++ b/Mage.Sets/src/mage/sets/worldwake/Terastodon.java @@ -63,7 +63,6 @@ public class Terastodon extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Elephant"); - this.color.setGreen(true); this.power = new MageInt(9); this.toughness = new MageInt(9); diff --git a/Mage.Sets/src/mage/sets/worldwake/TerraEternal.java b/Mage.Sets/src/mage/sets/worldwake/TerraEternal.java index faa17ebae2a..5f21ba5fef9 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TerraEternal.java +++ b/Mage.Sets/src/mage/sets/worldwake/TerraEternal.java @@ -49,7 +49,6 @@ public class TerraEternal extends CardImpl { super(ownerId, 22, "Terra Eternal", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "WWK"; - this.color.setWhite(true); // All lands are indestructible. FilterLandPermanent filter = new FilterLandPermanent("All lands"); diff --git a/Mage.Sets/src/mage/sets/worldwake/ThadaAdelAcquisitor.java b/Mage.Sets/src/mage/sets/worldwake/ThadaAdelAcquisitor.java index 6ae2163f6a4..8db182345cf 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ThadaAdelAcquisitor.java +++ b/Mage.Sets/src/mage/sets/worldwake/ThadaAdelAcquisitor.java @@ -63,7 +63,6 @@ public class ThadaAdelAcquisitor extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java b/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java index 279d8aef2a2..fcda03820e3 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java +++ b/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java @@ -63,7 +63,6 @@ public class TideforceElemental extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/TombHex.java b/Mage.Sets/src/mage/sets/worldwake/TombHex.java index b500f8db022..1204445582d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TombHex.java +++ b/Mage.Sets/src/mage/sets/worldwake/TombHex.java @@ -50,7 +50,6 @@ public class TombHex extends CardImpl { super(ownerId, 69, "Tomb Hex", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "WWK"; - this.color.setBlack(true); // Target creature gets -2/-2 until end of turn. // Landfall - If you had a land enter the battlefield under your control this turn, that creature gets -4/-4 until end of turn instead. diff --git a/Mage.Sets/src/mage/sets/worldwake/TreasureHunt.java b/Mage.Sets/src/mage/sets/worldwake/TreasureHunt.java index 127ba4da93e..a911916ff7d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TreasureHunt.java +++ b/Mage.Sets/src/mage/sets/worldwake/TreasureHunt.java @@ -51,7 +51,6 @@ public class TreasureHunt extends CardImpl { super(ownerId, 42, "Treasure Hunt", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{U}"); this.expansionSetCode = "WWK"; - this.color.setBlue(true); // Reveal cards from the top of your library until you reveal a nonland card, then put all cards revealed this way into your hand. this.getSpellAbility().addEffect(new TreasureHuntEffect()); diff --git a/Mage.Sets/src/mage/sets/worldwake/Twitch.java b/Mage.Sets/src/mage/sets/worldwake/Twitch.java index 6a1ef5cf4ea..9e73b027b7d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Twitch.java +++ b/Mage.Sets/src/mage/sets/worldwake/Twitch.java @@ -57,7 +57,6 @@ public class Twitch extends CardImpl { super(ownerId, 43, "Twitch", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "WWK"; - this.color.setBlue(true); // You may tap or untap target artifact, creature, or land. // Draw a card. diff --git a/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java b/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java index 83278e98d38..63b2dd60258 100644 --- a/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java +++ b/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java @@ -59,7 +59,6 @@ public class UrgeToFeed extends CardImpl { super(ownerId, 70, "Urge to Feed", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{B}{B}"); this.expansionSetCode = "WWK"; - this.color.setBlack(true); // Target creature gets -3/-3 until end of turn. You may tap any number of untapped Vampire creatures you control. If you do, put a +1/+1 counter on each of those Vampires. this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -3, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/worldwake/VaporSnare.java b/Mage.Sets/src/mage/sets/worldwake/VaporSnare.java index 869101fd532..e56332bdb5b 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VaporSnare.java +++ b/Mage.Sets/src/mage/sets/worldwake/VaporSnare.java @@ -57,7 +57,6 @@ public class VaporSnare extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/worldwake/VastwoodAnimist.java b/Mage.Sets/src/mage/sets/worldwake/VastwoodAnimist.java index 16f31b27a3f..02a22a0f7e8 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VastwoodAnimist.java +++ b/Mage.Sets/src/mage/sets/worldwake/VastwoodAnimist.java @@ -66,7 +66,6 @@ public class VastwoodAnimist extends CardImpl { this.subtype.add("Shaman"); this.subtype.add("Ally"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/VastwoodZendikon.java b/Mage.Sets/src/mage/sets/worldwake/VastwoodZendikon.java index f47f8814a06..0d0d88ac1dd 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VastwoodZendikon.java +++ b/Mage.Sets/src/mage/sets/worldwake/VastwoodZendikon.java @@ -54,7 +54,6 @@ public class VastwoodZendikon extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant land // Enchanted land is a 6/4 green Elemental creature. It's still a land. diff --git a/Mage.Sets/src/mage/sets/worldwake/VoyagerDrake.java b/Mage.Sets/src/mage/sets/worldwake/VoyagerDrake.java index db630d8c7ef..63fc3e04582 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VoyagerDrake.java +++ b/Mage.Sets/src/mage/sets/worldwake/VoyagerDrake.java @@ -56,7 +56,6 @@ public class VoyagerDrake extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/worldwake/WindZendikon.java b/Mage.Sets/src/mage/sets/worldwake/WindZendikon.java index 709563c60e4..5567206f335 100644 --- a/Mage.Sets/src/mage/sets/worldwake/WindZendikon.java +++ b/Mage.Sets/src/mage/sets/worldwake/WindZendikon.java @@ -55,7 +55,6 @@ public class WindZendikon extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant land // Enchanted land is a 2/2 blue Elemental creature with flying. It's still a land. diff --git a/Mage.Sets/src/mage/sets/worldwake/WrexialTheRisenDeep.java b/Mage.Sets/src/mage/sets/worldwake/WrexialTheRisenDeep.java index a34158a77e6..873b913bb6c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/WrexialTheRisenDeep.java +++ b/Mage.Sets/src/mage/sets/worldwake/WrexialTheRisenDeep.java @@ -68,8 +68,6 @@ public class WrexialTheRisenDeep extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Kraken"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java index 9b8e24f3c96..6360c8b1574 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java @@ -56,8 +56,6 @@ public class ArchiveTrap extends CardImpl { super(ownerId, 41, "Archive Trap", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); this.expansionSetCode = "ZEN"; - this.subtype.add("Trap"); - this.color.setBlue(true); // If an opponent searched his or her library this turn, you may pay {0} rather than pay Archive Trap's mana cost. this.addAbility(new AlternativeCostSourceAbility(new GenericManaCost(0), OpponentSearchesLibCondition.getInstance()), new ArchiveTrapWatcher()); diff --git a/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java b/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java index 9ca0a3dddff..dab9c4578fc 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java @@ -55,7 +55,6 @@ public class ArchmageAscension extends CardImpl { super(ownerId, 42, "Archmage Ascension", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "ZEN"; - this.color.setBlue(true); // At the beginning of each end step, if you drew two or more cards this turn, you may put a quest counter on Archmage Ascension. this.addAbility(new ArchmageAscensionTriggeredAbility(), new CardsDrawnControllerWatcher()); diff --git a/Mage.Sets/src/mage/sets/zendikar/ArmamentMaster.java b/Mage.Sets/src/mage/sets/zendikar/ArmamentMaster.java index a0b0adb0ae6..fc0cc082a93 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArmamentMaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArmamentMaster.java @@ -65,7 +65,6 @@ public class ArmamentMaster extends CardImpl { this.subtype.add("Kor"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/BalaGedThief.java b/Mage.Sets/src/mage/sets/zendikar/BalaGedThief.java index 0d8da7c3312..36129e4800a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BalaGedThief.java +++ b/Mage.Sets/src/mage/sets/zendikar/BalaGedThief.java @@ -66,7 +66,6 @@ public class BalaGedThief extends CardImpl { this.subtype.add("Rogue"); this.subtype.add("Ally"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java b/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java index 3a36a09599a..62210c83963 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java @@ -56,7 +56,6 @@ public class BalothCageTrap extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Trap"); - this.color.setGreen(true); // If an opponent had an artifact enter the battlefield under his or her control this turn, you may pay {1}{G} rather than pay Baloth Cage Trap's mana cost. this.getSpellAbility().addAlternativeCost(new BalothCageTrapAlternativeCost()); diff --git a/Mage.Sets/src/mage/sets/zendikar/BalothWoodcrasher.java b/Mage.Sets/src/mage/sets/zendikar/BalothWoodcrasher.java index a4fdffb6ae2..df625a31337 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BalothWoodcrasher.java +++ b/Mage.Sets/src/mage/sets/zendikar/BalothWoodcrasher.java @@ -50,7 +50,6 @@ public class BalothWoodcrasher extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/zendikar/BeastHunt.java b/Mage.Sets/src/mage/sets/zendikar/BeastHunt.java index 4787a3f1fb4..172d49dc4dc 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BeastHunt.java +++ b/Mage.Sets/src/mage/sets/zendikar/BeastHunt.java @@ -52,7 +52,6 @@ public class BeastHunt extends CardImpl { super(ownerId, 158, "Beast Hunt", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "ZEN"; - this.color.setGreen(true); this.getSpellAbility().addEffect(new BeastHuntEffect()); } diff --git a/Mage.Sets/src/mage/sets/zendikar/BloodSeeker.java b/Mage.Sets/src/mage/sets/zendikar/BloodSeeker.java index 8f8c78194a8..f017bba3d9b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BloodSeeker.java +++ b/Mage.Sets/src/mage/sets/zendikar/BloodSeeker.java @@ -54,7 +54,6 @@ public class BloodSeeker extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Shaman"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/BloodTribute.java b/Mage.Sets/src/mage/sets/zendikar/BloodTribute.java index b62db9aee3a..43437afc3f2 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BloodTribute.java +++ b/Mage.Sets/src/mage/sets/zendikar/BloodTribute.java @@ -67,7 +67,6 @@ public class BloodTribute extends CardImpl { super(ownerId, 81, "Blood Tribute", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{B}{B}"); this.expansionSetCode = "ZEN"; - this.color.setBlack(true); // Kicker - Tap an untapped Vampire you control. OptionalAdditionalCost cost = new OptionalAdditionalCostImpl("Kicker-","",new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); diff --git a/Mage.Sets/src/mage/sets/zendikar/BloodchiefAscension.java b/Mage.Sets/src/mage/sets/zendikar/BloodchiefAscension.java index b7c52f0a358..ae1c0d6ea8c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BloodchiefAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/BloodchiefAscension.java @@ -63,7 +63,6 @@ public class BloodchiefAscension extends CardImpl { super(ownerId, 82, "Bloodchief Ascension", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "ZEN"; - this.color.setBlack(true); // At the beginning of each end step, if an opponent lost 2 or more life this turn, you may put a quest counter on Bloodchief Ascension. (Damage causes loss of life.) this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/sets/zendikar/Bloodghast.java b/Mage.Sets/src/mage/sets/zendikar/Bloodghast.java index ffeef11609a..08caf739e2b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Bloodghast.java +++ b/Mage.Sets/src/mage/sets/zendikar/Bloodghast.java @@ -56,7 +56,6 @@ public class Bloodghast extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Spirit"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/ChandraAblaze.java b/Mage.Sets/src/mage/sets/zendikar/ChandraAblaze.java index 919ea799064..fb8c03d134b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ChandraAblaze.java +++ b/Mage.Sets/src/mage/sets/zendikar/ChandraAblaze.java @@ -65,7 +65,6 @@ public class ChandraAblaze extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Chandra"); - this.color.setRed(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(5)), false)); diff --git a/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java b/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java index d53b32c132a..628bf52267c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java @@ -59,7 +59,6 @@ public class CobraTrap extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Trap"); - this.color.setGreen(true); // If a noncreature permanent under your control was destroyed this turn by a spell or ability an opponent controlled, you may pay {G} rather than pay Cobra Trap's mana cost. this.getSpellAbility().addAlternativeCost( diff --git a/Mage.Sets/src/mage/sets/zendikar/CosisTrickster.java b/Mage.Sets/src/mage/sets/zendikar/CosisTrickster.java index 1fb9e87d237..8a72b543e52 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CosisTrickster.java +++ b/Mage.Sets/src/mage/sets/zendikar/CosisTrickster.java @@ -51,7 +51,6 @@ public class CosisTrickster extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/CryptRipper.java b/Mage.Sets/src/mage/sets/zendikar/CryptRipper.java index 4adf263bb19..816d6252053 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CryptRipper.java +++ b/Mage.Sets/src/mage/sets/zendikar/CryptRipper.java @@ -50,7 +50,6 @@ public class CryptRipper extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Shade"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/DesecratedEarth.java b/Mage.Sets/src/mage/sets/zendikar/DesecratedEarth.java index ceeb20d36aa..c54ec7de6b3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/DesecratedEarth.java +++ b/Mage.Sets/src/mage/sets/zendikar/DesecratedEarth.java @@ -51,7 +51,6 @@ public class DesecratedEarth extends CardImpl { super(ownerId, 86, "Desecrated Earth", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{B}"); this.expansionSetCode = "ZEN"; - this.color.setBlack(true); // Destroy target land. Its controller discards a card. this.getSpellAbility().addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/sets/zendikar/DevoutLightcaster.java b/Mage.Sets/src/mage/sets/zendikar/DevoutLightcaster.java index 48a6610069f..b65a1304123 100644 --- a/Mage.Sets/src/mage/sets/zendikar/DevoutLightcaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/DevoutLightcaster.java @@ -61,7 +61,6 @@ public class DevoutLightcaster extends CardImpl { this.subtype.add("Kor"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/Disfigure.java b/Mage.Sets/src/mage/sets/zendikar/Disfigure.java index b401cd028e5..304bb951be1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Disfigure.java +++ b/Mage.Sets/src/mage/sets/zendikar/Disfigure.java @@ -45,7 +45,6 @@ public class Disfigure extends CardImpl { super(ownerId, 87, "Disfigure", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "ZEN"; - this.color.setBlack(true); this.getSpellAbility().addEffect(new BoostTargetEffect(-2, -2, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Electropotence.java b/Mage.Sets/src/mage/sets/zendikar/Electropotence.java index 2b908f37f5c..3444242e8d5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Electropotence.java +++ b/Mage.Sets/src/mage/sets/zendikar/Electropotence.java @@ -54,7 +54,6 @@ public class Electropotence extends CardImpl { super(ownerId, 122, "Electropotence", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "ZEN"; - this.color.setRed(true); // Whenever a creature enters the battlefield under your control, you may pay {2}{R}. If you do, that creature deals damage equal to its power to target creature or player. Ability ability = new ElectropotenceTriggeredAbility(); diff --git a/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java b/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java index fb98e221fa7..dbe2952eb59 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java +++ b/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java @@ -56,7 +56,6 @@ public class ElementalAppeal extends CardImpl { super(ownerId, 123, "Elemental Appeal", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{R}{R}{R}{R}"); this.expansionSetCode = "ZEN"; - this.color.setRed(true); // Kicker {5} this.addAbility(new KickerAbility("{5}")); diff --git a/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java b/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java index ac96bd5d74c..24dabbcc7ec 100644 --- a/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java +++ b/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java @@ -50,7 +50,6 @@ public class FeastOfBlood extends CardImpl { super(ownerId, 88, "Feast of Blood", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "ZEN"; - this.color.setBlack(true); // Cast Feast of Blood only if you control two or more Vampires. this.getSpellAbility().addCost(new FeastOfBloodCost()); diff --git a/Mage.Sets/src/mage/sets/zendikar/FelidarSovereign.java b/Mage.Sets/src/mage/sets/zendikar/FelidarSovereign.java index 66aecd5f4b7..1e3af3f68da 100644 --- a/Mage.Sets/src/mage/sets/zendikar/FelidarSovereign.java +++ b/Mage.Sets/src/mage/sets/zendikar/FelidarSovereign.java @@ -55,7 +55,6 @@ public class FelidarSovereign extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Beast"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/zendikar/FrontierGuide.java b/Mage.Sets/src/mage/sets/zendikar/FrontierGuide.java index ff1cf42ccf2..0dec73110fe 100644 --- a/Mage.Sets/src/mage/sets/zendikar/FrontierGuide.java +++ b/Mage.Sets/src/mage/sets/zendikar/FrontierGuide.java @@ -54,7 +54,6 @@ public class FrontierGuide extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Scout"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java b/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java index f3b410e300e..cbdd96a3e6d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java +++ b/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java @@ -61,7 +61,6 @@ public class GatekeeperOfMalakir extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/GeyserGlider.java b/Mage.Sets/src/mage/sets/zendikar/GeyserGlider.java index ede17178480..26284755e82 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GeyserGlider.java +++ b/Mage.Sets/src/mage/sets/zendikar/GeyserGlider.java @@ -50,7 +50,6 @@ public class GeyserGlider extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/zendikar/GiantScorpion.java b/Mage.Sets/src/mage/sets/zendikar/GiantScorpion.java index 1f94031aecc..7c5e561c3d9 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GiantScorpion.java +++ b/Mage.Sets/src/mage/sets/zendikar/GiantScorpion.java @@ -45,7 +45,6 @@ public class GiantScorpion extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Scorpion"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java b/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java index 27eab0e3881..15d9f689266 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java +++ b/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java @@ -68,7 +68,6 @@ public class Gigantiform extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Aura"); - this.color.setGreen(true); // Kicker {4} this.addAbility(new KickerAbility("{4}")); diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinBushwhacker.java b/Mage.Sets/src/mage/sets/zendikar/GoblinBushwhacker.java index 6883fc8b1c2..578178bc415 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinBushwhacker.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinBushwhacker.java @@ -54,7 +54,6 @@ public class GoblinBushwhacker extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinShortcutter.java b/Mage.Sets/src/mage/sets/zendikar/GoblinShortcutter.java index a01364ddd24..447f162cfce 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinShortcutter.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinShortcutter.java @@ -50,7 +50,6 @@ public class GoblinShortcutter extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Scout"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinWarPaint.java b/Mage.Sets/src/mage/sets/zendikar/GoblinWarPaint.java index 2fcd9e72e96..db8538ec1e2 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinWarPaint.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinWarPaint.java @@ -59,7 +59,6 @@ public class GoblinWarPaint extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Aura"); - this.color.setRed(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java b/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java index 31c14fb894b..926f87731f0 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java +++ b/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java @@ -60,7 +60,6 @@ public class Gomazoa extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Jellyfish"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/zendikar/GrazingGladehart.java b/Mage.Sets/src/mage/sets/zendikar/GrazingGladehart.java index 87231599bfa..47319a5798b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GrazingGladehart.java +++ b/Mage.Sets/src/mage/sets/zendikar/GrazingGladehart.java @@ -46,7 +46,6 @@ public class GrazingGladehart extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Antelope"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/GreenweaverDruid.java b/Mage.Sets/src/mage/sets/zendikar/GreenweaverDruid.java index ddc3d326709..cc3d7eaefdb 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GreenweaverDruid.java +++ b/Mage.Sets/src/mage/sets/zendikar/GreenweaverDruid.java @@ -50,7 +50,6 @@ public class GreenweaverDruid extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/GrimDiscovery.java b/Mage.Sets/src/mage/sets/zendikar/GrimDiscovery.java index fc344b8a06e..eef77189932 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GrimDiscovery.java +++ b/Mage.Sets/src/mage/sets/zendikar/GrimDiscovery.java @@ -56,7 +56,6 @@ public class GrimDiscovery extends CardImpl { super(ownerId, 91, "Grim Discovery", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "ZEN"; - this.color.setBlack(true); // Choose one or both - this.getSpellAbility().getModes().setMinModes(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/HagraCrocodile.java b/Mage.Sets/src/mage/sets/zendikar/HagraCrocodile.java index bcf91b98e11..c42466dc2e8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HagraCrocodile.java +++ b/Mage.Sets/src/mage/sets/zendikar/HagraCrocodile.java @@ -48,7 +48,6 @@ public class HagraCrocodile extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Crocodile"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/HagraDiabolist.java b/Mage.Sets/src/mage/sets/zendikar/HagraDiabolist.java index 5c4ac47398f..7786a29a6a2 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HagraDiabolist.java +++ b/Mage.Sets/src/mage/sets/zendikar/HagraDiabolist.java @@ -63,7 +63,6 @@ public class HagraDiabolist extends CardImpl { this.subtype.add("Shaman"); this.subtype.add("Ally"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java b/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java index d6be086a32c..2e8d26f9e9d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java +++ b/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java @@ -57,7 +57,6 @@ public class HaloHunter extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Demon"); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java b/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java index 9fb5972e815..9a627962e42 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java +++ b/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java @@ -51,7 +51,6 @@ public class HeartstabberMosquito extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Insect"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/HedronCrab.java b/Mage.Sets/src/mage/sets/zendikar/HedronCrab.java index 7c5021ed16b..41f9bff9c5e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HedronCrab.java +++ b/Mage.Sets/src/mage/sets/zendikar/HedronCrab.java @@ -47,7 +47,6 @@ public class HedronCrab extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Crab"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(2); // Landfall - Whenever a land enters the battlefield under your control, target player puts the top three cards of his or her library into his or her graveyard. diff --git a/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java b/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java index 69f61d2e237..1877b0c61d2 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java +++ b/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java @@ -55,7 +55,6 @@ public class HideousEnd extends CardImpl { super(ownerId, 98, "Hideous End", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}{B}"); this.expansionSetCode = "ZEN"; - this.color.setBlack(true); // Destroy target nonblack creature. Its controller loses 2 life. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/zendikar/HighlandBerserker.java b/Mage.Sets/src/mage/sets/zendikar/HighlandBerserker.java index 4909e672bff..3ed316b0b69 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HighlandBerserker.java +++ b/Mage.Sets/src/mage/sets/zendikar/HighlandBerserker.java @@ -62,7 +62,6 @@ public class HighlandBerserker extends CardImpl { this.subtype.add("Berserker"); this.subtype.add("Ally"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java b/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java index 821a34bfdb9..e9e07a06bb3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java @@ -54,7 +54,6 @@ public class InfernoTrap extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Trap"); - this.color.setRed(true); // If you've been dealt damage by two or more creatures this turn, you may pay {R} rather than pay Inferno Trap's mana cost. this.getSpellAbility().addAlternativeCost(new InfernoTrapAlternativeCost()); diff --git a/Mage.Sets/src/mage/sets/zendikar/IorRuinExpedition.java b/Mage.Sets/src/mage/sets/zendikar/IorRuinExpedition.java index cd2d59a8a53..57d4201cfc0 100644 --- a/Mage.Sets/src/mage/sets/zendikar/IorRuinExpedition.java +++ b/Mage.Sets/src/mage/sets/zendikar/IorRuinExpedition.java @@ -52,7 +52,6 @@ public class IorRuinExpedition extends CardImpl { super(ownerId, 49, "Ior Ruin Expedition", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "ZEN"; - this.color.setBlue(true); this.addAbility(new LandfallAbility(new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true)); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(3), new RemoveCountersSourceCost(CounterType.QUEST.createInstance(3))); diff --git a/Mage.Sets/src/mage/sets/zendikar/JoragaBard.java b/Mage.Sets/src/mage/sets/zendikar/JoragaBard.java index fc9c55d8488..548871b84c7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/JoragaBard.java +++ b/Mage.Sets/src/mage/sets/zendikar/JoragaBard.java @@ -62,7 +62,6 @@ public class JoragaBard extends CardImpl { this.subtype.add("Rogue"); this.subtype.add("Ally"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/zendikar/KabiraEvangel.java b/Mage.Sets/src/mage/sets/zendikar/KabiraEvangel.java index c87e8982a39..35c7d52e50c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KabiraEvangel.java +++ b/Mage.Sets/src/mage/sets/zendikar/KabiraEvangel.java @@ -68,7 +68,6 @@ public class KabiraEvangel extends CardImpl { this.subtype.add("Cleric"); this.subtype.add("Ally"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java b/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java index 19068e8e592..3e521b30c4d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java +++ b/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java @@ -57,7 +57,6 @@ public class KalitasBloodchiefOfGhet extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/zendikar/KazanduBlademaster.java b/Mage.Sets/src/mage/sets/zendikar/KazanduBlademaster.java index 86c0b26bfeb..60272c990d1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KazanduBlademaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/KazanduBlademaster.java @@ -51,7 +51,6 @@ public class KazanduBlademaster extends CardImpl { this.subtype.add("Soldier"); this.subtype.add("Ally"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/KazuulWarlord.java b/Mage.Sets/src/mage/sets/zendikar/KazuulWarlord.java index 96cf7b55e7e..7618329ef62 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KazuulWarlord.java +++ b/Mage.Sets/src/mage/sets/zendikar/KazuulWarlord.java @@ -61,7 +61,6 @@ public class KazuulWarlord extends CardImpl { this.subtype.add("Warrior"); this.subtype.add("Ally"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java b/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java index 4a3b38f3c98..c897c8340fa 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java @@ -54,7 +54,6 @@ public class KorAeronaut extends CardImpl { this.subtype.add("Kor"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/KorCartographer.java b/Mage.Sets/src/mage/sets/zendikar/KorCartographer.java index 163b4e4de27..2ffd4d370e2 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorCartographer.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorCartographer.java @@ -49,7 +49,6 @@ public class KorCartographer extends CardImpl { this.subtype.add("Kor"); this.subtype.add("Scout"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/KorDuelist.java b/Mage.Sets/src/mage/sets/zendikar/KorDuelist.java index 3e3530079e7..4b3afa9b8ae 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorDuelist.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorDuelist.java @@ -58,7 +58,6 @@ public class KorDuelist extends CardImpl { this.subtype.add("Kor"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); GainAbilitySourceEffect effect = new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java b/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java index e863eeda156..ac10be7f41c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java @@ -58,7 +58,6 @@ public class KorHookmaster extends CardImpl { this.subtype.add("Kor"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/KorOutfitter.java b/Mage.Sets/src/mage/sets/zendikar/KorOutfitter.java index b668f4369ce..109e710672c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorOutfitter.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorOutfitter.java @@ -61,7 +61,6 @@ public class KorOutfitter extends CardImpl { this.subtype.add("Kor"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/LandbindRitual.java b/Mage.Sets/src/mage/sets/zendikar/LandbindRitual.java index cfeb1c2f39d..6b8ff733a10 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LandbindRitual.java +++ b/Mage.Sets/src/mage/sets/zendikar/LandbindRitual.java @@ -55,7 +55,6 @@ public class LandbindRitual extends CardImpl { super(ownerId, 24, "Landbind Ritual", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{W}{W}"); this.expansionSetCode = "ZEN"; - this.color.setWhite(true); this.getSpellAbility().addEffect(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter, 2))); } diff --git a/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java b/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java index 131b62e279b..0c9f4be3efe 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java @@ -59,7 +59,6 @@ public class LavaballTrap extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Trap"); - this.color.setRed(true); // If an opponent had two or more lands enter the battlefield under his or her control this turn, you may pay {3}{R}{R} rather than pay Lavaball Trap's mana cost. this.getSpellAbility().addAlternativeCost(new LavaballTrapAlternativeCost()); diff --git a/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java b/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java index 15e18f7856a..a52dc64ab3d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java @@ -59,7 +59,6 @@ public class LethargyTrap extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Trap"); - this.color.setBlue(true); // If three or more creatures are attacking, you may pay {U} rather than pay Lethargy Trap's mana cost. this.getSpellAbility().addAlternativeCost(new LethargyTrapAlternativeCost()); diff --git a/Mage.Sets/src/mage/sets/zendikar/LivingTsunami.java b/Mage.Sets/src/mage/sets/zendikar/LivingTsunami.java index e6eafed2d97..2333e64b7c5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LivingTsunami.java +++ b/Mage.Sets/src/mage/sets/zendikar/LivingTsunami.java @@ -60,7 +60,6 @@ public class LivingTsunami extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/zendikar/LorthosTheTidemaker.java b/Mage.Sets/src/mage/sets/zendikar/LorthosTheTidemaker.java index c0d01fccaf3..8fa56dd5e0a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LorthosTheTidemaker.java +++ b/Mage.Sets/src/mage/sets/zendikar/LorthosTheTidemaker.java @@ -62,7 +62,6 @@ public class LorthosTheTidemaker extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Octopus"); - this.color.setBlue(true); this.power = new MageInt(8); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/sets/zendikar/LotusCobra.java b/Mage.Sets/src/mage/sets/zendikar/LotusCobra.java index 2b73069dc2a..41844d2a1c4 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LotusCobra.java +++ b/Mage.Sets/src/mage/sets/zendikar/LotusCobra.java @@ -47,7 +47,6 @@ public class LotusCobra extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Snake"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java b/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java index ec4f11a5d1a..1e94eea0de7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java +++ b/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java @@ -74,7 +74,6 @@ public class LullmageMentor extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java b/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java index 1ae421321cd..953489a3b37 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java @@ -60,7 +60,6 @@ public class LuminarchAscension extends CardImpl { super(ownerId, 25, "Luminarch Ascension", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "ZEN"; - this.color.setWhite(true); // At the beginning of each opponent's end step, if you didn't lose life this turn, you may put a quest counter on Luminarch Ascension. this.addAbility(new ConditionalTriggeredAbility(new LuminarchAscensionTriggeredAbility(), YouLostNoLifeThisTurnCondition.getInstance(), rule, true)); diff --git a/Mage.Sets/src/mage/sets/zendikar/MakindiShieldmate.java b/Mage.Sets/src/mage/sets/zendikar/MakindiShieldmate.java index edc2d0c3f7c..6a776164ac8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MakindiShieldmate.java +++ b/Mage.Sets/src/mage/sets/zendikar/MakindiShieldmate.java @@ -50,7 +50,6 @@ public class MakindiShieldmate extends CardImpl { this.subtype.add("Soldier"); this.subtype.add("Ally"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/zendikar/MalakirBloodwitch.java b/Mage.Sets/src/mage/sets/zendikar/MalakirBloodwitch.java index c3add148b17..c04ed2b6c14 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MalakirBloodwitch.java +++ b/Mage.Sets/src/mage/sets/zendikar/MalakirBloodwitch.java @@ -65,7 +65,6 @@ public class MalakirBloodwitch extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Shaman"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny.java b/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny.java index 98a23c21c31..1f329686b98 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny.java +++ b/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny.java @@ -51,7 +51,6 @@ public class MarkOfMutiny extends CardImpl { super(ownerId, 137, "Mark of Mutiny", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "ZEN"; - this.color.setRed(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); diff --git a/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java b/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java index 1d8a10446d7..e5a91c04745 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java +++ b/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java @@ -61,7 +61,6 @@ public class MerfolkSeastalkers extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Scout"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/zendikar/MerfolkWayfinder.java b/Mage.Sets/src/mage/sets/zendikar/MerfolkWayfinder.java index 819ec2ee82e..6ecc9dbbdfe 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MerfolkWayfinder.java +++ b/Mage.Sets/src/mage/sets/zendikar/MerfolkWayfinder.java @@ -58,7 +58,6 @@ public class MerfolkWayfinder extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Scout"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/MindSludge.java b/Mage.Sets/src/mage/sets/zendikar/MindSludge.java index 65084de8f4e..2551722e66c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MindSludge.java +++ b/Mage.Sets/src/mage/sets/zendikar/MindSludge.java @@ -56,7 +56,6 @@ public class MindSludge extends CardImpl { super(ownerId, 102, "Mind Sludge", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{B}"); this.expansionSetCode = "ZEN"; - this.color.setBlack(true); this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DiscardTargetEffect(new PermanentsOnBattlefieldCount(filter))); diff --git a/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java b/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java index a6d5c9c05aa..2378fd36984 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java @@ -63,7 +63,6 @@ public class MindbreakTrap extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Trap"); - this.color.setBlue(true); // If an opponent cast three or more spells this turn, you may pay {0} rather than pay Mindbreak Trap's mana cost. this.getSpellAbility().addAlternativeCost( diff --git a/Mage.Sets/src/mage/sets/zendikar/MindlessNull.java b/Mage.Sets/src/mage/sets/zendikar/MindlessNull.java index 3c48ec7c4a6..1c486a77dd2 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MindlessNull.java +++ b/Mage.Sets/src/mage/sets/zendikar/MindlessNull.java @@ -53,7 +53,6 @@ public class MindlessNull extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/MireBlight.java b/Mage.Sets/src/mage/sets/zendikar/MireBlight.java index a8f12dbb7f3..c041d792628 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MireBlight.java +++ b/Mage.Sets/src/mage/sets/zendikar/MireBlight.java @@ -56,7 +56,6 @@ public class MireBlight extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java b/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java index d8e4126f089..2fb14333707 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java +++ b/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java @@ -62,7 +62,6 @@ public class MoldShambler extends CardImpl { this.subtype.add("Fungus"); this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/zendikar/MoltenRavager.java b/Mage.Sets/src/mage/sets/zendikar/MoltenRavager.java index ef9003f4441..d5b44fb1d66 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MoltenRavager.java +++ b/Mage.Sets/src/mage/sets/zendikar/MoltenRavager.java @@ -49,7 +49,6 @@ public class MoltenRavager extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/zendikar/MurasaPyromancer.java b/Mage.Sets/src/mage/sets/zendikar/MurasaPyromancer.java index 75e2f54e6cf..7b01a32ee03 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MurasaPyromancer.java +++ b/Mage.Sets/src/mage/sets/zendikar/MurasaPyromancer.java @@ -63,7 +63,6 @@ public class MurasaPyromancer extends CardImpl { this.subtype.add("Shaman"); this.subtype.add("Ally"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java b/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java index 84cd7367564..91bef3c6d89 100644 --- a/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java @@ -53,7 +53,6 @@ public class NeedlebiteTrap extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Trap"); - this.color.setBlack(true); // If an opponent gained life this turn, you may pay {B} rather than pay Needlebite Trap's mana cost. this.getSpellAbility().addAlternativeCost( diff --git a/Mage.Sets/src/mage/sets/zendikar/NimanaSellSword.java b/Mage.Sets/src/mage/sets/zendikar/NimanaSellSword.java index 835dad93a93..8f5902bd235 100644 --- a/Mage.Sets/src/mage/sets/zendikar/NimanaSellSword.java +++ b/Mage.Sets/src/mage/sets/zendikar/NimanaSellSword.java @@ -49,7 +49,6 @@ public class NimanaSellSword extends CardImpl { this.subtype.add("Warrior"); this.subtype.add("Ally"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/NissaRevane.java b/Mage.Sets/src/mage/sets/zendikar/NissaRevane.java index dfaf9d3c88f..1a24adaacdf 100644 --- a/Mage.Sets/src/mage/sets/zendikar/NissaRevane.java +++ b/Mage.Sets/src/mage/sets/zendikar/NissaRevane.java @@ -67,7 +67,6 @@ public class NissaRevane extends CardImpl { this.subtype.add("Nissa"); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(2)), false)); - this.color.setGreen(true); LoyaltyAbility ability1 = new LoyaltyAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(1, nissasChosenFilter)), 1); this.addAbility(ability1); diff --git a/Mage.Sets/src/mage/sets/zendikar/NissasChosen.java b/Mage.Sets/src/mage/sets/zendikar/NissasChosen.java index 0a1bc9ac5a5..3b4b5e1bda7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/NissasChosen.java +++ b/Mage.Sets/src/mage/sets/zendikar/NissasChosen.java @@ -56,7 +56,6 @@ public class NissasChosen extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/zendikar/NobleVestige.java b/Mage.Sets/src/mage/sets/zendikar/NobleVestige.java index 91eeca3164c..e9d34173127 100644 --- a/Mage.Sets/src/mage/sets/zendikar/NobleVestige.java +++ b/Mage.Sets/src/mage/sets/zendikar/NobleVestige.java @@ -52,7 +52,6 @@ public class NobleVestige extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/OnduCleric.java b/Mage.Sets/src/mage/sets/zendikar/OnduCleric.java index 7ef411443a1..0d27dfcd563 100644 --- a/Mage.Sets/src/mage/sets/zendikar/OnduCleric.java +++ b/Mage.Sets/src/mage/sets/zendikar/OnduCleric.java @@ -61,7 +61,6 @@ public class OnduCleric extends CardImpl { this.subtype.add("Cleric"); this.subtype.add("Ally"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java b/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java index 86ddc084931..35981c70095 100644 --- a/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java +++ b/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java @@ -60,7 +60,6 @@ public class OranRiefRecluse extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Spider"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/zendikar/OranRiefSurvivalist.java b/Mage.Sets/src/mage/sets/zendikar/OranRiefSurvivalist.java index 36a436e88ca..ec6a83bd899 100644 --- a/Mage.Sets/src/mage/sets/zendikar/OranRiefSurvivalist.java +++ b/Mage.Sets/src/mage/sets/zendikar/OranRiefSurvivalist.java @@ -49,7 +49,6 @@ public class OranRiefSurvivalist extends CardImpl { this.subtype.add("Warrior"); this.subtype.add("Ally"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/ParalyzingGrasp.java b/Mage.Sets/src/mage/sets/zendikar/ParalyzingGrasp.java index 6c488e8a7f6..d0414734bc3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ParalyzingGrasp.java +++ b/Mage.Sets/src/mage/sets/zendikar/ParalyzingGrasp.java @@ -51,7 +51,6 @@ public class ParalyzingGrasp extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/zendikar/PitfallTrap.java b/Mage.Sets/src/mage/sets/zendikar/PitfallTrap.java index f2a3b8d87a6..7d6e1f96dd7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PitfallTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/PitfallTrap.java @@ -59,7 +59,6 @@ public class PitfallTrap extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Trap"); - this.color.setWhite(true); // If exactly one creature is attacking, you may pay {W} rather than pay Pitfall Trap's mana cost. this.getSpellAbility().addAlternativeCost(new PitfallTrapAlternativeCost()); diff --git a/Mage.Sets/src/mage/sets/zendikar/PredatoryUrge.java b/Mage.Sets/src/mage/sets/zendikar/PredatoryUrge.java index 10ea5528edf..76273506c4c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PredatoryUrge.java +++ b/Mage.Sets/src/mage/sets/zendikar/PredatoryUrge.java @@ -58,7 +58,6 @@ public class PredatoryUrge extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java b/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java index 7be223b2c6c..8890ca3843b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java +++ b/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java @@ -58,7 +58,6 @@ public class PrimalBellow extends CardImpl { super(ownerId, 176, "Primal Bellow", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "ZEN"; - this.color.setGreen(true); PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(value, value, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/zendikar/PunishingFire.java b/Mage.Sets/src/mage/sets/zendikar/PunishingFire.java index 7e92769c399..f26ed4dfbe8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PunishingFire.java +++ b/Mage.Sets/src/mage/sets/zendikar/PunishingFire.java @@ -51,7 +51,6 @@ public class PunishingFire extends CardImpl { super(ownerId, 142, "Punishing Fire", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "ZEN"; - this.color.setRed(true); // Punishing Fire deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java b/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java index c191e329cec..58b0bd0db87 100644 --- a/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java +++ b/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java @@ -57,7 +57,6 @@ public class QuestForAncientSecrets extends CardImpl { super(ownerId, 59, "Quest for Ancient Secrets", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{U}"); this.expansionSetCode = "ZEN"; - this.color.setBlue(true); // Whenever a card is put into your graveyard from anywhere, you may put a quest counter on Quest for Ancient Secrets. this.addAbility(new PutCardIntoGraveFromAnywhereAllTriggeredAbility( diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java b/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java index 7f21d09812b..28cf04f0e75 100644 --- a/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java +++ b/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java @@ -55,7 +55,6 @@ public class QuestForTheGemblades extends CardImpl { super(ownerId, 177, "Quest for the Gemblades", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "ZEN"; - this.color.setGreen(true); // Whenever a creature you control deals combat damage to a creature, you may put a quest counter on Quest for the Gemblades. this.addAbility(new QuestForTheGembladesTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForTheGravelord.java b/Mage.Sets/src/mage/sets/zendikar/QuestForTheGravelord.java index eae3a14e84c..540570e9664 100644 --- a/Mage.Sets/src/mage/sets/zendikar/QuestForTheGravelord.java +++ b/Mage.Sets/src/mage/sets/zendikar/QuestForTheGravelord.java @@ -53,7 +53,6 @@ public class QuestForTheGravelord extends CardImpl { super(ownerId, 108, "Quest for the Gravelord", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "ZEN"; - this.color.setBlack(true); // Whenever a creature dies, you may put a quest counter on Quest for the Gravelord. this.addAbility(new DiesCreatureTriggeredAbility(new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true)); diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForTheHolyRelic.java b/Mage.Sets/src/mage/sets/zendikar/QuestForTheHolyRelic.java index 8aee67c1106..5c17c3c360b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/QuestForTheHolyRelic.java +++ b/Mage.Sets/src/mage/sets/zendikar/QuestForTheHolyRelic.java @@ -69,7 +69,6 @@ public class QuestForTheHolyRelic extends CardImpl { super(ownerId, 33, "Quest for the Holy Relic", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}"); this.expansionSetCode = "ZEN"; - this.color.setWhite(true); // Whenever you cast a creature spell, you may put a quest counter on Quest for the Holy Relic. this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.QUEST.createInstance()), filter, true)); diff --git a/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java b/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java index 120edcf6c68..d01bf7f2758 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java @@ -56,7 +56,6 @@ public class RavenousTrap extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Trap"); - this.color.setBlack(true); // If an opponent had three or more cards put into his or her graveyard from anywhere this turn, you may pay {0} rather than pay Ravenous Trap's mana cost. this.getSpellAbility().addAlternativeCost( diff --git a/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java b/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java index efbb3375a9f..b52beb4e60a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java +++ b/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java @@ -52,7 +52,6 @@ public class RecklessScholar extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java b/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java index 5b42c2e6ca0..57f4342258e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java +++ b/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java @@ -59,7 +59,6 @@ public class RelicCrush extends CardImpl { super(ownerId, 179, "Relic Crush", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{G}"); this.expansionSetCode = "ZEN"; - this.color.setGreen(true); // Destroy target artifact or enchantment and up to one other target artifact or enchantment. this.getSpellAbility().addEffect(new RelicCrushEffect()); diff --git a/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java b/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java index 8cef4201121..328c65228a8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java +++ b/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java @@ -54,7 +54,6 @@ public class RiteOfReplication extends CardImpl { super(ownerId, 61, "Rite of Replication", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{U}{U}"); this.expansionSetCode = "ZEN"; - this.color.setBlue(true); // Kicker {5} this.addAbility(new KickerAbility("{5}")); diff --git a/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java b/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java index 5c7debf3278..d31b5dc3674 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java +++ b/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java @@ -54,7 +54,6 @@ public class RoilElemental extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java index 2e21963392a..f14fad2b1a0 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java @@ -57,7 +57,6 @@ public class RuneflareTrap extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Trap"); - this.color.setRed(true); // If an opponent drew three or more cards this turn, you may pay {R} rather than pay Runeflare Trap's mana cost. this.getSpellAbility().addAlternativeCost(new RuneflareTrapAlternativeCost()); diff --git a/Mage.Sets/src/mage/sets/zendikar/SavageSilhouette.java b/Mage.Sets/src/mage/sets/zendikar/SavageSilhouette.java index 1ed9f91ce74..d3d3124c3c6 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SavageSilhouette.java +++ b/Mage.Sets/src/mage/sets/zendikar/SavageSilhouette.java @@ -58,7 +58,6 @@ public class SavageSilhouette extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/zendikar/ScytheTiger.java b/Mage.Sets/src/mage/sets/zendikar/ScytheTiger.java index 1fa72df98e8..b76465d7fd5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ScytheTiger.java +++ b/Mage.Sets/src/mage/sets/zendikar/ScytheTiger.java @@ -53,7 +53,6 @@ public class ScytheTiger extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Cat"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/SeaGateLoremaster.java b/Mage.Sets/src/mage/sets/zendikar/SeaGateLoremaster.java index ed4fb6653de..26b0f2830e7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SeaGateLoremaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/SeaGateLoremaster.java @@ -59,7 +59,6 @@ public class SeaGateLoremaster extends CardImpl { this.subtype.add("Wizard"); this.subtype.add("Ally"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/zendikar/SeascapeAerialist.java b/Mage.Sets/src/mage/sets/zendikar/SeascapeAerialist.java index bf3c0e5e678..8197e678ad7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SeascapeAerialist.java +++ b/Mage.Sets/src/mage/sets/zendikar/SeascapeAerialist.java @@ -62,7 +62,6 @@ public class SeascapeAerialist extends CardImpl { this.subtype.add("Wizard"); this.subtype.add("Ally"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/zendikar/SeismicShudder.java b/Mage.Sets/src/mage/sets/zendikar/SeismicShudder.java index c2177202d4c..d0abab24998 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SeismicShudder.java +++ b/Mage.Sets/src/mage/sets/zendikar/SeismicShudder.java @@ -53,7 +53,6 @@ public class SeismicShudder extends CardImpl { super(ownerId, 147, "Seismic Shudder", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "ZEN"; - this.color.setRed(true); this.getSpellAbility().addEffect(new DamageAllEffect(1, filter)); } diff --git a/Mage.Sets/src/mage/sets/zendikar/ShatterskullGiant.java b/Mage.Sets/src/mage/sets/zendikar/ShatterskullGiant.java index aed2d603d3e..f103d3a2c4c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ShatterskullGiant.java +++ b/Mage.Sets/src/mage/sets/zendikar/ShatterskullGiant.java @@ -45,7 +45,6 @@ public class ShatterskullGiant extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/zendikar/ShieldmatesBlessing.java b/Mage.Sets/src/mage/sets/zendikar/ShieldmatesBlessing.java index 4030c51c66d..aa97a0c7e9f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ShieldmatesBlessing.java +++ b/Mage.Sets/src/mage/sets/zendikar/ShieldmatesBlessing.java @@ -45,7 +45,6 @@ public class ShieldmatesBlessing extends CardImpl { super(ownerId, 35, "Shieldmate's Blessing", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "ZEN"; - this.color.setWhite(true); this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/zendikar/ShoalSerpent.java b/Mage.Sets/src/mage/sets/zendikar/ShoalSerpent.java index 86c6201de4c..d2a90a15ef2 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ShoalSerpent.java +++ b/Mage.Sets/src/mage/sets/zendikar/ShoalSerpent.java @@ -51,7 +51,6 @@ public class ShoalSerpent extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Serpent"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/zendikar/SkyRuinDrake.java b/Mage.Sets/src/mage/sets/zendikar/SkyRuinDrake.java index 2f9a1da7342..be752074d81 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SkyRuinDrake.java +++ b/Mage.Sets/src/mage/sets/zendikar/SkyRuinDrake.java @@ -45,7 +45,6 @@ public class SkyRuinDrake extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/zendikar/SlaughterCry.java b/Mage.Sets/src/mage/sets/zendikar/SlaughterCry.java index 16ba450cb85..6fb34df8f7f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SlaughterCry.java +++ b/Mage.Sets/src/mage/sets/zendikar/SlaughterCry.java @@ -47,7 +47,6 @@ public class SlaughterCry extends CardImpl { super(ownerId, 149, "Slaughter Cry", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "ZEN"; - this.color.setRed(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(3, 0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java b/Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java index 1c69ad1d876..5ecb9fe0b4c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java +++ b/Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java @@ -59,7 +59,6 @@ public class SorinMarkov extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Sorin"); - this.color.setBlack(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false)); diff --git a/Mage.Sets/src/mage/sets/zendikar/SoulStairExpedition.java b/Mage.Sets/src/mage/sets/zendikar/SoulStairExpedition.java index 0c688195376..43fe8c3c570 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SoulStairExpedition.java +++ b/Mage.Sets/src/mage/sets/zendikar/SoulStairExpedition.java @@ -53,7 +53,6 @@ public class SoulStairExpedition extends CardImpl { super(ownerId, 112, "Soul Stair Expedition", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "ZEN"; - this.color.setBlack(true); // Landfall - Whenever a land enters the battlefield under your control, you may put a quest counter on Soul Stair Expedition. this.addAbility(new LandfallAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true)); diff --git a/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java b/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java index 7995f12e2c1..d6bbe38832b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java +++ b/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java @@ -57,7 +57,6 @@ public class SphinxOfJwarIsle extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Sphinx"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java b/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java index e6a7f4b057d..667e7a88695 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java +++ b/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java @@ -53,7 +53,6 @@ public class SphinxOfLostTruths extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Sphinx"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/zendikar/SpireBarrage.java b/Mage.Sets/src/mage/sets/zendikar/SpireBarrage.java index 7f45466a0c9..e5c2426261d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SpireBarrage.java +++ b/Mage.Sets/src/mage/sets/zendikar/SpireBarrage.java @@ -57,7 +57,6 @@ public class SpireBarrage extends CardImpl { super(ownerId, 150, "Spire Barrage", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{R}"); this.expansionSetCode = "ZEN"; - this.color.setRed(true); // Spire Barrage deals damage to target creature or player equal to the number of Mountains you control. this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); diff --git a/Mage.Sets/src/mage/sets/zendikar/SummonersBane.java b/Mage.Sets/src/mage/sets/zendikar/SummonersBane.java index 91269a379ca..01b9270a209 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SummonersBane.java +++ b/Mage.Sets/src/mage/sets/zendikar/SummonersBane.java @@ -56,7 +56,6 @@ public class SummonersBane extends CardImpl { super(ownerId, 71, "Summoner's Bane", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); this.expansionSetCode = "ZEN"; - this.color.setBlue(true); this.getSpellAbility().addTarget(new TargetSpell(filter)); this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java b/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java index 1c87f79f946..6766cf3467c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java @@ -65,7 +65,6 @@ public class SummoningTrap extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Trap"); - this.color.setGreen(true); // If a creature spell you cast this turn was countered by a spell or // ability an opponent controlled, you may pay {0} rather than pay diff --git a/Mage.Sets/src/mage/sets/zendikar/SurrakarMarauder.java b/Mage.Sets/src/mage/sets/zendikar/SurrakarMarauder.java index 33e7b542a96..0e317d3a684 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SurrakarMarauder.java +++ b/Mage.Sets/src/mage/sets/zendikar/SurrakarMarauder.java @@ -49,7 +49,6 @@ public class SurrakarMarauder extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Surrakar"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/TajuruArcher.java b/Mage.Sets/src/mage/sets/zendikar/TajuruArcher.java index 9e6de0aeb71..a95d74ad3c9 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TajuruArcher.java +++ b/Mage.Sets/src/mage/sets/zendikar/TajuruArcher.java @@ -67,7 +67,6 @@ public class TajuruArcher extends CardImpl { this.subtype.add("Archer"); this.subtype.add("Ally"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); Ability ability = new AllyEntersBattlefieldTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), true); diff --git a/Mage.Sets/src/mage/sets/zendikar/Tanglesap.java b/Mage.Sets/src/mage/sets/zendikar/Tanglesap.java index 6451d05d76e..bb2545f9160 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Tanglesap.java +++ b/Mage.Sets/src/mage/sets/zendikar/Tanglesap.java @@ -54,7 +54,6 @@ public class Tanglesap extends CardImpl { super(ownerId, 186, "Tanglesap", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "ZEN"; - this.color.setGreen(true); // Prevent all combat damage that would be dealt this turn by creatures without trample. this.getSpellAbility().addEffect(new PreventAllDamageByAllEffect(filter, Duration.EndOfTurn, true)); diff --git a/Mage.Sets/src/mage/sets/zendikar/TempestOwl.java b/Mage.Sets/src/mage/sets/zendikar/TempestOwl.java index f4a881236ae..6cf03cff5e1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TempestOwl.java +++ b/Mage.Sets/src/mage/sets/zendikar/TempestOwl.java @@ -52,7 +52,6 @@ public class TempestOwl extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/TerraStomper.java b/Mage.Sets/src/mage/sets/zendikar/TerraStomper.java index 42f14da676b..570db343f66 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TerraStomper.java +++ b/Mage.Sets/src/mage/sets/zendikar/TerraStomper.java @@ -48,7 +48,6 @@ public class TerraStomper extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(8); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/sets/zendikar/TerritorialBaloth.java b/Mage.Sets/src/mage/sets/zendikar/TerritorialBaloth.java index fcfcd753c72..2a4b397a300 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TerritorialBaloth.java +++ b/Mage.Sets/src/mage/sets/zendikar/TerritorialBaloth.java @@ -47,7 +47,6 @@ public class TerritorialBaloth extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/zendikar/TimbermawLarva.java b/Mage.Sets/src/mage/sets/zendikar/TimbermawLarva.java index ae39b58e190..17be1c87ee8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TimbermawLarva.java +++ b/Mage.Sets/src/mage/sets/zendikar/TimbermawLarva.java @@ -60,7 +60,6 @@ public class TimbermawLarva extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java b/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java index d0ab599e601..5b4afb7b9f2 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java +++ b/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java @@ -51,7 +51,6 @@ public class TorchSlinger extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/TrapfindersTrick.java b/Mage.Sets/src/mage/sets/zendikar/TrapfindersTrick.java index 92b1487b80e..f1f1e885d1b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TrapfindersTrick.java +++ b/Mage.Sets/src/mage/sets/zendikar/TrapfindersTrick.java @@ -51,7 +51,6 @@ public class TrapfindersTrick extends CardImpl { super(ownerId, 73, "Trapfinder's Trick", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{U}"); this.expansionSetCode = "ZEN"; - this.color.setBlue(true); // Target player reveals his or her hand and discards all Trap cards. this.getSpellAbility().addEffect(new TrapfindersTrickEffect()); diff --git a/Mage.Sets/src/mage/sets/zendikar/TrapmakersSnare.java b/Mage.Sets/src/mage/sets/zendikar/TrapmakersSnare.java index 96f069e4151..5e23d2ebb67 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TrapmakersSnare.java +++ b/Mage.Sets/src/mage/sets/zendikar/TrapmakersSnare.java @@ -52,7 +52,6 @@ public class TrapmakersSnare extends CardImpl { super(ownerId, 74, "Trapmaker's Snare", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "ZEN"; - this.color.setBlue(true); // Search your library for a Trap card, reveal it, and put it into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true)); diff --git a/Mage.Sets/src/mage/sets/zendikar/TuktukGrunts.java b/Mage.Sets/src/mage/sets/zendikar/TuktukGrunts.java index e2669b03dd0..5e16814f4b5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TuktukGrunts.java +++ b/Mage.Sets/src/mage/sets/zendikar/TuktukGrunts.java @@ -50,7 +50,6 @@ public class TuktukGrunts extends CardImpl { this.subtype.add("Warrior"); this.subtype.add("Ally"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/TurntimberBasilisk.java b/Mage.Sets/src/mage/sets/zendikar/TurntimberBasilisk.java index 90ecd914d43..cd10fb658fb 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TurntimberBasilisk.java +++ b/Mage.Sets/src/mage/sets/zendikar/TurntimberBasilisk.java @@ -48,7 +48,6 @@ public class TurntimberBasilisk extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Basilisk"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/TurntimberRanger.java b/Mage.Sets/src/mage/sets/zendikar/TurntimberRanger.java index 6f804f018c7..e5a6c7d90d9 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TurntimberRanger.java +++ b/Mage.Sets/src/mage/sets/zendikar/TurntimberRanger.java @@ -52,7 +52,6 @@ public class TurntimberRanger extends CardImpl { this.subtype.add("Scout"); this.subtype.add("Ally"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/UmaraRaptor.java b/Mage.Sets/src/mage/sets/zendikar/UmaraRaptor.java index b71d7c348f8..b451f709068 100644 --- a/Mage.Sets/src/mage/sets/zendikar/UmaraRaptor.java +++ b/Mage.Sets/src/mage/sets/zendikar/UmaraRaptor.java @@ -49,7 +49,6 @@ public class UmaraRaptor extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Ally"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java b/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java index 3f4b9489352..913efaeefa7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java +++ b/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java @@ -55,7 +55,6 @@ public class UnstableFooting extends CardImpl { super(ownerId, 153, "Unstable Footing", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "ZEN"; - this.color.setRed(true); // Kicker {3}{R} (You may pay an additional {3}{R} as you cast this spell.) this.addAbility(new KickerAbility("{3}{R}")); diff --git a/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java b/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java index af36336c078..65a5d054c5c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java +++ b/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java @@ -57,7 +57,6 @@ public class VampireHexmage extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Shaman"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/VampireNighthawk.java b/Mage.Sets/src/mage/sets/zendikar/VampireNighthawk.java index 93075ae9f4d..189202f2f5c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VampireNighthawk.java +++ b/Mage.Sets/src/mage/sets/zendikar/VampireNighthawk.java @@ -48,7 +48,6 @@ public class VampireNighthawk extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Shaman"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java b/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java index 1f80f91b0dd..09af594f439 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java +++ b/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java @@ -52,7 +52,6 @@ public class VampiresBite extends CardImpl { super(ownerId, 117, "Vampire's Bite", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "ZEN"; - this.color.setBlack(true); // Kicker {2}{B} (You may pay an additional {2}{B} as you cast this spell.) this.addAbility(new KickerAbility("{2}{B}")); diff --git a/Mage.Sets/src/mage/sets/zendikar/VastwoodGorger.java b/Mage.Sets/src/mage/sets/zendikar/VastwoodGorger.java index 49bb6427d5f..d47d1b729a9 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VastwoodGorger.java +++ b/Mage.Sets/src/mage/sets/zendikar/VastwoodGorger.java @@ -44,7 +44,6 @@ public class VastwoodGorger extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(6); } diff --git a/Mage.Sets/src/mage/sets/zendikar/WarrenInstigator.java b/Mage.Sets/src/mage/sets/zendikar/WarrenInstigator.java index 80e14b5d876..ef559cc7065 100644 --- a/Mage.Sets/src/mage/sets/zendikar/WarrenInstigator.java +++ b/Mage.Sets/src/mage/sets/zendikar/WarrenInstigator.java @@ -58,7 +58,6 @@ public class WarrenInstigator extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Berserker"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/WelkinTern.java b/Mage.Sets/src/mage/sets/zendikar/WelkinTern.java index d542d5dbc63..466b0eaaac7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/WelkinTern.java +++ b/Mage.Sets/src/mage/sets/zendikar/WelkinTern.java @@ -47,7 +47,6 @@ public class WelkinTern extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(2 ); this.toughness = new MageInt( 1); diff --git a/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java b/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java index 7a7d6c91712..fc84669fdf3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java @@ -56,7 +56,6 @@ public class WhiplashTrap extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Trap"); - this.color.setBlue(true); // If an opponent had two or more creatures enter the battlefield under his or her control this turn, you may pay {U} rather than pay Whiplash Trap's mana cost. this.getSpellAbility().addAlternativeCost(new WhiplashAlternativeCost()); diff --git a/Mage.Sets/src/mage/sets/zendikar/WindborneCharge.java b/Mage.Sets/src/mage/sets/zendikar/WindborneCharge.java index 0721f007a98..fcd8b1e4bfc 100644 --- a/Mage.Sets/src/mage/sets/zendikar/WindborneCharge.java +++ b/Mage.Sets/src/mage/sets/zendikar/WindborneCharge.java @@ -47,7 +47,6 @@ public class WindborneCharge extends CardImpl { super(ownerId, 38, "Windborne Charge", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{W}{W}"); this.expansionSetCode = "ZEN"; - this.color.setWhite(true); // Two target creatures you control each get +2/+2 and gain flying until end of turn. this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(2)); diff --git a/Mage.Sets/src/mage/sets/zendikar/WorldQueller.java b/Mage.Sets/src/mage/sets/zendikar/WorldQueller.java index a7952dad323..c1c52dd604c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/WorldQueller.java +++ b/Mage.Sets/src/mage/sets/zendikar/WorldQueller.java @@ -65,7 +65,6 @@ public class WorldQueller extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Avatar"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/zendikar/ZektarShrineExpedition.java b/Mage.Sets/src/mage/sets/zendikar/ZektarShrineExpedition.java index c26d30ab296..a6d09201a64 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ZektarShrineExpedition.java +++ b/Mage.Sets/src/mage/sets/zendikar/ZektarShrineExpedition.java @@ -62,7 +62,6 @@ public class ZektarShrineExpedition extends CardImpl { super(ownerId, 155, "Zektar Shrine Expedition", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); this.expansionSetCode = "ZEN"; - this.color.setRed(true); // Landfall - Whenever a land enters the battlefield under your control, you may put a quest counter on Zektar Shrine Expedition. this.addAbility(new LandfallAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true)); diff --git a/Mage.Sets/src/mage/sets/zendikar/ZendikarFarguide.java b/Mage.Sets/src/mage/sets/zendikar/ZendikarFarguide.java index 98e834956cc..30a63c8f306 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ZendikarFarguide.java +++ b/Mage.Sets/src/mage/sets/zendikar/ZendikarFarguide.java @@ -45,7 +45,6 @@ public class ZendikarFarguide extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3);