diff --git a/Mage.Sets/src/mage/sets/eventide/CankerAbomination.java b/Mage.Sets/src/mage/sets/eventide/CankerAbomination.java index 405401dedd1..5b8107dd5f1 100644 --- a/Mage.Sets/src/mage/sets/eventide/CankerAbomination.java +++ b/Mage.Sets/src/mage/sets/eventide/CankerAbomination.java @@ -57,8 +57,6 @@ public class CankerAbomination extends CardImpl { this.subtype.add("Treefolk"); this.subtype.add("Horror"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java b/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java index cd138504119..8b91b41a63e 100644 --- a/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java +++ b/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java @@ -53,8 +53,6 @@ public class CankerousThirst extends CardImpl { super(ownerId, 116, "Cankerous Thirst", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{B/G}"); this.expansionSetCode = "EVE"; - this.color.setGreen(true); - this.color.setBlack(true); // If {B} was spent to cast Cankerous Thirst, you may have target creature get -3/-3 until end of turn. If {G} was spent to cast Cankerous Thirst, you may have target creature get +3/+3 until end of turn. this.getSpellAbility().addEffect(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/sets/eventide/CauldronHaze.java b/Mage.Sets/src/mage/sets/eventide/CauldronHaze.java index 631aeadfb4c..b0c4ad27c82 100644 --- a/Mage.Sets/src/mage/sets/eventide/CauldronHaze.java +++ b/Mage.Sets/src/mage/sets/eventide/CauldronHaze.java @@ -48,8 +48,6 @@ public class CauldronHaze extends CardImpl { super(ownerId, 84, "Cauldron Haze", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W/B}"); this.expansionSetCode = "EVE"; - this.color.setBlack(true); - this.color.setWhite(true); // Choose any number of target creatures. Each of those creatures gains persist until end of turn. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new PersistAbility(), Duration.EndOfTurn, rule)); diff --git a/Mage.Sets/src/mage/sets/eventide/ChaoticBacklash.java b/Mage.Sets/src/mage/sets/eventide/ChaoticBacklash.java index 132eb9f030b..d007e837f19 100644 --- a/Mage.Sets/src/mage/sets/eventide/ChaoticBacklash.java +++ b/Mage.Sets/src/mage/sets/eventide/ChaoticBacklash.java @@ -52,7 +52,6 @@ public class ChaoticBacklash extends CardImpl { super(ownerId, 49, "Chaotic Backlash", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{R}"); this.expansionSetCode = "EVE"; - this.color.setRed(true); // Chaotic Backlash deals damage to target player equal to twice the number of white and/or blue permanents he or she controls. this.getSpellAbility().addEffect(new ChaoticBacklashEffect()); diff --git a/Mage.Sets/src/mage/sets/eventide/CloutOfTheDominus.java b/Mage.Sets/src/mage/sets/eventide/CloutOfTheDominus.java index b80d0b2cb99..360f32f4bd9 100644 --- a/Mage.Sets/src/mage/sets/eventide/CloutOfTheDominus.java +++ b/Mage.Sets/src/mage/sets/eventide/CloutOfTheDominus.java @@ -59,8 +59,6 @@ public class CloutOfTheDominus extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Aura"); - this.color.setRed(true); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/eventide/ColdEyedSelkie.java b/Mage.Sets/src/mage/sets/eventide/ColdEyedSelkie.java index e10d217597e..2f60d5a75e2 100644 --- a/Mage.Sets/src/mage/sets/eventide/ColdEyedSelkie.java +++ b/Mage.Sets/src/mage/sets/eventide/ColdEyedSelkie.java @@ -52,8 +52,6 @@ public class ColdEyedSelkie extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Rogue"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/eventide/Crackleburr.java b/Mage.Sets/src/mage/sets/eventide/Crackleburr.java index 4e5d7626178..1a78d17d692 100644 --- a/Mage.Sets/src/mage/sets/eventide/Crackleburr.java +++ b/Mage.Sets/src/mage/sets/eventide/Crackleburr.java @@ -74,8 +74,6 @@ public class Crackleburr extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Elemental"); - 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/eventide/CragPuca.java b/Mage.Sets/src/mage/sets/eventide/CragPuca.java index 0e4198359e1..d613ead8c4a 100644 --- a/Mage.Sets/src/mage/sets/eventide/CragPuca.java +++ b/Mage.Sets/src/mage/sets/eventide/CragPuca.java @@ -50,8 +50,6 @@ public class CragPuca extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Shapeshifter"); - this.color.setRed(true); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/eventide/CrumblingAshes.java b/Mage.Sets/src/mage/sets/eventide/CrumblingAshes.java index 2489f4306e6..f126b27e4aa 100644 --- a/Mage.Sets/src/mage/sets/eventide/CrumblingAshes.java +++ b/Mage.Sets/src/mage/sets/eventide/CrumblingAshes.java @@ -58,7 +58,6 @@ public class CrumblingAshes extends CardImpl { super(ownerId, 35, "Crumbling Ashes", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "EVE"; - this.color.setBlack(true); // At the beginning of your upkeep, destroy target creature with a -1/-1 counter on it. Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/eventide/Doomgape.java b/Mage.Sets/src/mage/sets/eventide/Doomgape.java index f47995da0e5..79b97608e46 100644 --- a/Mage.Sets/src/mage/sets/eventide/Doomgape.java +++ b/Mage.Sets/src/mage/sets/eventide/Doomgape.java @@ -57,8 +57,6 @@ public class Doomgape extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Elemental"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(10); this.toughness = new MageInt(10); diff --git a/Mage.Sets/src/mage/sets/eventide/DreamFracture.java b/Mage.Sets/src/mage/sets/eventide/DreamFracture.java index 2a6928d4a04..2b4de1ba5eb 100644 --- a/Mage.Sets/src/mage/sets/eventide/DreamFracture.java +++ b/Mage.Sets/src/mage/sets/eventide/DreamFracture.java @@ -49,7 +49,6 @@ public class DreamFracture extends CardImpl { super(ownerId, 19, "Dream Fracture", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{U}"); this.expansionSetCode = "EVE"; - this.color.setBlue(true); // Counter target spell. Its controller draws a card. this.getSpellAbility().addEffect(new DreamFractureEffect()); diff --git a/Mage.Sets/src/mage/sets/eventide/DreamThief.java b/Mage.Sets/src/mage/sets/eventide/DreamThief.java index 7c36af41584..f0373c53ccf 100644 --- a/Mage.Sets/src/mage/sets/eventide/DreamThief.java +++ b/Mage.Sets/src/mage/sets/eventide/DreamThief.java @@ -62,7 +62,6 @@ public class DreamThief 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/eventide/DuergarAssailant.java b/Mage.Sets/src/mage/sets/eventide/DuergarAssailant.java index 5fc0fe49eb6..4605ec12f92 100644 --- a/Mage.Sets/src/mage/sets/eventide/DuergarAssailant.java +++ b/Mage.Sets/src/mage/sets/eventide/DuergarAssailant.java @@ -52,8 +52,6 @@ public class DuergarAssailant extends CardImpl { this.subtype.add("Dwarf"); 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/eventide/DuergarMineCaptain.java b/Mage.Sets/src/mage/sets/eventide/DuergarMineCaptain.java index 76749cfecf8..604da2191e8 100644 --- a/Mage.Sets/src/mage/sets/eventide/DuergarMineCaptain.java +++ b/Mage.Sets/src/mage/sets/eventide/DuergarMineCaptain.java @@ -54,8 +54,6 @@ public class DuergarMineCaptain extends CardImpl { this.subtype.add("Dwarf"); this.subtype.add("Soldier"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/eventide/EdgeOfTheDivinity.java b/Mage.Sets/src/mage/sets/eventide/EdgeOfTheDivinity.java index 1dfa2a1c2ef..d8d7b708014 100644 --- a/Mage.Sets/src/mage/sets/eventide/EdgeOfTheDivinity.java +++ b/Mage.Sets/src/mage/sets/eventide/EdgeOfTheDivinity.java @@ -58,8 +58,6 @@ public class EdgeOfTheDivinity extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Aura"); - this.color.setBlack(true); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/eventide/EndlessHorizons.java b/Mage.Sets/src/mage/sets/eventide/EndlessHorizons.java index 96f356143d9..240c94a0218 100644 --- a/Mage.Sets/src/mage/sets/eventide/EndlessHorizons.java +++ b/Mage.Sets/src/mage/sets/eventide/EndlessHorizons.java @@ -58,7 +58,6 @@ public class EndlessHorizons extends CardImpl { super(ownerId, 4, "Endless Horizons", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "EVE"; - this.color.setWhite(true); // When Endless Horizons enters the battlefield, search your library for any number of Plains cards and exile them. Then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new EndlessHorizonsEffect(), false)); diff --git a/Mage.Sets/src/mage/sets/eventide/Endure.java b/Mage.Sets/src/mage/sets/eventide/Endure.java index ba48fcc0c29..0ca051a8a54 100644 --- a/Mage.Sets/src/mage/sets/eventide/Endure.java +++ b/Mage.Sets/src/mage/sets/eventide/Endure.java @@ -55,7 +55,6 @@ public class Endure extends CardImpl { super(ownerId, 5, "Endure", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{W}{W}"); this.expansionSetCode = "EVE"; - this.color.setWhite(true); // Prevent all damage that would be dealt to you and permanents you control this turn. this.getSpellAbility().addEffect(new PreventAllDamageToAllEffect(Duration.EndOfTurn, filter)); diff --git a/Mage.Sets/src/mage/sets/eventide/Evershrike.java b/Mage.Sets/src/mage/sets/eventide/Evershrike.java index d93cc1ab19a..411fca6c81b 100644 --- a/Mage.Sets/src/mage/sets/eventide/Evershrike.java +++ b/Mage.Sets/src/mage/sets/eventide/Evershrike.java @@ -68,8 +68,6 @@ public class Evershrike extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Spirit"); - 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/eventide/FavorOfTheOverbeing.java b/Mage.Sets/src/mage/sets/eventide/FavorOfTheOverbeing.java index d96522ea27b..19e1111334d 100644 --- a/Mage.Sets/src/mage/sets/eventide/FavorOfTheOverbeing.java +++ b/Mage.Sets/src/mage/sets/eventide/FavorOfTheOverbeing.java @@ -60,8 +60,6 @@ public class FavorOfTheOverbeing extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Aura"); - this.color.setBlue(true); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/eventide/FieryBombardment.java b/Mage.Sets/src/mage/sets/eventide/FieryBombardment.java index 1aa34f7880d..e25fc0efc9d 100644 --- a/Mage.Sets/src/mage/sets/eventide/FieryBombardment.java +++ b/Mage.Sets/src/mage/sets/eventide/FieryBombardment.java @@ -61,7 +61,6 @@ public class FieryBombardment extends CardImpl { super(ownerId, 52, "Fiery Bombardment", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); this.expansionSetCode = "EVE"; - this.color.setRed(true); // Chroma - {2}, Sacrifice a creature: Fiery Bombardment deals damage to target creature or player equal to the number of red mana symbols in the sacrificed creature's mana cost. Effect effect = new FieryBombardmentEffect(); diff --git a/Mage.Sets/src/mage/sets/eventide/FigureOfDestiny.java b/Mage.Sets/src/mage/sets/eventide/FigureOfDestiny.java index 8e2c0003915..d024e96ed9a 100644 --- a/Mage.Sets/src/mage/sets/eventide/FigureOfDestiny.java +++ b/Mage.Sets/src/mage/sets/eventide/FigureOfDestiny.java @@ -64,8 +64,6 @@ public class FigureOfDestiny extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Kithkin"); - 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/eventide/FireAtWill.java b/Mage.Sets/src/mage/sets/eventide/FireAtWill.java index 321278d597e..f346fb7f6c4 100644 --- a/Mage.Sets/src/mage/sets/eventide/FireAtWill.java +++ b/Mage.Sets/src/mage/sets/eventide/FireAtWill.java @@ -57,8 +57,6 @@ public class FireAtWill extends CardImpl { super(ownerId, 140, "Fire at Will", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R/W}{R/W}{R/W}"); this.expansionSetCode = "EVE"; - this.color.setRed(true); - this.color.setWhite(true); // Fire at Will deals 3 damage divided as you choose among one, two, or three target attacking or blocking creatures. this.getSpellAbility().addEffect(new DamageMultiEffect(3)); diff --git a/Mage.Sets/src/mage/sets/eventide/GiftOfTheDeity.java b/Mage.Sets/src/mage/sets/eventide/GiftOfTheDeity.java index b412c62408c..ee36f6b6af4 100644 --- a/Mage.Sets/src/mage/sets/eventide/GiftOfTheDeity.java +++ b/Mage.Sets/src/mage/sets/eventide/GiftOfTheDeity.java @@ -61,8 +61,6 @@ public class GiftOfTheDeity extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Aura"); - this.color.setGreen(true); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/eventide/GlenElendraArchmage.java b/Mage.Sets/src/mage/sets/eventide/GlenElendraArchmage.java index d9043b17967..d1c6623391e 100644 --- a/Mage.Sets/src/mage/sets/eventide/GlenElendraArchmage.java +++ b/Mage.Sets/src/mage/sets/eventide/GlenElendraArchmage.java @@ -64,7 +64,6 @@ public class GlenElendraArchmage extends CardImpl { this.subtype.add("Faerie"); 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/eventide/GrazingKelpie.java b/Mage.Sets/src/mage/sets/eventide/GrazingKelpie.java index 0c3b6a03275..1ffd5eebcab 100644 --- a/Mage.Sets/src/mage/sets/eventide/GrazingKelpie.java +++ b/Mage.Sets/src/mage/sets/eventide/GrazingKelpie.java @@ -53,8 +53,6 @@ public class GrazingKelpie extends CardImpl { this.expansionSetCode = "EVE"; 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/eventide/HallowedBurial.java b/Mage.Sets/src/mage/sets/eventide/HallowedBurial.java index 62070b0006d..5d4716993e5 100644 --- a/Mage.Sets/src/mage/sets/eventide/HallowedBurial.java +++ b/Mage.Sets/src/mage/sets/eventide/HallowedBurial.java @@ -50,7 +50,6 @@ public class HallowedBurial extends CardImpl { super(ownerId, 7, "Hallowed Burial", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{W}{W}"); this.expansionSetCode = "EVE"; - this.color.setWhite(true); // Put all creatures on the bottom of their owners' libraries. this.getSpellAbility().addEffect(new HallowedBurialEffect()); diff --git a/Mage.Sets/src/mage/sets/eventide/HarvestGwyllion.java b/Mage.Sets/src/mage/sets/eventide/HarvestGwyllion.java index b382deb1818..9fb1d662d98 100644 --- a/Mage.Sets/src/mage/sets/eventide/HarvestGwyllion.java +++ b/Mage.Sets/src/mage/sets/eventide/HarvestGwyllion.java @@ -45,8 +45,6 @@ public class HarvestGwyllion extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Hag"); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/eventide/HatchetBully.java b/Mage.Sets/src/mage/sets/eventide/HatchetBully.java index b3df8f250e3..5f8404c6bdc 100644 --- a/Mage.Sets/src/mage/sets/eventide/HatchetBully.java +++ b/Mage.Sets/src/mage/sets/eventide/HatchetBully.java @@ -60,7 +60,6 @@ public class HatchetBully extends CardImpl { this.subtype.add("Goblin"); 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/eventide/Hateflayer.java b/Mage.Sets/src/mage/sets/eventide/Hateflayer.java index 63b975f7b64..09630c2852e 100644 --- a/Mage.Sets/src/mage/sets/eventide/Hateflayer.java +++ b/Mage.Sets/src/mage/sets/eventide/Hateflayer.java @@ -53,7 +53,6 @@ public class Hateflayer extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/eventide/HearthfireHobgoblin.java b/Mage.Sets/src/mage/sets/eventide/HearthfireHobgoblin.java index 3dcf0399aaf..6c752548f2d 100644 --- a/Mage.Sets/src/mage/sets/eventide/HearthfireHobgoblin.java +++ b/Mage.Sets/src/mage/sets/eventide/HearthfireHobgoblin.java @@ -46,8 +46,6 @@ public class HearthfireHobgoblin 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); diff --git a/Mage.Sets/src/mage/sets/eventide/HeartlashCinder.java b/Mage.Sets/src/mage/sets/eventide/HeartlashCinder.java index de1d7c19699..f6505d36a16 100644 --- a/Mage.Sets/src/mage/sets/eventide/HeartlashCinder.java +++ b/Mage.Sets/src/mage/sets/eventide/HeartlashCinder.java @@ -59,7 +59,6 @@ public class HeartlashCinder 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/eventide/HelixPinnacle.java b/Mage.Sets/src/mage/sets/eventide/HelixPinnacle.java index 2dec8688774..4ee82c7e94e 100644 --- a/Mage.Sets/src/mage/sets/eventide/HelixPinnacle.java +++ b/Mage.Sets/src/mage/sets/eventide/HelixPinnacle.java @@ -56,7 +56,6 @@ public class HelixPinnacle extends CardImpl { super(ownerId, 68, "Helix Pinnacle", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "EVE"; - this.color.setGreen(true); // Shroud this.addAbility(ShroudAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/eventide/HobgoblinDragoon.java b/Mage.Sets/src/mage/sets/eventide/HobgoblinDragoon.java index 21a3142d90a..4d670886c8a 100644 --- a/Mage.Sets/src/mage/sets/eventide/HobgoblinDragoon.java +++ b/Mage.Sets/src/mage/sets/eventide/HobgoblinDragoon.java @@ -47,8 +47,6 @@ public class HobgoblinDragoon extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Knight"); - 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/eventide/HotheadedGiant.java b/Mage.Sets/src/mage/sets/eventide/HotheadedGiant.java index 0c239c7c81e..41c797b735b 100644 --- a/Mage.Sets/src/mage/sets/eventide/HotheadedGiant.java +++ b/Mage.Sets/src/mage/sets/eventide/HotheadedGiant.java @@ -62,7 +62,6 @@ public class HotheadedGiant extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/eventide/IdleThoughts.java b/Mage.Sets/src/mage/sets/eventide/IdleThoughts.java index ff816585468..289ae9fa30c 100644 --- a/Mage.Sets/src/mage/sets/eventide/IdleThoughts.java +++ b/Mage.Sets/src/mage/sets/eventide/IdleThoughts.java @@ -48,7 +48,6 @@ public class IdleThoughts extends CardImpl { super(ownerId, 23, "Idle Thoughts", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); this.expansionSetCode = "EVE"; - this.color.setBlue(true); // {2}: Draw a card if you have no cards in hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalOneShotEffect( diff --git a/Mage.Sets/src/mage/sets/eventide/ImpelledGiant.java b/Mage.Sets/src/mage/sets/eventide/ImpelledGiant.java index 9de7d1d5c31..7c10d02f4d6 100644 --- a/Mage.Sets/src/mage/sets/eventide/ImpelledGiant.java +++ b/Mage.Sets/src/mage/sets/eventide/ImpelledGiant.java @@ -75,7 +75,6 @@ public class ImpelledGiant 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/eventide/IndigoFaerie.java b/Mage.Sets/src/mage/sets/eventide/IndigoFaerie.java index 360799985d6..e7b6df7e5c6 100644 --- a/Mage.Sets/src/mage/sets/eventide/IndigoFaerie.java +++ b/Mage.Sets/src/mage/sets/eventide/IndigoFaerie.java @@ -58,7 +58,6 @@ public class IndigoFaerie extends CardImpl { this.subtype.add("Faerie"); 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/eventide/InsideOut.java b/Mage.Sets/src/mage/sets/eventide/InsideOut.java index 8174b70e8c3..2ca7709f709 100644 --- a/Mage.Sets/src/mage/sets/eventide/InsideOut.java +++ b/Mage.Sets/src/mage/sets/eventide/InsideOut.java @@ -47,8 +47,6 @@ public class InsideOut extends CardImpl { super(ownerId, 103, "Inside Out", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U/R}"); this.expansionSetCode = "EVE"; - this.color.setRed(true); - this.color.setBlue(true); // Switch target creature's power and toughness until end of turn. this.getSpellAbility().addEffect(new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/eventide/Inundate.java b/Mage.Sets/src/mage/sets/eventide/Inundate.java index 885d7e99c49..931bc14f785 100644 --- a/Mage.Sets/src/mage/sets/eventide/Inundate.java +++ b/Mage.Sets/src/mage/sets/eventide/Inundate.java @@ -53,7 +53,6 @@ public class Inundate extends CardImpl { super(ownerId, 25, "Inundate", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}{U}{U}"); this.expansionSetCode = "EVE"; - this.color.setBlue(true); // Return all nonblue creatures to their owners' hands. this.getSpellAbility().addEffect(new ReturnToHandFromBattlefieldAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/eventide/InvertTheSkies.java b/Mage.Sets/src/mage/sets/eventide/InvertTheSkies.java index 42da5ffbb7b..c28569269b6 100644 --- a/Mage.Sets/src/mage/sets/eventide/InvertTheSkies.java +++ b/Mage.Sets/src/mage/sets/eventide/InvertTheSkies.java @@ -61,8 +61,6 @@ public class InvertTheSkies extends CardImpl { super(ownerId, 155, "Invert the Skies", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{G/U}"); this.expansionSetCode = "EVE"; - this.color.setBlue(true); - this.color.setGreen(true); // Creatures your opponents control lose flying until end of turn if {G} was spent to cast Invert the Skies, and creatures you control gain flying until end of turn if {U} was spent to cast it. this.getSpellAbility().addEffect(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java b/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java index 208056675c6..fb608e31165 100644 --- a/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java +++ b/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java @@ -62,7 +62,6 @@ public class KithkinSpellduster extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Wizard"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/eventide/KithkinZealot.java b/Mage.Sets/src/mage/sets/eventide/KithkinZealot.java index 8c129921625..e21fba00097 100644 --- a/Mage.Sets/src/mage/sets/eventide/KithkinZealot.java +++ b/Mage.Sets/src/mage/sets/eventide/KithkinZealot.java @@ -56,7 +56,6 @@ public class KithkinZealot extends CardImpl { this.subtype.add("Kithkin"); 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/eventide/LightFromWithin.java b/Mage.Sets/src/mage/sets/eventide/LightFromWithin.java index 7b943e795c5..5a2eec50fa1 100644 --- a/Mage.Sets/src/mage/sets/eventide/LightFromWithin.java +++ b/Mage.Sets/src/mage/sets/eventide/LightFromWithin.java @@ -66,7 +66,6 @@ public class LightFromWithin extends CardImpl { super(ownerId, 10, "Light from Within", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "EVE"; - this.color.setWhite(true); // Chroma - Each creature you control gets +1/+1 for each white mana symbol in its mana cost. Effect effect = new LightFromWithinEffect(); diff --git a/Mage.Sets/src/mage/sets/eventide/LingeringTormentor.java b/Mage.Sets/src/mage/sets/eventide/LingeringTormentor.java index a0c33b09541..4b7b36bf636 100644 --- a/Mage.Sets/src/mage/sets/eventide/LingeringTormentor.java +++ b/Mage.Sets/src/mage/sets/eventide/LingeringTormentor.java @@ -46,7 +46,6 @@ public class LingeringTormentor extends CardImpl { this.expansionSetCode = "EVE"; 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/eventide/MarshdrinkerGiant.java b/Mage.Sets/src/mage/sets/eventide/MarshdrinkerGiant.java index a6ab1d7d72d..eaba2740083 100644 --- a/Mage.Sets/src/mage/sets/eventide/MarshdrinkerGiant.java +++ b/Mage.Sets/src/mage/sets/eventide/MarshdrinkerGiant.java @@ -63,7 +63,6 @@ public class MarshdrinkerGiant extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/eventide/MerrowBonegnawer.java b/Mage.Sets/src/mage/sets/eventide/MerrowBonegnawer.java index eb85ba41b96..f8be8da2f87 100644 --- a/Mage.Sets/src/mage/sets/eventide/MerrowBonegnawer.java +++ b/Mage.Sets/src/mage/sets/eventide/MerrowBonegnawer.java @@ -65,7 +65,6 @@ public class MerrowBonegnawer extends CardImpl { this.subtype.add("Merfolk"); 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/eventide/MindwrackLiege.java b/Mage.Sets/src/mage/sets/eventide/MindwrackLiege.java index beb893f51dd..43fb85a3b22 100644 --- a/Mage.Sets/src/mage/sets/eventide/MindwrackLiege.java +++ b/Mage.Sets/src/mage/sets/eventide/MindwrackLiege.java @@ -75,8 +75,6 @@ public class MindwrackLiege extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Horror"); - 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/eventide/MirrorSheen.java b/Mage.Sets/src/mage/sets/eventide/MirrorSheen.java index c814d917681..53d3ab2d22c 100644 --- a/Mage.Sets/src/mage/sets/eventide/MirrorSheen.java +++ b/Mage.Sets/src/mage/sets/eventide/MirrorSheen.java @@ -66,8 +66,6 @@ public class MirrorSheen extends CardImpl { super(ownerId, 105, "Mirror Sheen", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U/R}{U/R}"); this.expansionSetCode = "EVE"; - this.color.setRed(true); - this.color.setBlue(true); // {1}{UR}{UR}: Copy target instant or sorcery spell that targets you. You may choose new targets for the copy. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MirrorSheenEffect(), new ManaCostsImpl("{1}{U/R}{U/R}")); diff --git a/Mage.Sets/src/mage/sets/eventide/Moonhold.java b/Mage.Sets/src/mage/sets/eventide/Moonhold.java index 513917758c4..25d6d5105f4 100644 --- a/Mage.Sets/src/mage/sets/eventide/Moonhold.java +++ b/Mage.Sets/src/mage/sets/eventide/Moonhold.java @@ -58,8 +58,6 @@ public class Moonhold extends CardImpl { super(ownerId, 143, "Moonhold", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{R/W}"); this.expansionSetCode = "EVE"; - this.color.setRed(true); - this.color.setWhite(true); // Target player can't play land cards this turn if {R} was spent to cast Moonhold and can't play creature cards this turn if {W} was spent to cast it. ContinuousRuleModifyingEffect effect = new MoonholdEffect(); diff --git a/Mage.Sets/src/mage/sets/eventide/Necroskitter.java b/Mage.Sets/src/mage/sets/eventide/Necroskitter.java index c087a27e6bb..0b71d9524b5 100644 --- a/Mage.Sets/src/mage/sets/eventide/Necroskitter.java +++ b/Mage.Sets/src/mage/sets/eventide/Necroskitter.java @@ -55,7 +55,6 @@ public class Necroskitter extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Elemental"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/eventide/NeedleSpecter.java b/Mage.Sets/src/mage/sets/eventide/NeedleSpecter.java index f7c487815e1..f051b29b881 100644 --- a/Mage.Sets/src/mage/sets/eventide/NeedleSpecter.java +++ b/Mage.Sets/src/mage/sets/eventide/NeedleSpecter.java @@ -52,7 +52,6 @@ public class NeedleSpecter extends CardImpl { this.expansionSetCode = "EVE"; 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/eventide/NettleSentinel.java b/Mage.Sets/src/mage/sets/eventide/NettleSentinel.java index 9461d0a1a4e..37eb340d2c5 100644 --- a/Mage.Sets/src/mage/sets/eventide/NettleSentinel.java +++ b/Mage.Sets/src/mage/sets/eventide/NettleSentinel.java @@ -59,7 +59,6 @@ public class NettleSentinel 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/eventide/NightmareIncursion.java b/Mage.Sets/src/mage/sets/eventide/NightmareIncursion.java index d31d2fee11c..5f418502f61 100644 --- a/Mage.Sets/src/mage/sets/eventide/NightmareIncursion.java +++ b/Mage.Sets/src/mage/sets/eventide/NightmareIncursion.java @@ -59,7 +59,6 @@ public class NightmareIncursion extends CardImpl { super(ownerId, 40, "Nightmare Incursion", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{B}"); this.expansionSetCode = "EVE"; - this.color.setBlack(true); // Search target player's library for up to X cards, where X is the number of Swamps you control, and exile them. Then that player shuffles his or her library. Effect effect = new NightmareIncursionEffect(); diff --git a/Mage.Sets/src/mage/sets/eventide/NipGwyllion.java b/Mage.Sets/src/mage/sets/eventide/NipGwyllion.java index 3c996ae45ed..ab189eb459f 100644 --- a/Mage.Sets/src/mage/sets/eventide/NipGwyllion.java +++ b/Mage.Sets/src/mage/sets/eventide/NipGwyllion.java @@ -45,8 +45,6 @@ public class NipGwyllion extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Hag"); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/eventide/NobilisOfWar.java b/Mage.Sets/src/mage/sets/eventide/NobilisOfWar.java index 6c707067ea5..df2e844014b 100644 --- a/Mage.Sets/src/mage/sets/eventide/NobilisOfWar.java +++ b/Mage.Sets/src/mage/sets/eventide/NobilisOfWar.java @@ -51,8 +51,6 @@ public class NobilisOfWar extends CardImpl { this.subtype.add("Spirit"); this.subtype.add("Avatar"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/eventide/NoggleBandit.java b/Mage.Sets/src/mage/sets/eventide/NoggleBandit.java index d3564ed911b..6c6b494ac48 100644 --- a/Mage.Sets/src/mage/sets/eventide/NoggleBandit.java +++ b/Mage.Sets/src/mage/sets/eventide/NoggleBandit.java @@ -60,8 +60,6 @@ public class NoggleBandit 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(2); diff --git a/Mage.Sets/src/mage/sets/eventide/Nucklavee.java b/Mage.Sets/src/mage/sets/eventide/Nucklavee.java index 8b7538940fc..54c65b9420c 100644 --- a/Mage.Sets/src/mage/sets/eventide/Nucklavee.java +++ b/Mage.Sets/src/mage/sets/eventide/Nucklavee.java @@ -61,8 +61,6 @@ public class Nucklavee extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Beast"); - 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/eventide/OutrageShaman.java b/Mage.Sets/src/mage/sets/eventide/OutrageShaman.java index df568b62362..385d62f9308 100644 --- a/Mage.Sets/src/mage/sets/eventide/OutrageShaman.java +++ b/Mage.Sets/src/mage/sets/eventide/OutrageShaman.java @@ -55,7 +55,6 @@ public class OutrageShaman 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/eventide/OverbeingOfMyth.java b/Mage.Sets/src/mage/sets/eventide/OverbeingOfMyth.java index 9a30adb5ff4..a8004d3a70d 100644 --- a/Mage.Sets/src/mage/sets/eventide/OverbeingOfMyth.java +++ b/Mage.Sets/src/mage/sets/eventide/OverbeingOfMyth.java @@ -55,8 +55,6 @@ public class OverbeingOfMyth extends CardImpl { this.subtype.add("Spirit"); this.subtype.add("Avatar"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/eventide/PatrolSignaler.java b/Mage.Sets/src/mage/sets/eventide/PatrolSignaler.java index aae4eaf8673..d23a120320f 100644 --- a/Mage.Sets/src/mage/sets/eventide/PatrolSignaler.java +++ b/Mage.Sets/src/mage/sets/eventide/PatrolSignaler.java @@ -53,7 +53,6 @@ public class PatrolSignaler 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/eventide/PhosphorescentFeast.java b/Mage.Sets/src/mage/sets/eventide/PhosphorescentFeast.java index 6d4ab6d0c50..d8525087f08 100644 --- a/Mage.Sets/src/mage/sets/eventide/PhosphorescentFeast.java +++ b/Mage.Sets/src/mage/sets/eventide/PhosphorescentFeast.java @@ -54,7 +54,6 @@ public class PhosphorescentFeast extends CardImpl { super(ownerId, 72, "Phosphorescent Feast", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}{G}{G}"); this.expansionSetCode = "EVE"; - this.color.setGreen(true); // Chroma - Reveal any number of cards in your hand. You gain 2 life for each green mana symbol in those cards' mana costs. Effect effect = new PhosphorescentFeastEffect(); diff --git a/Mage.Sets/src/mage/sets/eventide/Primalcrux.java b/Mage.Sets/src/mage/sets/eventide/Primalcrux.java index 7b3a5eb7abe..53084edc7ad 100644 --- a/Mage.Sets/src/mage/sets/eventide/Primalcrux.java +++ b/Mage.Sets/src/mage/sets/eventide/Primalcrux.java @@ -56,7 +56,6 @@ public class Primalcrux extends CardImpl { this.expansionSetCode = "EVE"; 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/eventide/PyrrhicRevival.java b/Mage.Sets/src/mage/sets/eventide/PyrrhicRevival.java index 9c40c2c3c26..e77a592711b 100644 --- a/Mage.Sets/src/mage/sets/eventide/PyrrhicRevival.java +++ b/Mage.Sets/src/mage/sets/eventide/PyrrhicRevival.java @@ -53,8 +53,6 @@ public class PyrrhicRevival extends CardImpl { super(ownerId, 93, "Pyrrhic Revival", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{W/B}{W/B}{W/B}"); this.expansionSetCode = "EVE"; - this.color.setBlack(true); - this.color.setWhite(true); // Each player returns each creature card from his or her graveyard to the battlefield with an additional -1/-1 counter on it. this.getSpellAbility().addEffect(new PyrrhicRevivalEffect()); diff --git a/Mage.Sets/src/mage/sets/eventide/Quillspike.java b/Mage.Sets/src/mage/sets/eventide/Quillspike.java index ea0c0106728..28dded38c24 100644 --- a/Mage.Sets/src/mage/sets/eventide/Quillspike.java +++ b/Mage.Sets/src/mage/sets/eventide/Quillspike.java @@ -55,8 +55,6 @@ public class Quillspike extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Beast"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/eventide/RazorfinAbolisher.java b/Mage.Sets/src/mage/sets/eventide/RazorfinAbolisher.java index f376b454980..282d0756bc4 100644 --- a/Mage.Sets/src/mage/sets/eventide/RazorfinAbolisher.java +++ b/Mage.Sets/src/mage/sets/eventide/RazorfinAbolisher.java @@ -61,7 +61,6 @@ public class RazorfinAbolisher 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/eventide/RegalForce.java b/Mage.Sets/src/mage/sets/eventide/RegalForce.java index 49ba70f7498..f5988a03ab9 100644 --- a/Mage.Sets/src/mage/sets/eventide/RegalForce.java +++ b/Mage.Sets/src/mage/sets/eventide/RegalForce.java @@ -56,7 +56,6 @@ public class RegalForce extends CardImpl { this.expansionSetCode = "EVE"; 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/eventide/RekindledFlame.java b/Mage.Sets/src/mage/sets/eventide/RekindledFlame.java index ddbe85c0e11..9131d46a428 100644 --- a/Mage.Sets/src/mage/sets/eventide/RekindledFlame.java +++ b/Mage.Sets/src/mage/sets/eventide/RekindledFlame.java @@ -55,7 +55,6 @@ public class RekindledFlame extends CardImpl { super(ownerId, 61, "Rekindled Flame", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); this.expansionSetCode = "EVE"; - this.color.setRed(true); // Rekindled Flame deals 4 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); diff --git a/Mage.Sets/src/mage/sets/eventide/RendclawTrow.java b/Mage.Sets/src/mage/sets/eventide/RendclawTrow.java index b5b39902f0a..443ce53963f 100644 --- a/Mage.Sets/src/mage/sets/eventide/RendclawTrow.java +++ b/Mage.Sets/src/mage/sets/eventide/RendclawTrow.java @@ -46,8 +46,6 @@ public class RendclawTrow extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Troll"); - 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/eventide/RestlessApparition.java b/Mage.Sets/src/mage/sets/eventide/RestlessApparition.java index 8a9e09fb197..590c71bf4a3 100644 --- a/Mage.Sets/src/mage/sets/eventide/RestlessApparition.java +++ b/Mage.Sets/src/mage/sets/eventide/RestlessApparition.java @@ -51,8 +51,6 @@ public class RestlessApparition extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Spirit"); - 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/eventide/RiseOfTheHobgoblins.java b/Mage.Sets/src/mage/sets/eventide/RiseOfTheHobgoblins.java index 7a250eb7d96..7dcda6a51f9 100644 --- a/Mage.Sets/src/mage/sets/eventide/RiseOfTheHobgoblins.java +++ b/Mage.Sets/src/mage/sets/eventide/RiseOfTheHobgoblins.java @@ -77,8 +77,6 @@ public class RiseOfTheHobgoblins extends CardImpl { super(ownerId, 145, "Rise of the Hobgoblins", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{R/W}{R/W}"); this.expansionSetCode = "EVE"; - this.color.setRed(true); - this.color.setWhite(true); // When Rise of the Hobgoblins enters the battlefield, you may pay {X}. If you do, put X 1/1 red and white Goblin Soldier creature tokens onto the battlefield. this.addAbility(new EntersBattlefieldTriggeredAbility(new RiseOfTheHobgoblinsEffect())); diff --git a/Mage.Sets/src/mage/sets/eventide/SanityGrinding.java b/Mage.Sets/src/mage/sets/eventide/SanityGrinding.java index 85db93084f6..9f5561d1c18 100644 --- a/Mage.Sets/src/mage/sets/eventide/SanityGrinding.java +++ b/Mage.Sets/src/mage/sets/eventide/SanityGrinding.java @@ -56,7 +56,6 @@ public class SanityGrinding extends CardImpl { super(ownerId, 29, "Sanity Grinding", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{U}{U}{U}"); this.expansionSetCode = "EVE"; - this.color.setBlue(true); // Chroma - Reveal the top ten cards of your library. For each blue mana symbol in the mana costs of the revealed cards, target opponent puts the top card of his or her library into his or her graveyard. Then put the cards you revealed this way on the bottom of your library in any order. this.getSpellAbility().addEffect(new SanityGrindingEffect()); diff --git a/Mage.Sets/src/mage/sets/eventide/SaplingOfColfenor.java b/Mage.Sets/src/mage/sets/eventide/SaplingOfColfenor.java index 08e1b3a11c5..d91784affe7 100644 --- a/Mage.Sets/src/mage/sets/eventide/SaplingOfColfenor.java +++ b/Mage.Sets/src/mage/sets/eventide/SaplingOfColfenor.java @@ -58,8 +58,6 @@ public class SaplingOfColfenor extends CardImpl { this.subtype.add("Treefolk"); this.subtype.add("Shaman"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/eventide/ScourgeOfTheNobilis.java b/Mage.Sets/src/mage/sets/eventide/ScourgeOfTheNobilis.java index 564e4b2290a..e7422a49129 100644 --- a/Mage.Sets/src/mage/sets/eventide/ScourgeOfTheNobilis.java +++ b/Mage.Sets/src/mage/sets/eventide/ScourgeOfTheNobilis.java @@ -62,8 +62,6 @@ public class ScourgeOfTheNobilis extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Aura"); - this.color.setRed(true); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/eventide/ShrewdHatchling.java b/Mage.Sets/src/mage/sets/eventide/ShrewdHatchling.java index 45a196f95af..be6d83c0cff 100644 --- a/Mage.Sets/src/mage/sets/eventide/ShrewdHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/ShrewdHatchling.java @@ -77,8 +77,6 @@ public class ShrewdHatchling extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Elemental"); - this.color.setRed(true); - this.color.setBlue(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/eventide/SlipperyBogle.java b/Mage.Sets/src/mage/sets/eventide/SlipperyBogle.java index c6eaf8d3e9a..4f6c9d2fa43 100644 --- a/Mage.Sets/src/mage/sets/eventide/SlipperyBogle.java +++ b/Mage.Sets/src/mage/sets/eventide/SlipperyBogle.java @@ -45,8 +45,6 @@ public class SlipperyBogle extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Beast"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/eventide/Snakeform.java b/Mage.Sets/src/mage/sets/eventide/Snakeform.java index 18d1514a035..710f3aaf6f1 100644 --- a/Mage.Sets/src/mage/sets/eventide/Snakeform.java +++ b/Mage.Sets/src/mage/sets/eventide/Snakeform.java @@ -50,8 +50,6 @@ public class Snakeform extends CardImpl { super(ownerId, 161, "Snakeform", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G/U}"); this.expansionSetCode = "EVE"; - this.color.setBlue(true); - this.color.setGreen(true); // Until end of turn, target creature loses all abilities and becomes a green Snake with base power and toughness 1/1. Effect effect = new BecomesCreatureTargetEffect(new SnakeToken(), true, false, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/sets/eventide/SootImp.java b/Mage.Sets/src/mage/sets/eventide/SootImp.java index cc1288e1093..94f98918dc6 100644 --- a/Mage.Sets/src/mage/sets/eventide/SootImp.java +++ b/Mage.Sets/src/mage/sets/eventide/SootImp.java @@ -64,7 +64,6 @@ public class SootImp extends CardImpl { this.expansionSetCode = "EVE"; 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/eventide/SoulReap.java b/Mage.Sets/src/mage/sets/eventide/SoulReap.java index 33a34b5ce3c..8c47750a966 100644 --- a/Mage.Sets/src/mage/sets/eventide/SoulReap.java +++ b/Mage.Sets/src/mage/sets/eventide/SoulReap.java @@ -72,7 +72,6 @@ public class SoulReap extends CardImpl { super(ownerId, 44, "Soul Reap", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "EVE"; - this.color.setBlack(true); // Destroy target nongreen creature. Its controller loses 3 life if you've cast another black spell this turn. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/eventide/SpiritOfTheHearth.java b/Mage.Sets/src/mage/sets/eventide/SpiritOfTheHearth.java index a035a2f7bb4..a2ba3b58540 100644 --- a/Mage.Sets/src/mage/sets/eventide/SpiritOfTheHearth.java +++ b/Mage.Sets/src/mage/sets/eventide/SpiritOfTheHearth.java @@ -51,7 +51,6 @@ public class SpiritOfTheHearth extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/eventide/Spitemare.java b/Mage.Sets/src/mage/sets/eventide/Spitemare.java index b2ff00277e2..e1f0be4bf9a 100644 --- a/Mage.Sets/src/mage/sets/eventide/Spitemare.java +++ b/Mage.Sets/src/mage/sets/eventide/Spitemare.java @@ -53,8 +53,6 @@ public class Spitemare extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Elemental"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/eventide/SpringjackShepherd.java b/Mage.Sets/src/mage/sets/eventide/SpringjackShepherd.java index 1990deac6f7..460d913355a 100644 --- a/Mage.Sets/src/mage/sets/eventide/SpringjackShepherd.java +++ b/Mage.Sets/src/mage/sets/eventide/SpringjackShepherd.java @@ -56,7 +56,6 @@ public class SpringjackShepherd extends CardImpl { this.subtype.add("Kithkin"); 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/eventide/StalkerHag.java b/Mage.Sets/src/mage/sets/eventide/StalkerHag.java index b403307c155..40872a98ea8 100644 --- a/Mage.Sets/src/mage/sets/eventide/StalkerHag.java +++ b/Mage.Sets/src/mage/sets/eventide/StalkerHag.java @@ -46,8 +46,6 @@ public class StalkerHag extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Hag"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/eventide/StillmoonCavalier.java b/Mage.Sets/src/mage/sets/eventide/StillmoonCavalier.java index fb31aceb38b..e16d40b51c4 100644 --- a/Mage.Sets/src/mage/sets/eventide/StillmoonCavalier.java +++ b/Mage.Sets/src/mage/sets/eventide/StillmoonCavalier.java @@ -65,8 +65,6 @@ public class StillmoonCavalier extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Knight"); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/eventide/SyphonLife.java b/Mage.Sets/src/mage/sets/eventide/SyphonLife.java index 1b0c65a53f2..519d6a7f117 100644 --- a/Mage.Sets/src/mage/sets/eventide/SyphonLife.java +++ b/Mage.Sets/src/mage/sets/eventide/SyphonLife.java @@ -49,7 +49,6 @@ public class SyphonLife extends CardImpl { super(ownerId, 46, "Syphon Life", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{B}{B}"); this.expansionSetCode = "EVE"; - this.color.setBlack(true); // Target player loses 2 life and you gain 2 life. this.getSpellAbility().addEffect(new LoseLifeTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/eventide/TalarasBane.java b/Mage.Sets/src/mage/sets/eventide/TalarasBane.java index a7b1aeb37ac..13902a46f22 100644 --- a/Mage.Sets/src/mage/sets/eventide/TalarasBane.java +++ b/Mage.Sets/src/mage/sets/eventide/TalarasBane.java @@ -56,7 +56,6 @@ public class TalarasBane extends CardImpl { super(ownerId, 47, "Talara's Bane", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "EVE"; - this.color.setBlack(true); // Target opponent reveals his or her hand. You choose a green or white creature card from it. You gain life equal that creature card's toughness, then that player discards that card. this.getSpellAbility().addEffect(new TalarasBaneEffect()); diff --git a/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java b/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java index e07b762826b..3220bda751d 100644 --- a/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java +++ b/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java @@ -63,7 +63,6 @@ public class TalarasBattalion extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/eventide/Thunderblust.java b/Mage.Sets/src/mage/sets/eventide/Thunderblust.java index 972c834df56..c74a0cafec0 100644 --- a/Mage.Sets/src/mage/sets/eventide/Thunderblust.java +++ b/Mage.Sets/src/mage/sets/eventide/Thunderblust.java @@ -56,7 +56,6 @@ public class Thunderblust extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(7); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/eventide/TillingTreefolk.java b/Mage.Sets/src/mage/sets/eventide/TillingTreefolk.java index 95fbbbf7804..bd16c847975 100644 --- a/Mage.Sets/src/mage/sets/eventide/TillingTreefolk.java +++ b/Mage.Sets/src/mage/sets/eventide/TillingTreefolk.java @@ -51,7 +51,6 @@ public class TillingTreefolk extends CardImpl { this.subtype.add("Treefolk"); 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/eventide/TrapjawKelpie.java b/Mage.Sets/src/mage/sets/eventide/TrapjawKelpie.java index 9fc9de41e69..9a6bbc0d4f5 100644 --- a/Mage.Sets/src/mage/sets/eventide/TrapjawKelpie.java +++ b/Mage.Sets/src/mage/sets/eventide/TrapjawKelpie.java @@ -46,8 +46,6 @@ public class TrapjawKelpie extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Beast"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/eventide/UmbraStalker.java b/Mage.Sets/src/mage/sets/eventide/UmbraStalker.java index 1a20eb052ac..b42b790f8a9 100644 --- a/Mage.Sets/src/mage/sets/eventide/UmbraStalker.java +++ b/Mage.Sets/src/mage/sets/eventide/UmbraStalker.java @@ -55,7 +55,6 @@ public class UmbraStalker extends CardImpl { this.expansionSetCode = "EVE"; 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/eventide/UnnervingAssault.java b/Mage.Sets/src/mage/sets/eventide/UnnervingAssault.java index df6aeb823e8..ba55648a575 100644 --- a/Mage.Sets/src/mage/sets/eventide/UnnervingAssault.java +++ b/Mage.Sets/src/mage/sets/eventide/UnnervingAssault.java @@ -62,8 +62,6 @@ public class UnnervingAssault extends CardImpl { super(ownerId, 114, "Unnerving Assault", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U/R}"); this.expansionSetCode = "EVE"; - this.color.setRed(true); - this.color.setBlue(true); // Creatures your opponents control get -1/-0 until end of turn if {U} was spent to cast Unnerving Assault, and creatures you control get +1/+0 until end of turn if {R} was spent to cast it. this.getSpellAbility().addEffect(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/sets/eventide/UnwillingRecruit.java b/Mage.Sets/src/mage/sets/eventide/UnwillingRecruit.java index bcaaa944122..3a0b70fb026 100644 --- a/Mage.Sets/src/mage/sets/eventide/UnwillingRecruit.java +++ b/Mage.Sets/src/mage/sets/eventide/UnwillingRecruit.java @@ -54,7 +54,6 @@ public class UnwillingRecruit extends CardImpl { super(ownerId, 64, "Unwilling Recruit", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{R}{R}{R}"); this.expansionSetCode = "EVE"; - this.color.setRed(true); // Gain control of target creature until end of turn. Untap that creature. It gets +X/+0 and gains haste until end of turn. this.getSpellAbility().addEffect(new UnwillingRecruitEffect()); diff --git a/Mage.Sets/src/mage/sets/eventide/WakeThrasher.java b/Mage.Sets/src/mage/sets/eventide/WakeThrasher.java index 1981bd6b3da..c98427c63e3 100644 --- a/Mage.Sets/src/mage/sets/eventide/WakeThrasher.java +++ b/Mage.Sets/src/mage/sets/eventide/WakeThrasher.java @@ -53,7 +53,6 @@ public class WakeThrasher extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/exodus/Carnophage.java b/Mage.Sets/src/mage/sets/exodus/Carnophage.java index 97d01ed1b80..14e2c54e472 100644 --- a/Mage.Sets/src/mage/sets/exodus/Carnophage.java +++ b/Mage.Sets/src/mage/sets/exodus/Carnophage.java @@ -48,7 +48,6 @@ public class Carnophage extends CardImpl { this.expansionSetCode = "EXO"; 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/exodus/Cartographer.java b/Mage.Sets/src/mage/sets/exodus/Cartographer.java index f2021b5222c..13449f6d650 100644 --- a/Mage.Sets/src/mage/sets/exodus/Cartographer.java +++ b/Mage.Sets/src/mage/sets/exodus/Cartographer.java @@ -49,7 +49,6 @@ public class Cartographer extends CardImpl { this.expansionSetCode = "EXO"; this.subtype.add("Human"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/exodus/CatBurglar.java b/Mage.Sets/src/mage/sets/exodus/CatBurglar.java index efbe5471df3..90f6821863a 100644 --- a/Mage.Sets/src/mage/sets/exodus/CatBurglar.java +++ b/Mage.Sets/src/mage/sets/exodus/CatBurglar.java @@ -54,7 +54,6 @@ public class CatBurglar extends CardImpl { this.subtype.add("Rogue"); 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/exodus/Convalescence.java b/Mage.Sets/src/mage/sets/exodus/Convalescence.java index bb1dbbdf3ea..2f159a5858a 100644 --- a/Mage.Sets/src/mage/sets/exodus/Convalescence.java +++ b/Mage.Sets/src/mage/sets/exodus/Convalescence.java @@ -50,7 +50,6 @@ public class Convalescence extends CardImpl { super(ownerId, 5, "Convalescence", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "EXO"; - this.color.setWhite(true); // At the beginning of your upkeep, if you have 10 or less life, you gain 1 life. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new ConvalescenceEffect(), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/exodus/CullingTheWeak.java b/Mage.Sets/src/mage/sets/exodus/CullingTheWeak.java index 2faa7d99334..80bb18a0270 100644 --- a/Mage.Sets/src/mage/sets/exodus/CullingTheWeak.java +++ b/Mage.Sets/src/mage/sets/exodus/CullingTheWeak.java @@ -47,7 +47,6 @@ public class CullingTheWeak extends CardImpl { super(ownerId, 55, "Culling the Weak", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "EXO"; - this.color.setBlack(true); // As an additional cost to cast Culling the Weak, sacrifice a creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(new FilterControlledCreaturePermanent("a creature")))); diff --git a/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java b/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java index f11db9b01c9..1e5348392f8 100644 --- a/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java +++ b/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java @@ -59,7 +59,6 @@ public class EntropicSpecter extends CardImpl { this.subtype.add("Specter"); 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/exodus/Ephemeron.java b/Mage.Sets/src/mage/sets/exodus/Ephemeron.java index 3471a5e1cd2..ef0a4318904 100644 --- a/Mage.Sets/src/mage/sets/exodus/Ephemeron.java +++ b/Mage.Sets/src/mage/sets/exodus/Ephemeron.java @@ -51,7 +51,6 @@ public class Ephemeron extends CardImpl { this.expansionSetCode = "EXO"; 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/exodus/Equilibrium.java b/Mage.Sets/src/mage/sets/exodus/Equilibrium.java index 954ace5f654..7df911f4343 100644 --- a/Mage.Sets/src/mage/sets/exodus/Equilibrium.java +++ b/Mage.Sets/src/mage/sets/exodus/Equilibrium.java @@ -56,7 +56,6 @@ public class Equilibrium extends CardImpl { super(ownerId, 32, "Equilibrium", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}{U}"); this.expansionSetCode = "EXO"; - this.color.setBlue(true); // Whenever you cast a creature spell, you may pay {1}. If you do, return target creature to its owner's hand. Ability ability = new SpellCastControllerTriggeredAbility(new DoIfCostPaid(new ReturnToHandTargetEffect(), new GenericManaCost(1)), filter, false); diff --git a/Mage.Sets/src/mage/sets/exodus/ErtaiWizardAdept.java b/Mage.Sets/src/mage/sets/exodus/ErtaiWizardAdept.java index 8e612a1da98..f54491a8300 100644 --- a/Mage.Sets/src/mage/sets/exodus/ErtaiWizardAdept.java +++ b/Mage.Sets/src/mage/sets/exodus/ErtaiWizardAdept.java @@ -54,7 +54,6 @@ public class ErtaiWizardAdept 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/exodus/FlowstoneFlood.java b/Mage.Sets/src/mage/sets/exodus/FlowstoneFlood.java index e5149599bbc..1164d875b00 100644 --- a/Mage.Sets/src/mage/sets/exodus/FlowstoneFlood.java +++ b/Mage.Sets/src/mage/sets/exodus/FlowstoneFlood.java @@ -47,7 +47,6 @@ public class FlowstoneFlood extends CardImpl { super(ownerId, 83, "Flowstone Flood", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "EXO"; - this.color.setRed(true); // Buyback—Pay 3 life, Discard a card at random. (You may pay 3 life and discard a card at random in addition to any other costs as you cast this spell. If you do, put this card into your hand as it resolves.) BuybackAbility buybackAbility = new BuybackAbility(new PayLifeCost(3)); diff --git a/Mage.Sets/src/mage/sets/exodus/Forbid.java b/Mage.Sets/src/mage/sets/exodus/Forbid.java index 6a91935817a..0848da34186 100644 --- a/Mage.Sets/src/mage/sets/exodus/Forbid.java +++ b/Mage.Sets/src/mage/sets/exodus/Forbid.java @@ -50,7 +50,6 @@ public class Forbid extends CardImpl { super(ownerId, 35, "Forbid", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{U}"); this.expansionSetCode = "EXO"; - this.color.setBlue(true); // Buyback-Discard two cards. this.addAbility(new BuybackAbility(new DiscardTargetCost(new TargetCardInHand(2, new FilterCard("two cards"))))); diff --git a/Mage.Sets/src/mage/sets/exodus/Hatred.java b/Mage.Sets/src/mage/sets/exodus/Hatred.java index 09ed1cf2610..6dc4c4fba79 100644 --- a/Mage.Sets/src/mage/sets/exodus/Hatred.java +++ b/Mage.Sets/src/mage/sets/exodus/Hatred.java @@ -49,7 +49,6 @@ public class Hatred extends CardImpl { super(ownerId, 64, "Hatred", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{B}{B}"); this.expansionSetCode = "EXO"; - this.color.setBlack(true); // As an additional cost to cast Hatred, pay X life. this.getSpellAbility().addCost(new PayVariableLifeCost(true)); diff --git a/Mage.Sets/src/mage/sets/exodus/Manabond.java b/Mage.Sets/src/mage/sets/exodus/Manabond.java index 49adf93eec7..95dcbe4d6c8 100644 --- a/Mage.Sets/src/mage/sets/exodus/Manabond.java +++ b/Mage.Sets/src/mage/sets/exodus/Manabond.java @@ -51,7 +51,6 @@ public class Manabond extends CardImpl { super(ownerId, 113, "Manabond", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "EXO"; - this.color.setGreen(true); // At the beginning of your end step, you may reveal your hand and put all land cards from it onto the battlefield. If you do, discard your hand. this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new ManabondEffect(), true)); diff --git a/Mage.Sets/src/mage/sets/exodus/MindOverMatter.java b/Mage.Sets/src/mage/sets/exodus/MindOverMatter.java index 4579c73041c..0b6094a6008 100644 --- a/Mage.Sets/src/mage/sets/exodus/MindOverMatter.java +++ b/Mage.Sets/src/mage/sets/exodus/MindOverMatter.java @@ -56,7 +56,6 @@ public class MindOverMatter extends CardImpl { super(ownerId, 40, "Mind Over Matter", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}{U}{U}"); this.expansionSetCode = "EXO"; - this.color.setBlue(true); // Discard a card: You may tap or untap target artifact, creature, or land. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/sets/exodus/OathOfDruids.java b/Mage.Sets/src/mage/sets/exodus/OathOfDruids.java index 73bc49973cd..194dfe03e6d 100644 --- a/Mage.Sets/src/mage/sets/exodus/OathOfDruids.java +++ b/Mage.Sets/src/mage/sets/exodus/OathOfDruids.java @@ -65,7 +65,6 @@ public class OathOfDruids extends CardImpl { super(ownerId, 115, "Oath of Druids", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "EXO"; - this.color.setGreen(true); // At the beginning of each player's upkeep, that player chooses target player who controls more creatures than he or she does and is his or her opponent. The first player may reveal cards from the top of his or her library until he or she reveals a creature card. If he or she does, that player puts that card onto the battlefield and all other cards revealed this way into his or her graveyard. Ability ability = new BeginningOfUpkeepTriggeredAbility(new OathOfDruidsEffect(), TargetController.ANY, true); diff --git a/Mage.Sets/src/mage/sets/exodus/OathOfLieges.java b/Mage.Sets/src/mage/sets/exodus/OathOfLieges.java index 631793810c0..b7a8d637588 100644 --- a/Mage.Sets/src/mage/sets/exodus/OathOfLieges.java +++ b/Mage.Sets/src/mage/sets/exodus/OathOfLieges.java @@ -62,7 +62,6 @@ public class OathOfLieges extends CardImpl { super(ownerId, 11, "Oath of Lieges", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "EXO"; - this.color.setWhite(true); // At the beginning of each player's upkeep, that player chooses target player who controls more lands than he or she does and is his or her opponent. The first player may search his or her library for a basic land card, put that card onto the battlefield, then shuffle his or her library. Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterBasicLandCard()), false, Outcome.PutLandInPlay); diff --git a/Mage.Sets/src/mage/sets/exodus/PriceOfProgress.java b/Mage.Sets/src/mage/sets/exodus/PriceOfProgress.java index f843c896980..93fce5e509f 100644 --- a/Mage.Sets/src/mage/sets/exodus/PriceOfProgress.java +++ b/Mage.Sets/src/mage/sets/exodus/PriceOfProgress.java @@ -50,7 +50,6 @@ public class PriceOfProgress extends CardImpl { super(ownerId, 95, "Price of Progress", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "EXO"; - this.color.setRed(true); // Price of Progress deals damage to each player equal to twice the number of nonbasic lands that player controls. this.getSpellAbility().addEffect(new PriceOfProgressEffect()); diff --git a/Mage.Sets/src/mage/sets/exodus/RavenousBaboons.java b/Mage.Sets/src/mage/sets/exodus/RavenousBaboons.java index a632bd9a1f2..adde08b2f06 100644 --- a/Mage.Sets/src/mage/sets/exodus/RavenousBaboons.java +++ b/Mage.Sets/src/mage/sets/exodus/RavenousBaboons.java @@ -48,7 +48,6 @@ public class RavenousBaboons extends CardImpl { this.expansionSetCode = "EXO"; this.subtype.add("Ape"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/exodus/RecurringNightmare.java b/Mage.Sets/src/mage/sets/exodus/RecurringNightmare.java index 2a1cd31bfb5..7b1e7534779 100644 --- a/Mage.Sets/src/mage/sets/exodus/RecurringNightmare.java +++ b/Mage.Sets/src/mage/sets/exodus/RecurringNightmare.java @@ -55,7 +55,6 @@ public class RecurringNightmare extends CardImpl { super(ownerId, 72, "Recurring Nightmare", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "EXO"; - this.color.setBlack(true); // Sacrifice a creature, Return Recurring Nightmare to its owner's hand: Return target creature card from your graveyard to the battlefield. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new SacrificeTargetCost(new TargetControlledPermanent(filter2))); diff --git a/Mage.Sets/src/mage/sets/exodus/SabertoothWyvern.java b/Mage.Sets/src/mage/sets/exodus/SabertoothWyvern.java index 305c752ee72..89eee87707f 100644 --- a/Mage.Sets/src/mage/sets/exodus/SabertoothWyvern.java +++ b/Mage.Sets/src/mage/sets/exodus/SabertoothWyvern.java @@ -46,7 +46,6 @@ public class SabertoothWyvern extends CardImpl { this.expansionSetCode = "EXO"; this.subtype.add("Drake"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/exodus/Scrivener.java b/Mage.Sets/src/mage/sets/exodus/Scrivener.java index b632f8b9874..ad6c2fad0c1 100644 --- a/Mage.Sets/src/mage/sets/exodus/Scrivener.java +++ b/Mage.Sets/src/mage/sets/exodus/Scrivener.java @@ -58,7 +58,6 @@ public class Scrivener 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/exodus/SoltariVisionary.java b/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java index d0e0283a891..6e9b73d8b87 100644 --- a/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java +++ b/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java @@ -56,7 +56,6 @@ public class SoltariVisionary extends CardImpl { this.subtype.add("Soltari"); 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/exodus/SpikeWeaver.java b/Mage.Sets/src/mage/sets/exodus/SpikeWeaver.java index 8fa5b558d84..ce51bc0f197 100644 --- a/Mage.Sets/src/mage/sets/exodus/SpikeWeaver.java +++ b/Mage.Sets/src/mage/sets/exodus/SpikeWeaver.java @@ -57,7 +57,6 @@ public class SpikeWeaver extends CardImpl { this.expansionSetCode = "EXO"; 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/exodus/SurvivalOfTheFittest.java b/Mage.Sets/src/mage/sets/exodus/SurvivalOfTheFittest.java index e65aa4da401..02f9e2d5055 100644 --- a/Mage.Sets/src/mage/sets/exodus/SurvivalOfTheFittest.java +++ b/Mage.Sets/src/mage/sets/exodus/SurvivalOfTheFittest.java @@ -60,7 +60,6 @@ public class SurvivalOfTheFittest extends CardImpl { super(ownerId, 129, "Survival of the Fittest", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "EXO"; - this.color.setGreen(true); // {G}, Discard a creature card: Search your library for a creature card, reveal that card, and put it into your hand. Then shuffle your library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), new ColoredManaCost(ColoredManaSymbol.G)); diff --git a/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs.java b/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs.java index 437fd7c6dea..0b13d1b92df 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs.java +++ b/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs.java @@ -55,7 +55,6 @@ public class BrassclawOrcs extends CardImpl { this.expansionSetCode = "FEM"; this.subtype.add("Orc"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/fallenempires/Derelor.java b/Mage.Sets/src/mage/sets/fallenempires/Derelor.java index 92c58eecddf..177006e55ba 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/Derelor.java +++ b/Mage.Sets/src/mage/sets/fallenempires/Derelor.java @@ -57,7 +57,6 @@ public class Derelor extends CardImpl { this.expansionSetCode = "FEM"; this.subtype.add("Thrull"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums1.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums1.java index fac1d0c2d98..33dd9e2c8aa 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums1.java +++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums1.java @@ -54,7 +54,6 @@ import mage.filter.predicate.permanent.ControllerPredicate; super(ownerId, 118, "Goblin War Drums", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "FEM"; - this.color.setRed(true); // Each creature you control can't be blocked except by two or more creatures. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneAllEffect(2, filter))); diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinWarrens.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinWarrens.java index deb57efe99c..55d3c90f07d 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/GoblinWarrens.java +++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinWarrens.java @@ -53,7 +53,6 @@ public class GoblinWarrens extends CardImpl { super(ownerId, 122, "Goblin Warrens", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "FEM"; - this.color.setRed(true); // {2}{R}, Sacrifice two Goblins: Put three 1/1 red Goblin creature tokens onto the battlefield. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoblinToken(), 3), new ManaCostsImpl("{2}{R}")); diff --git a/Mage.Sets/src/mage/sets/fallenempires/HighTide.java b/Mage.Sets/src/mage/sets/fallenempires/HighTide.java index 73cc0684a8a..e4a947dc8ae 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/HighTide.java +++ b/Mage.Sets/src/mage/sets/fallenempires/HighTide.java @@ -56,7 +56,6 @@ public class HighTide extends CardImpl { super(ownerId, 35, "High Tide", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "FEM"; - this.color.setBlue(true); // Until end of turn, whenever a player taps an Island for mana, that player adds {U} to his or her mana pool. this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new HighTideTriggeredAbility())); diff --git a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java index 2a897dbe2ed..314a045ff79 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java +++ b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java @@ -44,7 +44,6 @@ public class HymnToTourach extends CardImpl { super(ownerId, 12, "Hymn to Tourach", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}{B}"); this.expansionSetCode = "FEM"; - this.color.setBlack(true); // Target player discards two cards at random. this.getSpellAbility().addEffect(new DiscardTargetEffect(2, true)); diff --git a/Mage.Sets/src/mage/sets/fallenempires/IcatianTown.java b/Mage.Sets/src/mage/sets/fallenempires/IcatianTown.java index ece8e53be06..0abb933e8c6 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/IcatianTown.java +++ b/Mage.Sets/src/mage/sets/fallenempires/IcatianTown.java @@ -44,7 +44,6 @@ public class IcatianTown extends CardImpl { super(ownerId, 162, "Icatian Town", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{W}"); this.expansionSetCode = "FEM"; - this.color.setWhite(true); // Put four 1/1 white Citizen creature tokens onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new CitizenToken(), 4)); diff --git a/Mage.Sets/src/mage/sets/fallenempires/NightSoil.java b/Mage.Sets/src/mage/sets/fallenempires/NightSoil.java index 401954b8cc5..aa9118664a2 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/NightSoil.java +++ b/Mage.Sets/src/mage/sets/fallenempires/NightSoil.java @@ -51,7 +51,6 @@ public class NightSoil extends CardImpl { super(ownerId, 80, "Night Soil", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}{G}"); this.expansionSetCode = "FEM"; - this.color.setGreen(true); // {1}, Exile two creature cards from a single graveyard: Put a 1/1 green Saproling creature token onto the battlefield. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java b/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java index 11e8d1a2085..d5e757065c7 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java +++ b/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java @@ -72,7 +72,6 @@ public class Seasinger extends CardImpl { this.expansionSetCode = "FEM"; this.subtype.add("Merfolk"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/fatereforged/ValorousStance.java b/Mage.Sets/src/mage/sets/fatereforged/ValorousStance.java index 105125544ca..ee608d429e0 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/ValorousStance.java +++ b/Mage.Sets/src/mage/sets/fatereforged/ValorousStance.java @@ -57,7 +57,6 @@ public class ValorousStance extends CardImpl { super(ownerId, 28, "Valorous Stance", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "FRF"; - this.color.setWhite(true); //Choose one - Target creature gains Indestructible until end of turn this.getSpellAbility().addEffect(new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/AbunasChant.java b/Mage.Sets/src/mage/sets/fifthdawn/AbunasChant.java index 9f09b0fc591..5f315768946 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/AbunasChant.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/AbunasChant.java @@ -48,7 +48,6 @@ public class AbunasChant extends CardImpl { super(ownerId, 1, "Abuna's Chant", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "5DN"; - this.color.setWhite(true); // Choose one - this.getSpellAbility().getModes().setMinModes(1); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/Acquire.java b/Mage.Sets/src/mage/sets/fifthdawn/Acquire.java index 5e5ef361cc6..2ed36891b4a 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/Acquire.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/Acquire.java @@ -25,7 +25,6 @@ public class Acquire extends CardImpl{ super(ownerId, 21, "Acquire", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}{U}"); this.expansionSetCode = "5DN"; - this.color.setBlue(true); // Search target opponent's library for an artifact card and 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/fifthdawn/AdvancedHoverguard.java b/Mage.Sets/src/mage/sets/fifthdawn/AdvancedHoverguard.java index 560327b89d9..e7a0308548d 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/AdvancedHoverguard.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/AdvancedHoverguard.java @@ -51,7 +51,6 @@ public class AdvancedHoverguard extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Drone"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ArtificersIntuition.java b/Mage.Sets/src/mage/sets/fifthdawn/ArtificersIntuition.java index ccfec8c68f4..60eeba1ed98 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/ArtificersIntuition.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/ArtificersIntuition.java @@ -56,7 +56,6 @@ public class ArtificersIntuition extends CardImpl { super(ownerId, 23, "Artificer's Intuition", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "5DN"; - this.color.setBlue(true); // {U}, Discard an artifact card: Search your library for an artifact card with converted mana cost 1 or less, reveal that card, and put it into your hand. Then shuffle your library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), new ManaCostsImpl("{U}")); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/AuriokChampion.java b/Mage.Sets/src/mage/sets/fifthdawn/AuriokChampion.java index 212e3f8fb70..88c944a4514 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/AuriokChampion.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/AuriokChampion.java @@ -58,7 +58,6 @@ public class AuriokChampion 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/fifthdawn/BeaconOfCreation.java b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfCreation.java index eae11f5deef..a930cc1710d 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfCreation.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfCreation.java @@ -54,7 +54,6 @@ public class BeaconOfCreation extends CardImpl { super(ownerId, 82, "Beacon of Creation", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "5DN"; - this.color.setGreen(true); // Put a 1/1 green Insect creature token onto the battlefield for each Forest you control. this.getSpellAbility().addEffect(new CreateTokenEffect(new InsectToken(), new PermanentsOnBattlefieldCount(filter))); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfTomorrows.java b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfTomorrows.java index fd482505c6f..e06710bb109 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfTomorrows.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfTomorrows.java @@ -49,7 +49,6 @@ public class BeaconOfTomorrows extends CardImpl { super(ownerId, 24, "Beacon of Tomorrows", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{6}{U}{U}"); this.expansionSetCode = "5DN"; - this.color.setBlue(true); // Target player takes an extra turn after this one. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BlindCreeper.java b/Mage.Sets/src/mage/sets/fifthdawn/BlindCreeper.java index 68ff6326dce..19991829197 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BlindCreeper.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BlindCreeper.java @@ -53,7 +53,6 @@ public class BlindCreeper extends CardImpl { this.subtype.add("Zombie"); 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/fifthdawn/BlinkmothInfusion.java b/Mage.Sets/src/mage/sets/fifthdawn/BlinkmothInfusion.java index 474ce94bd28..85723c08a33 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BlinkmothInfusion.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BlinkmothInfusion.java @@ -50,7 +50,6 @@ public class BlinkmothInfusion extends CardImpl { super(ownerId, 25, "Blinkmoth Infusion", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{12}{U}{U}"); this.expansionSetCode = "5DN"; - this.color.setBlue(true); // Affinity for artifacts this.addAbility(new AffinityForArtifactsAbility()); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheBlackDawn.java b/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheBlackDawn.java index 6ffc6c2247a..aa55e3ba2b5 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheBlackDawn.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheBlackDawn.java @@ -55,7 +55,6 @@ public class BringerOfTheBlackDawn extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Bringer"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheBlueDawn.java b/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheBlueDawn.java index 89a815ebf8a..28e87c46299 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheBlueDawn.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheBlueDawn.java @@ -52,7 +52,6 @@ public class BringerOfTheBlueDawn extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Bringer"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheGreenDawn.java b/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheGreenDawn.java index fbdc5201e98..2bd7b7f8b7c 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheGreenDawn.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheGreenDawn.java @@ -53,7 +53,6 @@ public class BringerOfTheGreenDawn extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Bringer"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheRedDawn.java b/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheRedDawn.java index ea9d95be380..db096b018c2 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheRedDawn.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheRedDawn.java @@ -58,7 +58,6 @@ public class BringerOfTheRedDawn extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Bringer"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheWhiteDawn.java b/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheWhiteDawn.java index f4a56e5715a..1bca82995e4 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheWhiteDawn.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BringerOfTheWhiteDawn.java @@ -55,7 +55,6 @@ public class BringerOfTheWhiteDawn extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Bringer"); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ChannelTheSuns.java b/Mage.Sets/src/mage/sets/fifthdawn/ChannelTheSuns.java index d90476041b5..099b9cb6203 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/ChannelTheSuns.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/ChannelTheSuns.java @@ -46,7 +46,6 @@ public class ChannelTheSuns extends CardImpl { super(ownerId, 84, "Channel the Suns", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "5DN"; - this.color.setGreen(true); // Add {W}{U}{B}{R}{G} to your mana pool. Effect effect = new AddManaToManaPoolSourceControllerEffect(new Mana(1, 1, 1, 1, 1, 0, 0)); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/Condescend.java b/Mage.Sets/src/mage/sets/fifthdawn/Condescend.java index 351af3057cd..bfa496d612b 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/Condescend.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/Condescend.java @@ -46,7 +46,6 @@ public class Condescend extends CardImpl { super(ownerId, 27, "Condescend", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{X}{U}"); this.expansionSetCode = "5DN"; - this.color.setBlue(true); // Counter target spell unless its controller pays {X}. this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new ManacostVariableValue())); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/CosmicLarva.java b/Mage.Sets/src/mage/sets/fifthdawn/CosmicLarva.java index 9a5c5d9b662..d903064e8bf 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/CosmicLarva.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/CosmicLarva.java @@ -51,7 +51,6 @@ public class CosmicLarva extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(7); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/DawnsReflection.java b/Mage.Sets/src/mage/sets/fifthdawn/DawnsReflection.java index c499b810fab..88c61fc57d8 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/DawnsReflection.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/DawnsReflection.java @@ -58,7 +58,6 @@ public class DawnsReflection extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/DesecrationElemental.java b/Mage.Sets/src/mage/sets/fifthdawn/DesecrationElemental.java index ab6a98aea92..7c73ab5888b 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/DesecrationElemental.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/DesecrationElemental.java @@ -48,7 +48,6 @@ public class DesecrationElemental extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Elemental"); - this.color.setBlack(true); this.power = new MageInt(8); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/DevourInShadow.java b/Mage.Sets/src/mage/sets/fifthdawn/DevourInShadow.java index 6f67fd0772c..9adc25d11d4 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/DevourInShadow.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/DevourInShadow.java @@ -50,7 +50,6 @@ public class DevourInShadow extends CardImpl { super(ownerId, 46, "Devour in Shadow", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{B}{B}"); this.expansionSetCode = "5DN"; - this.color.setBlack(true); // Destroy target creature. It can't be regenerated. You lose life equal to that creature's toughness. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/EarlyFrost.java b/Mage.Sets/src/mage/sets/fifthdawn/EarlyFrost.java index eeda26cb2a0..24bc0117848 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/EarlyFrost.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/EarlyFrost.java @@ -45,7 +45,6 @@ public class EarlyFrost extends CardImpl { super(ownerId, 29, "Early Frost", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "5DN"; - this.color.setBlue(true); // Tap up to three target lands. this.getSpellAbility().addEffect(new TapTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/EbonDrake.java b/Mage.Sets/src/mage/sets/fifthdawn/EbonDrake.java index 2fb13963c84..18c7861351f 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/EbonDrake.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/EbonDrake.java @@ -47,7 +47,6 @@ public class EbonDrake extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Drake"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/EndlessWhispers.java b/Mage.Sets/src/mage/sets/fifthdawn/EndlessWhispers.java index 6eabc60d74b..df557686aee 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/EndlessWhispers.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/EndlessWhispers.java @@ -59,7 +59,6 @@ public class EndlessWhispers extends CardImpl { super(ownerId, 49, "Endless Whispers", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "5DN"; - this.color.setBlack(true); // Each creature has "When this creature dies, choose target opponent. That player puts this card from its owner's graveyard onto the battlefield under his or her control at the beginning of the next end step." DelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new ReturnSourceToBattlefieldEffect()); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/EternalWitness.java b/Mage.Sets/src/mage/sets/fifthdawn/EternalWitness.java index 0ba9873fa86..8f51deec8d1 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/EternalWitness.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/EternalWitness.java @@ -49,7 +49,6 @@ public class EternalWitness extends CardImpl { this.subtype.add("Human"); 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/fifthdawn/EyesOfTheWatcher.java b/Mage.Sets/src/mage/sets/fifthdawn/EyesOfTheWatcher.java index 1942ad14b6a..e6ae262edfd 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/EyesOfTheWatcher.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/EyesOfTheWatcher.java @@ -54,7 +54,6 @@ public class EyesOfTheWatcher extends CardImpl { super(ownerId, 30, "Eyes of the Watcher", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "5DN"; - this.color.setBlue(true); // Whenever you cast an instant or sorcery spell, you may pay {1}. If you do, scry 2. this.addAbility(new SpellCastControllerTriggeredAbility(new DoIfCostPaid(new ScryEffect(2), new ManaCostsImpl("{1}")), filter, true)); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/FangrenPathcutter.java b/Mage.Sets/src/mage/sets/fifthdawn/FangrenPathcutter.java index 2cc9e33befa..9d84889faac 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/FangrenPathcutter.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/FangrenPathcutter.java @@ -49,7 +49,6 @@ public class FangrenPathcutter extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/FeedbackBolt.java b/Mage.Sets/src/mage/sets/fifthdawn/FeedbackBolt.java index 75b0e295975..8845015553a 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/FeedbackBolt.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/FeedbackBolt.java @@ -47,7 +47,6 @@ public class FeedbackBolt extends CardImpl { super(ownerId, 64, "Feedback Bolt", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{R}"); this.expansionSetCode = "5DN"; - this.color.setRed(true); // Feedback Bolt deals damage to target player equal to the number of artifacts you control. Effect effect = new DamageTargetEffect(new PermanentsOnBattlefieldCount(new FilterControlledArtifactPermanent())); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/FerociousCharge.java b/Mage.Sets/src/mage/sets/fifthdawn/FerociousCharge.java index c4533ac952c..0c9ddf0d200 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/FerociousCharge.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/FerociousCharge.java @@ -46,7 +46,6 @@ public class FerociousCharge extends CardImpl { super(ownerId, 88, "Ferocious Charge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "5DN"; - 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/fifthdawn/FillWithFright.java b/Mage.Sets/src/mage/sets/fifthdawn/FillWithFright.java index d6a297af54b..dc4d8f8ba06 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/FillWithFright.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/FillWithFright.java @@ -45,7 +45,6 @@ public class FillWithFright extends CardImpl { super(ownerId, 50, "Fill with Fright", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "5DN"; - this.color.setBlack(true); // Target player discards two cards. this.getSpellAbility().addEffect(new DiscardTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/Fleshgrafter.java b/Mage.Sets/src/mage/sets/fifthdawn/Fleshgrafter.java index ebe5a54e95d..ffe48eedf3f 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/Fleshgrafter.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/Fleshgrafter.java @@ -51,7 +51,6 @@ public class Fleshgrafter extends CardImpl { this.subtype.add("Human"); 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/fifthdawn/FoldIntoAEther.java b/Mage.Sets/src/mage/sets/fifthdawn/FoldIntoAEther.java index 81f1bb56af6..5304727f9c0 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/FoldIntoAEther.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/FoldIntoAEther.java @@ -53,7 +53,6 @@ public class FoldIntoAEther extends CardImpl { super(ownerId, 31, "Fold into AEther", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); this.expansionSetCode = "5DN"; - this.color.setBlue(true); // Counter target spell. If that spell is countered this way, its controller may put a creature card from his or her hand onto the battlefield. this.getSpellAbility().addEffect(new FoldIntoAEtherEffect()); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/GoblinBrawler.java b/Mage.Sets/src/mage/sets/fifthdawn/GoblinBrawler.java index a0d40241217..3dffc7e3c9e 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/GoblinBrawler.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/GoblinBrawler.java @@ -56,7 +56,6 @@ public class GoblinBrawler 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/fifthdawn/Granulate.java b/Mage.Sets/src/mage/sets/fifthdawn/Granulate.java index 2becf4247c1..abb35be6dda 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/Granulate.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/Granulate.java @@ -52,7 +52,6 @@ public class Granulate extends CardImpl { super(ownerId, 67, "Granulate", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); this.expansionSetCode = "5DN"; - this.color.setRed(true); // Destroy each nonland artifact with converted mana cost 4 or less. this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/HoverguardSweepers.java b/Mage.Sets/src/mage/sets/fifthdawn/HoverguardSweepers.java index d27cbafa895..3d36d44fd0f 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/HoverguardSweepers.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/HoverguardSweepers.java @@ -49,7 +49,6 @@ public class HoverguardSweepers extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Drone"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/IntoThinAir.java b/Mage.Sets/src/mage/sets/fifthdawn/IntoThinAir.java index cda0b480a44..17ed5da2d13 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/IntoThinAir.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/IntoThinAir.java @@ -45,7 +45,6 @@ public class IntoThinAir extends CardImpl { super(ownerId, 33, "Into Thin Air", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{5}{U}"); this.expansionSetCode = "5DN"; - this.color.setBlue(true); // Affinity for artifacts this.addAbility(new AffinityForArtifactsAbility()); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/IonStorm.java b/Mage.Sets/src/mage/sets/fifthdawn/IonStorm.java index c5089eb5966..e2f86016bea 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/IonStorm.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/IonStorm.java @@ -52,7 +52,6 @@ public class IonStorm extends CardImpl { super(ownerId, 68, "Ion Storm", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "5DN"; - this.color.setRed(true); // {1}{R}, Remove a +1/+1 counter or a charge counter from a permanent you control: Ion Storm deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}")); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/IronBarbHellion.java b/Mage.Sets/src/mage/sets/fifthdawn/IronBarbHellion.java index 514e50b39e1..a4eb26ce3a1 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/IronBarbHellion.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/IronBarbHellion.java @@ -47,7 +47,6 @@ public class IronBarbHellion extends CardImpl { this.subtype.add("Hellion"); 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/fifthdawn/KrarkClanOgre.java b/Mage.Sets/src/mage/sets/fifthdawn/KrarkClanOgre.java index 2ffe0c13884..0ac4ee94d09 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/KrarkClanOgre.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/KrarkClanOgre.java @@ -54,7 +54,6 @@ public class KrarkClanOgre extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Ogre"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/LoseHope.java b/Mage.Sets/src/mage/sets/fifthdawn/LoseHope.java index 0d874b99e7a..e63ed0fc126 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/LoseHope.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/LoseHope.java @@ -46,7 +46,6 @@ public class LoseHope extends CardImpl { super(ownerId, 52, "Lose Hope", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "5DN"; - 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/fifthdawn/LoxodonAnchorite.java b/Mage.Sets/src/mage/sets/fifthdawn/LoxodonAnchorite.java index 1fe57e72d73..9b0d10a314a 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/LoxodonAnchorite.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/LoxodonAnchorite.java @@ -53,7 +53,6 @@ public class LoxodonAnchorite extends CardImpl { this.subtype.add("Elephant"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/LoxodonStalwart.java b/Mage.Sets/src/mage/sets/fifthdawn/LoxodonStalwart.java index 6a3e4877871..15852d85c77 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/LoxodonStalwart.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/LoxodonStalwart.java @@ -51,7 +51,6 @@ public class LoxodonStalwart extends CardImpl { this.subtype.add("Elephant"); 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/fifthdawn/MagmaJet.java b/Mage.Sets/src/mage/sets/fifthdawn/MagmaJet.java index aef67810d0b..ed02fdab3d1 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/MagmaJet.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/MagmaJet.java @@ -45,7 +45,6 @@ public class MagmaJet extends CardImpl { super(ownerId, 73, "Magma Jet", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "5DN"; - this.color.setRed(true); // Magma Jet deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/MagneticTheft.java b/Mage.Sets/src/mage/sets/fifthdawn/MagneticTheft.java index 2ef1a60e9ec..613dbe9b47f 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/MagneticTheft.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/MagneticTheft.java @@ -63,7 +63,6 @@ public class MagneticTheft extends CardImpl { super(ownerId, 74, "Magnetic Theft", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "5DN"; - this.color.setRed(true); // Attach target Equipment to target creature. this.getSpellAbility().addEffect(new EquipEffect()); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/MephidrossVampire.java b/Mage.Sets/src/mage/sets/fifthdawn/MephidrossVampire.java index 1ed594ecb48..b50baa54517 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/MephidrossVampire.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/MephidrossVampire.java @@ -65,7 +65,6 @@ public class MephidrossVampire extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Vampire"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/MoriokRigger.java b/Mage.Sets/src/mage/sets/fifthdawn/MoriokRigger.java index e504bf17ab2..2db73598cba 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/MoriokRigger.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/MoriokRigger.java @@ -52,7 +52,6 @@ public class MoriokRigger extends CardImpl { this.subtype.add("Rogue"); this.subtype.add("Rigger"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/NightsWhisper.java b/Mage.Sets/src/mage/sets/fifthdawn/NightsWhisper.java index b0bb43099fa..a3cd1b16914 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/NightsWhisper.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/NightsWhisper.java @@ -44,7 +44,6 @@ public class NightsWhisper extends CardImpl { super(ownerId, 55, "Night's Whisper", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "5DN"; - this.color.setBlack(true); // You draw two cards and you lose 2 life. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/NimGrotesque.java b/Mage.Sets/src/mage/sets/fifthdawn/NimGrotesque.java index 31715ec276c..4a05cbe3c7d 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/NimGrotesque.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/NimGrotesque.java @@ -51,7 +51,6 @@ public class NimGrotesque extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/PlasmaElemental.java b/Mage.Sets/src/mage/sets/fifthdawn/PlasmaElemental.java index 3f12fa5ed43..74f88715a9e 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/PlasmaElemental.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/PlasmaElemental.java @@ -47,7 +47,6 @@ public class PlasmaElemental extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/PlungeIntoDarkness.java b/Mage.Sets/src/mage/sets/fifthdawn/PlungeIntoDarkness.java index 9e7d3e16202..8e3b700106f 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/PlungeIntoDarkness.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/PlungeIntoDarkness.java @@ -61,7 +61,6 @@ public class PlungeIntoDarkness extends CardImpl { super(ownerId, 57, "Plunge into Darkness", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "5DN"; - this.color.setBlack(true); // Choose one - this.getSpellAbility().getModes().setMinModes(1); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/RainOfRust.java b/Mage.Sets/src/mage/sets/fifthdawn/RainOfRust.java index 09696f31726..ad28ada69ed 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/RainOfRust.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/RainOfRust.java @@ -47,7 +47,6 @@ public class RainOfRust extends CardImpl { super(ownerId, 76, "Rain of Rust", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{R}{R}"); this.expansionSetCode = "5DN"; - this.color.setRed(true); // Choose one - this.getSpellAbility().getModes().setMinModes(1); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ReversalOfFortune.java b/Mage.Sets/src/mage/sets/fifthdawn/ReversalOfFortune.java index c3ee9637b51..05a49050c48 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/ReversalOfFortune.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/ReversalOfFortune.java @@ -54,7 +54,6 @@ public class ReversalOfFortune extends CardImpl { super(ownerId, 77, "Reversal of Fortune", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{R}{R}"); this.expansionSetCode = "5DN"; - this.color.setRed(true); // Target opponent reveals his or her hand. You may copy an instant or sorcery card in it. If you do, you may cast the copy without paying its mana cost. this.getSpellAbility().addEffect(new ReversalOfFortuneEffect()); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/RiteOfPassage.java b/Mage.Sets/src/mage/sets/fifthdawn/RiteOfPassage.java index f0d776674df..b67288d2365 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/RiteOfPassage.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/RiteOfPassage.java @@ -52,7 +52,6 @@ public class RiteOfPassage extends CardImpl { super(ownerId, 91, "Rite of Passage", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "5DN"; - this.color.setGreen(true); // Whenever a creature you control is dealt damage, put a +1/+1 counter on it. Effect effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance()); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ScreamingFury.java b/Mage.Sets/src/mage/sets/fifthdawn/ScreamingFury.java index 0366bf8bf6c..f88eade9fa0 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/ScreamingFury.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/ScreamingFury.java @@ -48,7 +48,6 @@ public class ScreamingFury extends CardImpl { super(ownerId, 78, "Screaming Fury", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "5DN"; - this.color.setRed(true); // Target creature gets +5/+0 and gains haste until end of turn. Effect effect = new BoostTargetEffect(5,0, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/SerumVisions.java b/Mage.Sets/src/mage/sets/fifthdawn/SerumVisions.java index 2f671251d32..107673f0943 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/SerumVisions.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/SerumVisions.java @@ -44,7 +44,6 @@ public class SerumVisions extends CardImpl { super(ownerId, 36, "Serum Visions", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}"); this.expansionSetCode = "5DN"; - this.color.setBlue(true); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ShatteredDreams.java b/Mage.Sets/src/mage/sets/fifthdawn/ShatteredDreams.java index 5874c7a6e7f..508f7c4c398 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/ShatteredDreams.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/ShatteredDreams.java @@ -51,7 +51,6 @@ public class ShatteredDreams extends CardImpl { super(ownerId, 59, "Shattered Dreams", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "5DN"; - this.color.setBlack(true); // Target opponent reveals his or her hand. You choose an artifact card from it. That player discards that card. this.getSpellAbility().addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/StandFirm.java b/Mage.Sets/src/mage/sets/fifthdawn/StandFirm.java index 5bccfdab746..aa2c9fb1c6e 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/StandFirm.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/StandFirm.java @@ -46,7 +46,6 @@ public class StandFirm extends CardImpl { super(ownerId, 17, "Stand Firm", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "5DN"; - this.color.setWhite(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/fifthdawn/SteelshapersGift.java b/Mage.Sets/src/mage/sets/fifthdawn/SteelshapersGift.java index 68538a4fe91..98094d69f33 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/SteelshapersGift.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/SteelshapersGift.java @@ -54,7 +54,6 @@ public class SteelshapersGift extends CardImpl { super(ownerId, 19, "Steelshaper's Gift", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{W}"); this.expansionSetCode = "5DN"; - this.color.setWhite(true); // Search your library for an Equipment 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/fifthdawn/SylvokExplorer.java b/Mage.Sets/src/mage/sets/fifthdawn/SylvokExplorer.java index 4b46ca9bc01..0db79cfb655 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/SylvokExplorer.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/SylvokExplorer.java @@ -46,7 +46,6 @@ public class SylvokExplorer 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/fifthdawn/TelJiladJustice.java b/Mage.Sets/src/mage/sets/fifthdawn/TelJiladJustice.java index 51f537a5d97..37cfafa7776 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/TelJiladJustice.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/TelJiladJustice.java @@ -45,7 +45,6 @@ public class TelJiladJustice extends CardImpl { super(ownerId, 95, "Tel-Jilad Justice", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "5DN"; - this.color.setGreen(true); // Destroy target artifact. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/TelJiladLifebreather.java b/Mage.Sets/src/mage/sets/fifthdawn/TelJiladLifebreather.java index 0431c6b9696..df7db9a9437 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/TelJiladLifebreather.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/TelJiladLifebreather.java @@ -61,7 +61,6 @@ public class TelJiladLifebreather extends CardImpl { this.subtype.add("Troll"); 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/fifthdawn/TornadoElemental.java b/Mage.Sets/src/mage/sets/fifthdawn/TornadoElemental.java index c47cc08b14a..039445a1e5e 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/TornadoElemental.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/TornadoElemental.java @@ -56,7 +56,6 @@ public class TornadoElemental extends CardImpl { this.expansionSetCode = "5DN"; this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/Tyrranax.java b/Mage.Sets/src/mage/sets/fifthdawn/Tyrranax.java index 4471a6c8e42..880a5303232 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/Tyrranax.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/Tyrranax.java @@ -49,7 +49,6 @@ public class Tyrranax extends CardImpl { this.expansionSetCode = "5DN"; 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/fifthdawn/Vanquish.java b/Mage.Sets/src/mage/sets/fifthdawn/Vanquish.java index 805f243fe42..875ab6abcff 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/Vanquish.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/Vanquish.java @@ -45,7 +45,6 @@ public class Vanquish extends CardImpl { super(ownerId, 20, "Vanquish", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "5DN"; - this.color.setWhite(true); // Destroy target blocking creature. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ViciousBetrayal.java b/Mage.Sets/src/mage/sets/fifthdawn/ViciousBetrayal.java index ec212ffbf3e..07660ba4168 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/ViciousBetrayal.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/ViciousBetrayal.java @@ -52,7 +52,6 @@ public class ViciousBetrayal extends CardImpl { super(ownerId, 60, "Vicious Betrayal", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "5DN"; - this.color.setBlack(true); // As an additional cost to cast Vicious Betrayal, sacrifice any number of creatures. this.getSpellAbility().addCost(new SacrificeXTargetCost(new FilterControlledCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ViridianLorebearers.java b/Mage.Sets/src/mage/sets/fifthdawn/ViridianLorebearers.java index d835eb4ed85..03248a8be73 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/ViridianLorebearers.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/ViridianLorebearers.java @@ -62,7 +62,6 @@ public class ViridianLorebearers extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ViridianScout.java b/Mage.Sets/src/mage/sets/fifthdawn/ViridianScout.java index b51d6eae2da..32ee057d2a1 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/ViridianScout.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/ViridianScout.java @@ -60,7 +60,6 @@ public class ViridianScout extends CardImpl { this.subtype.add("Warrior"); 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/fifthdawn/VulshokSorcerer.java b/Mage.Sets/src/mage/sets/fifthdawn/VulshokSorcerer.java index f1d6d220056..81ee22adcef 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/VulshokSorcerer.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/VulshokSorcerer.java @@ -53,7 +53,6 @@ public class VulshokSorcerer 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/fifthedition/AbyssalSpecter.java b/Mage.Sets/src/mage/sets/fifthedition/AbyssalSpecter.java index 1a41502a059..a9d7c1ecab1 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/AbyssalSpecter.java +++ b/Mage.Sets/src/mage/sets/fifthedition/AbyssalSpecter.java @@ -47,7 +47,6 @@ public class AbyssalSpecter extends CardImpl { this.expansionSetCode = "5ED"; this.subtype.add("Specter"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/fifthedition/AmbushParty.java b/Mage.Sets/src/mage/sets/fifthedition/AmbushParty.java index e76e1a3c321..4f8e35af9d0 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/AmbushParty.java +++ b/Mage.Sets/src/mage/sets/fifthedition/AmbushParty.java @@ -47,7 +47,6 @@ public class AmbushParty extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/fifthedition/Armageddon.java b/Mage.Sets/src/mage/sets/fifthedition/Armageddon.java index 55edaeed007..9b51767989c 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Armageddon.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Armageddon.java @@ -44,7 +44,6 @@ public class Armageddon extends CardImpl { super(ownerId, 283, "Armageddon", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{W}"); this.expansionSetCode = "5ED"; - this.color.setWhite(true); // Destroy all lands. this.getSpellAbility().addEffect(new DestroyAllEffect(new FilterLandPermanent("lands"))); diff --git a/Mage.Sets/src/mage/sets/fifthedition/AshesToAshes.java b/Mage.Sets/src/mage/sets/fifthedition/AshesToAshes.java index 56e2387b8af..ad5cc9c5ee8 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/AshesToAshes.java +++ b/Mage.Sets/src/mage/sets/fifthedition/AshesToAshes.java @@ -59,7 +59,6 @@ public class AshesToAshes extends CardImpl { super(ownerId, 3, "Ashes to Ashes", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{B}{B}"); this.expansionSetCode = "5ED"; - this.color.setBlack(true); // Exile two target nonartifact creatures. Ashes to Ashes deals 5 damage to you. this.getSpellAbility().addEffect(new AshesToAshesEffect()); diff --git a/Mage.Sets/src/mage/sets/fifthedition/BadMoon.java b/Mage.Sets/src/mage/sets/fifthedition/BadMoon.java index 1755e28099c..2665e8fc353 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/BadMoon.java +++ b/Mage.Sets/src/mage/sets/fifthedition/BadMoon.java @@ -56,7 +56,6 @@ public class BadMoon extends CardImpl { super(ownerId, 4, "Bad Moon", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "5ED"; - this.color.setBlack(true); // Black creatures get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/sets/fifthedition/BirdMaiden.java b/Mage.Sets/src/mage/sets/fifthedition/BirdMaiden.java index 89ed7325623..e93c1dbc129 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/BirdMaiden.java +++ b/Mage.Sets/src/mage/sets/fifthedition/BirdMaiden.java @@ -46,7 +46,6 @@ public class BirdMaiden extends CardImpl { this.subtype.add("Human"); this.subtype.add("Bird"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/fifthedition/Blight.java b/Mage.Sets/src/mage/sets/fifthedition/Blight.java index f82cbc6419a..252c62715a6 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Blight.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Blight.java @@ -58,7 +58,6 @@ public class Blight extends CardImpl { this.expansionSetCode = "5ED"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/fifthedition/BogImp.java b/Mage.Sets/src/mage/sets/fifthedition/BogImp.java index 4edd3070f17..4e533ab0958 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/BogImp.java +++ b/Mage.Sets/src/mage/sets/fifthedition/BogImp.java @@ -45,7 +45,6 @@ public class BogImp extends CardImpl { this.expansionSetCode = "5ED"; 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/fifthedition/Brainstorm.java b/Mage.Sets/src/mage/sets/fifthedition/Brainstorm.java index a45bdfc2fb2..678b22f41fa 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Brainstorm.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Brainstorm.java @@ -50,7 +50,6 @@ public class Brainstorm extends CardImpl { super(ownerId, 76, "Brainstorm", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "5ED"; - this.color.setBlue(true); // Draw three cards, then put two cards from your hand on top of your library in any order. this.getSpellAbility().addEffect(new BrainstormEffect()); diff --git a/Mage.Sets/src/mage/sets/fifthedition/BreedingPit.java b/Mage.Sets/src/mage/sets/fifthedition/BreedingPit.java index 86e4aa0bb6a..d1d5f391e6f 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/BreedingPit.java +++ b/Mage.Sets/src/mage/sets/fifthedition/BreedingPit.java @@ -52,7 +52,6 @@ public class BreedingPit extends CardImpl { super(ownerId, 10, "Breeding Pit", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}"); this.expansionSetCode = "5ED"; - this.color.setBlack(true); // At the beginning of your upkeep, sacrifice Breeding Pit unless you pay {B}{B}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{B}{B}")), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/fifthedition/CatWarriors.java b/Mage.Sets/src/mage/sets/fifthedition/CatWarriors.java index b99e1063059..cb8e12452e5 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/CatWarriors.java +++ b/Mage.Sets/src/mage/sets/fifthedition/CatWarriors.java @@ -46,7 +46,6 @@ public class CatWarriors extends CardImpl { this.subtype.add("Cat"); 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/fifthedition/DAvenantArcher.java b/Mage.Sets/src/mage/sets/fifthedition/DAvenantArcher.java index 5ba4e1ed0e0..a843506dcfb 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/DAvenantArcher.java +++ b/Mage.Sets/src/mage/sets/fifthedition/DAvenantArcher.java @@ -52,7 +52,6 @@ public class DAvenantArcher extends CardImpl { this.subtype.add("Soldier"); this.subtype.add("Archer"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/fifthedition/Dandan.java b/Mage.Sets/src/mage/sets/fifthedition/Dandan.java index e4bdaeb606c..4d901bd4eee 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Dandan.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Dandan.java @@ -52,7 +52,6 @@ public class Dandan extends CardImpl { this.expansionSetCode = "5ED"; this.subtype.add("Fish"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/fifthedition/DivineTransformation.java b/Mage.Sets/src/mage/sets/fifthedition/DivineTransformation.java index 83130f23778..edfdba68339 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/DivineTransformation.java +++ b/Mage.Sets/src/mage/sets/fifthedition/DivineTransformation.java @@ -53,7 +53,6 @@ public class DivineTransformation extends CardImpl { this.expansionSetCode = "5ED"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/fifthedition/DurkwoodBoars.java b/Mage.Sets/src/mage/sets/fifthedition/DurkwoodBoars.java index fc6a50c7684..b455d746614 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/DurkwoodBoars.java +++ b/Mage.Sets/src/mage/sets/fifthedition/DurkwoodBoars.java @@ -44,7 +44,6 @@ public class DurkwoodBoars extends CardImpl { this.expansionSetCode = "5ED"; this.subtype.add("Boar"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/fifthedition/ElvishArchers.java b/Mage.Sets/src/mage/sets/fifthedition/ElvishArchers.java index b8442de7e16..7fb371b92f7 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/ElvishArchers.java +++ b/Mage.Sets/src/mage/sets/fifthedition/ElvishArchers.java @@ -46,7 +46,6 @@ public class ElvishArchers extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Archer"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/fifthedition/Flashfires.java b/Mage.Sets/src/mage/sets/fifthedition/Flashfires.java index 2c6206a8bd3..3132935836e 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Flashfires.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Flashfires.java @@ -51,7 +51,6 @@ public class Flashfires extends CardImpl { super(ownerId, 231, "Flashfires", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "5ED"; - this.color.setRed(true); // Destroy all Plains. this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/fifthedition/GlacialWall.java b/Mage.Sets/src/mage/sets/fifthedition/GlacialWall.java index ea607586202..9478de0d65e 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/GlacialWall.java +++ b/Mage.Sets/src/mage/sets/fifthedition/GlacialWall.java @@ -45,7 +45,6 @@ public class GlacialWall extends CardImpl { this.expansionSetCode = "5ED"; this.subtype.add("Wall"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/fifthedition/GoblinHero.java b/Mage.Sets/src/mage/sets/fifthedition/GoblinHero.java index c867805a216..aa30b87ceab 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/GoblinHero.java +++ b/Mage.Sets/src/mage/sets/fifthedition/GoblinHero.java @@ -44,7 +44,6 @@ public class GoblinHero extends CardImpl { this.expansionSetCode = "5ED"; 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/fifthedition/HurkylsRecall.java b/Mage.Sets/src/mage/sets/fifthedition/HurkylsRecall.java index 379419157b6..949651b181f 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/HurkylsRecall.java +++ b/Mage.Sets/src/mage/sets/fifthedition/HurkylsRecall.java @@ -51,7 +51,6 @@ public class HurkylsRecall extends CardImpl { super(ownerId, 93, "Hurkyl's Recall", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "5ED"; - this.color.setBlue(true); // Return all artifacts target player owns to his or her hand. this.getSpellAbility().addEffect(new HurkylsRecallReturnToHandEffect()); diff --git a/Mage.Sets/src/mage/sets/fifthedition/HurloonMinotaur.java b/Mage.Sets/src/mage/sets/fifthedition/HurloonMinotaur.java index b7621345674..f4d54b7e8b4 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/HurloonMinotaur.java +++ b/Mage.Sets/src/mage/sets/fifthedition/HurloonMinotaur.java @@ -44,7 +44,6 @@ public class HurloonMinotaur extends CardImpl { this.expansionSetCode = "5ED"; 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/fifthedition/Hydroblast.java b/Mage.Sets/src/mage/sets/fifthedition/Hydroblast.java index c1e95e43791..fbc117f5c72 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Hydroblast.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Hydroblast.java @@ -50,7 +50,6 @@ public class Hydroblast extends CardImpl { super(ownerId, 94, "Hydroblast", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "5ED"; - this.color.setBlue(true); // Choose one - Counter target spell if it's red; this.getSpellAbility().addEffect(new HydroblastCounterEffect()); diff --git a/Mage.Sets/src/mage/sets/fifthedition/IronrootTreefolk.java b/Mage.Sets/src/mage/sets/fifthedition/IronrootTreefolk.java index 26f3535c005..e5cd21d92ff 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/IronrootTreefolk.java +++ b/Mage.Sets/src/mage/sets/fifthedition/IronrootTreefolk.java @@ -44,7 +44,6 @@ public class IronrootTreefolk extends CardImpl { this.expansionSetCode = "5ED"; this.subtype.add("Treefolk"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/fifthedition/Justice.java b/Mage.Sets/src/mage/sets/fifthedition/Justice.java index dd6723c4017..ff880f4384c 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Justice.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Justice.java @@ -56,7 +56,6 @@ public class Justice extends CardImpl { super(ownerId, 317, "Justice", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "5ED"; - this.color.setWhite(true); // At the beginning of your upkeep, sacrifice Justice unless you pay {W}{W}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{W}{W}")), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/fifthedition/Juxtapose.java b/Mage.Sets/src/mage/sets/fifthedition/Juxtapose.java index 15f44e23240..815a5bdab55 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Juxtapose.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Juxtapose.java @@ -67,7 +67,6 @@ public class Juxtapose extends CardImpl { super(ownerId, 95, "Juxtapose", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "5ED"; - this.color.setBlue(true); // You and target player exchange control of the creature you each control with the highest converted mana cost. Then exchange control of artifacts the same way. If two or more permanents a player controls are tied for highest cost, their controller chooses one of them. this.getSpellAbility().addEffect(new JuxtaposeEffect(new FilterCreaturePermanent(), "You and target player exchange control of the creature you each control with the highest converted mana cost.")); diff --git a/Mage.Sets/src/mage/sets/fifthedition/Karma.java b/Mage.Sets/src/mage/sets/fifthedition/Karma.java index b889bed4457..12d29940f28 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Karma.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Karma.java @@ -56,7 +56,6 @@ public class Karma extends CardImpl { super(ownerId, 318, "Karma", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "5ED"; - this.color.setWhite(true); // At the beginning of each player's upkeep, Karma deals damage to that player equal to the number of Swamps he or she controls. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new KarmaDamageTargetEffect(), TargetController.ANY, false)); diff --git a/Mage.Sets/src/mage/sets/fifthedition/Kismet.java b/Mage.Sets/src/mage/sets/fifthedition/Kismet.java index 59c1824e3e3..3dfb9ed242a 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Kismet.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Kismet.java @@ -51,7 +51,6 @@ public class Kismet extends CardImpl { super(ownerId, 319, "Kismet", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "5ED"; - this.color.setWhite(true); // Artifacts, creatures, and lands played by your opponents enter the battlefield tapped. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KismetEffect())); diff --git a/Mage.Sets/src/mage/sets/fifthedition/LordOfAtlantis.java b/Mage.Sets/src/mage/sets/fifthedition/LordOfAtlantis.java index 39c7411ad9d..673169cd756 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/LordOfAtlantis.java +++ b/Mage.Sets/src/mage/sets/fifthedition/LordOfAtlantis.java @@ -60,7 +60,6 @@ public class LordOfAtlantis extends CardImpl { this.expansionSetCode = "5ED"; 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/fifthedition/LostSoul.java b/Mage.Sets/src/mage/sets/fifthedition/LostSoul.java index 9da3506bcb7..d362665b6e5 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/LostSoul.java +++ b/Mage.Sets/src/mage/sets/fifthedition/LostSoul.java @@ -46,7 +46,6 @@ public class LostSoul extends CardImpl { this.subtype.add("Spirit"); 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/fifthedition/MerfolkOfThePearlTrident.java b/Mage.Sets/src/mage/sets/fifthedition/MerfolkOfThePearlTrident.java index 1ad586ccae7..682104214f2 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/MerfolkOfThePearlTrident.java +++ b/Mage.Sets/src/mage/sets/fifthedition/MerfolkOfThePearlTrident.java @@ -44,7 +44,6 @@ public class MerfolkOfThePearlTrident extends CardImpl { this.expansionSetCode = "5ED"; 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/fifthedition/MonssGoblinRaiders.java b/Mage.Sets/src/mage/sets/fifthedition/MonssGoblinRaiders.java index 7d065f55fc4..e4a52c65aa1 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/MonssGoblinRaiders.java +++ b/Mage.Sets/src/mage/sets/fifthedition/MonssGoblinRaiders.java @@ -44,7 +44,6 @@ public class MonssGoblinRaiders extends CardImpl { this.expansionSetCode = "5ED"; 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/fifthedition/MountainGoat.java b/Mage.Sets/src/mage/sets/fifthedition/MountainGoat.java index 5950884f1bb..0fa87d639d4 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/MountainGoat.java +++ b/Mage.Sets/src/mage/sets/fifthedition/MountainGoat.java @@ -45,7 +45,6 @@ public class MountainGoat extends CardImpl { this.expansionSetCode = "5ED"; 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/fifthedition/PearledUnicorn.java b/Mage.Sets/src/mage/sets/fifthedition/PearledUnicorn.java index f2032274dbe..4e3d102cb09 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/PearledUnicorn.java +++ b/Mage.Sets/src/mage/sets/fifthedition/PearledUnicorn.java @@ -44,7 +44,6 @@ public class PearledUnicorn extends CardImpl { this.expansionSetCode = "5ED"; this.subtype.add("Unicorn"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/fifthedition/PhantomMonster.java b/Mage.Sets/src/mage/sets/fifthedition/PhantomMonster.java index 5eea7551185..cf48e70299a 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/PhantomMonster.java +++ b/Mage.Sets/src/mage/sets/fifthedition/PhantomMonster.java @@ -45,7 +45,6 @@ public class PhantomMonster extends CardImpl { this.expansionSetCode = "5ED"; this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/fifthedition/Pox.java b/Mage.Sets/src/mage/sets/fifthedition/Pox.java index 33d85181027..24d95c732c3 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Pox.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Pox.java @@ -54,7 +54,6 @@ public class Pox extends CardImpl { super(ownerId, 51, "Pox", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{B}{B}{B}"); this.expansionSetCode = "5ED"; - this.color.setBlack(true); // Each player loses a third of his or her life, then discards a third of the cards in his or her hand, then sacrifices a third of the creatures he or she controls, then sacrifices a third of the lands he or she controls. Round up each time. this.getSpellAbility().addEffect(new PoxEffect()); diff --git a/Mage.Sets/src/mage/sets/fifthedition/PradeshGypsies.java b/Mage.Sets/src/mage/sets/fifthedition/PradeshGypsies.java index f1cce3513bc..c38b26e2fbe 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/PradeshGypsies.java +++ b/Mage.Sets/src/mage/sets/fifthedition/PradeshGypsies.java @@ -53,7 +53,6 @@ public class PradeshGypsies extends CardImpl { this.subtype.add("Human"); this.subtype.add("Nomad"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/fifthedition/RadjanSpirit.java b/Mage.Sets/src/mage/sets/fifthedition/RadjanSpirit.java index efc029d3129..0724a516620 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/RadjanSpirit.java +++ b/Mage.Sets/src/mage/sets/fifthedition/RadjanSpirit.java @@ -52,7 +52,6 @@ public class RadjanSpirit extends CardImpl { this.expansionSetCode = "5ED"; this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/fifthedition/Recall.java b/Mage.Sets/src/mage/sets/fifthedition/Recall.java index c24e5aae09c..cbbb5e68973 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Recall.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Recall.java @@ -52,7 +52,6 @@ public class Recall extends CardImpl { super(ownerId, 93, "Recall", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{X}{U}"); this.expansionSetCode = "5ED"; - this.color.setBlue(true); // Discard X cards, then return a card from your graveyard to your hand for each card discarded this way. this.getSpellAbility().addEffect(new RecallEffect()); diff --git a/Mage.Sets/src/mage/sets/fifthedition/RepentantBlacksmith.java b/Mage.Sets/src/mage/sets/fifthedition/RepentantBlacksmith.java index 92b90c5ffb7..230ffa4d368 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/RepentantBlacksmith.java +++ b/Mage.Sets/src/mage/sets/fifthedition/RepentantBlacksmith.java @@ -54,7 +54,6 @@ public class RepentantBlacksmith extends CardImpl { this.expansionSetCode = "5ED"; 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/fifthedition/SabretoothTiger.java b/Mage.Sets/src/mage/sets/fifthedition/SabretoothTiger.java index 452c5656690..9e537a1b3da 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/SabretoothTiger.java +++ b/Mage.Sets/src/mage/sets/fifthedition/SabretoothTiger.java @@ -45,7 +45,6 @@ public class SabretoothTiger extends CardImpl { this.expansionSetCode = "5ED"; 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/fifthedition/ScrybSprites.java b/Mage.Sets/src/mage/sets/fifthedition/ScrybSprites.java index 108b7eb79b0..d6f8a14068c 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/ScrybSprites.java +++ b/Mage.Sets/src/mage/sets/fifthedition/ScrybSprites.java @@ -45,7 +45,6 @@ public class ScrybSprites extends CardImpl { this.expansionSetCode = "5ED"; 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/fifthedition/SegovianLeviathan.java b/Mage.Sets/src/mage/sets/fifthedition/SegovianLeviathan.java index a7132a674aa..8e025d91202 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/SegovianLeviathan.java +++ b/Mage.Sets/src/mage/sets/fifthedition/SegovianLeviathan.java @@ -45,7 +45,6 @@ public class SegovianLeviathan extends CardImpl { this.expansionSetCode = "5ED"; this.subtype.add("Leviathan"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/fifthedition/ShanodinDryads.java b/Mage.Sets/src/mage/sets/fifthedition/ShanodinDryads.java index 0633b31d113..9d7ff24671b 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/ShanodinDryads.java +++ b/Mage.Sets/src/mage/sets/fifthedition/ShanodinDryads.java @@ -45,7 +45,6 @@ public class ShanodinDryads extends CardImpl { this.expansionSetCode = "5ED"; 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/fifthedition/Shatterstorm.java b/Mage.Sets/src/mage/sets/fifthedition/Shatterstorm.java index 177f42d0bfe..8b7a9885776 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Shatterstorm.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Shatterstorm.java @@ -44,7 +44,6 @@ public class Shatterstorm extends CardImpl { super(ownerId, 266, "Shatterstorm", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); this.expansionSetCode = "5ED"; - this.color.setRed(true); // Destroy all artifacts. They can't be regenerated. this.getSpellAbility().addEffect(new DestroyAllEffect(new FilterArtifactPermanent(), true)); diff --git a/Mage.Sets/src/mage/sets/fifthedition/Stasis.java b/Mage.Sets/src/mage/sets/fifthedition/Stasis.java index 5fca955aac2..7d792b17ed4 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Stasis.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Stasis.java @@ -51,7 +51,6 @@ public class Stasis extends CardImpl { super(ownerId, 28, "Stasis", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "5ED"; - this.color.setBlue(true); // Players skip their untap steps. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipUntapStepEffect())); diff --git a/Mage.Sets/src/mage/sets/fifthedition/SylvanLibrary.java b/Mage.Sets/src/mage/sets/fifthedition/SylvanLibrary.java index f5e96d16ab5..422f7065d09 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/SylvanLibrary.java +++ b/Mage.Sets/src/mage/sets/fifthedition/SylvanLibrary.java @@ -61,7 +61,6 @@ public class SylvanLibrary extends CardImpl { super(ownerId, 191, "Sylvan Library", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "5ED"; - this.color.setGreen(true); // At the beginning of your draw step, you may draw two additional cards. If you do, choose two cards in your hand drawn this turn. For each of those cards, pay 4 life or put the card on top of your library. this.addAbility(new BeginningOfDrawTriggeredAbility(new SylvanLibraryEffect(), TargetController.YOU, true), new CardsDrawnThisTurnWatcher()); diff --git a/Mage.Sets/src/mage/sets/fifthedition/VampireBats.java b/Mage.Sets/src/mage/sets/fifthedition/VampireBats.java index 632ea5f9e33..dd9aafc8e56 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/VampireBats.java +++ b/Mage.Sets/src/mage/sets/fifthedition/VampireBats.java @@ -50,7 +50,6 @@ public class VampireBats extends CardImpl { this.expansionSetCode = "5ED"; this.subtype.add("Bat"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/fifthedition/VodalianSoldiers.java b/Mage.Sets/src/mage/sets/fifthedition/VodalianSoldiers.java index a8a397d2333..f9ef9a4460a 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/VodalianSoldiers.java +++ b/Mage.Sets/src/mage/sets/fifthedition/VodalianSoldiers.java @@ -45,7 +45,6 @@ public class VodalianSoldiers extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/fifthedition/WallOfStone.java b/Mage.Sets/src/mage/sets/fifthedition/WallOfStone.java index 07ed5e91d75..5de39ffc92e 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/WallOfStone.java +++ b/Mage.Sets/src/mage/sets/fifthedition/WallOfStone.java @@ -45,7 +45,6 @@ public class WallOfStone extends CardImpl { this.expansionSetCode = "5ED"; this.subtype.add("Wall"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/sets/fifthedition/WarMammoth.java b/Mage.Sets/src/mage/sets/fifthedition/WarMammoth.java index 5e7bde3c462..c23aaa40031 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/WarMammoth.java +++ b/Mage.Sets/src/mage/sets/fifthedition/WarMammoth.java @@ -45,7 +45,6 @@ public class WarMammoth extends CardImpl { this.expansionSetCode = "5ED"; 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/fifthedition/WindsOfChange.java b/Mage.Sets/src/mage/sets/fifthedition/WindsOfChange.java index a5adc541a4c..bcc08cf0532 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/WindsOfChange.java +++ b/Mage.Sets/src/mage/sets/fifthedition/WindsOfChange.java @@ -49,7 +49,6 @@ public class WindsOfChange extends CardImpl { super(ownerId, 275, "Winds of Change", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "5ED"; - this.color.setRed(true); // Each player shuffles the cards from his or her hand into his or her library, then draws that many cards. this.getSpellAbility().addEffect(new WindsOfChangeEffect()); diff --git a/Mage.Sets/src/mage/sets/fifthedition/WyluliWolf.java b/Mage.Sets/src/mage/sets/fifthedition/WyluliWolf.java index 8638a1dfcb0..b5a1d412511 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/WyluliWolf.java +++ b/Mage.Sets/src/mage/sets/fifthedition/WyluliWolf.java @@ -51,7 +51,6 @@ public class WyluliWolf extends CardImpl { this.expansionSetCode = "5ED"; this.subtype.add("Wolf"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/fifthedition/ZephyrFalcon.java b/Mage.Sets/src/mage/sets/fifthedition/ZephyrFalcon.java index 548adf5542f..0e69ce14b18 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/ZephyrFalcon.java +++ b/Mage.Sets/src/mage/sets/fifthedition/ZephyrFalcon.java @@ -46,7 +46,6 @@ public class ZephyrFalcon extends CardImpl { this.expansionSetCode = "5ED"; 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/fourthedition/Blessing.java b/Mage.Sets/src/mage/sets/fourthedition/Blessing.java index 3f424de5fd5..081b3a0bbfd 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/Blessing.java +++ b/Mage.Sets/src/mage/sets/fourthedition/Blessing.java @@ -55,7 +55,6 @@ public class Blessing extends CardImpl { this.expansionSetCode = "4ED"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/fourthedition/CarnivorousPlant.java b/Mage.Sets/src/mage/sets/fourthedition/CarnivorousPlant.java index 5ba19620460..c04fb9630d5 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/CarnivorousPlant.java +++ b/Mage.Sets/src/mage/sets/fourthedition/CarnivorousPlant.java @@ -46,7 +46,6 @@ public class CarnivorousPlant extends CardImpl { this.subtype.add("Plant"); this.subtype.add("Wall"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/fourthedition/GiantTortoise.java b/Mage.Sets/src/mage/sets/fourthedition/GiantTortoise.java index 0951d7ee3c6..b5e63ca2f37 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/GiantTortoise.java +++ b/Mage.Sets/src/mage/sets/fourthedition/GiantTortoise.java @@ -51,7 +51,6 @@ public class GiantTortoise extends CardImpl { this.expansionSetCode = "4ED"; this.subtype.add("Turtle"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/fourthedition/GrayOgre.java b/Mage.Sets/src/mage/sets/fourthedition/GrayOgre.java index 370f5011dd6..24fb86e5b80 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/GrayOgre.java +++ b/Mage.Sets/src/mage/sets/fourthedition/GrayOgre.java @@ -44,7 +44,6 @@ public class GrayOgre extends CardImpl { this.expansionSetCode = "4ED"; this.subtype.add("Ogre"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/fourthedition/HolyArmor.java b/Mage.Sets/src/mage/sets/fourthedition/HolyArmor.java index d6728160431..b76ab2f3e8f 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/HolyArmor.java +++ b/Mage.Sets/src/mage/sets/fourthedition/HolyArmor.java @@ -56,7 +56,6 @@ public class HolyArmor extends CardImpl { this.expansionSetCode = "4ED"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/fourthedition/LandLeeches.java b/Mage.Sets/src/mage/sets/fourthedition/LandLeeches.java index 16bbea2a330..ef66d29eb8f 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/LandLeeches.java +++ b/Mage.Sets/src/mage/sets/fourthedition/LandLeeches.java @@ -45,7 +45,6 @@ public class LandLeeches extends CardImpl { this.expansionSetCode = "4ED"; this.subtype.add("Leech"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/fourthedition/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/fourthedition/SwordsToPlowshares.java index ce65fd1dc8c..9f9ea258a24 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/SwordsToPlowshares.java +++ b/Mage.Sets/src/mage/sets/fourthedition/SwordsToPlowshares.java @@ -51,7 +51,6 @@ public class SwordsToPlowshares extends CardImpl { super(ownerId, 302, "Swords to Plowshares", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "4ED"; - this.color.setWhite(true); // Exile target creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/fourthedition/Tsunami.java b/Mage.Sets/src/mage/sets/fourthedition/Tsunami.java index 11189040fca..36ba3cf5122 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/Tsunami.java +++ b/Mage.Sets/src/mage/sets/fourthedition/Tsunami.java @@ -50,7 +50,6 @@ public class Tsunami extends CardImpl { super(ownerId, 162, "Tsunami", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "4ED"; - this.color.setGreen(true); // Destroy all Islands. this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/fourthedition/WallOfIce.java b/Mage.Sets/src/mage/sets/fourthedition/WallOfIce.java index 22eae43d835..cfb765a77b9 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/WallOfIce.java +++ b/Mage.Sets/src/mage/sets/fourthedition/WallOfIce.java @@ -45,7 +45,6 @@ public class WallOfIce extends CardImpl { this.expansionSetCode = "4ED"; this.subtype.add("Wall"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/fourthedition/WaterElemental.java b/Mage.Sets/src/mage/sets/fourthedition/WaterElemental.java index 8e9058976f7..345854f8dbb 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/WaterElemental.java +++ b/Mage.Sets/src/mage/sets/fourthedition/WaterElemental.java @@ -44,7 +44,6 @@ public class WaterElemental extends CardImpl { this.expansionSetCode = "4ED"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/futuresight/ArcanumWings.java b/Mage.Sets/src/mage/sets/futuresight/ArcanumWings.java index 4e7888a0db8..32571d38f5c 100644 --- a/Mage.Sets/src/mage/sets/futuresight/ArcanumWings.java +++ b/Mage.Sets/src/mage/sets/futuresight/ArcanumWings.java @@ -56,7 +56,6 @@ public class ArcanumWings extends CardImpl { this.expansionSetCode = "FUT"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/futuresight/AvenMindcensor.java b/Mage.Sets/src/mage/sets/futuresight/AvenMindcensor.java index 027d4cc29fb..d9e317a7052 100644 --- a/Mage.Sets/src/mage/sets/futuresight/AvenMindcensor.java +++ b/Mage.Sets/src/mage/sets/futuresight/AvenMindcensor.java @@ -56,7 +56,6 @@ public class AvenMindcensor extends CardImpl { this.subtype.add("Bird"); 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/futuresight/BaruFistOfKrosa.java b/Mage.Sets/src/mage/sets/futuresight/BaruFistOfKrosa.java index 348dfc2dc3e..559fb7d425b 100644 --- a/Mage.Sets/src/mage/sets/futuresight/BaruFistOfKrosa.java +++ b/Mage.Sets/src/mage/sets/futuresight/BaruFistOfKrosa.java @@ -74,7 +74,6 @@ public class BaruFistOfKrosa extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/futuresight/BladeOfTheSixthPride.java b/Mage.Sets/src/mage/sets/futuresight/BladeOfTheSixthPride.java index d324b05dba7..b571d3e9740 100644 --- a/Mage.Sets/src/mage/sets/futuresight/BladeOfTheSixthPride.java +++ b/Mage.Sets/src/mage/sets/futuresight/BladeOfTheSixthPride.java @@ -45,7 +45,6 @@ public class BladeOfTheSixthPride extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Rebel"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/futuresight/BlindPhantasm.java b/Mage.Sets/src/mage/sets/futuresight/BlindPhantasm.java index f765b602a28..761608eb2eb 100644 --- a/Mage.Sets/src/mage/sets/futuresight/BlindPhantasm.java +++ b/Mage.Sets/src/mage/sets/futuresight/BlindPhantasm.java @@ -44,7 +44,6 @@ public class BlindPhantasm extends CardImpl { this.expansionSetCode = "FUT"; this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/futuresight/CentaurOmenreader.java b/Mage.Sets/src/mage/sets/futuresight/CentaurOmenreader.java index 48dc1bb0f97..53ad12a4c92 100644 --- a/Mage.Sets/src/mage/sets/futuresight/CentaurOmenreader.java +++ b/Mage.Sets/src/mage/sets/futuresight/CentaurOmenreader.java @@ -59,7 +59,6 @@ public class CentaurOmenreader extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java b/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java index 51cffeb256d..7d04375e58e 100644 --- a/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java +++ b/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java @@ -65,7 +65,6 @@ public class DaybreakCoronet extends CardImpl { this.expansionSetCode = "FUT"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature with another Aura attached to it FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with another Aura attached to it."); diff --git a/Mage.Sets/src/mage/sets/futuresight/Delay.java b/Mage.Sets/src/mage/sets/futuresight/Delay.java index bad6a96dfa3..44399943572 100644 --- a/Mage.Sets/src/mage/sets/futuresight/Delay.java +++ b/Mage.Sets/src/mage/sets/futuresight/Delay.java @@ -57,7 +57,6 @@ public class Delay extends CardImpl { super(ownerId, 35, "Delay", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "FUT"; - this.color.setBlue(true); // Counter target spell. If the spell is countered this way, exile it with three time counters on it instead of putting it into its owner's graveyard. If it doesn't have suspend, it gains suspend. this.getSpellAbility().addEffect(new DelayEffect()); diff --git a/Mage.Sets/src/mage/sets/futuresight/FomoriNomad.java b/Mage.Sets/src/mage/sets/futuresight/FomoriNomad.java index 9e6a52302db..dc149da7fc0 100644 --- a/Mage.Sets/src/mage/sets/futuresight/FomoriNomad.java +++ b/Mage.Sets/src/mage/sets/futuresight/FomoriNomad.java @@ -45,7 +45,6 @@ public class FomoriNomad extends CardImpl { this.subtype.add("Nomad"); 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/futuresight/ForceOfSavagery.java b/Mage.Sets/src/mage/sets/futuresight/ForceOfSavagery.java index 6a6d5f214ec..e52d4b0cbdf 100644 --- a/Mage.Sets/src/mage/sets/futuresight/ForceOfSavagery.java +++ b/Mage.Sets/src/mage/sets/futuresight/ForceOfSavagery.java @@ -45,7 +45,6 @@ public class ForceOfSavagery extends CardImpl { this.expansionSetCode = "FUT"; this.subtype.add("Elemental"); - this.color.setGreen(true); this.power = new MageInt(8); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/futuresight/FrenzySliver.java b/Mage.Sets/src/mage/sets/futuresight/FrenzySliver.java index 9295d35ea1b..893abce9671 100644 --- a/Mage.Sets/src/mage/sets/futuresight/FrenzySliver.java +++ b/Mage.Sets/src/mage/sets/futuresight/FrenzySliver.java @@ -65,7 +65,6 @@ public class FrenzySliver extends CardImpl { this.expansionSetCode = "FUT"; 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/futuresight/GathanRaiders.java b/Mage.Sets/src/mage/sets/futuresight/GathanRaiders.java index 7128f14b1f6..a810a2bf3c4 100644 --- a/Mage.Sets/src/mage/sets/futuresight/GathanRaiders.java +++ b/Mage.Sets/src/mage/sets/futuresight/GathanRaiders.java @@ -53,7 +53,6 @@ public class GathanRaiders 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/futuresight/GibberingDescent.java b/Mage.Sets/src/mage/sets/futuresight/GibberingDescent.java index ed39156879e..e272ce3f96c 100644 --- a/Mage.Sets/src/mage/sets/futuresight/GibberingDescent.java +++ b/Mage.Sets/src/mage/sets/futuresight/GibberingDescent.java @@ -60,7 +60,6 @@ public class GibberingDescent extends CardImpl { super(ownerId, 66, "Gibbering Descent", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{B}{B}"); this.expansionSetCode = "FUT"; - this.color.setBlack(true); // At the beginning of each player's upkeep, that player loses 1 life and discards a card. Effect effect = new LoseLifeTargetEffect(1); diff --git a/Mage.Sets/src/mage/sets/futuresight/GlitteringWish.java b/Mage.Sets/src/mage/sets/futuresight/GlitteringWish.java index 24fecafcf41..cff98bf319b 100644 --- a/Mage.Sets/src/mage/sets/futuresight/GlitteringWish.java +++ b/Mage.Sets/src/mage/sets/futuresight/GlitteringWish.java @@ -57,8 +57,6 @@ public class GlitteringWish extends CardImpl { super(ownerId, 156, "Glittering Wish", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{G}{W}"); this.expansionSetCode = "FUT"; - this.color.setGreen(true); - this.color.setWhite(true); // You may choose a multicolored card you own from outside the game, reveal that card, and put it into your hand. Exile Glittering Wish. this.getSpellAbility().addEffect(new GlitteringWishEffect()); diff --git a/Mage.Sets/src/mage/sets/futuresight/HazeOfRage.java b/Mage.Sets/src/mage/sets/futuresight/HazeOfRage.java index 61460ac4242..6baa8a1130d 100644 --- a/Mage.Sets/src/mage/sets/futuresight/HazeOfRage.java +++ b/Mage.Sets/src/mage/sets/futuresight/HazeOfRage.java @@ -46,7 +46,6 @@ public class HazeOfRage extends CardImpl { super(ownerId, 100, "Haze of Rage", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "FUT"; - this.color.setRed(true); // Buyback {2} this.addAbility(new BuybackAbility("{2}")); diff --git a/Mage.Sets/src/mage/sets/futuresight/IchorSlick.java b/Mage.Sets/src/mage/sets/futuresight/IchorSlick.java index bf4f976ddc2..0000abfb642 100644 --- a/Mage.Sets/src/mage/sets/futuresight/IchorSlick.java +++ b/Mage.Sets/src/mage/sets/futuresight/IchorSlick.java @@ -49,7 +49,6 @@ public class IchorSlick extends CardImpl { super(ownerId, 68, "Ichor Slick", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "FUT"; - 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/futuresight/InterventionPact.java b/Mage.Sets/src/mage/sets/futuresight/InterventionPact.java index f67536b5269..3d8a28beebd 100644 --- a/Mage.Sets/src/mage/sets/futuresight/InterventionPact.java +++ b/Mage.Sets/src/mage/sets/futuresight/InterventionPact.java @@ -28,7 +28,6 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.delayed.PactDelayedTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/futuresight/KorlashHeirToBlackblade.java b/Mage.Sets/src/mage/sets/futuresight/KorlashHeirToBlackblade.java index 64401cad06e..a846f5313da 100644 --- a/Mage.Sets/src/mage/sets/futuresight/KorlashHeirToBlackblade.java +++ b/Mage.Sets/src/mage/sets/futuresight/KorlashHeirToBlackblade.java @@ -69,7 +69,6 @@ public class KorlashHeirToBlackblade extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/futuresight/LinessaZephyrMage.java b/Mage.Sets/src/mage/sets/futuresight/LinessaZephyrMage.java index d34e1beda56..16b11f8a818 100644 --- a/Mage.Sets/src/mage/sets/futuresight/LinessaZephyrMage.java +++ b/Mage.Sets/src/mage/sets/futuresight/LinessaZephyrMage.java @@ -68,7 +68,6 @@ public class LinessaZephyrMage extends CardImpl { this.subtype.add("Human"); 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/futuresight/LlanowarAugur.java b/Mage.Sets/src/mage/sets/futuresight/LlanowarAugur.java index a49d7ace525..3ff72547630 100644 --- a/Mage.Sets/src/mage/sets/futuresight/LlanowarAugur.java +++ b/Mage.Sets/src/mage/sets/futuresight/LlanowarAugur.java @@ -54,7 +54,6 @@ public class LlanowarAugur extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/futuresight/LucentLiminid.java b/Mage.Sets/src/mage/sets/futuresight/LucentLiminid.java index 84bf79ae2f6..53b293e9bf6 100644 --- a/Mage.Sets/src/mage/sets/futuresight/LucentLiminid.java +++ b/Mage.Sets/src/mage/sets/futuresight/LucentLiminid.java @@ -45,7 +45,6 @@ public class LucentLiminid extends CardImpl { this.expansionSetCode = "FUT"; 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/futuresight/MagusOfTheFuture.java b/Mage.Sets/src/mage/sets/futuresight/MagusOfTheFuture.java index 57556581353..bf77ee94ef7 100644 --- a/Mage.Sets/src/mage/sets/futuresight/MagusOfTheFuture.java +++ b/Mage.Sets/src/mage/sets/futuresight/MagusOfTheFuture.java @@ -50,7 +50,6 @@ public class MagusOfTheFuture 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/futuresight/MagusOfTheMoon.java b/Mage.Sets/src/mage/sets/futuresight/MagusOfTheMoon.java index df9aa95623d..d6ee678b76b 100644 --- a/Mage.Sets/src/mage/sets/futuresight/MagusOfTheMoon.java +++ b/Mage.Sets/src/mage/sets/futuresight/MagusOfTheMoon.java @@ -59,7 +59,6 @@ public class MagusOfTheMoon 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/futuresight/MesmericSliver.java b/Mage.Sets/src/mage/sets/futuresight/MesmericSliver.java index 55bd843981b..af211797d35 100644 --- a/Mage.Sets/src/mage/sets/futuresight/MesmericSliver.java +++ b/Mage.Sets/src/mage/sets/futuresight/MesmericSliver.java @@ -59,7 +59,6 @@ public class MesmericSliver extends CardImpl { this.expansionSetCode = "FUT"; this.subtype.add("Sliver"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/futuresight/Narcomoeba.java b/Mage.Sets/src/mage/sets/futuresight/Narcomoeba.java index 7e96c98e54a..b1c4d611873 100644 --- a/Mage.Sets/src/mage/sets/futuresight/Narcomoeba.java +++ b/Mage.Sets/src/mage/sets/futuresight/Narcomoeba.java @@ -49,7 +49,6 @@ public class Narcomoeba extends CardImpl { this.expansionSetCode = "FUT"; 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/futuresight/NessianCourser.java b/Mage.Sets/src/mage/sets/futuresight/NessianCourser.java index b404d038236..7eb24f9c815 100644 --- a/Mage.Sets/src/mage/sets/futuresight/NessianCourser.java +++ b/Mage.Sets/src/mage/sets/futuresight/NessianCourser.java @@ -45,7 +45,6 @@ public class NessianCourser 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/futuresight/PactOfNegation.java b/Mage.Sets/src/mage/sets/futuresight/PactOfNegation.java index 496bb12f89e..3ee5ce8ec47 100644 --- a/Mage.Sets/src/mage/sets/futuresight/PactOfNegation.java +++ b/Mage.Sets/src/mage/sets/futuresight/PactOfNegation.java @@ -28,13 +28,13 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.abilities.common.delayed.PactDelayedTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.target.TargetSpell; /** diff --git a/Mage.Sets/src/mage/sets/futuresight/PactOfTheTitan.java b/Mage.Sets/src/mage/sets/futuresight/PactOfTheTitan.java index 96712362afa..22e5b366002 100644 --- a/Mage.Sets/src/mage/sets/futuresight/PactOfTheTitan.java +++ b/Mage.Sets/src/mage/sets/futuresight/PactOfTheTitan.java @@ -28,14 +28,14 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.delayed.PactDelayedTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.game.permanent.token.Token; /** @@ -77,3 +77,4 @@ class GiantToken extends Token { toughness = new MageInt(4); } } + diff --git a/Mage.Sets/src/mage/sets/futuresight/PatriciansScorn.java b/Mage.Sets/src/mage/sets/futuresight/PatriciansScorn.java index bdb7be230ca..dfefae883dc 100644 --- a/Mage.Sets/src/mage/sets/futuresight/PatriciansScorn.java +++ b/Mage.Sets/src/mage/sets/futuresight/PatriciansScorn.java @@ -56,7 +56,6 @@ public class PatriciansScorn extends CardImpl { super(ownerId, 29, "Patrician's Scorn", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "FUT"; - this.color.setWhite(true); // If you've cast another white spell this turn, you may cast Patrician's Scorn without paying its mana cost. this.addAbility(new AlternativeCostSourceAbility(new CastWhiteSpellThisTurnCondition()), new PatriciansScornWatcher()); diff --git a/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java b/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java index c98f611b303..851e9a4f835 100644 --- a/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java +++ b/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java @@ -28,14 +28,14 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.common.delayed.PactDelayedTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; diff --git a/Mage.Sets/src/mage/sets/futuresight/SliverLegion.java b/Mage.Sets/src/mage/sets/futuresight/SliverLegion.java index d26d16d2cde..853b5983b12 100644 --- a/Mage.Sets/src/mage/sets/futuresight/SliverLegion.java +++ b/Mage.Sets/src/mage/sets/futuresight/SliverLegion.java @@ -61,11 +61,6 @@ public class SliverLegion 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/futuresight/StreetWraith.java b/Mage.Sets/src/mage/sets/futuresight/StreetWraith.java index 7f98b02d5ab..fd11c13fc61 100644 --- a/Mage.Sets/src/mage/sets/futuresight/StreetWraith.java +++ b/Mage.Sets/src/mage/sets/futuresight/StreetWraith.java @@ -47,7 +47,6 @@ public class StreetWraith extends CardImpl { this.expansionSetCode = "FUT"; this.subtype.add("Wraith"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/futuresight/StrongholdRats.java b/Mage.Sets/src/mage/sets/futuresight/StrongholdRats.java index 59db9f0fc47..9d0a3785461 100644 --- a/Mage.Sets/src/mage/sets/futuresight/StrongholdRats.java +++ b/Mage.Sets/src/mage/sets/futuresight/StrongholdRats.java @@ -47,7 +47,6 @@ public class StrongholdRats extends CardImpl { this.expansionSetCode = "FUT"; 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/futuresight/SummonersPact.java b/Mage.Sets/src/mage/sets/futuresight/SummonersPact.java index 12ef6682c8d..0bd4d325d77 100644 --- a/Mage.Sets/src/mage/sets/futuresight/SummonersPact.java +++ b/Mage.Sets/src/mage/sets/futuresight/SummonersPact.java @@ -28,14 +28,14 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.common.delayed.PactDelayedTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ColorPredicate; diff --git a/Mage.Sets/src/mage/sets/futuresight/Tarmogoyf.java b/Mage.Sets/src/mage/sets/futuresight/Tarmogoyf.java index 8f55c8875aa..d4824f85f57 100644 --- a/Mage.Sets/src/mage/sets/futuresight/Tarmogoyf.java +++ b/Mage.Sets/src/mage/sets/futuresight/Tarmogoyf.java @@ -57,7 +57,6 @@ public class Tarmogoyf extends CardImpl { this.expansionSetCode = "FUT"; this.subtype.add("Lhurgoyf"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/futuresight/TaroxBladewing.java b/Mage.Sets/src/mage/sets/futuresight/TaroxBladewing.java index 57502b9dd19..74812fc3110 100644 --- a/Mage.Sets/src/mage/sets/futuresight/TaroxBladewing.java +++ b/Mage.Sets/src/mage/sets/futuresight/TaroxBladewing.java @@ -56,7 +56,6 @@ public class TaroxBladewing extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/futuresight/ThornwealdArcher.java b/Mage.Sets/src/mage/sets/futuresight/ThornwealdArcher.java index aa84102215d..8fb016c402f 100644 --- a/Mage.Sets/src/mage/sets/futuresight/ThornwealdArcher.java +++ b/Mage.Sets/src/mage/sets/futuresight/ThornwealdArcher.java @@ -47,7 +47,6 @@ public class ThornwealdArcher extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Archer"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/futuresight/VenserShaperSavant.java b/Mage.Sets/src/mage/sets/futuresight/VenserShaperSavant.java index 734c4a8b0de..6cf33d4ecbb 100644 --- a/Mage.Sets/src/mage/sets/futuresight/VenserShaperSavant.java +++ b/Mage.Sets/src/mage/sets/futuresight/VenserShaperSavant.java @@ -59,7 +59,6 @@ public class VenserShaperSavant 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/futuresight/YixlidJailer.java b/Mage.Sets/src/mage/sets/futuresight/YixlidJailer.java index a758f4abe93..28f969c85bc 100644 --- a/Mage.Sets/src/mage/sets/futuresight/YixlidJailer.java +++ b/Mage.Sets/src/mage/sets/futuresight/YixlidJailer.java @@ -57,7 +57,6 @@ public class YixlidJailer extends CardImpl { this.subtype.add("Zombie"); 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/gatecrash/AEtherize.java b/Mage.Sets/src/mage/sets/gatecrash/AEtherize.java index 79372d92bbc..c11161d76f6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AEtherize.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AEtherize.java @@ -44,7 +44,6 @@ public class AEtherize extends CardImpl { super(ownerId, 29, "AEtherize", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); // Return all attacking creatures to their owners' hands. this.getSpellAbility().addEffect(new ReturnToHandFromBattlefieldAllEffect(new FilterAttackingCreature("attacking creatures"))); diff --git a/Mage.Sets/src/mage/sets/gatecrash/AdaptiveSnapjaw.java b/Mage.Sets/src/mage/sets/gatecrash/AdaptiveSnapjaw.java index 60a6582d967..8f714621afa 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AdaptiveSnapjaw.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AdaptiveSnapjaw.java @@ -46,7 +46,6 @@ public class AdaptiveSnapjaw extends CardImpl { this.subtype.add("Lizard"); this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/gatecrash/AerialManeuver.java b/Mage.Sets/src/mage/sets/gatecrash/AerialManeuver.java index 914b157bdf4..9c91e4ded86 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AerialManeuver.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AerialManeuver.java @@ -48,7 +48,6 @@ public class AerialManeuver extends CardImpl { super(ownerId, 1, "Aerial Maneuver", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "GTC"; - this.color.setWhite(true); // Target creature gets +1/+1 and gains flying and first strike until end of turn. getSpellAbility().addEffect(new BoostTargetEffect(1,1, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/Agoraphobia.java b/Mage.Sets/src/mage/sets/gatecrash/Agoraphobia.java index 42851922df7..d68ccf20826 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Agoraphobia.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Agoraphobia.java @@ -56,7 +56,6 @@ public class Agoraphobia extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/AlmsBeast.java b/Mage.Sets/src/mage/sets/gatecrash/AlmsBeast.java index 726ac24966b..58aac5ecfb2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AlmsBeast.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AlmsBeast.java @@ -53,8 +53,6 @@ public class AlmsBeast extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Beast"); - this.color.setWhite(true); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/gatecrash/AlphaAuthority.java b/Mage.Sets/src/mage/sets/gatecrash/AlphaAuthority.java index c258fc3a5f6..7c9e195c28a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AlphaAuthority.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AlphaAuthority.java @@ -61,8 +61,6 @@ public class AlphaAuthority extends CardImpl { super(ownerId, 114, "Alpha Authority", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "GTC"; - this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java b/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java index 0b7c6e59d4d..29326c88919 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java @@ -52,7 +52,6 @@ public class AngelicEdict extends CardImpl { super(ownerId, 2, "Angelic Edict", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{W}"); this.expansionSetCode = "GTC"; - this.color.setWhite(true); // Exile target creature or enchantment. getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/AngelicSkirmisher.java b/Mage.Sets/src/mage/sets/gatecrash/AngelicSkirmisher.java index e0a460c573b..75d0b481737 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AngelicSkirmisher.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AngelicSkirmisher.java @@ -74,7 +74,6 @@ public class AngelicSkirmisher extends CardImpl { this.expansionSetCode = "GTC"; 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/gatecrash/ArrowsOfJustice.java b/Mage.Sets/src/mage/sets/gatecrash/ArrowsOfJustice.java index 94562d38869..d6fa466fcc8 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ArrowsOfJustice.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ArrowsOfJustice.java @@ -44,8 +44,6 @@ public class ArrowsOfJustice extends CardImpl { super(ownerId, 211, "Arrows of Justice", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{R/W}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); - this.color.setWhite(true); // Arrows of Justice deals 4 damage to target attacking or blocking creature. getSpellAbility().addEffect(new DamageTargetEffect(4)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/AssembleTheLegion.java b/Mage.Sets/src/mage/sets/gatecrash/AssembleTheLegion.java index 6143d9e8c52..faac70e3640 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AssembleTheLegion.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AssembleTheLegion.java @@ -53,8 +53,6 @@ public class AssembleTheLegion extends CardImpl { super(ownerId, 142, "Assemble the Legion", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}{W}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); - this.color.setWhite(true); // At the beginning of your upkeep, put a muster counter on Assemble the Legion. Then put a 1/1 red and white Soldier creature token with haste onto the battlefield for each muster counter on Assemble the Legion. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AssembleTheLegionEffect(), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java b/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java index 78da253b9cc..6e45b039d3b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java @@ -87,8 +87,6 @@ public class AureliasFury extends CardImpl { super(ownerId, 144, "Aurelia's Fury", Rarity.MYTHIC, new CardType[]{CardType.INSTANT}, "{X}{R}{W}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); - this.color.setWhite(true); // Aurelia's Fury deals X damage divided as you choose among any number of target creatures and/or players. // Tap each creature dealt damage this way. Players dealt damage this way can't cast noncreature spells this turn. diff --git a/Mage.Sets/src/mage/sets/gatecrash/BaneAlleyBroker.java b/Mage.Sets/src/mage/sets/gatecrash/BaneAlleyBroker.java index a465546929d..0443afca8af 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BaneAlleyBroker.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BaneAlleyBroker.java @@ -96,8 +96,6 @@ public class BaneAlleyBroker extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/gatecrash/BasilicaGuards.java b/Mage.Sets/src/mage/sets/gatecrash/BasilicaGuards.java index 0aaf13d6384..1f1ff3388c5 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BasilicaGuards.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BasilicaGuards.java @@ -47,7 +47,6 @@ public class BasilicaGuards 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/gatecrash/BasilicaScreecher.java b/Mage.Sets/src/mage/sets/gatecrash/BasilicaScreecher.java index bafbc58d48d..89fbcf4eda0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BasilicaScreecher.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BasilicaScreecher.java @@ -46,7 +46,6 @@ public class BasilicaScreecher extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Bat"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/gatecrash/BiomassMutation.java b/Mage.Sets/src/mage/sets/gatecrash/BiomassMutation.java index 75fc3379d59..434c10e426b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BiomassMutation.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BiomassMutation.java @@ -48,8 +48,6 @@ public class BiomassMutation extends CardImpl { super(ownerId, 213, "Biomass Mutation", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{G/U}{G/U}"); this.expansionSetCode = "GTC"; - this.color.setGreen(true); - this.color.setBlue(true); // Creatures you control become X/X until end of turn. DynamicValue variableMana = new ManacostVariableValue(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/Bioshift.java b/Mage.Sets/src/mage/sets/gatecrash/Bioshift.java index 54a96128934..27cb238c2fc 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Bioshift.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Bioshift.java @@ -52,8 +52,6 @@ public class Bioshift extends CardImpl { super(ownerId, 214, "Bioshift", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G/U}"); this.expansionSetCode = "GTC"; - this.color.setGreen(true); - this.color.setBlue(true); // Move any number of +1/+1 counters from target creature onto another target creature with the same controller. getSpellAbility().addEffect(new MoveCounterFromTargetToTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/Biovisionary.java b/Mage.Sets/src/mage/sets/gatecrash/Biovisionary.java index e9dd54a5c45..5c32f5d3190 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Biovisionary.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Biovisionary.java @@ -59,8 +59,6 @@ public class Biovisionary extends CardImpl { this.subtype.add("Wizard"); - this.color.setGreen(true); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/gatecrash/BlindObedience.java b/Mage.Sets/src/mage/sets/gatecrash/BlindObedience.java index d79cfe04b39..9051f4bc474 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BlindObedience.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BlindObedience.java @@ -52,7 +52,6 @@ public class BlindObedience extends CardImpl { super(ownerId, 6, "Blind Obedience", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "GTC"; - this.color.setWhite(true); // Extort (Whenever you cast a spell, you may pay {WB}. If you do, each opponent loses 1 life and you gain that much life.) this.addAbility(new ExtortAbility()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/BomberCorps.java b/Mage.Sets/src/mage/sets/gatecrash/BomberCorps.java index c670b569fee..8fd77f40018 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BomberCorps.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BomberCorps.java @@ -49,7 +49,6 @@ public class BomberCorps extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/gatecrash/BorborygmosEnraged.java b/Mage.Sets/src/mage/sets/gatecrash/BorborygmosEnraged.java index 7fe7d77a260..6d3728184cb 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BorborygmosEnraged.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BorborygmosEnraged.java @@ -64,8 +64,6 @@ public class BorborygmosEnraged extends CardImpl { this.supertype.add("Legendary"); - this.color.setGreen(true); - this.color.setRed(true); this.power = new MageInt(7); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java b/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java index 70cbb858cb9..fc4f57fe01f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java @@ -54,8 +54,6 @@ public class BorosCharm extends CardImpl { super(ownerId, 148, "Boros Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}{W}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); - this.color.setWhite(true); //Choose one - Boros Charm deals 4 damage to target player this.getSpellAbility().addEffect(new DamageTargetEffect(4)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/BorosElite.java b/Mage.Sets/src/mage/sets/gatecrash/BorosElite.java index 8a453a3104c..6f16618db89 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BorosElite.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BorosElite.java @@ -49,7 +49,6 @@ public class BorosElite 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/gatecrash/BorosReckoner.java b/Mage.Sets/src/mage/sets/gatecrash/BorosReckoner.java index 5d39fefc9d0..507f292c443 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BorosReckoner.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BorosReckoner.java @@ -59,8 +59,6 @@ public class BorosReckoner extends CardImpl { this.subtype.add("Minotaur"); this.subtype.add("Wizard"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/gatecrash/BurningTreeEmissary.java b/Mage.Sets/src/mage/sets/gatecrash/BurningTreeEmissary.java index 879de783fc7..5f3cb1626fe 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BurningTreeEmissary.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BurningTreeEmissary.java @@ -48,8 +48,6 @@ public class BurningTreeEmissary extends CardImpl { this.subtype.add("Human"); 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/gatecrash/BurstOfStrength.java b/Mage.Sets/src/mage/sets/gatecrash/BurstOfStrength.java index 778d17a577b..af0a59601cc 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BurstOfStrength.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BurstOfStrength.java @@ -46,7 +46,6 @@ public class BurstOfStrength extends CardImpl { super(ownerId, 115, "Burst of Strength", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "GTC"; - this.color.setGreen(true); // Put a +1/+1 counter on target creature and untap it. this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance(1))); diff --git a/Mage.Sets/src/mage/sets/gatecrash/CallOfTheNightwing.java b/Mage.Sets/src/mage/sets/gatecrash/CallOfTheNightwing.java index 6c36a41f7cd..57470ed0db1 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CallOfTheNightwing.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CallOfTheNightwing.java @@ -47,8 +47,6 @@ public class CallOfTheNightwing extends CardImpl { super(ownerId, 149, "Call of the Nightwing", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}{B}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); - this.color.setBlack(true); // Put a 1/1/ blue and black Horror creature token with flying onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new NightwingHorrorToken(),1)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/CartelAristocrat.java b/Mage.Sets/src/mage/sets/gatecrash/CartelAristocrat.java index 3bc00c30e82..fea5663b5eb 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CartelAristocrat.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CartelAristocrat.java @@ -71,8 +71,6 @@ public class CartelAristocrat extends CardImpl { this.subtype.add("Human"); this.subtype.add("Advisor"); - 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/gatecrash/CinderElemental.java b/Mage.Sets/src/mage/sets/gatecrash/CinderElemental.java index aecf6e33a97..05a29b6b809 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CinderElemental.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CinderElemental.java @@ -54,7 +54,6 @@ public class CinderElemental extends CardImpl { this.expansionSetCode = "GTC"; 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/gatecrash/ClanDefiance.java b/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java index 7474913ca46..518b8d85b84 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java @@ -59,8 +59,6 @@ public class ClanDefiance extends CardImpl { super(ownerId, 151, "Clan Defiance", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{R}{G}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); - this.color.setGreen(true); // Choose one or more - this.getSpellAbility().getModes().setMinModes(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ClingingAnemones.java b/Mage.Sets/src/mage/sets/gatecrash/ClingingAnemones.java index 225ee33174a..dd6dfc349cb 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ClingingAnemones.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ClingingAnemones.java @@ -46,7 +46,6 @@ public class ClingingAnemones extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Jellyfish"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/gatecrash/CloudfinRaptor.java b/Mage.Sets/src/mage/sets/gatecrash/CloudfinRaptor.java index 7b046e43497..752cf34c6a0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CloudfinRaptor.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CloudfinRaptor.java @@ -47,7 +47,6 @@ public class CloudfinRaptor extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Mutant"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java b/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java index 57adf1a89af..59c989bcd71 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java @@ -51,8 +51,6 @@ public class CoercedConfession extends CardImpl { super(ownerId, 217, "Coerced Confession", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{U/B}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); - this.color.setBlack(true); // Target player puts the top four cards of his or her library into his or her graveyard. You draw a card for each creature card put into a graveyard this way. getSpellAbility().addEffect(new CoercedConfessionMillEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java b/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java index 213ef0dbd63..13dafeafa36 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java @@ -60,8 +60,6 @@ public class ConsumingAberration extends CardImpl { this.subtype.add("Horror"); - this.color.setBlack(true); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/gatecrash/CorpseBlockade.java b/Mage.Sets/src/mage/sets/gatecrash/CorpseBlockade.java index b1cfdeb0a37..ad1a0172b94 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CorpseBlockade.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CorpseBlockade.java @@ -60,7 +60,6 @@ public class CorpseBlockade extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/gatecrash/CourtStreetDenizen.java b/Mage.Sets/src/mage/sets/gatecrash/CourtStreetDenizen.java index 868a7591d0a..3a7126cc167 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CourtStreetDenizen.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CourtStreetDenizen.java @@ -65,7 +65,6 @@ public class CourtStreetDenizen 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/gatecrash/CracklingPerimeter.java b/Mage.Sets/src/mage/sets/gatecrash/CracklingPerimeter.java index 768d45922b2..2623673ec41 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CracklingPerimeter.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CracklingPerimeter.java @@ -60,7 +60,6 @@ public class CracklingPerimeter extends CardImpl { super(ownerId, 88, "Crackling Perimeter", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); // Tap an untapped Gate you control: Crackling Perimeter deals 1 damage to each opponent. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(1, TargetController.OPPONENT), new TapTargetCost(new TargetControlledPermanent(filter)))); diff --git a/Mage.Sets/src/mage/sets/gatecrash/Crocanura.java b/Mage.Sets/src/mage/sets/gatecrash/Crocanura.java index 65482821fec..d7d888c567c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Crocanura.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Crocanura.java @@ -48,7 +48,6 @@ public class Crocanura extends CardImpl { this.subtype.add("Crocodile"); this.subtype.add("Frog"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/gatecrash/CrownedCeratok.java b/Mage.Sets/src/mage/sets/gatecrash/CrownedCeratok.java index 7a5eef6aa79..f9ddee91971 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CrownedCeratok.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CrownedCeratok.java @@ -60,7 +60,6 @@ public class CrownedCeratok extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Rhino"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java b/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java index e5aa727691f..69d29454f28 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java @@ -55,7 +55,6 @@ public class CryptGhast extends CardImpl { this.expansionSetCode = "GTC"; 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/gatecrash/DaringSkyjek.java b/Mage.Sets/src/mage/sets/gatecrash/DaringSkyjek.java index 21c4fe9eb8f..493dbb1947f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DaringSkyjek.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DaringSkyjek.java @@ -49,7 +49,6 @@ public class DaringSkyjek extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/DeathcultRogue.java b/Mage.Sets/src/mage/sets/gatecrash/DeathcultRogue.java index a0cf6d900e2..38e5e14577c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DeathcultRogue.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DeathcultRogue.java @@ -53,8 +53,6 @@ public class DeathcultRogue extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - 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/gatecrash/DeathpactAngel.java b/Mage.Sets/src/mage/sets/gatecrash/DeathpactAngel.java index 9e4f540a79d..f645f83d405 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DeathpactAngel.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DeathpactAngel.java @@ -60,8 +60,6 @@ public class DeathpactAngel extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Angel"); - 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/gatecrash/DeathsApproach.java b/Mage.Sets/src/mage/sets/gatecrash/DeathsApproach.java index 34320b29a26..07ba99adfbb 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DeathsApproach.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DeathsApproach.java @@ -57,8 +57,6 @@ public class DeathsApproach extends CardImpl { super(ownerId, 62, "Death's Approach", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "GTC"; - this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/DebtorsPulpit.java b/Mage.Sets/src/mage/sets/gatecrash/DebtorsPulpit.java index ba0bc475f5c..fb0581aefc8 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DebtorsPulpit.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DebtorsPulpit.java @@ -53,8 +53,6 @@ public class DebtorsPulpit extends CardImpl { super(ownerId, 10, "Debtor's Pulpit", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{W}"); this.expansionSetCode = "GTC"; - this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/DiluvianPrimordial.java b/Mage.Sets/src/mage/sets/gatecrash/DiluvianPrimordial.java index 18181950126..ef979340321 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DiluvianPrimordial.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DiluvianPrimordial.java @@ -66,7 +66,6 @@ public class DiluvianPrimordial extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Avatar"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java b/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java index dd56f20245f..3a73a2c04be 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java @@ -72,8 +72,6 @@ public class DimirCharm extends CardImpl { super(ownerId, 154, "Dimir Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}{B}"); this.expansionSetCode = "GTC"; - this.color.setBlack(true); - this.color.setBlue(true); //Choose one - Counter target sorcery spell this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java b/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java index 9bb33455698..5eab7a69163 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java @@ -53,8 +53,6 @@ public class DinrovaHorror extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Horror"); - 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/gatecrash/DiscipleOfTheOldWays.java b/Mage.Sets/src/mage/sets/gatecrash/DiscipleOfTheOldWays.java index 8a40c944308..d02a48b770b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DiscipleOfTheOldWays.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DiscipleOfTheOldWays.java @@ -52,7 +52,6 @@ public class DiscipleOfTheOldWays 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/gatecrash/DrakewingKrasis.java b/Mage.Sets/src/mage/sets/gatecrash/DrakewingKrasis.java index bd9647547d9..168d55cac09 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DrakewingKrasis.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DrakewingKrasis.java @@ -47,8 +47,6 @@ public class DrakewingKrasis extends CardImpl { this.subtype.add("Lizard"); this.subtype.add("Drake"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java index 32e442383f4..6cfb3ad6b2d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java @@ -62,8 +62,6 @@ public class DuskmantleGuildmage 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/gatecrash/DuskmantleSeer.java b/Mage.Sets/src/mage/sets/gatecrash/DuskmantleSeer.java index 5b4eaa58517..f69c688772e 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DuskmantleSeer.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DuskmantleSeer.java @@ -58,8 +58,6 @@ public class DuskmantleSeer extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Wizard"); - 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/gatecrash/DutifulThrull.java b/Mage.Sets/src/mage/sets/gatecrash/DutifulThrull.java index 7f4592a981c..1be1a0335b4 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DutifulThrull.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DutifulThrull.java @@ -50,7 +50,6 @@ public class DutifulThrull extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Thrull"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java b/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java index c0225074a27..9816d7f34b8 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java @@ -53,8 +53,6 @@ public class DyingWish extends CardImpl { super(ownerId, 64, "Dying Wish", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "GTC"; - this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature you control TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ElusiveKrasis.java b/Mage.Sets/src/mage/sets/gatecrash/ElusiveKrasis.java index 0a734aa9653..9fde91ebe65 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ElusiveKrasis.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ElusiveKrasis.java @@ -47,8 +47,6 @@ public class ElusiveKrasis extends CardImpl { this.subtype.add("Fish"); this.subtype.add("Mutant"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/gatecrash/EmberBeast.java b/Mage.Sets/src/mage/sets/gatecrash/EmberBeast.java index ae2e6d7d11a..77ebea7de25 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/EmberBeast.java +++ b/Mage.Sets/src/mage/sets/gatecrash/EmberBeast.java @@ -46,7 +46,6 @@ public class EmberBeast extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/gatecrash/EnterTheInfinite.java b/Mage.Sets/src/mage/sets/gatecrash/EnterTheInfinite.java index 7d7cbbb22f7..a53a1e0b985 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/EnterTheInfinite.java +++ b/Mage.Sets/src/mage/sets/gatecrash/EnterTheInfinite.java @@ -53,7 +53,6 @@ public class EnterTheInfinite extends CardImpl { super(ownerId, 34, "Enter the Infinite", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{8}{U}{U}{U}{U}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); // Draw cards equal to the number of cards in your library, this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(new CardsInControllerLibraryCount())); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java b/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java index 2fb4e5b221e..55bd290fc77 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java @@ -53,8 +53,6 @@ public class ExecutionersSwing extends CardImpl { super(ownerId, 161, "Executioner's Swing", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}{B}"); this.expansionSetCode = "GTC"; - this.color.setBlack(true); - this.color.setWhite(true); // Target creature that dealt damage this turn gets -5/-5 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-5,-5, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ExperimentOne.java b/Mage.Sets/src/mage/sets/gatecrash/ExperimentOne.java index e935590e85b..c1000e01386 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ExperimentOne.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ExperimentOne.java @@ -53,7 +53,6 @@ public class ExperimentOne extends CardImpl { this.subtype.add("Human"); 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/gatecrash/FathomMage.java b/Mage.Sets/src/mage/sets/gatecrash/FathomMage.java index 1adcce192aa..2a399e55387 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FathomMage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FathomMage.java @@ -54,8 +54,6 @@ public class FathomMage extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setGreen(true); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/FirefistStriker.java b/Mage.Sets/src/mage/sets/gatecrash/FirefistStriker.java index 1b4c3b0e5fb..aa64fedd529 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FirefistStriker.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FirefistStriker.java @@ -51,7 +51,6 @@ public class FirefistStriker 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/gatecrash/ForcedAdaptation.java b/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java index f5831c6c71c..27efbcd6ed1 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java @@ -53,7 +53,6 @@ public class ForcedAdaptation extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/FortressCyclops.java b/Mage.Sets/src/mage/sets/gatecrash/FortressCyclops.java index f2be81b7fb5..b820a9b06d3 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FortressCyclops.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FortressCyclops.java @@ -49,8 +49,6 @@ public class FortressCyclops extends CardImpl { this.subtype.add("Cyclops"); this.subtype.add("Soldier"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/gatecrash/FoundryChampion.java b/Mage.Sets/src/mage/sets/gatecrash/FoundryChampion.java index 3744cf846ce..434f5c228f7 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FoundryChampion.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FoundryChampion.java @@ -58,8 +58,6 @@ public class FoundryChampion extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Soldier"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/gatecrash/FoundryStreetDenizen.java b/Mage.Sets/src/mage/sets/gatecrash/FoundryStreetDenizen.java index fb65ff633b3..b3beb32817d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FoundryStreetDenizen.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FoundryStreetDenizen.java @@ -63,7 +63,6 @@ public class FoundryStreetDenizen 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/gatecrash/FrilledOculus.java b/Mage.Sets/src/mage/sets/gatecrash/FrilledOculus.java index e7c4ade9a1d..bd24f49a14a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FrilledOculus.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FrilledOculus.java @@ -50,7 +50,6 @@ public class FrilledOculus extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Homunculus"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java b/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java index 0c05c7ad8f7..279ea4111de 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java @@ -59,7 +59,6 @@ public class FuriousResistance extends CardImpl { super(ownerId, 93, "Furious Resistance", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); // Target blocking creature gets +3/+0 and gains first strike until end of turn. this.getSpellAbility().addEffect(new FuriousResistanceEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GhorClanRampager.java b/Mage.Sets/src/mage/sets/gatecrash/GhorClanRampager.java index 26217d1580b..b5758fb45a7 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GhorClanRampager.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GhorClanRampager.java @@ -51,8 +51,6 @@ public class GhorClanRampager extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Beast"); - 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/gatecrash/GiftOfOrzhova.java b/Mage.Sets/src/mage/sets/gatecrash/GiftOfOrzhova.java index 869e849ea27..647e664547d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GiftOfOrzhova.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GiftOfOrzhova.java @@ -56,9 +56,6 @@ public class GiftOfOrzhova extends CardImpl { super(ownerId, 219, "Gift of Orzhova", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W/B}{W/B}"); this.expansionSetCode = "GTC"; - this.subtype.add("Aura"); - this.color.setWhite(true); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java b/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java index 9ecc1f2308b..97bcb428f3d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java @@ -59,7 +59,6 @@ public class GreensideWatcher extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/Gridlock.java b/Mage.Sets/src/mage/sets/gatecrash/Gridlock.java index 794452735fe..6628fb71055 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Gridlock.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Gridlock.java @@ -49,7 +49,6 @@ public class Gridlock extends CardImpl { super(ownerId, 36, "Gridlock", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{U}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); // Tap X target nonland permanents. this.getSpellAbility().addEffect(new TapTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java b/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java index 501df68cbf0..700cc889663 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java @@ -61,7 +61,6 @@ public class GrislySpectacle extends CardImpl { super(ownerId, 66, "Grisly Spectacle", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}{B}"); this.expansionSetCode = "GTC"; - this.color.setBlack(true); // Destroy target nonartifact creature. Its controller puts a number of cards equal to that creature's power from the top of his or her library into his or her graveyard. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GroundAssault.java b/Mage.Sets/src/mage/sets/gatecrash/GroundAssault.java index fbf6d242bb6..baf76485110 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GroundAssault.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GroundAssault.java @@ -46,8 +46,6 @@ public class GroundAssault extends CardImpl { super(ownerId, 168, "Ground Assault", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{R}{G}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); - this.color.setGreen(true); // Ground Assault deals damage to target creature equal to the number of lands you control. this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(new FilterControlledLandPermanent()))); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GruulCharm.java b/Mage.Sets/src/mage/sets/gatecrash/GruulCharm.java index f8e12a6df22..a05c0bec09b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GruulCharm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GruulCharm.java @@ -67,8 +67,6 @@ public class GruulCharm extends CardImpl { super(ownerId, 169, "Gruul Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}{G}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); - this.color.setGreen(true); // Choose one - Creatures without flying can't block this turn; this.getSpellAbility().addEffect(new CantBlockAllEffect(filter, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java b/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java index e228654ddd9..d2e18c0c0dd 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java @@ -62,8 +62,6 @@ public class GruulRagebeast extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Beast"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GuardianOfTheGateless.java b/Mage.Sets/src/mage/sets/gatecrash/GuardianOfTheGateless.java index 22982ee41fd..3fe1d4a47bf 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GuardianOfTheGateless.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GuardianOfTheGateless.java @@ -51,7 +51,6 @@ public class GuardianOfTheGateless extends CardImpl { this.expansionSetCode = "GTC"; 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/gatecrash/GuildscornWard.java b/Mage.Sets/src/mage/sets/gatecrash/GuildscornWard.java index 62916dcf272..c56d793bf47 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GuildscornWard.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GuildscornWard.java @@ -61,8 +61,6 @@ public class GuildscornWard extends CardImpl { super(ownerId, 15, "Guildscorn Ward", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}"); this.expansionSetCode = "GTC"; - this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GutterSkulk.java b/Mage.Sets/src/mage/sets/gatecrash/GutterSkulk.java index aa15f60112a..3d628ac34db 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GutterSkulk.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GutterSkulk.java @@ -45,7 +45,6 @@ public class GutterSkulk extends CardImpl { this.subtype.add("Zombie"); 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/gatecrash/GyreSage.java b/Mage.Sets/src/mage/sets/gatecrash/GyreSage.java index 3382bcc4372..6acb0c27fc5 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GyreSage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GyreSage.java @@ -51,7 +51,6 @@ public class GyreSage 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/gatecrash/HandsOfBinding.java b/Mage.Sets/src/mage/sets/gatecrash/HandsOfBinding.java index cafca493c0e..7d4d785de72 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HandsOfBinding.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HandsOfBinding.java @@ -55,7 +55,6 @@ public class HandsOfBinding extends CardImpl { super(ownerId, 37, "Hands of Binding", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{U}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); //Tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step. this.getSpellAbility().addEffect(new TapTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/HellkiteTyrant.java b/Mage.Sets/src/mage/sets/gatecrash/HellkiteTyrant.java index 7d2da234f22..20a1c1781f9 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HellkiteTyrant.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HellkiteTyrant.java @@ -69,7 +69,6 @@ public class HellkiteTyrant extends CardImpl { this.expansionSetCode = "GTC"; 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/gatecrash/HellraiserGoblin.java b/Mage.Sets/src/mage/sets/gatecrash/HellraiserGoblin.java index af6f03f8f6c..f5179f67eee 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HellraiserGoblin.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HellraiserGoblin.java @@ -59,7 +59,6 @@ public class HellraiserGoblin 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/gatecrash/HighPriestOfPenance.java b/Mage.Sets/src/mage/sets/gatecrash/HighPriestOfPenance.java index 12bfe8f37ab..40afe2cf989 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HighPriestOfPenance.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HighPriestOfPenance.java @@ -53,8 +53,6 @@ public class HighPriestOfPenance extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java b/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java index 78fbc83fa76..db6f6ac5de4 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java @@ -54,7 +54,6 @@ public class Hindervines extends CardImpl { super(ownerId, 124, "Hindervines", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "GTC"; - this.color.setGreen(true); // Prevent all combat damage that would be dealt this turn by creatures with no +1/+1 counters on them. this.getSpellAbility().addEffect(new PreventAllDamageByAllEffect(filter, Duration.EndOfTurn, true)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/HoldTheGates.java b/Mage.Sets/src/mage/sets/gatecrash/HoldTheGates.java index 3c04cd59337..cb8c08bc671 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HoldTheGates.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HoldTheGates.java @@ -62,7 +62,6 @@ public class HoldTheGates extends CardImpl { super(ownerId, 16, "Hold the Gates", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "GTC"; - this.color.setWhite(true); // Creatures you control get +0/+1 for each Gate you control and have vigilance. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/sets/gatecrash/HolyMantle.java b/Mage.Sets/src/mage/sets/gatecrash/HolyMantle.java index 6e078041fbe..7267283bdc4 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HolyMantle.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HolyMantle.java @@ -56,8 +56,6 @@ public class HolyMantle extends CardImpl { super(ownerId, 17, "Holy Mantle", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "GTC"; - this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/HomingLightning.java b/Mage.Sets/src/mage/sets/gatecrash/HomingLightning.java index f3eb69a4d35..1ffd5d29688 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HomingLightning.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HomingLightning.java @@ -52,7 +52,6 @@ public class HomingLightning extends CardImpl { super(ownerId, 96, "Homing Lightning", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{R}{R}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); // Homing Lightning deals 4 damage to target creature and each other creature with the same name as that creature. this.getSpellAbility().addEffect(new HomingLightningEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/HorrorOfTheDim.java b/Mage.Sets/src/mage/sets/gatecrash/HorrorOfTheDim.java index 71f1af2689a..4f9486d0fcb 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HorrorOfTheDim.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HorrorOfTheDim.java @@ -52,7 +52,6 @@ public class HorrorOfTheDim extends CardImpl { this.expansionSetCode = "GTC"; 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/gatecrash/Hydroform.java b/Mage.Sets/src/mage/sets/gatecrash/Hydroform.java index 18b485f4451..b5379c7567a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Hydroform.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Hydroform.java @@ -49,8 +49,6 @@ public class Hydroform extends CardImpl { super(ownerId, 172, "Hydroform", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}{U}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); - this.color.setGreen(true); // Target land becomes a 3/3 Elemental creature with flying until end of turn. It's still a land. this.getSpellAbility().addEffect(new BecomesCreatureTargetEffect(new HydroformToken(), false, true, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/IllnessInTheRanks.java b/Mage.Sets/src/mage/sets/gatecrash/IllnessInTheRanks.java index 6044dcdc5ec..09b195285a8 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/IllnessInTheRanks.java +++ b/Mage.Sets/src/mage/sets/gatecrash/IllnessInTheRanks.java @@ -53,7 +53,6 @@ public class IllnessInTheRanks extends CardImpl { super(ownerId, 69, "Illness in the Ranks", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "GTC"; - this.color.setBlack(true); // Creature tokens get -1/-1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1,-1, Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ImmortalServitude.java b/Mage.Sets/src/mage/sets/gatecrash/ImmortalServitude.java index 48a881d2244..cc60020db0d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ImmortalServitude.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ImmortalServitude.java @@ -51,8 +51,6 @@ public class ImmortalServitude extends CardImpl { super(ownerId, 220, "Immortal Servitude", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{W/B}{W/B}{W/B}"); this.expansionSetCode = "GTC"; - this.color.setBlack(true); - this.color.setWhite(true); // Return each creature card with converted mana cost X from your graveyard to the battlefield. this.getSpellAbility().addEffect(new ImmortalServitudeEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java b/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java index 64470da92ae..ffbdfecb931 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java +++ b/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java @@ -52,7 +52,6 @@ public class IncursionSpecialist 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/gatecrash/IvyLaneDenizen.java b/Mage.Sets/src/mage/sets/gatecrash/IvyLaneDenizen.java index 3357a529479..ef6a115ac1c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/IvyLaneDenizen.java +++ b/Mage.Sets/src/mage/sets/gatecrash/IvyLaneDenizen.java @@ -61,7 +61,6 @@ public class IvyLaneDenizen 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/gatecrash/KeymasterRogue.java b/Mage.Sets/src/mage/sets/gatecrash/KeymasterRogue.java index aca818284b3..a074c5a9d61 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/KeymasterRogue.java +++ b/Mage.Sets/src/mage/sets/gatecrash/KeymasterRogue.java @@ -49,7 +49,6 @@ public class KeymasterRogue extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java b/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java index 8bcb53c71ad..ef201b54619 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java +++ b/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java @@ -50,7 +50,6 @@ public class KillingGlare extends CardImpl { super(ownerId, 70, "Killing Glare", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{B}"); this.expansionSetCode = "GTC"; - this.color.setBlack(true); // Destroy target creature with power X or less. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/KingpinsPet.java b/Mage.Sets/src/mage/sets/gatecrash/KingpinsPet.java index 6c7bd675164..e976dcfedb4 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/KingpinsPet.java +++ b/Mage.Sets/src/mage/sets/gatecrash/KingpinsPet.java @@ -46,8 +46,6 @@ public class KingpinsPet extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Thrull"); - 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/gatecrash/KnightOfObligation.java b/Mage.Sets/src/mage/sets/gatecrash/KnightOfObligation.java index f6acff92b1a..4e9d953093b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/KnightOfObligation.java +++ b/Mage.Sets/src/mage/sets/gatecrash/KnightOfObligation.java @@ -47,7 +47,6 @@ public class KnightOfObligation extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/gatecrash/KnightWatch.java b/Mage.Sets/src/mage/sets/gatecrash/KnightWatch.java index d2753a9f508..754b234dc0c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/KnightWatch.java +++ b/Mage.Sets/src/mage/sets/gatecrash/KnightWatch.java @@ -44,7 +44,6 @@ public class KnightWatch extends CardImpl { super(ownerId, 19, "Knight Watch", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{W}"); this.expansionSetCode = "GTC"; - this.color.setWhite(true); //Put two 2/2 white Knight creature tokens with vigilance onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new KnightToken(),2)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/LastThoughts.java b/Mage.Sets/src/mage/sets/gatecrash/LastThoughts.java index e909fe2e576..92b63a705b6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/LastThoughts.java +++ b/Mage.Sets/src/mage/sets/gatecrash/LastThoughts.java @@ -44,7 +44,6 @@ public class LastThoughts extends CardImpl { super(ownerId, 40, "Last Thoughts", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java b/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java index 289dd7faeed..e795b43c9ef 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java +++ b/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java @@ -61,8 +61,6 @@ public class LazavDimirMastermind extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Shapeshifter"); - 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/gatecrash/LegionLoyalist.java b/Mage.Sets/src/mage/sets/gatecrash/LegionLoyalist.java index f6deceb3a6f..0c35f45e77a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/LegionLoyalist.java +++ b/Mage.Sets/src/mage/sets/gatecrash/LegionLoyalist.java @@ -60,7 +60,6 @@ public class LegionLoyalist extends CardImpl { this.subtype.add("Goblin"); 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/gatecrash/LeylinePhantom.java b/Mage.Sets/src/mage/sets/gatecrash/LeylinePhantom.java index 7039bf06399..7738e497bce 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/LeylinePhantom.java +++ b/Mage.Sets/src/mage/sets/gatecrash/LeylinePhantom.java @@ -52,7 +52,6 @@ public class LeylinePhantom extends CardImpl { this.expansionSetCode = "GTC"; 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/gatecrash/LordOfTheVoid.java b/Mage.Sets/src/mage/sets/gatecrash/LordOfTheVoid.java index 403c8ace7b5..124f66d644f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/LordOfTheVoid.java +++ b/Mage.Sets/src/mage/sets/gatecrash/LordOfTheVoid.java @@ -58,7 +58,6 @@ public class LordOfTheVoid extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Demon"); - this.color.setBlack(true); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/gatecrash/LuminatePrimordial.java b/Mage.Sets/src/mage/sets/gatecrash/LuminatePrimordial.java index 8c918e51f3d..aeabeb32d0a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/LuminatePrimordial.java +++ b/Mage.Sets/src/mage/sets/gatecrash/LuminatePrimordial.java @@ -56,7 +56,6 @@ public class LuminatePrimordial extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Avatar"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/gatecrash/MadcapSkills.java b/Mage.Sets/src/mage/sets/gatecrash/MadcapSkills.java index ed2a187f9ee..33cee037fa2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MadcapSkills.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MadcapSkills.java @@ -55,7 +55,6 @@ public class MadcapSkills extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java b/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java index 6f01d876675..9466d5a6719 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java @@ -66,7 +66,6 @@ public class MarkForDeath extends CardImpl { super(ownerId, 99, "Mark for Death", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); // Target creature an opponent controls blocks this turn if able. Untap that creature. Other creatures that player controls can't block this turn. this.getSpellAbility().addEffect(new MarkForDeathEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/MartialGlory.java b/Mage.Sets/src/mage/sets/gatecrash/MartialGlory.java index 97a06baa1df..1ac85ebb806 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MartialGlory.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MartialGlory.java @@ -49,8 +49,6 @@ public class MartialGlory extends CardImpl { super(ownerId, 175, "Martial Glory", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}{W}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); - this.color.setWhite(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/gatecrash/MassiveRaid.java b/Mage.Sets/src/mage/sets/gatecrash/MassiveRaid.java index 823595ff897..14c1ca044c2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MassiveRaid.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MassiveRaid.java @@ -46,7 +46,6 @@ public class MassiveRaid extends CardImpl { super(ownerId, 100, "Massive Raid", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}{R}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); // Massive Raid deals damage to target creature or player equal to the number of creatures you control. this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()))); diff --git a/Mage.Sets/src/mage/sets/gatecrash/MasterBiomancer.java b/Mage.Sets/src/mage/sets/gatecrash/MasterBiomancer.java index ed0d5d61712..5d967f7609d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MasterBiomancer.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MasterBiomancer.java @@ -59,8 +59,6 @@ public class MasterBiomancer extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java b/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java index 090978a3665..6646f005516 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java @@ -45,7 +45,6 @@ public class MentalVapors extends CardImpl { super(ownerId, 72, "Mental Vapors", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "GTC"; - this.color.setBlack(true); // Target player discards a card. this.getSpellAbility().addEffect(new DiscardTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/MercilessEviction.java b/Mage.Sets/src/mage/sets/gatecrash/MercilessEviction.java index 68e5278bd0c..6ad92556aaa 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MercilessEviction.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MercilessEviction.java @@ -48,8 +48,6 @@ public class MercilessEviction extends CardImpl { super(ownerId, 177, "Merciless Eviction", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{W}{B}"); this.expansionSetCode = "GTC"; - this.color.setBlack(true); - this.color.setWhite(true); // Choose one - Exile all artifacts this.getSpellAbility().addEffect(new ExileAllEffect(new FilterArtifactPermanent("artifacts"))); diff --git a/Mage.Sets/src/mage/sets/gatecrash/MerfolkOfTheDepths.java b/Mage.Sets/src/mage/sets/gatecrash/MerfolkOfTheDepths.java index 2043f5f9665..f97fe7da635 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MerfolkOfTheDepths.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MerfolkOfTheDepths.java @@ -46,8 +46,6 @@ public class MerfolkOfTheDepths extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Soldier"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/gatecrash/MetropolisSprite.java b/Mage.Sets/src/mage/sets/gatecrash/MetropolisSprite.java index 40cf649eb31..49ee8bbcf33 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MetropolisSprite.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MetropolisSprite.java @@ -52,7 +52,6 @@ public class MetropolisSprite extends CardImpl { this.subtype.add("Faerie"); 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/gatecrash/MidnightRecovery.java b/Mage.Sets/src/mage/sets/gatecrash/MidnightRecovery.java index 9ca6437e05a..4783ecb7810 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MidnightRecovery.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MidnightRecovery.java @@ -46,7 +46,6 @@ public class MidnightRecovery extends CardImpl { super(ownerId, 73, "Midnight Recovery", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "GTC"; - 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/gatecrash/MindGrind.java b/Mage.Sets/src/mage/sets/gatecrash/MindGrind.java index 979427a83db..3cd85a56342 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MindGrind.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MindGrind.java @@ -53,8 +53,6 @@ public class MindGrind extends CardImpl { super(ownerId, 178, "Mind Grind", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{U}{B}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); - this.color.setBlack(true); // Each opponent reveals cards from the top of his or her library until he or she reveals X land cards, then puts all cards revealed this way into his or her graveyard. X can't be 0. this.getSpellAbility().addEffect(new MindGrindEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/MindeyeDrake.java b/Mage.Sets/src/mage/sets/gatecrash/MindeyeDrake.java index 107dad9c952..6e81ea146f3 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MindeyeDrake.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MindeyeDrake.java @@ -49,7 +49,6 @@ public class MindeyeDrake extends CardImpl { this.expansionSetCode = "GTC"; 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/gatecrash/MoltenPrimordial.java b/Mage.Sets/src/mage/sets/gatecrash/MoltenPrimordial.java index ea24c634381..3fe8408d4e0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MoltenPrimordial.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MoltenPrimordial.java @@ -62,7 +62,6 @@ public class MoltenPrimordial extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Avatar"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/gatecrash/MortusStrider.java b/Mage.Sets/src/mage/sets/gatecrash/MortusStrider.java index 4888c95907d..57634a616e9 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MortusStrider.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MortusStrider.java @@ -46,8 +46,6 @@ public class MortusStrider extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Skeleton"); - 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/gatecrash/Mugging.java b/Mage.Sets/src/mage/sets/gatecrash/Mugging.java index 2c34e8c715b..929f8e7a7d0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Mugging.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Mugging.java @@ -47,7 +47,6 @@ public class Mugging extends CardImpl { super(ownerId, 102, "Mugging", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); // Mugging deals 2 damage to target creature. That creature can't block this turn. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java b/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java index a0b08e80610..f51812e12c5 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java @@ -56,8 +56,6 @@ public class MurderInvestigation extends CardImpl { super(ownerId, 21, "Murder Investigation", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "GTC"; - this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature you control TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/NavSquadCommandos.java b/Mage.Sets/src/mage/sets/gatecrash/NavSquadCommandos.java index eb0e61b522a..cd3f3a86797 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/NavSquadCommandos.java +++ b/Mage.Sets/src/mage/sets/gatecrash/NavSquadCommandos.java @@ -51,7 +51,6 @@ public class NavSquadCommandos extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java b/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java index e85489098f8..88f9aaca2ea 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java +++ b/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java @@ -70,8 +70,6 @@ public class NightveilSpecter extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Specter"); - 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/gatecrash/NimbusSwimmer.java b/Mage.Sets/src/mage/sets/gatecrash/NimbusSwimmer.java index 458301f2df2..804d39b1250 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/NimbusSwimmer.java +++ b/Mage.Sets/src/mage/sets/gatecrash/NimbusSwimmer.java @@ -54,8 +54,6 @@ public class NimbusSwimmer extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Leviathan"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java b/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java index 1f5121e8b52..1e15e297516 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java @@ -70,8 +70,6 @@ public class ObzedatGhostCouncil extends CardImpl { this.subtype.add("Advisor"); this.supertype.add("Legendary"); - 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/gatecrash/OgreSlumlord.java b/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java index 1f72b849f82..6a456cd32e7 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java @@ -72,7 +72,6 @@ public class OgreSlumlord extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.color.setBlack(true); // Whenever another nontoken creature dies, you may put a 1/1 black Rat creature token onto the battlefield. this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new RatToken()), true, filter)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/OneThousandLashes.java b/Mage.Sets/src/mage/sets/gatecrash/OneThousandLashes.java index b54c0f1d676..7c968bee309 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OneThousandLashes.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OneThousandLashes.java @@ -56,8 +56,6 @@ public class OneThousandLashes extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Aura"); - this.color.setBlack(true); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/OrdruunVeteran.java b/Mage.Sets/src/mage/sets/gatecrash/OrdruunVeteran.java index b340d64d48a..ef15568c574 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OrdruunVeteran.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OrdruunVeteran.java @@ -49,8 +49,6 @@ public class OrdruunVeteran extends CardImpl { this.subtype.add("Minotaur"); this.subtype.add("Soldier"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/OrzhovCharm.java b/Mage.Sets/src/mage/sets/gatecrash/OrzhovCharm.java index d8d9a07c62a..f5e366d0fb2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OrzhovCharm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OrzhovCharm.java @@ -64,8 +64,6 @@ public class OrzhovCharm extends CardImpl { super(ownerId, 185, "Orzhov Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}{B}"); this.expansionSetCode = "GTC"; - this.color.setBlack(true); - this.color.setWhite(true); //Choose one - Return target creature you control and all Auras you control attached to it to their owner's hand this.getSpellAbility().addEffect(new OrzhovCharmReturnToHandEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ParanoidDelusions.java b/Mage.Sets/src/mage/sets/gatecrash/ParanoidDelusions.java index 5886df0c8b9..566a4896c79 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ParanoidDelusions.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ParanoidDelusions.java @@ -45,8 +45,6 @@ public class ParanoidDelusions extends CardImpl { super(ownerId, 186, "Paranoid Delusions", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}{B}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); - this.color.setBlack(true); // Target player puts the top three cards of his or her library into his or her graveyard. this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/PitFight.java b/Mage.Sets/src/mage/sets/gatecrash/PitFight.java index 06585a9b909..c4571ac321b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PitFight.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PitFight.java @@ -47,8 +47,6 @@ public class PitFight extends CardImpl { super(ownerId, 223, "Pit Fight", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R/G}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); - this.color.setGreen(true); // Target creature you control fights another target creature. this.getSpellAbility().addEffect(new FightTargetsEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/PredatorsRapport.java b/Mage.Sets/src/mage/sets/gatecrash/PredatorsRapport.java index b7eea48313d..f6c5f019f10 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PredatorsRapport.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PredatorsRapport.java @@ -49,7 +49,6 @@ public class PredatorsRapport extends CardImpl { super(ownerId, 129, "Predator's Rapport", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "GTC"; - this.color.setGreen(true); // Choose target creature you control. You gain life equal to that creature's power plus its toughness. Effect effect = new GainLifeEffect(new TargetPermanentPowerPlusToughnessCount()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/PrimalVisitation.java b/Mage.Sets/src/mage/sets/gatecrash/PrimalVisitation.java index 93b12b8df23..04c96199019 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PrimalVisitation.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PrimalVisitation.java @@ -57,8 +57,6 @@ public class PrimalVisitation extends CardImpl { this.expansionSetCode = "GTC"; 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/gatecrash/PrimeSpeakerZegana.java b/Mage.Sets/src/mage/sets/gatecrash/PrimeSpeakerZegana.java index 8141bbf4082..adfa5c40513 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PrimeSpeakerZegana.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PrimeSpeakerZegana.java @@ -60,8 +60,6 @@ public class PrimeSpeakerZegana extends CardImpl { this.subtype.add("Wizard"); this.supertype.add("Legendary"); - this.color.setGreen(true); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java b/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java index 77065467dc1..f7546f28458 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java @@ -52,8 +52,6 @@ public class PsychicStrike extends CardImpl { super(ownerId, 189, "Psychic Strike", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{B}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); - this.color.setBlack(true); // Counter target spell. Its controller puts the top two cards of his or her library into his or her graveyard. this.getSpellAbility().addTarget(new TargetSpell(new FilterSpell())); diff --git a/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java b/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java index ce49bfbc6a2..e2c44aa0c90 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java @@ -45,8 +45,6 @@ public class PurgeTheProfane extends CardImpl { super(ownerId, 190, "Purge the Profane", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{W}{B}"); this.expansionSetCode = "GTC"; - this.color.setBlack(true); - this.color.setWhite(true); // Target opponent discards two cards and you gain 2 life. this.getSpellAbility().addEffect(new DiscardTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java b/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java index 18507a201c7..e78fd5d41f4 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java @@ -52,7 +52,6 @@ public class RapidHybridization extends CardImpl { super(ownerId, 44, "Rapid Hybridization", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); // Destroy target creature. It can't be regenerated. That creature's controller puts a 3/3 green Frog Lizard creature token onto the battlefield. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/Realmwright.java b/Mage.Sets/src/mage/sets/gatecrash/Realmwright.java index 7e103845be6..dfb670e3dd7 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Realmwright.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Realmwright.java @@ -62,7 +62,6 @@ public class Realmwright 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/gatecrash/RighteousCharge.java b/Mage.Sets/src/mage/sets/gatecrash/RighteousCharge.java index 897eb5174da..b4254a151c0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RighteousCharge.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RighteousCharge.java @@ -44,7 +44,6 @@ public class RighteousCharge extends CardImpl { super(ownerId, 23, "Righteous Charge", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{W}{W}"); this.expansionSetCode = "GTC"; - this.color.setWhite(true); // Creatures you control get +2/+2 until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(2,2, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/RipscalePredator.java b/Mage.Sets/src/mage/sets/gatecrash/RipscalePredator.java index 63c0c40da41..8b9019948d6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RipscalePredator.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RipscalePredator.java @@ -48,7 +48,6 @@ public class RipscalePredator extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Lizard"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/gatecrash/RubblebeltRaiders.java b/Mage.Sets/src/mage/sets/gatecrash/RubblebeltRaiders.java index 0bf1c251655..ac24995ec40 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RubblebeltRaiders.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RubblebeltRaiders.java @@ -49,8 +49,6 @@ public class RubblebeltRaiders extends CardImpl { this.subtype.add("Human"); 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/gatecrash/Rubblehulk.java b/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java index 17c068d3a2d..08d347221e0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java @@ -57,8 +57,6 @@ public class Rubblehulk extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Elemental"); - 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/gatecrash/RuinationWurm.java b/Mage.Sets/src/mage/sets/gatecrash/RuinationWurm.java index de1086e02b5..4eb0ab87213 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RuinationWurm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RuinationWurm.java @@ -44,8 +44,6 @@ public class RuinationWurm extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Wurm"); - 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/gatecrash/RustScarab.java b/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java index c204ad0872f..1d29e0ce3ad 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java @@ -58,7 +58,6 @@ public class RustScarab extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SagesRowDenizen.java b/Mage.Sets/src/mage/sets/gatecrash/SagesRowDenizen.java index 07f1da8f9a5..60c7cd56ca0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SagesRowDenizen.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SagesRowDenizen.java @@ -62,7 +62,6 @@ public class SagesRowDenizen extends CardImpl { this.subtype.add("Vedalken"); 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/gatecrash/SapphireDrake.java b/Mage.Sets/src/mage/sets/gatecrash/SapphireDrake.java index 662a6f0431c..fa758d372eb 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SapphireDrake.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SapphireDrake.java @@ -62,7 +62,6 @@ public class SapphireDrake extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ScabClanCharger.java b/Mage.Sets/src/mage/sets/gatecrash/ScabClanCharger.java index 230edca7e63..a2cdae6bedd 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ScabClanCharger.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ScabClanCharger.java @@ -48,7 +48,6 @@ public class ScabClanCharger extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ScatterArc.java b/Mage.Sets/src/mage/sets/gatecrash/ScatterArc.java index 1977f1ced1c..69c133ac075 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ScatterArc.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ScatterArc.java @@ -53,7 +53,6 @@ public class ScatterArc extends CardImpl { super(ownerId, 48, "Scatter Arc", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); // Counter target noncreature spell. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/Scorchwalker.java b/Mage.Sets/src/mage/sets/gatecrash/Scorchwalker.java index c868316ab9b..75ac16cc815 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Scorchwalker.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Scorchwalker.java @@ -48,7 +48,6 @@ public class Scorchwalker extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SepulchralPrimordial.java b/Mage.Sets/src/mage/sets/gatecrash/SepulchralPrimordial.java index 03c81873746..80783a03693 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SepulchralPrimordial.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SepulchralPrimordial.java @@ -58,7 +58,6 @@ public class SepulchralPrimordial extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Avatar"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SereneRemembrance.java b/Mage.Sets/src/mage/sets/gatecrash/SereneRemembrance.java index f5d82165104..50959950ba9 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SereneRemembrance.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SereneRemembrance.java @@ -53,7 +53,6 @@ public class SereneRemembrance extends CardImpl { super(ownerId, 132, "Serene Remembrance", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{G}"); this.expansionSetCode = "GTC"; - this.color.setGreen(true); // Shuffle Serene Remembrance and up to three target cards from a single graveyard into their owners' libraries. this.getSpellAbility().addEffect(new SereneRemembranceEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ShadowAlleyDenizen.java b/Mage.Sets/src/mage/sets/gatecrash/ShadowAlleyDenizen.java index 0c87b85411c..b75c34820b6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ShadowAlleyDenizen.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ShadowAlleyDenizen.java @@ -63,7 +63,6 @@ public class ShadowAlleyDenizen 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/gatecrash/ShadowSlice.java b/Mage.Sets/src/mage/sets/gatecrash/ShadowSlice.java index ae14a089955..c7e443df953 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ShadowSlice.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ShadowSlice.java @@ -45,7 +45,6 @@ public class ShadowSlice extends CardImpl { super(ownerId, 77, "Shadow Slice", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{B}"); this.expansionSetCode = "GTC"; - this.color.setBlack(true); // Target Opponent loses 3 life. this.getSpellAbility().addEffect(new LoseLifeTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/Shambleshark.java b/Mage.Sets/src/mage/sets/gatecrash/Shambleshark.java index cff94a1ff53..c3981248233 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Shambleshark.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Shambleshark.java @@ -47,8 +47,6 @@ public class Shambleshark extends CardImpl { this.subtype.add("Fish"); this.subtype.add("Crab"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ShatteringBlow.java b/Mage.Sets/src/mage/sets/gatecrash/ShatteringBlow.java index f36640699f1..b8c233ca603 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ShatteringBlow.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ShatteringBlow.java @@ -45,8 +45,6 @@ public class ShatteringBlow extends CardImpl { super(ownerId, 225, "Shattering Blow", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R/W}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); - this.color.setWhite(true); // Exile target artifact. this.getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ShieldedPassage.java b/Mage.Sets/src/mage/sets/gatecrash/ShieldedPassage.java index af9f8e6f207..c1cb2d3cec0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ShieldedPassage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ShieldedPassage.java @@ -45,7 +45,6 @@ public class ShieldedPassage extends CardImpl { super(ownerId, 24, "Shielded Passage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "GTC"; - this.color.setWhite(true); // Prevent all damage that would be dealt to target creature this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SignalTheClans.java b/Mage.Sets/src/mage/sets/gatecrash/SignalTheClans.java index 81b7081aa99..895994b2fde 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SignalTheClans.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SignalTheClans.java @@ -55,8 +55,6 @@ public class SignalTheClans extends CardImpl { super(ownerId, 194, "Signal the Clans", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{R}{G}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); - this.color.setGreen(true); // Search your library for three creature cards and reveal them. If you reveal three cards with different names, choose one of them at random and put that card into your hand. Shuffle the rest into your library. this.getSpellAbility().addEffect(new SignalTheClansEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java b/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java index 44428ce4e35..da5d66b08c2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java @@ -58,7 +58,6 @@ public class SimicFluxmage extends CardImpl { this.subtype.add("Merfolk"); 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/gatecrash/SimicManipulator.java b/Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java index d0821c1b35e..195737b5175 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java @@ -72,7 +72,6 @@ public class SimicManipulator extends CardImpl { this.subtype.add("Mutant"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SkarrgGoliath.java b/Mage.Sets/src/mage/sets/gatecrash/SkarrgGoliath.java index a0b018cfe8d..5bd38291229 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SkarrgGoliath.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SkarrgGoliath.java @@ -50,7 +50,6 @@ public class SkarrgGoliath extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(9); this.toughness = new MageInt(9); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SkarrgGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/SkarrgGuildmage.java index 136ae74b8e8..1592b913e92 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SkarrgGuildmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SkarrgGuildmage.java @@ -65,8 +65,6 @@ public class SkarrgGuildmage extends CardImpl { this.subtype.add("Human"); 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/gatecrash/SkinbrandGoblin.java b/Mage.Sets/src/mage/sets/gatecrash/SkinbrandGoblin.java index b84936be2c1..68137d042c5 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SkinbrandGoblin.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SkinbrandGoblin.java @@ -49,7 +49,6 @@ public class SkinbrandGoblin 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/gatecrash/Skullcrack.java b/Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java index f4845ad74ee..d7303a90eb7 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java @@ -52,7 +52,6 @@ public class Skullcrack extends CardImpl { super(ownerId, 106, "Skullcrack", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); // Players can't gain life this turn. Damage can't be prevented this turn. Skullcrack deals 3 damage to target player. this.getSpellAbility().addEffect(new CantGainLifeAllEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/Skygames.java b/Mage.Sets/src/mage/sets/gatecrash/Skygames.java index 95814ebef10..ae0765f4978 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Skygames.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Skygames.java @@ -55,7 +55,6 @@ public class Skygames extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SlateStreetRuffian.java b/Mage.Sets/src/mage/sets/gatecrash/SlateStreetRuffian.java index c4ffc0412a6..19c03cc8e2f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SlateStreetRuffian.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SlateStreetRuffian.java @@ -52,7 +52,6 @@ public class SlateStreetRuffian extends CardImpl { this.subtype.add("Human"); 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/gatecrash/Slaughterhorn.java b/Mage.Sets/src/mage/sets/gatecrash/Slaughterhorn.java index 6d501bd0851..f86a65210ee 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Slaughterhorn.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Slaughterhorn.java @@ -47,7 +47,6 @@ public class Slaughterhorn extends CardImpl { this.expansionSetCode = "GTC"; 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/gatecrash/SmogElemental.java b/Mage.Sets/src/mage/sets/gatecrash/SmogElemental.java index 97a06614bd8..26ac68f8291 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SmogElemental.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SmogElemental.java @@ -56,7 +56,6 @@ public class SmogElemental extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Elemental"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SoulRansom.java b/Mage.Sets/src/mage/sets/gatecrash/SoulRansom.java index 6499ab92ab1..75b8d1fa8ca 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SoulRansom.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SoulRansom.java @@ -57,8 +57,6 @@ public class SoulRansom extends CardImpl { this.expansionSetCode = "GTC"; 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/gatecrash/SparkTrooper.java b/Mage.Sets/src/mage/sets/gatecrash/SparkTrooper.java index 9e52c0d6101..9d55dc9a920 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SparkTrooper.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SparkTrooper.java @@ -51,8 +51,6 @@ public class SparkTrooper extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Soldier"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(6); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SpellRupture.java b/Mage.Sets/src/mage/sets/gatecrash/SpellRupture.java index 6b0a1b283db..044ed10c370 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SpellRupture.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SpellRupture.java @@ -57,7 +57,6 @@ public class SpellRupture extends CardImpl { super(ownerId, 52, "Spell Rupture", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); // Counter target spell unless its controller pays {X}, where X is the greatest power among creatures you control. this.getSpellAbility().addEffect(new SpellRuptureCounterUnlessPaysEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SpireTracer.java b/Mage.Sets/src/mage/sets/gatecrash/SpireTracer.java index da8de30484f..61018e23785 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SpireTracer.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SpireTracer.java @@ -55,7 +55,6 @@ public class SpireTracer 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/gatecrash/StolenIdentity.java b/Mage.Sets/src/mage/sets/gatecrash/StolenIdentity.java index cf73dbbc5f7..af874fafb0d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/StolenIdentity.java +++ b/Mage.Sets/src/mage/sets/gatecrash/StolenIdentity.java @@ -61,7 +61,6 @@ public class StolenIdentity extends CardImpl { super(ownerId, 53, "Stolen Identity", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{U}{U}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); // Put a token onto the battlefield that's a copy of target artifact or creature. this.getSpellAbility().addEffect(new StolenIdentityEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/StructuralCollapse.java b/Mage.Sets/src/mage/sets/gatecrash/StructuralCollapse.java index b2f41caf80a..c8ccee1a7d6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/StructuralCollapse.java +++ b/Mage.Sets/src/mage/sets/gatecrash/StructuralCollapse.java @@ -47,7 +47,6 @@ public class StructuralCollapse extends CardImpl { super(ownerId, 107, "Structural Collapse", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{5}{R}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); // Target player sacrifices an artifact and a land. Structural Collapse deals 2 damage to that player. this.getSpellAbility().addEffect(new SacrificeEffect(new FilterArtifactPermanent(), 1, "Target player")); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SunhomeGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/SunhomeGuildmage.java index 9673d59e54f..0adc3c7a3a6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SunhomeGuildmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SunhomeGuildmage.java @@ -54,8 +54,6 @@ public class SunhomeGuildmage extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - 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/gatecrash/SylvanPrimordial.java b/Mage.Sets/src/mage/sets/gatecrash/SylvanPrimordial.java index 2f394470780..bb234030537 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SylvanPrimordial.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SylvanPrimordial.java @@ -62,7 +62,6 @@ public class SylvanPrimordial extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Avatar"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SyndicOfTithes.java b/Mage.Sets/src/mage/sets/gatecrash/SyndicOfTithes.java index 244e22b1b0f..a068ee5e4ff 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SyndicOfTithes.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SyndicOfTithes.java @@ -46,7 +46,6 @@ public class SyndicOfTithes 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/gatecrash/SyndicateEnforcer.java b/Mage.Sets/src/mage/sets/gatecrash/SyndicateEnforcer.java index 4ac0794a891..ec6d1feb661 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SyndicateEnforcer.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SyndicateEnforcer.java @@ -46,7 +46,6 @@ public class SyndicateEnforcer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ThrullParasite.java b/Mage.Sets/src/mage/sets/gatecrash/ThrullParasite.java index 99c398e672c..e989bcca14d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ThrullParasite.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ThrullParasite.java @@ -63,7 +63,6 @@ public class ThrullParasite extends CardImpl { this.expansionSetCode = "GTC"; 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/gatecrash/TotallyLost.java b/Mage.Sets/src/mage/sets/gatecrash/TotallyLost.java index 659503598d6..1d1ff3d230c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/TotallyLost.java +++ b/Mage.Sets/src/mage/sets/gatecrash/TotallyLost.java @@ -44,7 +44,6 @@ public class TotallyLost extends CardImpl { super(ownerId, 54, "Totally Lost", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{U}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); // Put target nonland permanent on top of its owner's library. this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/TowerDefense.java b/Mage.Sets/src/mage/sets/gatecrash/TowerDefense.java index 39811554799..907edb808ce 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/TowerDefense.java +++ b/Mage.Sets/src/mage/sets/gatecrash/TowerDefense.java @@ -55,7 +55,6 @@ public class TowerDefense extends CardImpl { super(ownerId, 137, "Tower Defense", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "GTC"; - this.color.setGreen(true); // Creatures you control get +0/+5 and gain reach until end of turn. this.getSpellAbility().addEffect(new BoostAllEffect(0, 5, Duration.EndOfTurn, filter , false)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ToweringThunderfist.java b/Mage.Sets/src/mage/sets/gatecrash/ToweringThunderfist.java index 98c77e0728a..510f9ebbf90 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ToweringThunderfist.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ToweringThunderfist.java @@ -52,7 +52,6 @@ public class ToweringThunderfist extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Soldier"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java b/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java index e4d743133c5..883a3afd105 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java +++ b/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java @@ -59,8 +59,6 @@ public class TreasuryThrull extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Thrull"); - this.color.setWhite(true); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/gatecrash/TruefirePaladin.java b/Mage.Sets/src/mage/sets/gatecrash/TruefirePaladin.java index 97e24fbe182..026f751ec0d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/TruefirePaladin.java +++ b/Mage.Sets/src/mage/sets/gatecrash/TruefirePaladin.java @@ -55,8 +55,6 @@ public class TruefirePaladin extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - 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/gatecrash/UndercityInformer.java b/Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java index 190c41f7d8c..39953838c5e 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java +++ b/Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java @@ -61,7 +61,6 @@ public class UndercityInformer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java b/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java index 638a5926982..5d0780eeb24 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java +++ b/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java @@ -48,7 +48,6 @@ public class UndercityPlague extends CardImpl { super(ownerId, 83, "Undercity Plague", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{B}{B}"); this.expansionSetCode = "GTC"; - this.color.setBlack(true); // Target player loses 1 life, discards a card, then sacrifices a permanent. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/UnexpectedResults.java b/Mage.Sets/src/mage/sets/gatecrash/UnexpectedResults.java index 7a86b6f85b9..3fb0e6c321f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/UnexpectedResults.java +++ b/Mage.Sets/src/mage/sets/gatecrash/UnexpectedResults.java @@ -71,8 +71,6 @@ public class UnexpectedResults extends CardImpl { super(ownerId, 203, "Unexpected Results", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{G}{U}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); - this.color.setGreen(true); // Shuffle your library, then reveal the top card. If it's a nonland card, you may cast it without paying its mana cost. If it's a land card, you may put it onto the battlefield and return Unexpected Results to its owner's hand. this.getSpellAbility().addEffect(new UnexpectedResultEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/UrbanEvolution.java b/Mage.Sets/src/mage/sets/gatecrash/UrbanEvolution.java index d3935699791..626a9642465 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/UrbanEvolution.java +++ b/Mage.Sets/src/mage/sets/gatecrash/UrbanEvolution.java @@ -48,8 +48,6 @@ public class UrbanEvolution extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Wizard"); - this.color.setGreen(true); - this.color.setBlue(true); //Draw three cards. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/UrbisProtector.java b/Mage.Sets/src/mage/sets/gatecrash/UrbisProtector.java index 72697d79984..d4745b17108 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/UrbisProtector.java +++ b/Mage.Sets/src/mage/sets/gatecrash/UrbisProtector.java @@ -48,7 +48,6 @@ public class UrbisProtector 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/gatecrash/VerdantHaven.java b/Mage.Sets/src/mage/sets/gatecrash/VerdantHaven.java index 12b13d025c2..d0abdaa242c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/VerdantHaven.java +++ b/Mage.Sets/src/mage/sets/gatecrash/VerdantHaven.java @@ -57,7 +57,6 @@ public class VerdantHaven extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ViashinoShanktail.java b/Mage.Sets/src/mage/sets/gatecrash/ViashinoShanktail.java index 873793706c8..2d1082954a0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ViashinoShanktail.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ViashinoShanktail.java @@ -51,7 +51,6 @@ public class ViashinoShanktail extends CardImpl { this.subtype.add("Viashino"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java index f70d4ca452f..cf9b249967c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java @@ -72,8 +72,6 @@ public class VizkopaGuildmage extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setWhite(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/gatecrash/Voidwalk.java b/Mage.Sets/src/mage/sets/gatecrash/Voidwalk.java index 4fb09d45941..e23881336e6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Voidwalk.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Voidwalk.java @@ -54,7 +54,6 @@ public class Voidwalk extends CardImpl { super(ownerId, 55, "Voidwalk", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); // Exile target creature. Return it to the battlefield under its owner's control at the beginning of the next end step. this.getSpellAbility().addEffect(new VoidwalkEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/WarmindInfantry.java b/Mage.Sets/src/mage/sets/gatecrash/WarmindInfantry.java index 410bd52d5c7..af84f4e3744 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WarmindInfantry.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WarmindInfantry.java @@ -49,7 +49,6 @@ public class WarmindInfantry extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Soldier"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/gatecrash/WastelandViper.java b/Mage.Sets/src/mage/sets/gatecrash/WastelandViper.java index 1f13e444a5b..754de8df9ea 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WastelandViper.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WastelandViper.java @@ -51,7 +51,6 @@ public class WastelandViper extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Snake"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java b/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java index e87cdb27156..a55e94e6f38 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java @@ -68,7 +68,6 @@ public class WayOfTheThief extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/WhisperingMadness.java b/Mage.Sets/src/mage/sets/gatecrash/WhisperingMadness.java index b8057d2ea1e..dbe8d2fd1f3 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WhisperingMadness.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WhisperingMadness.java @@ -50,8 +50,6 @@ public class WhisperingMadness extends CardImpl { super(ownerId, 207, "Whispering Madness", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{U}{B}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); - this.color.setBlack(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 WhisperingMadnessEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/WightOfPrecinctSix.java b/Mage.Sets/src/mage/sets/gatecrash/WightOfPrecinctSix.java index 08fd8087c67..c3f678451fb 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WightOfPrecinctSix.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WightOfPrecinctSix.java @@ -58,7 +58,6 @@ public class WightOfPrecinctSix extends CardImpl { this.expansionSetCode = "GTC"; 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/gatecrash/WildwoodRebirth.java b/Mage.Sets/src/mage/sets/gatecrash/WildwoodRebirth.java index 910baf55311..89f4c527166 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WildwoodRebirth.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WildwoodRebirth.java @@ -45,7 +45,6 @@ public class WildwoodRebirth extends CardImpl { super(ownerId, 140, "Wildwood Rebirth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "GTC"; - this.color.setGreen(true); // Return target creature card from your graveyard to your hand. this.getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/WojekHalberdiers.java b/Mage.Sets/src/mage/sets/gatecrash/WojekHalberdiers.java index bc4de5e66c2..7e4b4476dd3 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WojekHalberdiers.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WojekHalberdiers.java @@ -50,8 +50,6 @@ public class WojekHalberdiers 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/gatecrash/WreckingOgre.java b/Mage.Sets/src/mage/sets/gatecrash/WreckingOgre.java index fce1e90541d..dd079a71810 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WreckingOgre.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WreckingOgre.java @@ -51,7 +51,6 @@ public class WreckingOgre 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/gatecrash/ZameckGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java index c6a986aa66a..48c906b6fec 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java @@ -66,8 +66,6 @@ public class ZameckGuildmage extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Wizard"); - 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/gatecrash/ZarichiTiger.java b/Mage.Sets/src/mage/sets/gatecrash/ZarichiTiger.java index b8c6517423e..73ad671781d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ZarichiTiger.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ZarichiTiger.java @@ -51,7 +51,6 @@ public class ZarichiTiger extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Cat"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ZhurTaaSwine.java b/Mage.Sets/src/mage/sets/gatecrash/ZhurTaaSwine.java index 7768e778991..68144479efd 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ZhurTaaSwine.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ZhurTaaSwine.java @@ -47,8 +47,6 @@ public class ZhurTaaSwine extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Boar"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/guildpact/AbsolverThrull.java b/Mage.Sets/src/mage/sets/guildpact/AbsolverThrull.java index 30b95729ae2..338148b9fa0 100644 --- a/Mage.Sets/src/mage/sets/guildpact/AbsolverThrull.java +++ b/Mage.Sets/src/mage/sets/guildpact/AbsolverThrull.java @@ -51,7 +51,6 @@ public class AbsolverThrull extends CardImpl { this.subtype.add("Thrull"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/guildpact/BatteringWurm.java b/Mage.Sets/src/mage/sets/guildpact/BatteringWurm.java index a154e0520b8..d31dc873335 100644 --- a/Mage.Sets/src/mage/sets/guildpact/BatteringWurm.java +++ b/Mage.Sets/src/mage/sets/guildpact/BatteringWurm.java @@ -48,7 +48,6 @@ public class BatteringWurm extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/guildpact/BelfrySpirit.java b/Mage.Sets/src/mage/sets/guildpact/BelfrySpirit.java index 22df4c93a53..f3aae080e2c 100644 --- a/Mage.Sets/src/mage/sets/guildpact/BelfrySpirit.java +++ b/Mage.Sets/src/mage/sets/guildpact/BelfrySpirit.java @@ -48,7 +48,6 @@ public class BelfrySpirit extends CardImpl { this.expansionSetCode = "GPT"; 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/guildpact/BlindHunter.java b/Mage.Sets/src/mage/sets/guildpact/BlindHunter.java index 8202051cf59..cb39bdb6ef1 100644 --- a/Mage.Sets/src/mage/sets/guildpact/BlindHunter.java +++ b/Mage.Sets/src/mage/sets/guildpact/BlindHunter.java @@ -50,8 +50,6 @@ public class BlindHunter extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Bat"); - 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/guildpact/Castigate.java b/Mage.Sets/src/mage/sets/guildpact/Castigate.java index 59a72c111f3..b21755aab2f 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Castigate.java +++ b/Mage.Sets/src/mage/sets/guildpact/Castigate.java @@ -57,8 +57,6 @@ public class Castigate extends CardImpl { super(ownerId, 106, "Castigate", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{W}{B}"); this.expansionSetCode = "GPT"; - this.color.setBlack(true); - this.color.setWhite(true); // Target opponent reveals his or her hand. You choose a nonland card from it and exile that card. this.getSpellAbility().addEffect(new ExileCardYouChooseTargetOpponentEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/guildpact/CullingSun.java b/Mage.Sets/src/mage/sets/guildpact/CullingSun.java index 033514e26b6..3002922810f 100644 --- a/Mage.Sets/src/mage/sets/guildpact/CullingSun.java +++ b/Mage.Sets/src/mage/sets/guildpact/CullingSun.java @@ -51,8 +51,6 @@ public class CullingSun extends CardImpl { super(ownerId, 109, "Culling Sun", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{W}{W}{B}"); this.expansionSetCode = "GPT"; - this.color.setBlack(true); - this.color.setWhite(true); this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); } diff --git a/Mage.Sets/src/mage/sets/guildpact/DebtorsKnell.java b/Mage.Sets/src/mage/sets/guildpact/DebtorsKnell.java index 8b927c147a4..b5de0ad0fd4 100644 --- a/Mage.Sets/src/mage/sets/guildpact/DebtorsKnell.java +++ b/Mage.Sets/src/mage/sets/guildpact/DebtorsKnell.java @@ -49,8 +49,6 @@ public class DebtorsKnell extends CardImpl { super(ownerId, 141, "Debtors' Knell", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{W/B}{W/B}{W/B}"); this.expansionSetCode = "GPT"; - this.color.setBlack(true); - this.color.setWhite(true); // ({WB} can be paid with either {W} or {B}.) // At the beginning of your upkeep, put target creature card from a graveyard onto the battlefield under your control. diff --git a/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java b/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java index 9ad39f92d0c..dd51a461c24 100644 --- a/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java +++ b/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java @@ -53,7 +53,6 @@ public class DrownedRusalka extends CardImpl { this.expansionSetCode = "GPT"; 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/guildpact/DryadSophisticate.java b/Mage.Sets/src/mage/sets/guildpact/DryadSophisticate.java index 5b69fa7dc99..9aec57a53e2 100644 --- a/Mage.Sets/src/mage/sets/guildpact/DryadSophisticate.java +++ b/Mage.Sets/src/mage/sets/guildpact/DryadSophisticate.java @@ -48,7 +48,6 @@ public class DryadSophisticate extends CardImpl { this.expansionSetCode = "GPT"; 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/guildpact/Electrolyze.java b/Mage.Sets/src/mage/sets/guildpact/Electrolyze.java index 17ca290101d..c1f1fdfa9c5 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Electrolyze.java +++ b/Mage.Sets/src/mage/sets/guildpact/Electrolyze.java @@ -46,8 +46,6 @@ public class Electrolyze extends CardImpl { super(ownerId, 111, "Electrolyze", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{R}"); this.expansionSetCode = "GPT"; - this.color.setRed(true); - this.color.setBlue(true); // Electrolyze 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/guildpact/ExhumerThrull.java b/Mage.Sets/src/mage/sets/guildpact/ExhumerThrull.java index 9c22c6b1612..e12a80dcf75 100644 --- a/Mage.Sets/src/mage/sets/guildpact/ExhumerThrull.java +++ b/Mage.Sets/src/mage/sets/guildpact/ExhumerThrull.java @@ -49,7 +49,6 @@ public class ExhumerThrull extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Thrull"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/guildpact/FeralAnimist.java b/Mage.Sets/src/mage/sets/guildpact/FeralAnimist.java index 6346182f36a..c212a9e797a 100644 --- a/Mage.Sets/src/mage/sets/guildpact/FeralAnimist.java +++ b/Mage.Sets/src/mage/sets/guildpact/FeralAnimist.java @@ -52,8 +52,6 @@ public class FeralAnimist 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(1); diff --git a/Mage.Sets/src/mage/sets/guildpact/GhorClanSavage.java b/Mage.Sets/src/mage/sets/guildpact/GhorClanSavage.java index 68e19d88b7d..973a4ad57b1 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GhorClanSavage.java +++ b/Mage.Sets/src/mage/sets/guildpact/GhorClanSavage.java @@ -46,7 +46,6 @@ public class GhorClanSavage extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Berserker"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/guildpact/Gigadrowse.java b/Mage.Sets/src/mage/sets/guildpact/Gigadrowse.java index effc23d09bb..e3168d25aa7 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Gigadrowse.java +++ b/Mage.Sets/src/mage/sets/guildpact/Gigadrowse.java @@ -48,7 +48,6 @@ public class Gigadrowse extends CardImpl { super(ownerId, 26, "Gigadrowse", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "GPT"; - this.color.setBlue(true); // Replicate {U} this.addAbility(new ReplicateAbility(this, "{U}")); diff --git a/Mage.Sets/src/mage/sets/guildpact/GravenDominator.java b/Mage.Sets/src/mage/sets/guildpact/GravenDominator.java index d460dcc3bbb..94367eecb77 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GravenDominator.java +++ b/Mage.Sets/src/mage/sets/guildpact/GravenDominator.java @@ -56,7 +56,6 @@ public class GravenDominator extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Gargoyle"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/guildpact/InfiltratorsMagemark.java b/Mage.Sets/src/mage/sets/guildpact/InfiltratorsMagemark.java index ce22019b841..80109c64535 100644 --- a/Mage.Sets/src/mage/sets/guildpact/InfiltratorsMagemark.java +++ b/Mage.Sets/src/mage/sets/guildpact/InfiltratorsMagemark.java @@ -69,7 +69,6 @@ public class InfiltratorsMagemark extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/guildpact/InvokeTheFiremind.java b/Mage.Sets/src/mage/sets/guildpact/InvokeTheFiremind.java index 4789cd4b509..b691d8d7426 100644 --- a/Mage.Sets/src/mage/sets/guildpact/InvokeTheFiremind.java +++ b/Mage.Sets/src/mage/sets/guildpact/InvokeTheFiremind.java @@ -47,8 +47,6 @@ public class InvokeTheFiremind extends CardImpl { super(ownerId, 118, "Invoke the Firemind", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{U}{U}{R}"); this.expansionSetCode = "GPT"; - this.color.setRed(true); - this.color.setBlue(true); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(new ManacostVariableValue())); Mode mode = new Mode(); diff --git a/Mage.Sets/src/mage/sets/guildpact/IzzetGuildmage.java b/Mage.Sets/src/mage/sets/guildpact/IzzetGuildmage.java index cdb099d3e56..fc224ec262f 100644 --- a/Mage.Sets/src/mage/sets/guildpact/IzzetGuildmage.java +++ b/Mage.Sets/src/mage/sets/guildpact/IzzetGuildmage.java @@ -69,8 +69,6 @@ public class IzzetGuildmage 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/guildpact/LeapOfFlame.java b/Mage.Sets/src/mage/sets/guildpact/LeapOfFlame.java index d3d60cbd8d4..386e145b7b0 100644 --- a/Mage.Sets/src/mage/sets/guildpact/LeapOfFlame.java +++ b/Mage.Sets/src/mage/sets/guildpact/LeapOfFlame.java @@ -50,8 +50,6 @@ public class LeapOfFlame extends CardImpl { super(ownerId, 121, "Leap of Flame", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}{R}"); this.expansionSetCode = "GPT"; - this.color.setRed(true); - this.color.setBlue(true); // Replicate {U}{R} this.addAbility(new ReplicateAbility(this, "{U}{R}")); diff --git a/Mage.Sets/src/mage/sets/guildpact/LeylineOfLifeforce.java b/Mage.Sets/src/mage/sets/guildpact/LeylineOfLifeforce.java index c3179a77492..8df8237b83d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/LeylineOfLifeforce.java +++ b/Mage.Sets/src/mage/sets/guildpact/LeylineOfLifeforce.java @@ -53,7 +53,6 @@ public class LeylineOfLifeforce extends CardImpl { super(ownerId, 90, "Leyline of Lifeforce", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); this.expansionSetCode = "GPT"; - this.color.setGreen(true); // If Leyline of Lifeforce is in your opening hand, you may begin the game with it on the battlefield. this.addAbility(LeylineAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/guildpact/LeylineOfLightning.java b/Mage.Sets/src/mage/sets/guildpact/LeylineOfLightning.java index 551b0b4622b..7a32bf2d730 100644 --- a/Mage.Sets/src/mage/sets/guildpact/LeylineOfLightning.java +++ b/Mage.Sets/src/mage/sets/guildpact/LeylineOfLightning.java @@ -51,7 +51,6 @@ public class LeylineOfLightning extends CardImpl { super(ownerId, 68, "Leyline of Lightning", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{R}"); this.expansionSetCode = "GPT"; - this.color.setRed(true); // If Leyline of Lightning is in your opening hand, you may begin the game with it on the battlefield. this.addAbility(LeylineAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/guildpact/LeylineOfTheMeek.java b/Mage.Sets/src/mage/sets/guildpact/LeylineOfTheMeek.java index ce9c41b2800..6a94c10ddf9 100644 --- a/Mage.Sets/src/mage/sets/guildpact/LeylineOfTheMeek.java +++ b/Mage.Sets/src/mage/sets/guildpact/LeylineOfTheMeek.java @@ -54,7 +54,6 @@ public class LeylineOfTheMeek extends CardImpl { super(ownerId, 10, "Leyline of the Meek", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "GPT"; - this.color.setWhite(true); // If Leyline of the Meek is in your opening hand, you may begin the game with it on the battlefield. this.addAbility(LeylineAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/guildpact/MourningThrull.java b/Mage.Sets/src/mage/sets/guildpact/MourningThrull.java index 44a3fa5c264..172911ca1d0 100644 --- a/Mage.Sets/src/mage/sets/guildpact/MourningThrull.java +++ b/Mage.Sets/src/mage/sets/guildpact/MourningThrull.java @@ -46,8 +46,6 @@ public class MourningThrull extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Thrull"); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java b/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java index 154754e5241..d9416587558 100644 --- a/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java +++ b/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java @@ -57,7 +57,6 @@ public class OrzhovEuthanist extends CardImpl { this.subtype.add("Human"); this.subtype.add("Assassin"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/guildpact/OrzhovPontiff.java b/Mage.Sets/src/mage/sets/guildpact/OrzhovPontiff.java index 71c44466beb..28cb903865e 100644 --- a/Mage.Sets/src/mage/sets/guildpact/OrzhovPontiff.java +++ b/Mage.Sets/src/mage/sets/guildpact/OrzhovPontiff.java @@ -60,8 +60,6 @@ public class OrzhovPontiff extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/guildpact/Petrahydrox.java b/Mage.Sets/src/mage/sets/guildpact/Petrahydrox.java index 139afff26ce..a268c8b042e 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Petrahydrox.java +++ b/Mage.Sets/src/mage/sets/guildpact/Petrahydrox.java @@ -46,8 +46,6 @@ public class Petrahydrox extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Weird"); - this.color.setRed(true); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/guildpact/PilloryOfTheSleepless.java b/Mage.Sets/src/mage/sets/guildpact/PilloryOfTheSleepless.java index bbe082297ac..46f24021a67 100644 --- a/Mage.Sets/src/mage/sets/guildpact/PilloryOfTheSleepless.java +++ b/Mage.Sets/src/mage/sets/guildpact/PilloryOfTheSleepless.java @@ -56,8 +56,6 @@ public class PilloryOfTheSleepless extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Aura"); - this.color.setBlack(true); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/guildpact/Pyromatics.java b/Mage.Sets/src/mage/sets/guildpact/Pyromatics.java index 3616e1abee7..fa0ef245783 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Pyromatics.java +++ b/Mage.Sets/src/mage/sets/guildpact/Pyromatics.java @@ -45,7 +45,6 @@ public class Pyromatics extends CardImpl { super(ownerId, 72, "Pyromatics", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "GPT"; - this.color.setRed(true); // Replicate {1}{R} this.addAbility(new ReplicateAbility(this, "{1}{R}")); diff --git a/Mage.Sets/src/mage/sets/guildpact/Quicken.java b/Mage.Sets/src/mage/sets/guildpact/Quicken.java index be65ccea161..3b75f314c54 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Quicken.java +++ b/Mage.Sets/src/mage/sets/guildpact/Quicken.java @@ -57,7 +57,6 @@ public class Quicken extends CardImpl { super(ownerId, 31, "Quicken", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "GPT"; - this.color.setBlue(true); // The next sorcery card you cast this turn can be cast as though it had flash. this.getSpellAbility().addEffect(new QuickenAsThoughEffect()); diff --git a/Mage.Sets/src/mage/sets/guildpact/Repeal.java b/Mage.Sets/src/mage/sets/guildpact/Repeal.java index ddcac13000a..014e5c031dc 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Repeal.java +++ b/Mage.Sets/src/mage/sets/guildpact/Repeal.java @@ -52,7 +52,6 @@ public class Repeal extends CardImpl { super(ownerId, 32, "Repeal", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{X}{U}"); this.expansionSetCode = "GPT"; - this.color.setBlue(true); // Return target nonland permanent with converted mana cost X to its owner's hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/guildpact/ShadowLance.java b/Mage.Sets/src/mage/sets/guildpact/ShadowLance.java index 0c5e92fe043..d98badd31b6 100644 --- a/Mage.Sets/src/mage/sets/guildpact/ShadowLance.java +++ b/Mage.Sets/src/mage/sets/guildpact/ShadowLance.java @@ -54,7 +54,6 @@ public class ShadowLance extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Aura"); - this.color.setWhite(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/guildpact/ShatteringSpree.java b/Mage.Sets/src/mage/sets/guildpact/ShatteringSpree.java index 4b836d69ef6..8d445861e8d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/ShatteringSpree.java +++ b/Mage.Sets/src/mage/sets/guildpact/ShatteringSpree.java @@ -46,7 +46,6 @@ public class ShatteringSpree extends CardImpl { super(ownerId, 75, "Shattering Spree", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "GPT"; - this.color.setRed(true); // Replicate {R} this.addAbility(new ReplicateAbility(this, "{R}")); diff --git a/Mage.Sets/src/mage/sets/guildpact/SiegeOfTowers.java b/Mage.Sets/src/mage/sets/guildpact/SiegeOfTowers.java index c77f795e7e8..e326546bb9a 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SiegeOfTowers.java +++ b/Mage.Sets/src/mage/sets/guildpact/SiegeOfTowers.java @@ -57,7 +57,6 @@ public class SiegeOfTowers extends CardImpl { super(ownerId, 76, "Siege of Towers", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "GPT"; - this.color.setRed(true); // Replicate {1}{R} this.addAbility(new ReplicateAbility(this, "{1}{R}")); diff --git a/Mage.Sets/src/mage/sets/guildpact/SkarrganPitSkulk.java b/Mage.Sets/src/mage/sets/guildpact/SkarrganPitSkulk.java index 097821e14d8..5ddf7aade40 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SkarrganPitSkulk.java +++ b/Mage.Sets/src/mage/sets/guildpact/SkarrganPitSkulk.java @@ -49,7 +49,6 @@ public class SkarrganPitSkulk extends CardImpl { this.subtype.add("Human"); 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/guildpact/SkyriderTrainee.java b/Mage.Sets/src/mage/sets/guildpact/SkyriderTrainee.java index 69133607354..91f4138918a 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SkyriderTrainee.java +++ b/Mage.Sets/src/mage/sets/guildpact/SkyriderTrainee.java @@ -52,7 +52,6 @@ public class SkyriderTrainee 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/guildpact/SoulsOfTheFaultless.java b/Mage.Sets/src/mage/sets/guildpact/SoulsOfTheFaultless.java index 099270697b8..6cd66ece7e1 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SoulsOfTheFaultless.java +++ b/Mage.Sets/src/mage/sets/guildpact/SoulsOfTheFaultless.java @@ -56,8 +56,6 @@ public class SoulsOfTheFaultless extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Spirit"); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/guildpact/StitchInTime.java b/Mage.Sets/src/mage/sets/guildpact/StitchInTime.java index 93c16608f64..c75bcf98774 100644 --- a/Mage.Sets/src/mage/sets/guildpact/StitchInTime.java +++ b/Mage.Sets/src/mage/sets/guildpact/StitchInTime.java @@ -48,8 +48,6 @@ public class StitchInTime extends CardImpl { super(ownerId, 132, "Stitch in Time", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{U}{R}"); this.expansionSetCode = "GPT"; - this.color.setRed(true); - this.color.setBlue(true); // Flip a coin. If you win the flip, take an extra turn after this one. this.getSpellAbility().addEffect(new StitchInTimeEffect()); diff --git a/Mage.Sets/src/mage/sets/guildpact/StreetbreakerWurm.java b/Mage.Sets/src/mage/sets/guildpact/StreetbreakerWurm.java index 1d2c4f92f48..9fa1fa580c3 100644 --- a/Mage.Sets/src/mage/sets/guildpact/StreetbreakerWurm.java +++ b/Mage.Sets/src/mage/sets/guildpact/StreetbreakerWurm.java @@ -44,8 +44,6 @@ public class StreetbreakerWurm extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Wurm"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/guildpact/TeysaOrzhovScion.java b/Mage.Sets/src/mage/sets/guildpact/TeysaOrzhovScion.java index 4978c411623..eee0db60961 100644 --- a/Mage.Sets/src/mage/sets/guildpact/TeysaOrzhovScion.java +++ b/Mage.Sets/src/mage/sets/guildpact/TeysaOrzhovScion.java @@ -72,8 +72,6 @@ public class TeysaOrzhovScion extends CardImpl { this.subtype.add("Human"); this.subtype.add("Advisor"); - this.color.setWhite(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/guildpact/TinStreetHooligan.java b/Mage.Sets/src/mage/sets/guildpact/TinStreetHooligan.java index 62bd685a8ab..bfa2c666645 100644 --- a/Mage.Sets/src/mage/sets/guildpact/TinStreetHooligan.java +++ b/Mage.Sets/src/mage/sets/guildpact/TinStreetHooligan.java @@ -53,7 +53,6 @@ public class TinStreetHooligan 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/guildpact/ToArms.java b/Mage.Sets/src/mage/sets/guildpact/ToArms.java index 815fe1fb456..4fc2fafc5aa 100644 --- a/Mage.Sets/src/mage/sets/guildpact/ToArms.java +++ b/Mage.Sets/src/mage/sets/guildpact/ToArms.java @@ -48,7 +48,6 @@ public class ToArms extends CardImpl { super(ownerId, 20, "To Arms!", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "GPT"; - this.color.setWhite(true); // Untap all creatures you control. Effect effect = new UntapAllControllerEffect(new FilterControlledCreaturePermanent(), rule); diff --git a/Mage.Sets/src/mage/sets/guildpact/TrainOfThought.java b/Mage.Sets/src/mage/sets/guildpact/TrainOfThought.java index 464557fb9ea..150d51d5149 100644 --- a/Mage.Sets/src/mage/sets/guildpact/TrainOfThought.java +++ b/Mage.Sets/src/mage/sets/guildpact/TrainOfThought.java @@ -44,7 +44,6 @@ public class TrainOfThought extends CardImpl { super(ownerId, 39, "Train of Thought", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{U}"); this.expansionSetCode = "GPT"; - this.color.setBlue(true); // Replicate {1}{U} this.addAbility(new ReplicateAbility(this, "{1}{U}")); diff --git a/Mage.Sets/src/mage/sets/guildpact/UlashtTheHateSeed.java b/Mage.Sets/src/mage/sets/guildpact/UlashtTheHateSeed.java index c7dfb337dd1..6d99f312a7e 100644 --- a/Mage.Sets/src/mage/sets/guildpact/UlashtTheHateSeed.java +++ b/Mage.Sets/src/mage/sets/guildpact/UlashtTheHateSeed.java @@ -68,8 +68,6 @@ public class UlashtTheHateSeed extends CardImpl { this.subtype.add("Hellion"); this.subtype.add("Hydra"); - this.color.setGreen(true); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/guildpact/Vacuumelt.java b/Mage.Sets/src/mage/sets/guildpact/Vacuumelt.java index d02dcb85d4e..e766614a6d1 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Vacuumelt.java +++ b/Mage.Sets/src/mage/sets/guildpact/Vacuumelt.java @@ -45,7 +45,6 @@ public class Vacuumelt extends CardImpl { super(ownerId, 40, "Vacuumelt", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "GPT"; - this.color.setBlue(true); // Replicate {2}{U} this.addAbility(new ReplicateAbility(this, "{2}{U}")); diff --git a/Mage.Sets/src/mage/sets/guildpact/WitchMawNephilim.java b/Mage.Sets/src/mage/sets/guildpact/WitchMawNephilim.java index da3dd12ff31..2624e57b7b1 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WitchMawNephilim.java +++ b/Mage.Sets/src/mage/sets/guildpact/WitchMawNephilim.java @@ -54,10 +54,6 @@ public class WitchMawNephilim extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Nephilim"); - this.color.setBlue(true); - this.color.setBlack(true); - 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/heroesvsmonsters/DeusOfCalamity.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/DeusOfCalamity.java index 96838f27901..1e344e09817 100644 --- a/Mage.Sets/src/mage/sets/heroesvsmonsters/DeusOfCalamity.java +++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/DeusOfCalamity.java @@ -56,8 +56,6 @@ public class DeusOfCalamity extends CardImpl { this.subtype.add("Spirit"); this.subtype.add("Avatar"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/KavuPredator.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/KavuPredator.java index 630ffa24b15..64654ecfdcc 100644 --- a/Mage.Sets/src/mage/sets/heroesvsmonsters/KavuPredator.java +++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/KavuPredator.java @@ -55,7 +55,6 @@ public class KavuPredator extends CardImpl { this.expansionSetCode = "DDL"; this.subtype.add("Kavu"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/KrosanTusker.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/KrosanTusker.java index d053e471b37..9057aa57c09 100644 --- a/Mage.Sets/src/mage/sets/heroesvsmonsters/KrosanTusker.java +++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/KrosanTusker.java @@ -51,7 +51,6 @@ public class KrosanTusker extends CardImpl { this.subtype.add("Boar"); this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/OrcishLumberjack.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/OrcishLumberjack.java index 1228a3aa73e..c6505ff9f7c 100644 --- a/Mage.Sets/src/mage/sets/heroesvsmonsters/OrcishLumberjack.java +++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/OrcishLumberjack.java @@ -67,7 +67,6 @@ public class OrcishLumberjack extends CardImpl { this.expansionSetCode = "DDL"; 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/heroesvsmonsters/ShowerOfSparks.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/ShowerOfSparks.java index d55429c021a..92dd77d9785 100644 --- a/Mage.Sets/src/mage/sets/heroesvsmonsters/ShowerOfSparks.java +++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/ShowerOfSparks.java @@ -47,7 +47,6 @@ public class ShowerOfSparks extends CardImpl { super(ownerId, 61, "Shower of Sparks", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "DDL"; - this.color.setRed(true); // Shower of Sparks deals 1 damage to target creature and 1 damage to target player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrganFirebird.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrganFirebird.java index dd9bcd16546..029a6c6655d 100644 --- a/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrganFirebird.java +++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrganFirebird.java @@ -54,7 +54,6 @@ public class SkarrganFirebird extends CardImpl { this.expansionSetCode = "DDL"; this.subtype.add("Phoenix"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrganSkybreaker.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrganSkybreaker.java index 19833abdaa4..4f12ee48838 100644 --- a/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrganSkybreaker.java +++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrganSkybreaker.java @@ -54,8 +54,6 @@ public class SkarrganSkybreaker extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Shaman"); - 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/heroesvsmonsters/UndyingRage.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/UndyingRage.java index 431ed7d8437..0357379d95c 100644 --- a/Mage.Sets/src/mage/sets/heroesvsmonsters/UndyingRage.java +++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/UndyingRage.java @@ -58,7 +58,6 @@ public class UndyingRage extends CardImpl { this.expansionSetCode = "DDL"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/WindsOfRath.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/WindsOfRath.java index a8261ca19a4..13c0abaf9f0 100644 --- a/Mage.Sets/src/mage/sets/heroesvsmonsters/WindsOfRath.java +++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/WindsOfRath.java @@ -51,7 +51,6 @@ public class WindsOfRath extends CardImpl { super(ownerId, 31, "Winds of Rath", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{W}{W}"); this.expansionSetCode = "DDL"; - this.color.setWhite(true); // Destroy all creatures that aren't enchanted. They can't be regenerated. this.getSpellAbility().addEffect(new DestroyAllEffect(filter, true)); diff --git a/Mage.Sets/src/mage/sets/homelands/DrySpell1.java b/Mage.Sets/src/mage/sets/homelands/DrySpell1.java index e0516b85e3b..96b6bcd6455 100644 --- a/Mage.Sets/src/mage/sets/homelands/DrySpell1.java +++ b/Mage.Sets/src/mage/sets/homelands/DrySpell1.java @@ -43,7 +43,6 @@ public class DrySpell1 extends CardImpl { super(ownerId, 7, "Dry Spell", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "HML"; - this.color.setBlack(true); // Dry Spell deals 1 damage to each creature and each player. this.getSpellAbility().addEffect(new DamageEverythingEffect(1)); diff --git a/Mage.Sets/src/mage/sets/homelands/DwarvenTrader1.java b/Mage.Sets/src/mage/sets/homelands/DwarvenTrader1.java index 9044dd2e16c..ae705709ba0 100644 --- a/Mage.Sets/src/mage/sets/homelands/DwarvenTrader1.java +++ b/Mage.Sets/src/mage/sets/homelands/DwarvenTrader1.java @@ -44,7 +44,6 @@ public class DwarvenTrader1 extends CardImpl { this.expansionSetCode = "HML"; 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/homelands/EronTheRelentless.java b/Mage.Sets/src/mage/sets/homelands/EronTheRelentless.java index 48166da0680..da56164ff42 100644 --- a/Mage.Sets/src/mage/sets/homelands/EronTheRelentless.java +++ b/Mage.Sets/src/mage/sets/homelands/EronTheRelentless.java @@ -52,7 +52,6 @@ public class EronTheRelentless extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/homelands/FeastOfTheUnicorn1.java b/Mage.Sets/src/mage/sets/homelands/FeastOfTheUnicorn1.java index fa881031ea5..6f97a297664 100644 --- a/Mage.Sets/src/mage/sets/homelands/FeastOfTheUnicorn1.java +++ b/Mage.Sets/src/mage/sets/homelands/FeastOfTheUnicorn1.java @@ -53,7 +53,6 @@ public class FeastOfTheUnicorn1 extends CardImpl { this.expansionSetCode = "HML"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/homelands/Forget.java b/Mage.Sets/src/mage/sets/homelands/Forget.java index c620e05f6be..9be4b324626 100644 --- a/Mage.Sets/src/mage/sets/homelands/Forget.java +++ b/Mage.Sets/src/mage/sets/homelands/Forget.java @@ -48,7 +48,6 @@ public class Forget extends CardImpl { super(ownerId, 32, "Forget", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{U}{U}"); this.expansionSetCode = "HML"; - this.color.setBlue(true); // Target player discards two cards, then draws as many cards as he or she discarded this way. this.getSpellAbility().addEffect(new ForgetEffect()); diff --git a/Mage.Sets/src/mage/sets/homelands/MesaFalcon1.java b/Mage.Sets/src/mage/sets/homelands/MesaFalcon1.java index f51da51501b..f211b9ff1ed 100644 --- a/Mage.Sets/src/mage/sets/homelands/MesaFalcon1.java +++ b/Mage.Sets/src/mage/sets/homelands/MesaFalcon1.java @@ -50,7 +50,6 @@ public class MesaFalcon1 extends CardImpl { this.expansionSetCode = "HML"; 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/homelands/SengirAutocrat.java b/Mage.Sets/src/mage/sets/homelands/SengirAutocrat.java index 25c0766b84d..b43c87a6317 100644 --- a/Mage.Sets/src/mage/sets/homelands/SengirAutocrat.java +++ b/Mage.Sets/src/mage/sets/homelands/SengirAutocrat.java @@ -60,7 +60,6 @@ public class SengirAutocrat extends CardImpl { this.expansionSetCode = "HML"; this.subtype.add("Human"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/homelands/Torture.java b/Mage.Sets/src/mage/sets/homelands/Torture.java index 846bf093470..fce655bf927 100644 --- a/Mage.Sets/src/mage/sets/homelands/Torture.java +++ b/Mage.Sets/src/mage/sets/homelands/Torture.java @@ -57,7 +57,6 @@ public class Torture extends CardImpl { this.expansionSetCode = "HML"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/homelands/WillowFaerie1.java b/Mage.Sets/src/mage/sets/homelands/WillowFaerie1.java index 9ca1a445397..715ebc668aa 100644 --- a/Mage.Sets/src/mage/sets/homelands/WillowFaerie1.java +++ b/Mage.Sets/src/mage/sets/homelands/WillowFaerie1.java @@ -45,7 +45,6 @@ public class WillowFaerie1 extends CardImpl { this.expansionSetCode = "HML"; this.subtype.add("Faerie"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/iceage/AltarOfBone.java b/Mage.Sets/src/mage/sets/iceage/AltarOfBone.java index a1546f4de19..f707874f338 100644 --- a/Mage.Sets/src/mage/sets/iceage/AltarOfBone.java +++ b/Mage.Sets/src/mage/sets/iceage/AltarOfBone.java @@ -47,8 +47,6 @@ public class AltarOfBone extends CardImpl { super(ownerId, 359, "Altar of Bone", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{G}{W}"); this.expansionSetCode = "ICE"; - this.color.setGreen(true); - this.color.setWhite(true); // As an additional cost to cast Altar of Bone, sacrifice a creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/iceage/Anarchy.java b/Mage.Sets/src/mage/sets/iceage/Anarchy.java index 5d0724791d9..62248f102a2 100644 --- a/Mage.Sets/src/mage/sets/iceage/Anarchy.java +++ b/Mage.Sets/src/mage/sets/iceage/Anarchy.java @@ -52,7 +52,6 @@ public class Anarchy extends CardImpl { super(ownerId, 170, "Anarchy", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); this.expansionSetCode = "ICE"; - this.color.setRed(true); // Destroy all white permanents. this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/iceage/BalduvianBears.java b/Mage.Sets/src/mage/sets/iceage/BalduvianBears.java index 98fc34475b3..9276a9159d2 100644 --- a/Mage.Sets/src/mage/sets/iceage/BalduvianBears.java +++ b/Mage.Sets/src/mage/sets/iceage/BalduvianBears.java @@ -44,7 +44,6 @@ public class BalduvianBears extends CardImpl { this.expansionSetCode = "ICE"; 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/iceage/CentaurArcher.java b/Mage.Sets/src/mage/sets/iceage/CentaurArcher.java index b9d860c90b1..9acc13e6526 100644 --- a/Mage.Sets/src/mage/sets/iceage/CentaurArcher.java +++ b/Mage.Sets/src/mage/sets/iceage/CentaurArcher.java @@ -60,8 +60,6 @@ public class CentaurArcher extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Archer"); - this.color.setGreen(true); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionBlack.java index efa4527537e..107e7877ad4 100644 --- a/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionBlack.java +++ b/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionBlack.java @@ -58,7 +58,6 @@ public class CircleOfProtectionBlack extends CardImpl { super(ownerId, 236, "Circle of Protection: Black", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "ICE"; - this.color.setWhite(true); // {1}: The next time a black source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); diff --git a/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionBlue.java index a5f238f5ac6..bac707535ee 100644 --- a/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionBlue.java +++ b/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionBlue.java @@ -58,7 +58,6 @@ public class CircleOfProtectionBlue extends CardImpl { super(ownerId, 237, "Circle of Protection: Blue", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "ICE"; - this.color.setWhite(true); // {1}: The next time a blue source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); diff --git a/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionGreen.java index 93ba07c4d01..83d11cd169f 100644 --- a/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionGreen.java +++ b/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionGreen.java @@ -58,7 +58,6 @@ public class CircleOfProtectionGreen extends CardImpl { super(ownerId, 238, "Circle of Protection: Green", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "ICE"; - this.color.setWhite(true); // {1}: The next time a green source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); diff --git a/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionRed.java index de656a53739..b9d49d3d5e0 100644 --- a/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionRed.java +++ b/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionRed.java @@ -58,7 +58,6 @@ public class CircleOfProtectionRed extends CardImpl { super(ownerId, 239, "Circle of Protection: Red", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "ICE"; - this.color.setWhite(true); // {1}: The next time a red source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); diff --git a/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionWhite.java index 54ab125a4ab..c0905da7822 100644 --- a/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionWhite.java +++ b/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionWhite.java @@ -58,7 +58,6 @@ public class CircleOfProtectionWhite extends CardImpl { super(ownerId, 240, "Circle of Protection: White", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "ICE"; - this.color.setWhite(true); // {1}: The next time a white source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); diff --git a/Mage.Sets/src/mage/sets/iceage/Conquer.java b/Mage.Sets/src/mage/sets/iceage/Conquer.java index 4065522f8d2..614ae63e28d 100644 --- a/Mage.Sets/src/mage/sets/iceage/Conquer.java +++ b/Mage.Sets/src/mage/sets/iceage/Conquer.java @@ -52,7 +52,6 @@ public class Conquer extends CardImpl { this.expansionSetCode = "ICE"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/iceage/DanceOfTheDead.java b/Mage.Sets/src/mage/sets/iceage/DanceOfTheDead.java index 603de287e5c..d0f72fc69f1 100644 --- a/Mage.Sets/src/mage/sets/iceage/DanceOfTheDead.java +++ b/Mage.Sets/src/mage/sets/iceage/DanceOfTheDead.java @@ -78,7 +78,6 @@ public class DanceOfTheDead extends CardImpl { this.expansionSetCode = "ICE"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature card in a graveyard TargetCardInGraveyard auraTarget = new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard")); diff --git a/Mage.Sets/src/mage/sets/iceage/Deflection.java b/Mage.Sets/src/mage/sets/iceage/Deflection.java index df70f7c7038..377591e7a7b 100644 --- a/Mage.Sets/src/mage/sets/iceage/Deflection.java +++ b/Mage.Sets/src/mage/sets/iceage/Deflection.java @@ -52,7 +52,6 @@ public class Deflection extends CardImpl { super(ownerId, 65, "Deflection", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "ICE"; - 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/iceage/DemonicConsultation.java b/Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java index be4c1185fb9..3400dc1a706 100644 --- a/Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java +++ b/Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java @@ -54,7 +54,6 @@ public class DemonicConsultation extends CardImpl { super(ownerId, 9, "Demonic Consultation", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "ICE"; - this.color.setBlack(true); // Name a card. Exile the top six cards of your library, then reveal cards from the top of your library until you reveal the named card. Put that card into your hand and exile all other cards revealed this way. this.getSpellAbility().addEffect(new DemonicConsultationEffect()); diff --git a/Mage.Sets/src/mage/sets/iceage/ElderDruid.java b/Mage.Sets/src/mage/sets/iceage/ElderDruid.java index a9e95f383cd..52e8fc7915d 100644 --- a/Mage.Sets/src/mage/sets/iceage/ElderDruid.java +++ b/Mage.Sets/src/mage/sets/iceage/ElderDruid.java @@ -65,7 +65,6 @@ public class ElderDruid extends CardImpl { this.subtype.add("Cleric"); 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/iceage/FieryJustice.java b/Mage.Sets/src/mage/sets/iceage/FieryJustice.java index 11eca0a68cb..b304eaef5b7 100644 --- a/Mage.Sets/src/mage/sets/iceage/FieryJustice.java +++ b/Mage.Sets/src/mage/sets/iceage/FieryJustice.java @@ -48,9 +48,6 @@ public class FieryJustice extends CardImpl { super(ownerId, 366, "Fiery Justice", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{R}{G}{W}"); this.expansionSetCode = "ICE"; - this.color.setRed(true); - this.color.setGreen(true); - this.color.setWhite(true); // Fiery Justice deals 5 damage divided as you choose among any number of target creatures and/or players. Target opponent gains 5 life. this.getSpellAbility().addEffect(new DamageMultiEffect(5)); diff --git a/Mage.Sets/src/mage/sets/iceage/FireCovenant.java b/Mage.Sets/src/mage/sets/iceage/FireCovenant.java index 166da4ac704..d8783c06671 100644 --- a/Mage.Sets/src/mage/sets/iceage/FireCovenant.java +++ b/Mage.Sets/src/mage/sets/iceage/FireCovenant.java @@ -48,8 +48,6 @@ public class FireCovenant extends CardImpl { super(ownerId, 367, "Fire Covenant", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{B}{R}"); this.expansionSetCode = "ICE"; - this.color.setRed(true); - this.color.setBlack(true); // As an additional cost to cast Fire Covenant, pay X life. this.getSpellAbility().addCost(new PayVariableLifeCost(true)); diff --git a/Mage.Sets/src/mage/sets/iceage/FlameSpirit.java b/Mage.Sets/src/mage/sets/iceage/FlameSpirit.java index ae218ab657c..70ade182fb7 100644 --- a/Mage.Sets/src/mage/sets/iceage/FlameSpirit.java +++ b/Mage.Sets/src/mage/sets/iceage/FlameSpirit.java @@ -50,7 +50,6 @@ public class FlameSpirit extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Spirit"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/iceage/FyndhornBrownie.java b/Mage.Sets/src/mage/sets/iceage/FyndhornBrownie.java index 817e025db0d..e075e364b72 100644 --- a/Mage.Sets/src/mage/sets/iceage/FyndhornBrownie.java +++ b/Mage.Sets/src/mage/sets/iceage/FyndhornBrownie.java @@ -51,7 +51,6 @@ public class FyndhornBrownie extends CardImpl { this.expansionSetCode = "ICE"; this.subtype.add("Ouphe"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/iceage/FyndhornElder.java b/Mage.Sets/src/mage/sets/iceage/FyndhornElder.java index b49c5728f96..0d83d21f4b1 100644 --- a/Mage.Sets/src/mage/sets/iceage/FyndhornElder.java +++ b/Mage.Sets/src/mage/sets/iceage/FyndhornElder.java @@ -50,7 +50,6 @@ public class FyndhornElder 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/iceage/FyndhornElves.java b/Mage.Sets/src/mage/sets/iceage/FyndhornElves.java index f127923cb16..4087b21b922 100644 --- a/Mage.Sets/src/mage/sets/iceage/FyndhornElves.java +++ b/Mage.Sets/src/mage/sets/iceage/FyndhornElves.java @@ -47,7 +47,6 @@ public class FyndhornElves 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/iceage/Hecatomb.java b/Mage.Sets/src/mage/sets/iceage/Hecatomb.java index 41e22d4d019..da9f5f0655b 100644 --- a/Mage.Sets/src/mage/sets/iceage/Hecatomb.java +++ b/Mage.Sets/src/mage/sets/iceage/Hecatomb.java @@ -64,7 +64,6 @@ public class Hecatomb extends CardImpl { super(ownerId, 18, "Hecatomb", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}"); this.expansionSetCode = "ICE"; - this.color.setBlack(true); // When Hecatomb enters the battlefield, sacrifice Hecatomb unless you sacrifice four creatures. this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new SacrificeTargetCost(new TargetControlledCreaturePermanent(4))), false)); diff --git a/Mage.Sets/src/mage/sets/iceage/IcyPrison.java b/Mage.Sets/src/mage/sets/iceage/IcyPrison.java index a93871eba4a..c1ca95860fe 100644 --- a/Mage.Sets/src/mage/sets/iceage/IcyPrison.java +++ b/Mage.Sets/src/mage/sets/iceage/IcyPrison.java @@ -54,7 +54,6 @@ public class IcyPrison extends CardImpl { super(ownerId, 74, "Icy Prison", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{U}{U}"); this.expansionSetCode = "ICE"; - this.color.setBlue(true); // When Icy Prison enters the battlefield, exile target creature. Ability ability1 = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect(), false); diff --git a/Mage.Sets/src/mage/sets/iceage/IllusionsOfGrandeur.java b/Mage.Sets/src/mage/sets/iceage/IllusionsOfGrandeur.java index 9c64ef44a6b..470fd9dcd8b 100644 --- a/Mage.Sets/src/mage/sets/iceage/IllusionsOfGrandeur.java +++ b/Mage.Sets/src/mage/sets/iceage/IllusionsOfGrandeur.java @@ -48,7 +48,6 @@ public class IllusionsOfGrandeur extends CardImpl { super(ownerId, 79, "Illusions of Grandeur", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); this.expansionSetCode = "ICE"; - this.color.setBlue(true); // Cumulative upkeep {2} this.addAbility(new CumulativeUpkeepAbility(new GenericManaCost(2))); diff --git a/Mage.Sets/src/mage/sets/iceage/Jokulhaups.java b/Mage.Sets/src/mage/sets/iceage/Jokulhaups.java index 309e9bd8398..13d8fbdfa80 100644 --- a/Mage.Sets/src/mage/sets/iceage/Jokulhaups.java +++ b/Mage.Sets/src/mage/sets/iceage/Jokulhaups.java @@ -55,7 +55,6 @@ public class Jokulhaups extends CardImpl { super(ownerId, 195, "Jokulhaups", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{R}{R}"); this.expansionSetCode = "ICE"; - this.color.setRed(true); // Destroy all artifacts, creatures, and lands. They can't be regenerated. this.getSpellAbility().addEffect(new DestroyAllEffect(filter, true)); diff --git a/Mage.Sets/src/mage/sets/iceage/KjeldoranDead.java b/Mage.Sets/src/mage/sets/iceage/KjeldoranDead.java index 1c66a09934d..e7d1901ed92 100644 --- a/Mage.Sets/src/mage/sets/iceage/KjeldoranDead.java +++ b/Mage.Sets/src/mage/sets/iceage/KjeldoranDead.java @@ -52,7 +52,6 @@ public class KjeldoranDead extends CardImpl { this.expansionSetCode = "ICE"; this.subtype.add("Skeleton"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/iceage/KjeldoranRoyalGuard.java b/Mage.Sets/src/mage/sets/iceage/KjeldoranRoyalGuard.java index 18ce55ae15a..3ef0d4d97d9 100644 --- a/Mage.Sets/src/mage/sets/iceage/KjeldoranRoyalGuard.java +++ b/Mage.Sets/src/mage/sets/iceage/KjeldoranRoyalGuard.java @@ -59,7 +59,6 @@ public class KjeldoranRoyalGuard 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/iceage/LeshracsRite.java b/Mage.Sets/src/mage/sets/iceage/LeshracsRite.java index 58972d4908b..97163ee10ba 100644 --- a/Mage.Sets/src/mage/sets/iceage/LeshracsRite.java +++ b/Mage.Sets/src/mage/sets/iceage/LeshracsRite.java @@ -54,7 +54,6 @@ public class LeshracsRite extends CardImpl { this.expansionSetCode = "ICE"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/iceage/Lhurgoyf.java b/Mage.Sets/src/mage/sets/iceage/Lhurgoyf.java index 4bba05812ca..f927d789a56 100644 --- a/Mage.Sets/src/mage/sets/iceage/Lhurgoyf.java +++ b/Mage.Sets/src/mage/sets/iceage/Lhurgoyf.java @@ -54,7 +54,6 @@ public class Lhurgoyf extends CardImpl { this.expansionSetCode = "ICE"; 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/iceage/MagusOfTheUnseen.java b/Mage.Sets/src/mage/sets/iceage/MagusOfTheUnseen.java index ef786833f1b..a0de5638da4 100644 --- a/Mage.Sets/src/mage/sets/iceage/MagusOfTheUnseen.java +++ b/Mage.Sets/src/mage/sets/iceage/MagusOfTheUnseen.java @@ -71,7 +71,6 @@ public class MagusOfTheUnseen 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/iceage/MindWarp.java b/Mage.Sets/src/mage/sets/iceage/MindWarp.java index 444d4d5a5b3..d64c55a9dc5 100644 --- a/Mage.Sets/src/mage/sets/iceage/MindWarp.java +++ b/Mage.Sets/src/mage/sets/iceage/MindWarp.java @@ -46,7 +46,6 @@ public class MindWarp extends CardImpl { super(ownerId, 14, "Mind Warp", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{3}{B}"); this.expansionSetCode = "ICE"; - this.color.setBlack(true); // Look at target player's hand and choose X cards from it. That player discards those cards. this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(new ManacostVariableValue(), TargetController.ANY)); diff --git a/Mage.Sets/src/mage/sets/iceage/MoorFiend.java b/Mage.Sets/src/mage/sets/iceage/MoorFiend.java index f1e0029abb7..c37e6da8e5a 100644 --- a/Mage.Sets/src/mage/sets/iceage/MoorFiend.java +++ b/Mage.Sets/src/mage/sets/iceage/MoorFiend.java @@ -45,7 +45,6 @@ public class MoorFiend extends CardImpl { this.expansionSetCode = "ICE"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/iceage/NaturesLore.java b/Mage.Sets/src/mage/sets/iceage/NaturesLore.java index a3fa2bc5fcc..49a5c2aec1b 100644 --- a/Mage.Sets/src/mage/sets/iceage/NaturesLore.java +++ b/Mage.Sets/src/mage/sets/iceage/NaturesLore.java @@ -52,7 +52,6 @@ public class NaturesLore extends CardImpl { super(ownerId, 143, "Nature's Lore", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "ICE"; - 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), false, true)); diff --git a/Mage.Sets/src/mage/sets/iceage/OrcishLibrarian.java b/Mage.Sets/src/mage/sets/iceage/OrcishLibrarian.java index 5ea8f38aa4e..d222dabce1b 100644 --- a/Mage.Sets/src/mage/sets/iceage/OrcishLibrarian.java +++ b/Mage.Sets/src/mage/sets/iceage/OrcishLibrarian.java @@ -59,7 +59,6 @@ public class OrcishLibrarian extends CardImpl { this.expansionSetCode = "ICE"; 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/iceage/OrderOfTheSacredTorch.java b/Mage.Sets/src/mage/sets/iceage/OrderOfTheSacredTorch.java index a0554157303..a2fff3c0797 100644 --- a/Mage.Sets/src/mage/sets/iceage/OrderOfTheSacredTorch.java +++ b/Mage.Sets/src/mage/sets/iceage/OrderOfTheSacredTorch.java @@ -59,7 +59,6 @@ public class OrderOfTheSacredTorch 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/iceage/PaleBears.java b/Mage.Sets/src/mage/sets/iceage/PaleBears.java index f9d49d49677..397915b0d55 100644 --- a/Mage.Sets/src/mage/sets/iceage/PaleBears.java +++ b/Mage.Sets/src/mage/sets/iceage/PaleBears.java @@ -45,7 +45,6 @@ public class PaleBears extends CardImpl { this.expansionSetCode = "ICE"; 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/iceage/PestilenceRats.java b/Mage.Sets/src/mage/sets/iceage/PestilenceRats.java index 102999721a9..151a1bfff8c 100644 --- a/Mage.Sets/src/mage/sets/iceage/PestilenceRats.java +++ b/Mage.Sets/src/mage/sets/iceage/PestilenceRats.java @@ -61,7 +61,6 @@ public class PestilenceRats extends CardImpl { this.expansionSetCode = "ICE"; this.subtype.add("Rat"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/iceage/PolarKraken.java b/Mage.Sets/src/mage/sets/iceage/PolarKraken.java index a0ae88492b7..d48591e4dc5 100644 --- a/Mage.Sets/src/mage/sets/iceage/PolarKraken.java +++ b/Mage.Sets/src/mage/sets/iceage/PolarKraken.java @@ -50,7 +50,6 @@ public class PolarKraken extends CardImpl { this.expansionSetCode = "ICE"; this.subtype.add("Kraken"); - this.color.setBlue(true); this.power = new MageInt(11); this.toughness = new MageInt(11); diff --git a/Mage.Sets/src/mage/sets/iceage/PygmyAllosaurus.java b/Mage.Sets/src/mage/sets/iceage/PygmyAllosaurus.java index ae4b0727628..6f0fef48874 100644 --- a/Mage.Sets/src/mage/sets/iceage/PygmyAllosaurus.java +++ b/Mage.Sets/src/mage/sets/iceage/PygmyAllosaurus.java @@ -45,7 +45,6 @@ public class PygmyAllosaurus extends CardImpl { this.expansionSetCode = "ICE"; this.subtype.add("Lizard"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/iceage/Pyroblast.java b/Mage.Sets/src/mage/sets/iceage/Pyroblast.java index 11440e036de..536577b0297 100644 --- a/Mage.Sets/src/mage/sets/iceage/Pyroblast.java +++ b/Mage.Sets/src/mage/sets/iceage/Pyroblast.java @@ -50,7 +50,6 @@ public class Pyroblast extends CardImpl { super(ownerId, 213, "Pyroblast", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "ICE"; - this.color.setRed(true); // Choose one - Counter target spell if it's blue; or destroy target permanent if it's blue. this.getSpellAbility().addEffect(new PyroblastCounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/iceage/RayOfCommand.java b/Mage.Sets/src/mage/sets/iceage/RayOfCommand.java index a0cb13ad2b0..9a84518e77a 100644 --- a/Mage.Sets/src/mage/sets/iceage/RayOfCommand.java +++ b/Mage.Sets/src/mage/sets/iceage/RayOfCommand.java @@ -62,7 +62,6 @@ public class RayOfCommand extends CardImpl { super(ownerId, 92, "Ray of Command", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "ICE"; - this.color.setBlue(true); // Untap target creature an opponent controls and gain control of it until end of turn. That creature gains haste until end of turn. When you lose control of the creature, tap it. this.getSpellAbility().addEffect(new UntapTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/iceage/Regeneration.java b/Mage.Sets/src/mage/sets/iceage/Regeneration.java index 612e6b964e6..8c7aba83054 100644 --- a/Mage.Sets/src/mage/sets/iceage/Regeneration.java +++ b/Mage.Sets/src/mage/sets/iceage/Regeneration.java @@ -51,7 +51,6 @@ public class Regeneration extends CardImpl { this.expansionSetCode = "ICE"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/iceage/SibilantSpirit.java b/Mage.Sets/src/mage/sets/iceage/SibilantSpirit.java index b6c7d163290..e0e4714d808 100644 --- a/Mage.Sets/src/mage/sets/iceage/SibilantSpirit.java +++ b/Mage.Sets/src/mage/sets/iceage/SibilantSpirit.java @@ -51,7 +51,6 @@ public class SibilantSpirit extends CardImpl { this.expansionSetCode = "ICE"; this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/iceage/SilverErne.java b/Mage.Sets/src/mage/sets/iceage/SilverErne.java index bab91686d88..e3d50cf600a 100644 --- a/Mage.Sets/src/mage/sets/iceage/SilverErne.java +++ b/Mage.Sets/src/mage/sets/iceage/SilverErne.java @@ -46,7 +46,6 @@ public class SilverErne extends CardImpl { this.expansionSetCode = "ICE"; 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/iceage/StromgaldCabal.java b/Mage.Sets/src/mage/sets/iceage/StromgaldCabal.java index 361ec8fe335..e1fc5fd6c4b 100644 --- a/Mage.Sets/src/mage/sets/iceage/StromgaldCabal.java +++ b/Mage.Sets/src/mage/sets/iceage/StromgaldCabal.java @@ -61,7 +61,6 @@ public class StromgaldCabal 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/iceage/StuntedGrowth.java b/Mage.Sets/src/mage/sets/iceage/StuntedGrowth.java index 8c4d0cff6c4..b82e78fda8d 100644 --- a/Mage.Sets/src/mage/sets/iceage/StuntedGrowth.java +++ b/Mage.Sets/src/mage/sets/iceage/StuntedGrowth.java @@ -54,7 +54,6 @@ public class StuntedGrowth extends CardImpl { super(ownerId, 154, "Stunted Growth", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); this.expansionSetCode = "ICE"; - this.color.setGreen(true); // Target player chooses three cards from his or her hand and puts them on top of his or her library in any order. this.getSpellAbility().addEffect(new StuntedGrowthEffect()); diff --git a/Mage.Sets/src/mage/sets/iceage/TinderWall.java b/Mage.Sets/src/mage/sets/iceage/TinderWall.java index 45da4fc5702..5ee8dc535c8 100644 --- a/Mage.Sets/src/mage/sets/iceage/TinderWall.java +++ b/Mage.Sets/src/mage/sets/iceage/TinderWall.java @@ -66,7 +66,6 @@ public class TinderWall extends CardImpl { this.subtype.add("Plant"); 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/iceage/TorGiant.java b/Mage.Sets/src/mage/sets/iceage/TorGiant.java index da2da785596..406c02c838d 100644 --- a/Mage.Sets/src/mage/sets/iceage/TorGiant.java +++ b/Mage.Sets/src/mage/sets/iceage/TorGiant.java @@ -44,7 +44,6 @@ public class TorGiant extends CardImpl { this.expansionSetCode = "ICE"; 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/iceage/Vertigo.java b/Mage.Sets/src/mage/sets/iceage/Vertigo.java index 6d005d8fa9c..3ff9489eea2 100644 --- a/Mage.Sets/src/mage/sets/iceage/Vertigo.java +++ b/Mage.Sets/src/mage/sets/iceage/Vertigo.java @@ -55,7 +55,6 @@ public class Vertigo extends CardImpl { super(ownerId, 222, "Vertigo", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "ICE"; - this.color.setRed(true); // Vertigo deals 2 damage to target creature with flying. That creature loses flying until end of turn. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/iceage/WildGrowth.java b/Mage.Sets/src/mage/sets/iceage/WildGrowth.java index 8070da7dc63..513e4568d09 100644 --- a/Mage.Sets/src/mage/sets/iceage/WildGrowth.java +++ b/Mage.Sets/src/mage/sets/iceage/WildGrowth.java @@ -60,7 +60,6 @@ public class WildGrowth extends CardImpl { this.expansionSetCode = "ICE"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/iceage/WindSpirit.java b/Mage.Sets/src/mage/sets/iceage/WindSpirit.java index 6cbc41b0902..d894afbdfce 100644 --- a/Mage.Sets/src/mage/sets/iceage/WindSpirit.java +++ b/Mage.Sets/src/mage/sets/iceage/WindSpirit.java @@ -50,7 +50,6 @@ public class WindSpirit extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/iceage/WrathOfMaritLage.java b/Mage.Sets/src/mage/sets/iceage/WrathOfMaritLage.java index 549e7e7f7f4..ba13bc802ba 100644 --- a/Mage.Sets/src/mage/sets/iceage/WrathOfMaritLage.java +++ b/Mage.Sets/src/mage/sets/iceage/WrathOfMaritLage.java @@ -64,7 +64,6 @@ public class WrathOfMaritLage extends CardImpl { super(ownerId, 109, "Wrath of Marit Lage", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}{U}"); this.expansionSetCode = "ICE"; - this.color.setBlue(true); // When Wrath of Marit Lage enters the battlefield, tap all red creatures. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapAllEffect())); diff --git a/Mage.Sets/src/mage/sets/iceage/ZursWeirding.java b/Mage.Sets/src/mage/sets/iceage/ZursWeirding.java index 99b16460440..6ac69f1248a 100644 --- a/Mage.Sets/src/mage/sets/iceage/ZursWeirding.java +++ b/Mage.Sets/src/mage/sets/iceage/ZursWeirding.java @@ -56,7 +56,6 @@ public class ZursWeirding extends CardImpl { super(ownerId, 112, "Zur's Weirding", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); this.expansionSetCode = "ICE"; - this.color.setBlue(true); // Players play with their hands revealed. diff --git a/Mage.Sets/src/mage/sets/innistrad/AbattoirGhoul.java b/Mage.Sets/src/mage/sets/innistrad/AbattoirGhoul.java index ff2b6da4f2f..256c6af6059 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AbattoirGhoul.java +++ b/Mage.Sets/src/mage/sets/innistrad/AbattoirGhoul.java @@ -51,7 +51,6 @@ public class AbattoirGhoul extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/AltarsReap.java b/Mage.Sets/src/mage/sets/innistrad/AltarsReap.java index 755e28a0650..d9723f9b49d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AltarsReap.java +++ b/Mage.Sets/src/mage/sets/innistrad/AltarsReap.java @@ -46,7 +46,6 @@ public class AltarsReap extends CardImpl { super(ownerId, 86, "Altar's Reap", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "ISD"; - this.color.setBlack(true); // As an additional cost to cast Altar's Reap, sacrifice a creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent("a creature"), true))); diff --git a/Mage.Sets/src/mage/sets/innistrad/AmbushViper.java b/Mage.Sets/src/mage/sets/innistrad/AmbushViper.java index 8517fe0e41b..a3f687821e0 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AmbushViper.java +++ b/Mage.Sets/src/mage/sets/innistrad/AmbushViper.java @@ -46,7 +46,6 @@ public class AmbushViper extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/AncientGrudge.java b/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java index 96aadf31d6a..8936c752c6b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java +++ b/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java @@ -55,7 +55,6 @@ public class AncientGrudge extends CardImpl { super(ownerId, 127, "Ancient Grudge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "ISD"; - this.color.setRed(true); // Destroy target artifact. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/ArmoredSkaab.java b/Mage.Sets/src/mage/sets/innistrad/ArmoredSkaab.java index c8a880131ae..ce6145d3c42 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ArmoredSkaab.java +++ b/Mage.Sets/src/mage/sets/innistrad/ArmoredSkaab.java @@ -54,7 +54,6 @@ public class ArmoredSkaab extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Warrior"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/innistrad/ArmyOfTheDamned.java b/Mage.Sets/src/mage/sets/innistrad/ArmyOfTheDamned.java index 4161a8e9c1a..1ab4ba853f5 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ArmyOfTheDamned.java +++ b/Mage.Sets/src/mage/sets/innistrad/ArmyOfTheDamned.java @@ -47,7 +47,6 @@ public class ArmyOfTheDamned extends CardImpl { super(ownerId, 87, "Army of the Damned", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{5}{B}{B}{B}"); this.expansionSetCode = "ISD"; - this.color.setBlack(true); // Put thirteen 2/2 black Zombie creature tokens onto the battlefield tapped. this.getSpellAbility().addEffect(new CreateTokenEffect(new ZombieToken("ISD"), 13, true, false)); diff --git a/Mage.Sets/src/mage/sets/innistrad/AshmouthHound.java b/Mage.Sets/src/mage/sets/innistrad/AshmouthHound.java index 8a11fd6932a..219b5262ffd 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AshmouthHound.java +++ b/Mage.Sets/src/mage/sets/innistrad/AshmouthHound.java @@ -47,7 +47,6 @@ public class AshmouthHound extends CardImpl { this.subtype.add("Elemental"); 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/innistrad/AvacynianPriest.java b/Mage.Sets/src/mage/sets/innistrad/AvacynianPriest.java index 770a20dae02..fabd0091a9b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AvacynianPriest.java +++ b/Mage.Sets/src/mage/sets/innistrad/AvacynianPriest.java @@ -61,7 +61,6 @@ public class AvacynianPriest 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/innistrad/BackFromTheBrink.java b/Mage.Sets/src/mage/sets/innistrad/BackFromTheBrink.java index 45acadc65d1..d088e33c83c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BackFromTheBrink.java +++ b/Mage.Sets/src/mage/sets/innistrad/BackFromTheBrink.java @@ -57,7 +57,6 @@ public class BackFromTheBrink extends CardImpl { super(ownerId, 44, "Back from the Brink", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}{U}"); this.expansionSetCode = "ISD"; - this.color.setBlue(true); // Exile a creature card from your graveyard and pay its mana cost: Put a token onto the battlefield that's a copy of that card. Activate this ability only any time you could cast a sorcery. this.addAbility(new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new BackFromTheBrinkEffect(), new BackFromTheBrinkCost())); diff --git a/Mage.Sets/src/mage/sets/innistrad/BalefireDragon.java b/Mage.Sets/src/mage/sets/innistrad/BalefireDragon.java index aa8f46347fa..f82948d8516 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BalefireDragon.java +++ b/Mage.Sets/src/mage/sets/innistrad/BalefireDragon.java @@ -53,7 +53,6 @@ public class BalefireDragon extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/BattlegroundGeist.java b/Mage.Sets/src/mage/sets/innistrad/BattlegroundGeist.java index 27a951356aa..265bc48f31a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BattlegroundGeist.java +++ b/Mage.Sets/src/mage/sets/innistrad/BattlegroundGeist.java @@ -57,7 +57,6 @@ public class BattlegroundGeist extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/BitterheartWitch.java b/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java index cd8a123a64a..2fe0fc9e9a7 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java +++ b/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java @@ -59,7 +59,6 @@ public class BitterheartWitch extends CardImpl { this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/BloodcrazedNeonate.java b/Mage.Sets/src/mage/sets/innistrad/BloodcrazedNeonate.java index a250230e0af..27cb5dd2261 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BloodcrazedNeonate.java +++ b/Mage.Sets/src/mage/sets/innistrad/BloodcrazedNeonate.java @@ -48,7 +48,6 @@ public class BloodcrazedNeonate extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Vampire"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/innistrad/BloodgiftDemon.java b/Mage.Sets/src/mage/sets/innistrad/BloodgiftDemon.java index 22c51082807..871bf8646b3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BloodgiftDemon.java +++ b/Mage.Sets/src/mage/sets/innistrad/BloodgiftDemon.java @@ -53,7 +53,6 @@ public class BloodgiftDemon extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Demon"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/innistrad/BloodlineKeeper.java b/Mage.Sets/src/mage/sets/innistrad/BloodlineKeeper.java index 0d6a5d2fde7..1c7d05c764d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BloodlineKeeper.java +++ b/Mage.Sets/src/mage/sets/innistrad/BloodlineKeeper.java @@ -60,7 +60,6 @@ public class BloodlineKeeper extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/BondsOfFaith.java b/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java index 3b3c5236f73..60e010dc0f4 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java +++ b/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java @@ -60,7 +60,6 @@ public class BondsOfFaith extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java b/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java index 4f9cb535317..bdeb990c6d4 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java +++ b/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java @@ -52,7 +52,6 @@ public class BrainWeevil extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/Bramblecrush.java b/Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java index 3216c0092a9..171a036b228 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java +++ b/Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java @@ -53,7 +53,6 @@ public class Bramblecrush extends CardImpl { super(ownerId, 172, "Bramblecrush", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}{G}"); this.expansionSetCode = "ISD"; - this.color.setGreen(true); // Destroy target noncreature permanent. this.getSpellAbility().addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/innistrad/BrimstoneVolley.java b/Mage.Sets/src/mage/sets/innistrad/BrimstoneVolley.java index 07dbdfc23a3..05843642594 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BrimstoneVolley.java +++ b/Mage.Sets/src/mage/sets/innistrad/BrimstoneVolley.java @@ -50,7 +50,6 @@ public class BrimstoneVolley extends CardImpl { super(ownerId, 132, "Brimstone Volley", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "ISD"; - this.color.setRed(true); // Brimstone Volley deals 3 damage to target creature or player. // Morbid - Brimstone Volley deals 5 damage to that creature or player instead if a creature died this turn. diff --git a/Mage.Sets/src/mage/sets/innistrad/BumpInTheNight.java b/Mage.Sets/src/mage/sets/innistrad/BumpInTheNight.java index b0974919550..50269772bc9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BumpInTheNight.java +++ b/Mage.Sets/src/mage/sets/innistrad/BumpInTheNight.java @@ -47,7 +47,6 @@ public class BumpInTheNight extends CardImpl { super(ownerId, 92, "Bump in the Night", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "ISD"; - this.color.setBlack(true); // Target opponent loses 3 life. this.getSpellAbility().addEffect(new LoseLifeTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/innistrad/BurningVengeance.java b/Mage.Sets/src/mage/sets/innistrad/BurningVengeance.java index ccf75e9d710..917a07f35a4 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BurningVengeance.java +++ b/Mage.Sets/src/mage/sets/innistrad/BurningVengeance.java @@ -48,7 +48,6 @@ public class BurningVengeance extends CardImpl { super(ownerId, 133, "Burning Vengeance", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "ISD"; - this.color.setRed(true); // Whenever you cast a spell from your graveyard, Burning Vengeance deals 2 damage to target creature or player. this.addAbility(new BurningVengeanceOnCastAbility()); diff --git a/Mage.Sets/src/mage/sets/innistrad/CacklingCounterpart.java b/Mage.Sets/src/mage/sets/innistrad/CacklingCounterpart.java index 385a43f5de1..3d0174773d9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CacklingCounterpart.java +++ b/Mage.Sets/src/mage/sets/innistrad/CacklingCounterpart.java @@ -46,7 +46,6 @@ public class CacklingCounterpart extends CardImpl { super(ownerId, 46, "Cackling Counterpart", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{U}{U}"); this.expansionSetCode = "ISD"; - this.color.setBlue(true); // Put a token onto the battlefield that's a copy of target creature you control. this.getSpellAbility().addEffect(new PutTokenOntoBattlefieldCopyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/CaravanVigil.java b/Mage.Sets/src/mage/sets/innistrad/CaravanVigil.java index 9c45c44fd69..bfb77513ee3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CaravanVigil.java +++ b/Mage.Sets/src/mage/sets/innistrad/CaravanVigil.java @@ -55,7 +55,6 @@ public class CaravanVigil extends CardImpl { super(ownerId, 173, "Caravan Vigil", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{G}"); this.expansionSetCode = "ISD"; - this.color.setGreen(true); // Search your library for a basic land card, reveal it, put it into your hand, then shuffle your library. // Morbid - You may put that card onto the battlefield instead of putting it into your hand if a creature died this turn. diff --git a/Mage.Sets/src/mage/sets/innistrad/ChampionOfTheParish.java b/Mage.Sets/src/mage/sets/innistrad/ChampionOfTheParish.java index a0562401344..f1f8a75746c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ChampionOfTheParish.java +++ b/Mage.Sets/src/mage/sets/innistrad/ChampionOfTheParish.java @@ -58,7 +58,6 @@ public class ChampionOfTheParish 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/innistrad/ChapelGeist.java b/Mage.Sets/src/mage/sets/innistrad/ChapelGeist.java index 3897ab0df6a..e9aca1a4f6d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ChapelGeist.java +++ b/Mage.Sets/src/mage/sets/innistrad/ChapelGeist.java @@ -45,7 +45,6 @@ public class ChapelGeist extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/innistrad/CharmbreakerDevils.java b/Mage.Sets/src/mage/sets/innistrad/CharmbreakerDevils.java index 3c3cc65b8da..3b77016e274 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CharmbreakerDevils.java +++ b/Mage.Sets/src/mage/sets/innistrad/CharmbreakerDevils.java @@ -69,7 +69,6 @@ public class CharmbreakerDevils extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Devil"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java b/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java index e96f3b66911..31917f43114 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java +++ b/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java @@ -61,7 +61,6 @@ public class CivilizedScholar extends CardImpl { this.canTransform = true; this.secondSideCard = new HomicidalBrute(ownerId); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/innistrad/Claustrophobia.java b/Mage.Sets/src/mage/sets/innistrad/Claustrophobia.java index 9c0e9411ef4..8bec3eda852 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Claustrophobia.java +++ b/Mage.Sets/src/mage/sets/innistrad/Claustrophobia.java @@ -53,7 +53,6 @@ public class Claustrophobia extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/innistrad/CloisteredYouth.java b/Mage.Sets/src/mage/sets/innistrad/CloisteredYouth.java index 904713dafe5..f3b54d4c6e9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CloisteredYouth.java +++ b/Mage.Sets/src/mage/sets/innistrad/CloisteredYouth.java @@ -49,7 +49,6 @@ public class CloisteredYouth extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/CorpseLunge.java b/Mage.Sets/src/mage/sets/innistrad/CorpseLunge.java index 10999fe7f6f..a9bc0bad833 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CorpseLunge.java +++ b/Mage.Sets/src/mage/sets/innistrad/CorpseLunge.java @@ -53,7 +53,6 @@ public class CorpseLunge extends CardImpl { super(ownerId, 93, "Corpse Lunge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "ISD"; - this.color.setBlack(true); // As an additional cost to cast Corpse Lunge, exile a creature card from your graveyard. this.getSpellAbility().addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")))); diff --git a/Mage.Sets/src/mage/sets/innistrad/CreepingRenaissance.java b/Mage.Sets/src/mage/sets/innistrad/CreepingRenaissance.java index 75b7400b2f6..1049985b973 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CreepingRenaissance.java +++ b/Mage.Sets/src/mage/sets/innistrad/CreepingRenaissance.java @@ -51,7 +51,6 @@ public class CreepingRenaissance extends CardImpl { super(ownerId, 174, "Creeping Renaissance", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); this.expansionSetCode = "ISD"; - this.color.setGreen(true); // Choose a permanent type. Return all cards of the chosen type from your graveyard to your hand. this.getSpellAbility().addEffect(new CreepingRenaissanceEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/CrosswayVampire.java b/Mage.Sets/src/mage/sets/innistrad/CrosswayVampire.java index 94bf3e0b9c9..35c476b63a1 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CrosswayVampire.java +++ b/Mage.Sets/src/mage/sets/innistrad/CrosswayVampire.java @@ -49,7 +49,6 @@ public class CrosswayVampire extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Vampire"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/Curiosity.java b/Mage.Sets/src/mage/sets/innistrad/Curiosity.java index ed271ea491c..80226a7f55a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Curiosity.java +++ b/Mage.Sets/src/mage/sets/innistrad/Curiosity.java @@ -57,7 +57,6 @@ public class Curiosity extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfDeathsHold.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfDeathsHold.java index 326fe0e54ab..1de846c25ec 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfDeathsHold.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfDeathsHold.java @@ -54,7 +54,6 @@ public class CurseOfDeathsHold extends CardImpl { this.subtype.add("Aura"); this.subtype.add("Curse"); - this.color.setBlack(true); // Enchant player TargetPlayer auraTarget = new TargetPlayer(); diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java index 147f730105f..5c736744649 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java @@ -60,7 +60,6 @@ public class CurseOfOblivion extends CardImpl { this.subtype.add("Aura"); this.subtype.add("Curse"); - this.color.setBlack(true); // Enchant player TargetPlayer target = new TargetPlayer(); diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java index 4ef2d7b073b..898e0504477 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java @@ -61,7 +61,6 @@ public class CurseOfStalkedPrey extends CardImpl { this.subtype.add("Aura"); this.subtype.add("Curse"); - this.color.setRed(true); // Enchant player TargetPlayer target = new TargetPlayer(); diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java index e5da8ee561b..57821a1edd7 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java @@ -58,7 +58,6 @@ public class CurseOfTheBloodyTome extends CardImpl { this.subtype.add("Aura"); this.subtype.add("Curse"); - this.color.setBlue(true); // Enchant player TargetPlayer target = new TargetPlayer(); diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java index cd37dc26b06..d3e7b6a6bfe 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java @@ -55,7 +55,6 @@ public class CurseOfTheNightlyHunt extends CardImpl { this.subtype.add("Aura"); this.subtype.add("Curse"); - this.color.setRed(true); // Enchant player TargetPlayer auraTarget = new TargetPlayer(); diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java index 549e45265f0..b0cc02e2dd7 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java @@ -59,7 +59,6 @@ public class CurseOfThePiercedHeart extends CardImpl { this.subtype.add("Aura"); this.subtype.add("Curse"); - this.color.setRed(true); // Enchant player TargetPlayer target = new TargetPlayer(); diff --git a/Mage.Sets/src/mage/sets/innistrad/DarkthicketWolf.java b/Mage.Sets/src/mage/sets/innistrad/DarkthicketWolf.java index 4ef53eee810..e3a4e917a48 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DarkthicketWolf.java +++ b/Mage.Sets/src/mage/sets/innistrad/DarkthicketWolf.java @@ -50,7 +50,6 @@ public class DarkthicketWolf extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/DaybreakRanger.java b/Mage.Sets/src/mage/sets/innistrad/DaybreakRanger.java index bf8c8ae6e3b..0424a7e8023 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DaybreakRanger.java +++ b/Mage.Sets/src/mage/sets/innistrad/DaybreakRanger.java @@ -71,7 +71,6 @@ public class DaybreakRanger extends CardImpl { this.canTransform = true; this.secondSideCard = new NightfallPredator(ownerId); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/DeadWeight.java b/Mage.Sets/src/mage/sets/innistrad/DeadWeight.java index a6a8ec93148..2cf6f5504e3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DeadWeight.java +++ b/Mage.Sets/src/mage/sets/innistrad/DeadWeight.java @@ -50,7 +50,6 @@ public class DeadWeight extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/innistrad/DearlyDeparted.java b/Mage.Sets/src/mage/sets/innistrad/DearlyDeparted.java index 0042c372778..4a3a953c42c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DearlyDeparted.java +++ b/Mage.Sets/src/mage/sets/innistrad/DearlyDeparted.java @@ -64,7 +64,6 @@ public class DearlyDeparted extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/DelverOfSecrets.java b/Mage.Sets/src/mage/sets/innistrad/DelverOfSecrets.java index 68b923684fd..71a1d172fb3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DelverOfSecrets.java +++ b/Mage.Sets/src/mage/sets/innistrad/DelverOfSecrets.java @@ -60,7 +60,6 @@ public class DelverOfSecrets 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/innistrad/DesperateRavings.java b/Mage.Sets/src/mage/sets/innistrad/DesperateRavings.java index d81d419207f..7836b02af08 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DesperateRavings.java +++ b/Mage.Sets/src/mage/sets/innistrad/DesperateRavings.java @@ -52,7 +52,6 @@ public class DesperateRavings extends CardImpl { super(ownerId, 139, "Desperate Ravings", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "ISD"; - this.color.setRed(true); // Draw two cards, then discard a card at random. this.getSpellAbility().addEffect(new DesperateRavingsEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/DevilsPlay.java b/Mage.Sets/src/mage/sets/innistrad/DevilsPlay.java index ecab55a4717..6d9df7a34fe 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DevilsPlay.java +++ b/Mage.Sets/src/mage/sets/innistrad/DevilsPlay.java @@ -49,7 +49,6 @@ public class DevilsPlay extends CardImpl { super(ownerId, 140, "Devil's Play", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{R}"); this.expansionSetCode = "ISD"; - this.color.setRed(true); // Devil's Play deals X damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); diff --git a/Mage.Sets/src/mage/sets/innistrad/DiscipleOfGriselbrand.java b/Mage.Sets/src/mage/sets/innistrad/DiscipleOfGriselbrand.java index db125152468..64cf75487ce 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DiscipleOfGriselbrand.java +++ b/Mage.Sets/src/mage/sets/innistrad/DiscipleOfGriselbrand.java @@ -56,7 +56,6 @@ public class DiscipleOfGriselbrand 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/innistrad/Dissipate.java b/Mage.Sets/src/mage/sets/innistrad/Dissipate.java index aca0ae1ac96..9a35273c50a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Dissipate.java +++ b/Mage.Sets/src/mage/sets/innistrad/Dissipate.java @@ -45,7 +45,6 @@ public class Dissipate extends CardImpl { super(ownerId, 53, "Dissipate", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{U}"); this.expansionSetCode = "ISD"; - this.color.setBlue(true); // Counter target spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard. this.getSpellAbility().addEffect(new CounterTargetWithReplacementEffect(Zone.EXILED)); diff --git a/Mage.Sets/src/mage/sets/innistrad/DoomedTraveler.java b/Mage.Sets/src/mage/sets/innistrad/DoomedTraveler.java index 7e8d1b7e2e6..de347ada5ee 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DoomedTraveler.java +++ b/Mage.Sets/src/mage/sets/innistrad/DoomedTraveler.java @@ -48,7 +48,6 @@ public class DoomedTraveler 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/innistrad/DreamTwist.java b/Mage.Sets/src/mage/sets/innistrad/DreamTwist.java index 129efedd359..e38a6be7e77 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DreamTwist.java +++ b/Mage.Sets/src/mage/sets/innistrad/DreamTwist.java @@ -47,7 +47,6 @@ public class DreamTwist extends CardImpl { super(ownerId, 54, "Dream Twist", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "ISD"; - 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/innistrad/ElderCathar.java b/Mage.Sets/src/mage/sets/innistrad/ElderCathar.java index 6f1c2fdfc91..3177e1d417e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ElderCathar.java +++ b/Mage.Sets/src/mage/sets/innistrad/ElderCathar.java @@ -54,7 +54,6 @@ public class ElderCathar 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/innistrad/ElderOfLaurels.java b/Mage.Sets/src/mage/sets/innistrad/ElderOfLaurels.java index e78619fb287..efde2e06ca8 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ElderOfLaurels.java +++ b/Mage.Sets/src/mage/sets/innistrad/ElderOfLaurels.java @@ -53,7 +53,6 @@ public class ElderOfLaurels extends CardImpl { this.subtype.add("Human"); this.subtype.add("Advisor"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/innistrad/EliteInquisitor.java b/Mage.Sets/src/mage/sets/innistrad/EliteInquisitor.java index 8936e87c5cf..d214eec6058 100644 --- a/Mage.Sets/src/mage/sets/innistrad/EliteInquisitor.java +++ b/Mage.Sets/src/mage/sets/innistrad/EliteInquisitor.java @@ -61,7 +61,6 @@ public class EliteInquisitor 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/innistrad/EndlessRanksOfTheDead.java b/Mage.Sets/src/mage/sets/innistrad/EndlessRanksOfTheDead.java index e6469191cfc..28d7a191a35 100644 --- a/Mage.Sets/src/mage/sets/innistrad/EndlessRanksOfTheDead.java +++ b/Mage.Sets/src/mage/sets/innistrad/EndlessRanksOfTheDead.java @@ -53,7 +53,6 @@ public class EndlessRanksOfTheDead extends CardImpl { super(ownerId, 99, "Endless Ranks of the Dead", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "ISD"; - this.color.setBlack(true); // At the beginning of your upkeep, put X 2/2 black Zombie creature tokens onto the battlefield, // where X is half the number of Zombies you control, rounded down. diff --git a/Mage.Sets/src/mage/sets/innistrad/EssenceOfTheWild.java b/Mage.Sets/src/mage/sets/innistrad/EssenceOfTheWild.java index f49cde00514..8633a1bab21 100644 --- a/Mage.Sets/src/mage/sets/innistrad/EssenceOfTheWild.java +++ b/Mage.Sets/src/mage/sets/innistrad/EssenceOfTheWild.java @@ -57,7 +57,6 @@ public class EssenceOfTheWild extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/EvilTwin.java b/Mage.Sets/src/mage/sets/innistrad/EvilTwin.java index 29eff084172..e6cb8e4ccdc 100644 --- a/Mage.Sets/src/mage/sets/innistrad/EvilTwin.java +++ b/Mage.Sets/src/mage/sets/innistrad/EvilTwin.java @@ -62,8 +62,6 @@ public class EvilTwin extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Shapeshifter"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/innistrad/FalkenrathMarauders.java b/Mage.Sets/src/mage/sets/innistrad/FalkenrathMarauders.java index bf5632de114..21a134aead1 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FalkenrathMarauders.java +++ b/Mage.Sets/src/mage/sets/innistrad/FalkenrathMarauders.java @@ -50,7 +50,6 @@ public class FalkenrathMarauders extends CardImpl { this.subtype.add("Vampire"); 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/innistrad/FalkenrathNoble.java b/Mage.Sets/src/mage/sets/innistrad/FalkenrathNoble.java index b26f63236f4..8e8e1bbf7e7 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FalkenrathNoble.java +++ b/Mage.Sets/src/mage/sets/innistrad/FalkenrathNoble.java @@ -54,7 +54,6 @@ public class FalkenrathNoble extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Vampire"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/FeelingOfDread.java b/Mage.Sets/src/mage/sets/innistrad/FeelingOfDread.java index cb73760d73e..525dcb89398 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FeelingOfDread.java +++ b/Mage.Sets/src/mage/sets/innistrad/FeelingOfDread.java @@ -48,7 +48,6 @@ public class FeelingOfDread extends CardImpl { super(ownerId, 14, "Feeling of Dread", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "ISD"; - this.color.setWhite(true); // Tap up to two target creatures. this.getSpellAbility().addEffect(new TapTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/FeralRidgewolf.java b/Mage.Sets/src/mage/sets/innistrad/FeralRidgewolf.java index 7b459ef8fa3..e5f9d6cbab4 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FeralRidgewolf.java +++ b/Mage.Sets/src/mage/sets/innistrad/FeralRidgewolf.java @@ -50,7 +50,6 @@ public class FeralRidgewolf extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Wolf"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/FesterhideBoar.java b/Mage.Sets/src/mage/sets/innistrad/FesterhideBoar.java index ce67baff056..d2d810129cb 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FesterhideBoar.java +++ b/Mage.Sets/src/mage/sets/innistrad/FesterhideBoar.java @@ -50,7 +50,6 @@ public class FesterhideBoar extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Boar"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java b/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java index 019c9835cac..7aedc01c0e5 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java +++ b/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java @@ -60,7 +60,6 @@ public class FiendHunter 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/innistrad/ForbiddenAlchemy.java b/Mage.Sets/src/mage/sets/innistrad/ForbiddenAlchemy.java index 44d15db3dc7..ac041bd4658 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ForbiddenAlchemy.java +++ b/Mage.Sets/src/mage/sets/innistrad/ForbiddenAlchemy.java @@ -56,7 +56,6 @@ public class ForbiddenAlchemy extends CardImpl { super(ownerId, 55, "Forbidden Alchemy", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "ISD"; - this.color.setBlue(true); // Look at the top four cards of your library. Put one of them into your hand and the rest into your graveyard. this.getSpellAbility().addEffect(new ForbiddenAlchemyEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/FortressCrab.java b/Mage.Sets/src/mage/sets/innistrad/FortressCrab.java index 58b17854951..36ee3aadcf0 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FortressCrab.java +++ b/Mage.Sets/src/mage/sets/innistrad/FortressCrab.java @@ -44,7 +44,6 @@ public class FortressCrab extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Crab"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(6); } diff --git a/Mage.Sets/src/mage/sets/innistrad/FrightfulDelusion.java b/Mage.Sets/src/mage/sets/innistrad/FrightfulDelusion.java index 0f175f01d60..12077bfd759 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FrightfulDelusion.java +++ b/Mage.Sets/src/mage/sets/innistrad/FrightfulDelusion.java @@ -51,7 +51,6 @@ public class FrightfulDelusion extends CardImpl { super(ownerId, 57, "Frightful Delusion", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "ISD"; - this.color.setBlue(true); // Counter target spell unless its controller pays {1}. That player discards a card. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/innistrad/FullMoonsRise.java b/Mage.Sets/src/mage/sets/innistrad/FullMoonsRise.java index da51f4a9280..7a3f45a4730 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FullMoonsRise.java +++ b/Mage.Sets/src/mage/sets/innistrad/FullMoonsRise.java @@ -64,7 +64,6 @@ public class FullMoonsRise extends CardImpl { super(ownerId, 180, "Full Moon's Rise", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "ISD"; - this.color.setGreen(true); // Werewolf creatures you control get +1/+0 and have trample. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter)); diff --git a/Mage.Sets/src/mage/sets/innistrad/FurorOfTheBitten.java b/Mage.Sets/src/mage/sets/innistrad/FurorOfTheBitten.java index fdb1ad512a1..bc19111137e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FurorOfTheBitten.java +++ b/Mage.Sets/src/mage/sets/innistrad/FurorOfTheBitten.java @@ -55,7 +55,6 @@ public class FurorOfTheBitten extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/innistrad/GallowsWarden.java b/Mage.Sets/src/mage/sets/innistrad/GallowsWarden.java index a8fd8d4f9e4..b7bf86b0bad 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GallowsWarden.java +++ b/Mage.Sets/src/mage/sets/innistrad/GallowsWarden.java @@ -57,7 +57,6 @@ public class GallowsWarden extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/GarrukRelentless.java b/Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java index 07f24fc503d..2bc737f28f6 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java +++ b/Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java @@ -60,7 +60,6 @@ public class GarrukRelentless extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Garruk"); - this.color.setGreen(true); this.canTransform = true; this.secondSideCard = new GarrukTheVeilCursed(ownerId); diff --git a/Mage.Sets/src/mage/sets/innistrad/GatstafShepherd.java b/Mage.Sets/src/mage/sets/innistrad/GatstafShepherd.java index 6abca573121..107596e5ad3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GatstafShepherd.java +++ b/Mage.Sets/src/mage/sets/innistrad/GatstafShepherd.java @@ -55,7 +55,6 @@ public class GatstafShepherd extends CardImpl { this.canTransform = true; this.secondSideCard = new GatstafHowler(ownerId); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/GeistHonoredMonk.java b/Mage.Sets/src/mage/sets/innistrad/GeistHonoredMonk.java index 356ae1d1502..5d43302872e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GeistHonoredMonk.java +++ b/Mage.Sets/src/mage/sets/innistrad/GeistHonoredMonk.java @@ -54,7 +54,6 @@ public class GeistHonoredMonk extends CardImpl { this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/innistrad/Geistflame.java b/Mage.Sets/src/mage/sets/innistrad/Geistflame.java index e54eb8e1982..82f94d3393d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Geistflame.java +++ b/Mage.Sets/src/mage/sets/innistrad/Geistflame.java @@ -47,7 +47,6 @@ public class Geistflame extends CardImpl { super(ownerId, 144, "Geistflame", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "ISD"; - this.color.setRed(true); // Geistflame deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/innistrad/GhostlyPossession.java b/Mage.Sets/src/mage/sets/innistrad/GhostlyPossession.java index 82c35906d90..556896cfad7 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GhostlyPossession.java +++ b/Mage.Sets/src/mage/sets/innistrad/GhostlyPossession.java @@ -56,7 +56,6 @@ public class GhostlyPossession extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Aura"); - this.color.setWhite(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/innistrad/GhoulcallersChant.java b/Mage.Sets/src/mage/sets/innistrad/GhoulcallersChant.java index 5406ead5d56..4db75557b69 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GhoulcallersChant.java +++ b/Mage.Sets/src/mage/sets/innistrad/GhoulcallersChant.java @@ -54,7 +54,6 @@ public class GhoulcallersChant extends CardImpl { super(ownerId, 101, "Ghoulcaller's Chant", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "ISD"; - this.color.setBlack(true); // Choose one - Return target creature card from your graveyard to your hand this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/Ghoulraiser.java b/Mage.Sets/src/mage/sets/innistrad/Ghoulraiser.java index 2b3eba2a765..ac601b37b57 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Ghoulraiser.java +++ b/Mage.Sets/src/mage/sets/innistrad/Ghoulraiser.java @@ -55,7 +55,6 @@ public class Ghoulraiser extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/GnawToTheBone.java b/Mage.Sets/src/mage/sets/innistrad/GnawToTheBone.java index 8749e896d09..d1fe7467378 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GnawToTheBone.java +++ b/Mage.Sets/src/mage/sets/innistrad/GnawToTheBone.java @@ -50,7 +50,6 @@ public class GnawToTheBone extends CardImpl { super(ownerId, 183, "Gnaw to the Bone", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "ISD"; - this.color.setGreen(true); // You gain 2 life for each creature card in your graveyard. DynamicValue value = new CardsInControllerGraveyardCount(new FilterCreatureCard(), 2); diff --git a/Mage.Sets/src/mage/sets/innistrad/GraspOfPhantoms.java b/Mage.Sets/src/mage/sets/innistrad/GraspOfPhantoms.java index 990fcca4068..807b022f5bd 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GraspOfPhantoms.java +++ b/Mage.Sets/src/mage/sets/innistrad/GraspOfPhantoms.java @@ -48,7 +48,6 @@ public class GraspOfPhantoms extends CardImpl { super(ownerId, 58, "Grasp of Phantoms", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "ISD"; - this.color.setBlue(true); // Put target creature on top of its owner's library. this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/innistrad/GraveBramble.java b/Mage.Sets/src/mage/sets/innistrad/GraveBramble.java index 66223f79330..c7a291d9786 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GraveBramble.java +++ b/Mage.Sets/src/mage/sets/innistrad/GraveBramble.java @@ -55,7 +55,6 @@ public class GraveBramble extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Plant"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java b/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java index 8a7ae888e28..db9609e39cf 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java +++ b/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java @@ -70,8 +70,6 @@ public class GrimgrinCorpseBorn extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Warrior"); - 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/innistrad/GrizzledOutcasts.java b/Mage.Sets/src/mage/sets/innistrad/GrizzledOutcasts.java index 60f8ec4946a..bd5cf5ae169 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GrizzledOutcasts.java +++ b/Mage.Sets/src/mage/sets/innistrad/GrizzledOutcasts.java @@ -55,7 +55,6 @@ public class GrizzledOutcasts extends CardImpl { this.canTransform = true; this.secondSideCard = new KrallenhordeWantons(ownerId); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/innistrad/GruesomeDeformity.java b/Mage.Sets/src/mage/sets/innistrad/GruesomeDeformity.java index fe79894bee6..41cfde99032 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GruesomeDeformity.java +++ b/Mage.Sets/src/mage/sets/innistrad/GruesomeDeformity.java @@ -51,7 +51,6 @@ public class GruesomeDeformity extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent target = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java b/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java index cacf57bcc7d..59e9efb8756 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java +++ b/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java @@ -60,7 +60,6 @@ public class GutterGrime extends CardImpl { super(ownerId, 186, "Gutter Grime", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}"); this.expansionSetCode = "ISD"; - this.color.setGreen(true); // Whenever a nontoken creature you control dies, put a slime counter on Gutter Grime, then put a green Ooze creature token onto the battlefield with "This creature's power and toughness are each equal to the number of slime counters on Gutter Grime." this.addAbility(new GutterGrimeTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java b/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java index d51f75f54de..e739df02dc4 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java +++ b/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java @@ -56,7 +56,6 @@ public class HamletCaptain 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/innistrad/HanweirWatchkeep.java b/Mage.Sets/src/mage/sets/innistrad/HanweirWatchkeep.java index 2fc6225afce..92ec92edc27 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HanweirWatchkeep.java +++ b/Mage.Sets/src/mage/sets/innistrad/HanweirWatchkeep.java @@ -57,7 +57,6 @@ public class HanweirWatchkeep extends CardImpl { this.canTransform = true; this.secondSideCard = new BaneOfHanweir(ownerId); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/innistrad/HarvestPyre.java b/Mage.Sets/src/mage/sets/innistrad/HarvestPyre.java index 5d7bd499bb3..5554a86fc95 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HarvestPyre.java +++ b/Mage.Sets/src/mage/sets/innistrad/HarvestPyre.java @@ -47,7 +47,6 @@ public class HarvestPyre extends CardImpl { super(ownerId, 146, "Harvest Pyre", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "ISD"; - this.color.setRed(true); // As an additional cost to cast Harvest Pyre, exile X cards from your graveyard. this.getSpellAbility().addCost(new ExileXFromYourGraveCost(new FilterCard("cards from your graveyard"))); diff --git a/Mage.Sets/src/mage/sets/innistrad/HeartlessSummoning.java b/Mage.Sets/src/mage/sets/innistrad/HeartlessSummoning.java index 199039f5c7e..9e088614be2 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HeartlessSummoning.java +++ b/Mage.Sets/src/mage/sets/innistrad/HeartlessSummoning.java @@ -48,7 +48,6 @@ public class HeartlessSummoning extends CardImpl { super(ownerId, 104, "Heartless Summoning", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "ISD"; - this.color.setBlack(true); // Creature spells you cast cost {2} less to cast. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(new FilterCreatureCard("Creature spells"), 2))); diff --git a/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java b/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java index 5cd18d05ecc..b58d40d6e88 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java +++ b/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java @@ -53,7 +53,6 @@ public class HereticsPunishment extends CardImpl { super(ownerId, 147, "Heretic's Punishment", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}"); this.expansionSetCode = "ISD"; - this.color.setRed(true); // {3}{R}: Choose target creature or player, then put the top three cards of your library into your graveyard. Heretic's Punishment deals damage to that creature or player equal to the highest converted mana cost among those cards. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HereticsPunishmentEffect(), new ManaCostsImpl("{3}{R}")); diff --git a/Mage.Sets/src/mage/sets/innistrad/HystericalBlindness.java b/Mage.Sets/src/mage/sets/innistrad/HystericalBlindness.java index 15af6a32d8a..0fc50471c39 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HystericalBlindness.java +++ b/Mage.Sets/src/mage/sets/innistrad/HystericalBlindness.java @@ -53,7 +53,6 @@ public class HystericalBlindness extends CardImpl { super(ownerId, 59, "Hysterical Blindness", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "ISD"; - this.color.setBlue(true); // Creatures your opponents control get -4/-0 until end of turn. this.getSpellAbility().addEffect(new BoostAllEffect(-4, 0, Duration.EndOfTurn, filter, false)); diff --git a/Mage.Sets/src/mage/sets/innistrad/InfernalPlunge.java b/Mage.Sets/src/mage/sets/innistrad/InfernalPlunge.java index d491dc90003..20d905e3e13 100644 --- a/Mage.Sets/src/mage/sets/innistrad/InfernalPlunge.java +++ b/Mage.Sets/src/mage/sets/innistrad/InfernalPlunge.java @@ -46,7 +46,6 @@ public class InfernalPlunge extends CardImpl { super(ownerId, 148, "Infernal Plunge", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "ISD"; - this.color.setRed(true); // As an additional cost to cast Infernal Plunge, sacrifice a creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/innistrad/InstigatorGang.java b/Mage.Sets/src/mage/sets/innistrad/InstigatorGang.java index 3c83e8d3da5..8cb04e47bfd 100644 --- a/Mage.Sets/src/mage/sets/innistrad/InstigatorGang.java +++ b/Mage.Sets/src/mage/sets/innistrad/InstigatorGang.java @@ -58,7 +58,6 @@ public class InstigatorGang extends CardImpl { this.canTransform = true; this.secondSideCard = new WildbloodPack(ownerId); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/innistrad/IntangibleVirtue.java b/Mage.Sets/src/mage/sets/innistrad/IntangibleVirtue.java index b329121266f..b180a101cc9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/IntangibleVirtue.java +++ b/Mage.Sets/src/mage/sets/innistrad/IntangibleVirtue.java @@ -57,7 +57,6 @@ public class IntangibleVirtue extends CardImpl { super(ownerId, 19, "Intangible Virtue", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "ISD"; - this.color.setWhite(true); // Creature tokens you control get +1/+1 and have vigilance. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter))); diff --git a/Mage.Sets/src/mage/sets/innistrad/IntoTheMawOfHell.java b/Mage.Sets/src/mage/sets/innistrad/IntoTheMawOfHell.java index 2d3bc8c5468..37f032757e1 100644 --- a/Mage.Sets/src/mage/sets/innistrad/IntoTheMawOfHell.java +++ b/Mage.Sets/src/mage/sets/innistrad/IntoTheMawOfHell.java @@ -50,7 +50,6 @@ public class IntoTheMawOfHell extends CardImpl { super(ownerId, 150, "Into the Maw of Hell", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{R}{R}"); this.expansionSetCode = "ISD"; - this.color.setRed(true); // Destroy target land. Into the Maw of Hell deals 13 damage to target creature. this.getSpellAbility().addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/sets/innistrad/InvisibleStalker.java b/Mage.Sets/src/mage/sets/innistrad/InvisibleStalker.java index 8121ed30a4e..bd51eaa9bfa 100644 --- a/Mage.Sets/src/mage/sets/innistrad/InvisibleStalker.java +++ b/Mage.Sets/src/mage/sets/innistrad/InvisibleStalker.java @@ -47,7 +47,6 @@ public class InvisibleStalker 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/innistrad/KessigCagebreakers.java b/Mage.Sets/src/mage/sets/innistrad/KessigCagebreakers.java index 9073aa6b285..09ec0aa7c24 100644 --- a/Mage.Sets/src/mage/sets/innistrad/KessigCagebreakers.java +++ b/Mage.Sets/src/mage/sets/innistrad/KessigCagebreakers.java @@ -54,7 +54,6 @@ public class KessigCagebreakers extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/innistrad/KessigWolf.java b/Mage.Sets/src/mage/sets/innistrad/KessigWolf.java index 020545346c3..a82a2ff5f8b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/KessigWolf.java +++ b/Mage.Sets/src/mage/sets/innistrad/KessigWolf.java @@ -50,7 +50,6 @@ public class KessigWolf extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Wolf"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/innistrad/Kindercatch.java b/Mage.Sets/src/mage/sets/innistrad/Kindercatch.java index 309741fec95..64cbc5d72b8 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Kindercatch.java +++ b/Mage.Sets/src/mage/sets/innistrad/Kindercatch.java @@ -44,7 +44,6 @@ public class Kindercatch extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(6); } diff --git a/Mage.Sets/src/mage/sets/innistrad/KruinOutlaw.java b/Mage.Sets/src/mage/sets/innistrad/KruinOutlaw.java index f77c9c56b5f..8bfde9a0e41 100644 --- a/Mage.Sets/src/mage/sets/innistrad/KruinOutlaw.java +++ b/Mage.Sets/src/mage/sets/innistrad/KruinOutlaw.java @@ -57,7 +57,6 @@ public class KruinOutlaw extends CardImpl { this.canTransform = true; this.secondSideCard = new TerrorOfKruinPass(ownerId); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/LanternSpirit.java b/Mage.Sets/src/mage/sets/innistrad/LanternSpirit.java index 3d2bbbf7b2c..f41a59c49a0 100644 --- a/Mage.Sets/src/mage/sets/innistrad/LanternSpirit.java +++ b/Mage.Sets/src/mage/sets/innistrad/LanternSpirit.java @@ -49,7 +49,6 @@ public class LanternSpirit extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/LilianaOfTheVeil.java b/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java index bf8d01f10ab..d20fc714ff0 100644 --- a/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java +++ b/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java @@ -62,7 +62,6 @@ public class LilianaOfTheVeil extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Liliana"); - this.color.setBlack(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), false)); diff --git a/Mage.Sets/src/mage/sets/innistrad/LostInTheMist.java b/Mage.Sets/src/mage/sets/innistrad/LostInTheMist.java index d3ee6b60d66..35f2efd4279 100644 --- a/Mage.Sets/src/mage/sets/innistrad/LostInTheMist.java +++ b/Mage.Sets/src/mage/sets/innistrad/LostInTheMist.java @@ -51,7 +51,6 @@ public class LostInTheMist extends CardImpl { super(ownerId, 63, "Lost in the Mist", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); this.expansionSetCode = "ISD"; - this.color.setBlue(true); // Counter target spell. Return target permanent to its owner's hand. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/innistrad/LudevicsTestSubject.java b/Mage.Sets/src/mage/sets/innistrad/LudevicsTestSubject.java index 6ea034ab16c..173bf694c53 100644 --- a/Mage.Sets/src/mage/sets/innistrad/LudevicsTestSubject.java +++ b/Mage.Sets/src/mage/sets/innistrad/LudevicsTestSubject.java @@ -58,7 +58,6 @@ public class LudevicsTestSubject extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Lizard"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/innistrad/Lumberknot.java b/Mage.Sets/src/mage/sets/innistrad/Lumberknot.java index ffd7a355301..ee33c138818 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Lumberknot.java +++ b/Mage.Sets/src/mage/sets/innistrad/Lumberknot.java @@ -48,7 +48,6 @@ public class Lumberknot extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Treefolk"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/innistrad/MakeAWish.java b/Mage.Sets/src/mage/sets/innistrad/MakeAWish.java index 887a7d1236f..4638ed43fb4 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MakeAWish.java +++ b/Mage.Sets/src/mage/sets/innistrad/MakeAWish.java @@ -50,7 +50,6 @@ public class MakeAWish extends CardImpl { super(ownerId, 192, "Make a Wish", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "ISD"; - this.color.setGreen(true); // Return two cards at random from your graveyard to your hand. this.getSpellAbility().addEffect(new MakeAWishEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/MakeshiftMauler.java b/Mage.Sets/src/mage/sets/innistrad/MakeshiftMauler.java index fd28668a85e..f531b8aaeda 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MakeshiftMauler.java +++ b/Mage.Sets/src/mage/sets/innistrad/MakeshiftMauler.java @@ -48,7 +48,6 @@ public class MakeshiftMauler extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Horror"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/innistrad/ManorSkeleton.java b/Mage.Sets/src/mage/sets/innistrad/ManorSkeleton.java index 4437323f298..3e98f9a6858 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ManorSkeleton.java +++ b/Mage.Sets/src/mage/sets/innistrad/ManorSkeleton.java @@ -49,7 +49,6 @@ public class ManorSkeleton extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/MarkovPatrician.java b/Mage.Sets/src/mage/sets/innistrad/MarkovPatrician.java index 1b1de320063..ce201670b5c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MarkovPatrician.java +++ b/Mage.Sets/src/mage/sets/innistrad/MarkovPatrician.java @@ -45,7 +45,6 @@ public class MarkovPatrician extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Vampire"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/innistrad/MausoleumGuard.java b/Mage.Sets/src/mage/sets/innistrad/MausoleumGuard.java index c947a4b7251..f9cc2d4d74f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MausoleumGuard.java +++ b/Mage.Sets/src/mage/sets/innistrad/MausoleumGuard.java @@ -47,7 +47,6 @@ public class MausoleumGuard extends CardImpl { this.subtype.add("Human"); 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/innistrad/MawOfTheMire.java b/Mage.Sets/src/mage/sets/innistrad/MawOfTheMire.java index 09465c3702c..03a98516760 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MawOfTheMire.java +++ b/Mage.Sets/src/mage/sets/innistrad/MawOfTheMire.java @@ -45,7 +45,6 @@ public class MawOfTheMire extends CardImpl { super(ownerId, 108, "Maw of the Mire", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{B}"); this.expansionSetCode = "ISD"; - this.color.setBlack(true); // Destroy target land. You gain 4 life. this.getSpellAbility().addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java b/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java index b03f9112757..e5f0dfacf66 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java +++ b/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java @@ -71,7 +71,6 @@ public class MayorOfAvabruck extends CardImpl { this.canTransform = true; this.secondSideCard = new HowlpackAlpha(ownerId); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java b/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java index 28202135a7d..654c90130cd 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java +++ b/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java @@ -56,7 +56,6 @@ public class MemorysJourney extends CardImpl { super(ownerId, 66, "Memory's Journey", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "ISD"; - this.color.setBlue(true); // Target player shuffles up to three target cards from his or her graveyard into his or her library. this.getSpellAbility().addEffect(new MemorysJourneyEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/MidnightHaunting.java b/Mage.Sets/src/mage/sets/innistrad/MidnightHaunting.java index 8f6a80edc62..c12ecfc1a85 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MidnightHaunting.java +++ b/Mage.Sets/src/mage/sets/innistrad/MidnightHaunting.java @@ -44,7 +44,6 @@ public class MidnightHaunting extends CardImpl { super(ownerId, 22, "Midnight Haunting", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "ISD"; - this.color.setWhite(true); // Put two 1/1 white Spirit creature tokens with flying onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new SpiritWhiteToken("ISD"), 2)); diff --git a/Mage.Sets/src/mage/sets/innistrad/MikaeusTheLunarch.java b/Mage.Sets/src/mage/sets/innistrad/MikaeusTheLunarch.java index b29c18e618e..fe50dc84018 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MikaeusTheLunarch.java +++ b/Mage.Sets/src/mage/sets/innistrad/MikaeusTheLunarch.java @@ -70,7 +70,6 @@ public class MikaeusTheLunarch extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java b/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java index b5c2b988c42..d2566c89f20 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java +++ b/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java @@ -58,7 +58,6 @@ public class Mindshrieker extends CardImpl { this.subtype.add("Spirit"); 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/innistrad/MirrorMadPhantasm.java b/Mage.Sets/src/mage/sets/innistrad/MirrorMadPhantasm.java index f05cbadae1c..d6156710c65 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MirrorMadPhantasm.java +++ b/Mage.Sets/src/mage/sets/innistrad/MirrorMadPhantasm.java @@ -57,7 +57,6 @@ public class MirrorMadPhantasm extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/innistrad/MoanOfTheUnhallowed.java b/Mage.Sets/src/mage/sets/innistrad/MoanOfTheUnhallowed.java index 2a1f1acac48..a981392e93d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MoanOfTheUnhallowed.java +++ b/Mage.Sets/src/mage/sets/innistrad/MoanOfTheUnhallowed.java @@ -47,7 +47,6 @@ public class MoanOfTheUnhallowed extends CardImpl { super(ownerId, 109, "Moan of the Unhallowed", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{B}{B}"); this.expansionSetCode = "ISD"; - this.color.setBlack(true); // Put two 2/2 black Zombie creature tokens onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new ZombieToken("ISD"), 2)); diff --git a/Mage.Sets/src/mage/sets/innistrad/MoldgrafMonstrosity.java b/Mage.Sets/src/mage/sets/innistrad/MoldgrafMonstrosity.java index eaffd7a68d6..d1b6a1addf2 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MoldgrafMonstrosity.java +++ b/Mage.Sets/src/mage/sets/innistrad/MoldgrafMonstrosity.java @@ -57,7 +57,6 @@ public class MoldgrafMonstrosity extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Insect"); - this.color.setGreen(true); this.power = new MageInt(8); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/sets/innistrad/MomentOfHeroism.java b/Mage.Sets/src/mage/sets/innistrad/MomentOfHeroism.java index 124387cb24f..0c15cb48985 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MomentOfHeroism.java +++ b/Mage.Sets/src/mage/sets/innistrad/MomentOfHeroism.java @@ -47,7 +47,6 @@ public class MomentOfHeroism extends CardImpl { super(ownerId, 24, "Moment of Heroism", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "ISD"; - this.color.setWhite(true); // Target creature gets +2/+2 and gains lifelink until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/innistrad/MoonHeron.java b/Mage.Sets/src/mage/sets/innistrad/MoonHeron.java index e1a0d36cb92..0df3c7e670d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MoonHeron.java +++ b/Mage.Sets/src/mage/sets/innistrad/MoonHeron.java @@ -46,7 +46,6 @@ public class MoonHeron extends CardImpl { this.subtype.add("Spirit"); this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/Moonmist.java b/Mage.Sets/src/mage/sets/innistrad/Moonmist.java index 10bd9f66a65..729a905f91a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Moonmist.java +++ b/Mage.Sets/src/mage/sets/innistrad/Moonmist.java @@ -59,7 +59,6 @@ public class Moonmist extends CardImpl { super(ownerId, 195, "Moonmist", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "ISD"; - this.color.setGreen(true); // Transform all Humans. Prevent all combat damage that would be dealt this turn by creatures other than Werewolves and Wolves. this.getSpellAbility().addEffect(new MoonmistEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/Mulch.java b/Mage.Sets/src/mage/sets/innistrad/Mulch.java index ead8493f276..a18ac113e7a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Mulch.java +++ b/Mage.Sets/src/mage/sets/innistrad/Mulch.java @@ -52,7 +52,6 @@ public class Mulch extends CardImpl { super(ownerId, 196, "Mulch", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "ISD"; - this.color.setGreen(true); // Reveal the top four cards of your library. Put all land cards revealed this way into your hand and the rest into your graveyard. this.getSpellAbility().addEffect(new MulchEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/MurderOfCrows.java b/Mage.Sets/src/mage/sets/innistrad/MurderOfCrows.java index 49c78715ce5..1e4a5d8e570 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MurderOfCrows.java +++ b/Mage.Sets/src/mage/sets/innistrad/MurderOfCrows.java @@ -51,7 +51,6 @@ public class MurderOfCrows extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/innistrad/NightTerrors.java b/Mage.Sets/src/mage/sets/innistrad/NightTerrors.java index f8166216834..f8dc2b78031 100644 --- a/Mage.Sets/src/mage/sets/innistrad/NightTerrors.java +++ b/Mage.Sets/src/mage/sets/innistrad/NightTerrors.java @@ -52,7 +52,6 @@ public class NightTerrors extends CardImpl { super(ownerId, 111, "Night Terrors", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "ISD"; - this.color.setBlack(true); // Target player reveals his or her hand. You choose a nonland card from it. Exile that card. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/innistrad/NightbirdsClutches.java b/Mage.Sets/src/mage/sets/innistrad/NightbirdsClutches.java index f85731d6ac5..491342438c3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/NightbirdsClutches.java +++ b/Mage.Sets/src/mage/sets/innistrad/NightbirdsClutches.java @@ -48,7 +48,6 @@ public class NightbirdsClutches extends CardImpl { super(ownerId, 154, "Nightbird's Clutches", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "ISD"; - this.color.setRed(true); // Up to two target creatures can't block this turn. this.getSpellAbility().addEffect(new CantBlockTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java b/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java index a6b1fde594d..9a11d4153a7 100644 --- a/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java +++ b/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java @@ -71,8 +71,6 @@ public class OliviaVoldaren extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Vampire"); - 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/innistrad/OrchardSpirit.java b/Mage.Sets/src/mage/sets/innistrad/OrchardSpirit.java index ea06f65b4cc..e16f95e77af 100644 --- a/Mage.Sets/src/mage/sets/innistrad/OrchardSpirit.java +++ b/Mage.Sets/src/mage/sets/innistrad/OrchardSpirit.java @@ -52,7 +52,6 @@ public class OrchardSpirit extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/Paraselene.java b/Mage.Sets/src/mage/sets/innistrad/Paraselene.java index e4b4b739137..87bdfc9ec33 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Paraselene.java +++ b/Mage.Sets/src/mage/sets/innistrad/Paraselene.java @@ -49,7 +49,6 @@ public class Paraselene extends CardImpl { super(ownerId, 26, "Paraselene", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{W}"); this.expansionSetCode = "ISD"; - this.color.setWhite(true); // Destroy all enchantments. You gain 1 life for each enchantment destroyed this way. this.getSpellAbility().addEffect(new ParaseleneEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/PastInFlames.java b/Mage.Sets/src/mage/sets/innistrad/PastInFlames.java index d7861ffc03b..27e5207cd7e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/PastInFlames.java +++ b/Mage.Sets/src/mage/sets/innistrad/PastInFlames.java @@ -55,7 +55,6 @@ public class PastInFlames extends CardImpl { super(ownerId, 155, "Past in Flames", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "ISD"; - this.color.setRed(true); // Each instant and sorcery card in your graveyard gains flashback until end of turn. The flashback cost is equal to its mana cost. this.getSpellAbility().addEffect(new PastInFlamesEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/PitchburnDevils.java b/Mage.Sets/src/mage/sets/innistrad/PitchburnDevils.java index f8ac670ddf1..d1ad75d1bf8 100644 --- a/Mage.Sets/src/mage/sets/innistrad/PitchburnDevils.java +++ b/Mage.Sets/src/mage/sets/innistrad/PitchburnDevils.java @@ -47,7 +47,6 @@ public class PitchburnDevils extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/PreyUpon.java b/Mage.Sets/src/mage/sets/innistrad/PreyUpon.java index b26d753def0..aca1feb0f0c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/PreyUpon.java +++ b/Mage.Sets/src/mage/sets/innistrad/PreyUpon.java @@ -55,7 +55,6 @@ public class PreyUpon extends CardImpl { super(ownerId, 200, "Prey Upon", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{G}"); this.expansionSetCode = "ISD"; - this.color.setGreen(true); // Target creature you control fights target creature you don't control. this.getSpellAbility().addEffect(new FightTargetsEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/PurifyTheGrave.java b/Mage.Sets/src/mage/sets/innistrad/PurifyTheGrave.java index ea7e882de99..71372157d92 100644 --- a/Mage.Sets/src/mage/sets/innistrad/PurifyTheGrave.java +++ b/Mage.Sets/src/mage/sets/innistrad/PurifyTheGrave.java @@ -48,7 +48,6 @@ public class PurifyTheGrave extends CardImpl { super(ownerId, 27, "Purify the Grave", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "ISD"; - this.color.setWhite(true); // Exile target card from a graveyard. this.getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/RageThrower.java b/Mage.Sets/src/mage/sets/innistrad/RageThrower.java index 6de99a18350..1748d74ed1f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RageThrower.java +++ b/Mage.Sets/src/mage/sets/innistrad/RageThrower.java @@ -48,7 +48,6 @@ public class RageThrower extends CardImpl { this.subtype.add("Human"); 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/innistrad/RakishHeir.java b/Mage.Sets/src/mage/sets/innistrad/RakishHeir.java index e6ce546c5e4..8df3ac41ad6 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RakishHeir.java +++ b/Mage.Sets/src/mage/sets/innistrad/RakishHeir.java @@ -53,7 +53,6 @@ public class RakishHeir extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Vampire"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/RallyThePeasants.java b/Mage.Sets/src/mage/sets/innistrad/RallyThePeasants.java index b3d35ba086d..733cf5da046 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RallyThePeasants.java +++ b/Mage.Sets/src/mage/sets/innistrad/RallyThePeasants.java @@ -47,7 +47,6 @@ public class RallyThePeasants extends CardImpl { super(ownerId, 28, "Rally the Peasants", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "ISD"; - this.color.setWhite(true); // Creatures you control get +2/+0 until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/innistrad/RangersGuile.java b/Mage.Sets/src/mage/sets/innistrad/RangersGuile.java index 742e017c25c..2d8be0a2945 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RangersGuile.java +++ b/Mage.Sets/src/mage/sets/innistrad/RangersGuile.java @@ -48,7 +48,6 @@ public class RangersGuile extends CardImpl { super(ownerId, 201, "Ranger's Guile", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "ISD"; - this.color.setGreen(true); // Target creature you control gets +1/+1 and gains hexproof until end of turn. this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/innistrad/Rebuke.java b/Mage.Sets/src/mage/sets/innistrad/Rebuke.java index b4f8e46ad44..1cfcbdef84e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Rebuke.java +++ b/Mage.Sets/src/mage/sets/innistrad/Rebuke.java @@ -45,7 +45,6 @@ public class Rebuke extends CardImpl { super(ownerId, 29, "Rebuke", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "ISD"; - this.color.setWhite(true); // Destroy target attacking creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent(new FilterAttackingCreature())); diff --git a/Mage.Sets/src/mage/sets/innistrad/RecklessWaif.java b/Mage.Sets/src/mage/sets/innistrad/RecklessWaif.java index fd41db61489..902fdf57c0d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RecklessWaif.java +++ b/Mage.Sets/src/mage/sets/innistrad/RecklessWaif.java @@ -56,7 +56,6 @@ public class RecklessWaif extends CardImpl { this.canTransform = true; this.secondSideCard = new MercilessPredator(ownerId); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/innistrad/RiotDevils.java b/Mage.Sets/src/mage/sets/innistrad/RiotDevils.java index 37785e8d835..4332ee342dd 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RiotDevils.java +++ b/Mage.Sets/src/mage/sets/innistrad/RiotDevils.java @@ -44,7 +44,6 @@ public class RiotDevils extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Devil"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/innistrad/RollingTemblor.java b/Mage.Sets/src/mage/sets/innistrad/RollingTemblor.java index 638bdfa07ee..b4b2f50b9d7 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RollingTemblor.java +++ b/Mage.Sets/src/mage/sets/innistrad/RollingTemblor.java @@ -56,7 +56,6 @@ public class RollingTemblor extends CardImpl { super(ownerId, 161, "Rolling Temblor", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "ISD"; - this.color.setRed(true); // Rolling Temblor deals 2 damage to each creature without flying. this.getSpellAbility().addEffect(new DamageAllEffect(2, filter)); diff --git a/Mage.Sets/src/mage/sets/innistrad/RottingFensnake.java b/Mage.Sets/src/mage/sets/innistrad/RottingFensnake.java index 059d1338fc4..e4bfa992711 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RottingFensnake.java +++ b/Mage.Sets/src/mage/sets/innistrad/RottingFensnake.java @@ -45,7 +45,6 @@ public class RottingFensnake extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Snake"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/innistrad/ScourgeOfGeierReach.java b/Mage.Sets/src/mage/sets/innistrad/ScourgeOfGeierReach.java index d0853d2e7ba..522bd1e2e75 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ScourgeOfGeierReach.java +++ b/Mage.Sets/src/mage/sets/innistrad/ScourgeOfGeierReach.java @@ -58,7 +58,6 @@ public class ScourgeOfGeierReach extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java b/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java index 2a97f85fd01..7ebc1ee753c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java +++ b/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java @@ -61,7 +61,6 @@ public class ScreechingBat extends CardImpl { this.canTransform = true; this.secondSideCard = new StalkingVampire(ownerId); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/SelflessCathar.java b/Mage.Sets/src/mage/sets/innistrad/SelflessCathar.java index 9ad2b4c77e1..7202bc5c503 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SelflessCathar.java +++ b/Mage.Sets/src/mage/sets/innistrad/SelflessCathar.java @@ -52,7 +52,6 @@ public class SelflessCathar 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/innistrad/SelhoffOccultist.java b/Mage.Sets/src/mage/sets/innistrad/SelhoffOccultist.java index bcfb2654af9..c00a4a44da2 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SelhoffOccultist.java +++ b/Mage.Sets/src/mage/sets/innistrad/SelhoffOccultist.java @@ -50,7 +50,6 @@ public class SelhoffOccultist extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/innistrad/SensoryDeprivation.java b/Mage.Sets/src/mage/sets/innistrad/SensoryDeprivation.java index bfa9d8f4414..8960035394a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SensoryDeprivation.java +++ b/Mage.Sets/src/mage/sets/innistrad/SensoryDeprivation.java @@ -52,7 +52,6 @@ public class SensoryDeprivation extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/innistrad/SeverTheBloodline.java b/Mage.Sets/src/mage/sets/innistrad/SeverTheBloodline.java index c4f86f7f616..2998dac4923 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SeverTheBloodline.java +++ b/Mage.Sets/src/mage/sets/innistrad/SeverTheBloodline.java @@ -56,7 +56,6 @@ public class SeverTheBloodline extends CardImpl { super(ownerId, 115, "Sever the Bloodline", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "ISD"; - this.color.setBlack(true); // Exile target creature and all other creatures with the same name as that creature. this.getSpellAbility().addEffect(new SeverTheBloodlineEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/SilentDeparture.java b/Mage.Sets/src/mage/sets/innistrad/SilentDeparture.java index 4b2fa22c0f1..1d0444e8c57 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SilentDeparture.java +++ b/Mage.Sets/src/mage/sets/innistrad/SilentDeparture.java @@ -48,7 +48,6 @@ public class SilentDeparture extends CardImpl { super(ownerId, 75, "Silent Departure", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}"); this.expansionSetCode = "ISD"; - this.color.setBlue(true); // Return target creature to its owner's hand. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java b/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java index 8c691c0651c..de54eefd158 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java +++ b/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java @@ -59,7 +59,6 @@ public class SilverchaseFox extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Fox"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/SkaabGoliath.java b/Mage.Sets/src/mage/sets/innistrad/SkaabGoliath.java index 7fe137c92a5..18ef426180d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SkaabGoliath.java +++ b/Mage.Sets/src/mage/sets/innistrad/SkaabGoliath.java @@ -49,7 +49,6 @@ public class SkaabGoliath extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Giant"); - this.color.setBlue(true); this.power = new MageInt(6); this.toughness = new MageInt(9); diff --git a/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java b/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java index 756cbf4be62..d49ad5e7eda 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java +++ b/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java @@ -58,7 +58,6 @@ public class SkaabRuinator extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Horror"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/innistrad/SkeletalGrimace.java b/Mage.Sets/src/mage/sets/innistrad/SkeletalGrimace.java index 17065f09ad0..149a854f372 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SkeletalGrimace.java +++ b/Mage.Sets/src/mage/sets/innistrad/SkeletalGrimace.java @@ -58,7 +58,6 @@ public class SkeletalGrimace extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/innistrad/SkirsdagCultist.java b/Mage.Sets/src/mage/sets/innistrad/SkirsdagCultist.java index eff79dcca0e..3998bc8da43 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SkirsdagCultist.java +++ b/Mage.Sets/src/mage/sets/innistrad/SkirsdagCultist.java @@ -54,7 +54,6 @@ public class SkirsdagCultist extends CardImpl { this.subtype.add("Human"); 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/innistrad/SkirsdagHighPriest.java b/Mage.Sets/src/mage/sets/innistrad/SkirsdagHighPriest.java index 182c5a54754..08e333a7ef6 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SkirsdagHighPriest.java +++ b/Mage.Sets/src/mage/sets/innistrad/SkirsdagHighPriest.java @@ -65,7 +65,6 @@ public class SkirsdagHighPriest extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java b/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java index 8aedd8e60ae..904bc2bd8bf 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java +++ b/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java @@ -61,7 +61,6 @@ public class SlayerOfTheWicked extends CardImpl { this.subtype.add("Human"); 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/innistrad/SmiteTheMonstrous.java b/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java index 0efffacc97b..38e67b17d4e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java +++ b/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java @@ -52,7 +52,6 @@ public class SmiteTheMonstrous extends CardImpl { super(ownerId, 33, "Smite the Monstrous", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "ISD"; - 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/innistrad/SnapcasterMage.java b/Mage.Sets/src/mage/sets/innistrad/SnapcasterMage.java index 292a17a97de..3199eccb636 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SnapcasterMage.java +++ b/Mage.Sets/src/mage/sets/innistrad/SnapcasterMage.java @@ -69,7 +69,6 @@ public class SnapcasterMage 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/innistrad/SomberwaldSpider.java b/Mage.Sets/src/mage/sets/innistrad/SomberwaldSpider.java index ef0071a3205..4a6d2060a1d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SomberwaldSpider.java +++ b/Mage.Sets/src/mage/sets/innistrad/SomberwaldSpider.java @@ -50,7 +50,6 @@ public class SomberwaldSpider extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/SpareFromEvil.java b/Mage.Sets/src/mage/sets/innistrad/SpareFromEvil.java index aba420acb6c..73bb4d28c61 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SpareFromEvil.java +++ b/Mage.Sets/src/mage/sets/innistrad/SpareFromEvil.java @@ -55,7 +55,6 @@ public class SpareFromEvil extends CardImpl { super(ownerId, 34, "Spare from Evil", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "ISD"; - this.color.setWhite(true); // Creatures you control gain protection from non-Human creatures until end of turn. this.getSpellAbility().addEffect(new GainAbilityControlledEffect(new ProtectionAbility(filterNonHuman), Duration.EndOfTurn, new FilterCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/sets/innistrad/SpectralFlight.java b/Mage.Sets/src/mage/sets/innistrad/SpectralFlight.java index 222573d9184..3abb3f1d411 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SpectralFlight.java +++ b/Mage.Sets/src/mage/sets/innistrad/SpectralFlight.java @@ -52,7 +52,6 @@ public class SpectralFlight extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent target = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/innistrad/SpectralRider.java b/Mage.Sets/src/mage/sets/innistrad/SpectralRider.java index 8afa9a7c29f..8fb49e0f21f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SpectralRider.java +++ b/Mage.Sets/src/mage/sets/innistrad/SpectralRider.java @@ -46,7 +46,6 @@ public class SpectralRider extends CardImpl { this.subtype.add("Spirit"); 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/innistrad/SpiderSpawning.java b/Mage.Sets/src/mage/sets/innistrad/SpiderSpawning.java index 74601e00158..af915331c45 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SpiderSpawning.java +++ b/Mage.Sets/src/mage/sets/innistrad/SpiderSpawning.java @@ -51,7 +51,6 @@ public class SpiderSpawning extends CardImpl { super(ownerId, 203, "Spider Spawning", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{G}"); this.expansionSetCode = "ISD"; - this.color.setGreen(true); // Put a 1/2 green Spider creature token with reach onto the battlefield for each creature card in your graveyard. this.getSpellAbility().addEffect(new CreateTokenEffect(new SpiderToken(), new CardsInControllerGraveyardCount(new FilterCreatureCard()))); diff --git a/Mage.Sets/src/mage/sets/innistrad/Splinterfright.java b/Mage.Sets/src/mage/sets/innistrad/Splinterfright.java index b4e3fec87c4..3dca5ca1c71 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Splinterfright.java +++ b/Mage.Sets/src/mage/sets/innistrad/Splinterfright.java @@ -54,7 +54,6 @@ public class Splinterfright extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/StitchedDrake.java b/Mage.Sets/src/mage/sets/innistrad/StitchedDrake.java index 70006eba944..0d7f2cc6bc9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/StitchedDrake.java +++ b/Mage.Sets/src/mage/sets/innistrad/StitchedDrake.java @@ -49,7 +49,6 @@ public class StitchedDrake extends CardImpl { this.subtype.add("Zombie"); 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/innistrad/StitchersApprentice.java b/Mage.Sets/src/mage/sets/innistrad/StitchersApprentice.java index e803a176df8..0d9ba044385 100644 --- a/Mage.Sets/src/mage/sets/innistrad/StitchersApprentice.java +++ b/Mage.Sets/src/mage/sets/innistrad/StitchersApprentice.java @@ -59,7 +59,6 @@ public class StitchersApprentice extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Homunculus"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/StonySilence.java b/Mage.Sets/src/mage/sets/innistrad/StonySilence.java index dd50b273014..30afcb24bbc 100644 --- a/Mage.Sets/src/mage/sets/innistrad/StonySilence.java +++ b/Mage.Sets/src/mage/sets/innistrad/StonySilence.java @@ -49,7 +49,6 @@ public class StonySilence extends CardImpl { super(ownerId, 36, "Stony Silence", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "ISD"; - this.color.setWhite(true); // Activated abilities of artifacts can't be activated. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new StonySilenceCantActivateEffect())); diff --git a/Mage.Sets/src/mage/sets/innistrad/StromkirkNoble.java b/Mage.Sets/src/mage/sets/innistrad/StromkirkNoble.java index 0bb009ec3e7..bae289634cb 100644 --- a/Mage.Sets/src/mage/sets/innistrad/StromkirkNoble.java +++ b/Mage.Sets/src/mage/sets/innistrad/StromkirkNoble.java @@ -56,7 +56,6 @@ public class StromkirkNoble extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Vampire"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/innistrad/StromkirkPatrol.java b/Mage.Sets/src/mage/sets/innistrad/StromkirkPatrol.java index 28e25f0e6c8..ec3d03080fa 100644 --- a/Mage.Sets/src/mage/sets/innistrad/StromkirkPatrol.java +++ b/Mage.Sets/src/mage/sets/innistrad/StromkirkPatrol.java @@ -48,7 +48,6 @@ public class StromkirkPatrol extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Soldier"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/innistrad/Sturmgeist.java b/Mage.Sets/src/mage/sets/innistrad/Sturmgeist.java index 10408ce009a..93970c98a64 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Sturmgeist.java +++ b/Mage.Sets/src/mage/sets/innistrad/Sturmgeist.java @@ -52,7 +52,6 @@ public class Sturmgeist extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/innistrad/ThinkTwice.java b/Mage.Sets/src/mage/sets/innistrad/ThinkTwice.java index 1827ddf6ed9..97557075fe9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ThinkTwice.java +++ b/Mage.Sets/src/mage/sets/innistrad/ThinkTwice.java @@ -47,7 +47,6 @@ public class ThinkTwice extends CardImpl { super(ownerId, 83, "Think Twice", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "ISD"; - this.color.setBlue(true); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/innistrad/ThrabenPurebloods.java b/Mage.Sets/src/mage/sets/innistrad/ThrabenPurebloods.java index 7124ffb7bb2..7cd5a7ffb9f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ThrabenPurebloods.java +++ b/Mage.Sets/src/mage/sets/innistrad/ThrabenPurebloods.java @@ -44,7 +44,6 @@ public class ThrabenPurebloods extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Hound"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/innistrad/ThrabenSentry.java b/Mage.Sets/src/mage/sets/innistrad/ThrabenSentry.java index 01471c2f31f..4ca0ffb0748 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ThrabenSentry.java +++ b/Mage.Sets/src/mage/sets/innistrad/ThrabenSentry.java @@ -57,7 +57,6 @@ public class ThrabenSentry extends CardImpl { this.canTransform = true; this.secondSideCard = new ThrabenMilitia(ownerId); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/TormentedPariah.java b/Mage.Sets/src/mage/sets/innistrad/TormentedPariah.java index 5b979839714..d22c777f2bc 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TormentedPariah.java +++ b/Mage.Sets/src/mage/sets/innistrad/TormentedPariah.java @@ -56,7 +56,6 @@ public class TormentedPariah extends CardImpl { this.canTransform = true; this.secondSideCard = new RampagingWerewolf(ownerId); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/TraitorousBlood.java b/Mage.Sets/src/mage/sets/innistrad/TraitorousBlood.java index db1169a7c52..f1412f73b2e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TraitorousBlood.java +++ b/Mage.Sets/src/mage/sets/innistrad/TraitorousBlood.java @@ -49,7 +49,6 @@ public class TraitorousBlood extends CardImpl { super(ownerId, 166, "Traitorous Blood", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); this.expansionSetCode = "ISD"; - this.color.setRed(true); // Gain control of target creature until end of turn. Untap it. It gains trample and haste until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/innistrad/TravelPreparations.java b/Mage.Sets/src/mage/sets/innistrad/TravelPreparations.java index 4e9a81135ab..d34f3ea38dc 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TravelPreparations.java +++ b/Mage.Sets/src/mage/sets/innistrad/TravelPreparations.java @@ -48,7 +48,6 @@ public class TravelPreparations extends CardImpl { super(ownerId, 206, "Travel Preparations", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "ISD"; - this.color.setGreen(true); // Put a +1/+1 counter on each of up to two target creatures. this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); diff --git a/Mage.Sets/src/mage/sets/innistrad/TreeOfRedemption.java b/Mage.Sets/src/mage/sets/innistrad/TreeOfRedemption.java index 08add4b33fd..f5a37fb5ce7 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TreeOfRedemption.java +++ b/Mage.Sets/src/mage/sets/innistrad/TreeOfRedemption.java @@ -56,7 +56,6 @@ public class TreeOfRedemption extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Plant"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(13); diff --git a/Mage.Sets/src/mage/sets/innistrad/TyphoidRats.java b/Mage.Sets/src/mage/sets/innistrad/TyphoidRats.java index 565f9768bd1..399ad1c20b0 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TyphoidRats.java +++ b/Mage.Sets/src/mage/sets/innistrad/TyphoidRats.java @@ -45,7 +45,6 @@ public class TyphoidRats extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/UlvenwaldMystics.java b/Mage.Sets/src/mage/sets/innistrad/UlvenwaldMystics.java index 05899b7935a..76f077fc2b1 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UlvenwaldMystics.java +++ b/Mage.Sets/src/mage/sets/innistrad/UlvenwaldMystics.java @@ -56,7 +56,6 @@ public class UlvenwaldMystics extends CardImpl { this.canTransform = true; this.secondSideCard = new UlvenwaldPrimordials(ownerId); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/innistrad/UnbreathingHorde.java b/Mage.Sets/src/mage/sets/innistrad/UnbreathingHorde.java index 1bfd2ec7bd9..c51d4a005b9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UnbreathingHorde.java +++ b/Mage.Sets/src/mage/sets/innistrad/UnbreathingHorde.java @@ -60,7 +60,6 @@ public class UnbreathingHorde extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/innistrad/UnburialRites.java b/Mage.Sets/src/mage/sets/innistrad/UnburialRites.java index 8f6399f639a..5ec521e28eb 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UnburialRites.java +++ b/Mage.Sets/src/mage/sets/innistrad/UnburialRites.java @@ -48,7 +48,6 @@ public class UnburialRites extends CardImpl { super(ownerId, 122, "Unburial Rites", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{B}"); this.expansionSetCode = "ISD"; - 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/innistrad/UndeadAlchemist.java b/Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java index 783234283ab..f01b7dfe38e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java +++ b/Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java @@ -62,7 +62,6 @@ public class UndeadAlchemist extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Zombie"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/UnrulyMob.java b/Mage.Sets/src/mage/sets/innistrad/UnrulyMob.java index dfeefa7b43f..e79ac6e42d8 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UnrulyMob.java +++ b/Mage.Sets/src/mage/sets/innistrad/UnrulyMob.java @@ -58,7 +58,6 @@ public class UnrulyMob extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/UrgentExorcism.java b/Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java index 6a1dddcedd1..dc7a0a04f0e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java +++ b/Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java @@ -57,7 +57,6 @@ public class UrgentExorcism extends CardImpl { super(ownerId, 40, "Urgent Exorcism", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "ISD"; - this.color.setWhite(true); // Destroy target Spirit or enchantment. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/VampireInterloper.java b/Mage.Sets/src/mage/sets/innistrad/VampireInterloper.java index b4bc07c97a7..e2f031332eb 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VampireInterloper.java +++ b/Mage.Sets/src/mage/sets/innistrad/VampireInterloper.java @@ -47,7 +47,6 @@ public class VampireInterloper extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Scout"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/innistrad/VampiricFury.java b/Mage.Sets/src/mage/sets/innistrad/VampiricFury.java index 1d84e85b978..57ea5a3ba85 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VampiricFury.java +++ b/Mage.Sets/src/mage/sets/innistrad/VampiricFury.java @@ -57,7 +57,6 @@ public class VampiricFury extends CardImpl { super(ownerId, 167, "Vampiric Fury", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "ISD"; - this.color.setRed(true); // Vampire creatures you control get +2/+0 and gain first strike until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn, vampires)); diff --git a/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java b/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java index dbe084a7bc7..13fcbe224f3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java +++ b/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java @@ -55,7 +55,6 @@ public class VictimOfNight extends CardImpl { super(ownerId, 124, "Victim of Night", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}{B}"); this.expansionSetCode = "ISD"; - this.color.setBlack(true); // Destroy target non-Vampire, non-Werewolf, non-Zombie creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/innistrad/VillageBellRinger.java b/Mage.Sets/src/mage/sets/innistrad/VillageBellRinger.java index 9ede9c0adc2..bcbef4bd2d6 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VillageBellRinger.java +++ b/Mage.Sets/src/mage/sets/innistrad/VillageBellRinger.java @@ -51,7 +51,6 @@ public class VillageBellRinger 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/innistrad/VillageCannibals.java b/Mage.Sets/src/mage/sets/innistrad/VillageCannibals.java index dd8e2d6f136..e00e0240adf 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VillageCannibals.java +++ b/Mage.Sets/src/mage/sets/innistrad/VillageCannibals.java @@ -52,7 +52,6 @@ public class VillageCannibals extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Human"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/VillageIronsmith.java b/Mage.Sets/src/mage/sets/innistrad/VillageIronsmith.java index 3ad41a83a0f..525e5c2ede5 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VillageIronsmith.java +++ b/Mage.Sets/src/mage/sets/innistrad/VillageIronsmith.java @@ -56,7 +56,6 @@ public class VillageIronsmith extends CardImpl { this.canTransform = true; this.secondSideCard = new Ironfang(ownerId); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/innistrad/VillagersOfEstwald.java b/Mage.Sets/src/mage/sets/innistrad/VillagersOfEstwald.java index b4dbb198fb6..0e6057edd33 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VillagersOfEstwald.java +++ b/Mage.Sets/src/mage/sets/innistrad/VillagersOfEstwald.java @@ -55,7 +55,6 @@ public class VillagersOfEstwald extends CardImpl { this.canTransform = true; this.secondSideCard = new HowlpackOfEstwald(ownerId); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/innistrad/VoicelessSpirit.java b/Mage.Sets/src/mage/sets/innistrad/VoicelessSpirit.java index 4395235824a..975587afe56 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VoicelessSpirit.java +++ b/Mage.Sets/src/mage/sets/innistrad/VoicelessSpirit.java @@ -46,7 +46,6 @@ public class VoicelessSpirit extends CardImpl { this.expansionSetCode = "ISD"; 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/innistrad/WalkingCorpse.java b/Mage.Sets/src/mage/sets/innistrad/WalkingCorpse.java index 90d661330bd..7067139857a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/WalkingCorpse.java +++ b/Mage.Sets/src/mage/sets/innistrad/WalkingCorpse.java @@ -44,7 +44,6 @@ public class WalkingCorpse extends CardImpl { this.expansionSetCode = "ISD"; 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/invasion/AEtherRift.java b/Mage.Sets/src/mage/sets/invasion/AEtherRift.java index 62df379c79e..70e23a50c58 100644 --- a/Mage.Sets/src/mage/sets/invasion/AEtherRift.java +++ b/Mage.Sets/src/mage/sets/invasion/AEtherRift.java @@ -55,8 +55,6 @@ public class AEtherRift extends CardImpl { super(ownerId, 227, "AEther Rift", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{G}"); this.expansionSetCode = "INV"; - this.color.setRed(true); - this.color.setGreen(true); // At the beginning of your upkeep, discard a card at random. If you discard a creature card this way, return it from your graveyard to the battlefield unless any player pays 5 life. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AEtherRiftEffect(), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/invasion/Absorb.java b/Mage.Sets/src/mage/sets/invasion/Absorb.java index 364b83364db..265d86f4c16 100644 --- a/Mage.Sets/src/mage/sets/invasion/Absorb.java +++ b/Mage.Sets/src/mage/sets/invasion/Absorb.java @@ -45,8 +45,6 @@ public class Absorb extends CardImpl { super(ownerId, 226, "Absorb", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{W}{U}{U}"); this.expansionSetCode = "INV"; - this.color.setBlue(true); - this.color.setWhite(true); // Counter target spell. You gain 3 life. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/invasion/Annihilate.java b/Mage.Sets/src/mage/sets/invasion/Annihilate.java index 2aadd123c7f..96a5dabd855 100644 --- a/Mage.Sets/src/mage/sets/invasion/Annihilate.java +++ b/Mage.Sets/src/mage/sets/invasion/Annihilate.java @@ -54,7 +54,6 @@ public class Annihilate extends CardImpl { super(ownerId, 94, "Annihilate", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{B}{B}"); this.expansionSetCode = "INV"; - this.color.setBlack(true); // Destroy target nonblack creature. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/invasion/ArmadilloCloak.java b/Mage.Sets/src/mage/sets/invasion/ArmadilloCloak.java index 06540e431c8..c517f2bb141 100644 --- a/Mage.Sets/src/mage/sets/invasion/ArmadilloCloak.java +++ b/Mage.Sets/src/mage/sets/invasion/ArmadilloCloak.java @@ -63,8 +63,6 @@ public class ArmadilloCloak extends CardImpl { this.expansionSetCode = "INV"; 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/invasion/ArtifactMutation.java b/Mage.Sets/src/mage/sets/invasion/ArtifactMutation.java index 6a3f34a48ab..f2b2537f96c 100644 --- a/Mage.Sets/src/mage/sets/invasion/ArtifactMutation.java +++ b/Mage.Sets/src/mage/sets/invasion/ArtifactMutation.java @@ -48,8 +48,6 @@ public class ArtifactMutation extends CardImpl { super(ownerId, 231, "Artifact Mutation", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{R}{G}"); this.expansionSetCode = "INV"; - this.color.setRed(true); - this.color.setGreen(true); // Destroy target artifact. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/invasion/AuraMutation.java b/Mage.Sets/src/mage/sets/invasion/AuraMutation.java index 8627cd10b59..e673774a0a0 100644 --- a/Mage.Sets/src/mage/sets/invasion/AuraMutation.java +++ b/Mage.Sets/src/mage/sets/invasion/AuraMutation.java @@ -48,8 +48,6 @@ public class AuraMutation extends CardImpl { super(ownerId, 232, "Aura Mutation", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{G}{W}"); this.expansionSetCode = "INV"; - this.color.setGreen(true); - this.color.setWhite(true); // Destroy target enchantment. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/invasion/BenalishHeralds.java b/Mage.Sets/src/mage/sets/invasion/BenalishHeralds.java index 85ced599d03..ce73f6b31e7 100644 --- a/Mage.Sets/src/mage/sets/invasion/BenalishHeralds.java +++ b/Mage.Sets/src/mage/sets/invasion/BenalishHeralds.java @@ -52,7 +52,6 @@ public class BenalishHeralds 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/invasion/BenalishTrapper.java b/Mage.Sets/src/mage/sets/invasion/BenalishTrapper.java index a1d0a68a540..0e7ca51da71 100644 --- a/Mage.Sets/src/mage/sets/invasion/BenalishTrapper.java +++ b/Mage.Sets/src/mage/sets/invasion/BenalishTrapper.java @@ -54,7 +54,6 @@ public class BenalishTrapper 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/invasion/BlazingSpecter.java b/Mage.Sets/src/mage/sets/invasion/BlazingSpecter.java index 7239becb693..f6cbf93fb44 100644 --- a/Mage.Sets/src/mage/sets/invasion/BlazingSpecter.java +++ b/Mage.Sets/src/mage/sets/invasion/BlazingSpecter.java @@ -48,8 +48,6 @@ public class BlazingSpecter extends CardImpl { this.expansionSetCode = "INV"; this.subtype.add("Specter"); - 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/invasion/BlurredMongoose.java b/Mage.Sets/src/mage/sets/invasion/BlurredMongoose.java index c36462eaa93..f9612327a79 100644 --- a/Mage.Sets/src/mage/sets/invasion/BlurredMongoose.java +++ b/Mage.Sets/src/mage/sets/invasion/BlurredMongoose.java @@ -46,7 +46,6 @@ public class BlurredMongoose extends CardImpl { this.expansionSetCode = "INV"; this.subtype.add("Mongoose"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/invasion/BogInitiate.java b/Mage.Sets/src/mage/sets/invasion/BogInitiate.java index 967e5e69180..32e731cc687 100644 --- a/Mage.Sets/src/mage/sets/invasion/BogInitiate.java +++ b/Mage.Sets/src/mage/sets/invasion/BogInitiate.java @@ -49,7 +49,6 @@ public class BogInitiate 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/invasion/CaptainSisay.java b/Mage.Sets/src/mage/sets/invasion/CaptainSisay.java index e628e36f3ed..8894d2bf899 100644 --- a/Mage.Sets/src/mage/sets/invasion/CaptainSisay.java +++ b/Mage.Sets/src/mage/sets/invasion/CaptainSisay.java @@ -59,8 +59,6 @@ public class CaptainSisay extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - 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/invasion/ChargingTroll.java b/Mage.Sets/src/mage/sets/invasion/ChargingTroll.java index b1cc27c0119..edc6d0fbb3d 100644 --- a/Mage.Sets/src/mage/sets/invasion/ChargingTroll.java +++ b/Mage.Sets/src/mage/sets/invasion/ChargingTroll.java @@ -50,8 +50,6 @@ public class ChargingTroll extends CardImpl { this.expansionSetCode = "INV"; this.subtype.add("Troll"); - 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/invasion/DismantlingBlow.java b/Mage.Sets/src/mage/sets/invasion/DismantlingBlow.java index 1b88f04c6ac..7d6e4f246f9 100644 --- a/Mage.Sets/src/mage/sets/invasion/DismantlingBlow.java +++ b/Mage.Sets/src/mage/sets/invasion/DismantlingBlow.java @@ -59,7 +59,6 @@ public class DismantlingBlow extends CardImpl { super(ownerId, 14, "Dismantling Blow", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "INV"; - this.color.setWhite(true); // Kicker {2}{U} this.addAbility(new KickerAbility("{2}{U}")); diff --git a/Mage.Sets/src/mage/sets/invasion/DreamThrush.java b/Mage.Sets/src/mage/sets/invasion/DreamThrush.java index 7dc8f0e6cdd..2ffec274a15 100644 --- a/Mage.Sets/src/mage/sets/invasion/DreamThrush.java +++ b/Mage.Sets/src/mage/sets/invasion/DreamThrush.java @@ -53,7 +53,6 @@ public class DreamThrush extends CardImpl { this.expansionSetCode = "INV"; 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/invasion/DromarTheBanisher.java b/Mage.Sets/src/mage/sets/invasion/DromarTheBanisher.java index ebb9fb95f55..e7df4a3e8c7 100644 --- a/Mage.Sets/src/mage/sets/invasion/DromarTheBanisher.java +++ b/Mage.Sets/src/mage/sets/invasion/DromarTheBanisher.java @@ -58,9 +58,6 @@ public class DromarTheBanisher extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Dragon"); - this.color.setBlue(true); - this.color.setWhite(true); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/invasion/FrenziedTilling.java b/Mage.Sets/src/mage/sets/invasion/FrenziedTilling.java index e1a5d77159f..119db59ff07 100644 --- a/Mage.Sets/src/mage/sets/invasion/FrenziedTilling.java +++ b/Mage.Sets/src/mage/sets/invasion/FrenziedTilling.java @@ -47,8 +47,6 @@ public class FrenziedTilling extends CardImpl { super(ownerId, 247, "Frenzied Tilling", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}{G}"); this.expansionSetCode = "INV"; - this.color.setRed(true); - this.color.setGreen(true); // Destroy target land. Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/invasion/HannaShipsNavigator.java b/Mage.Sets/src/mage/sets/invasion/HannaShipsNavigator.java index 2832cf26af7..2408a4bca39 100644 --- a/Mage.Sets/src/mage/sets/invasion/HannaShipsNavigator.java +++ b/Mage.Sets/src/mage/sets/invasion/HannaShipsNavigator.java @@ -65,8 +65,6 @@ public class HannaShipsNavigator extends CardImpl { this.subtype.add("Human"); this.subtype.add("Artificer"); - 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/invasion/HeroesReunion.java b/Mage.Sets/src/mage/sets/invasion/HeroesReunion.java index 09a91efa031..0b1b7409a78 100644 --- a/Mage.Sets/src/mage/sets/invasion/HeroesReunion.java +++ b/Mage.Sets/src/mage/sets/invasion/HeroesReunion.java @@ -44,8 +44,6 @@ public class HeroesReunion extends CardImpl { super(ownerId, 250, "Heroes' Reunion", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}{W}"); this.expansionSetCode = "INV"; - this.color.setGreen(true); - this.color.setWhite(true); // Target player gains 7 life. this.getSpellAbility().addEffect(new GainLifeTargetEffect(7)); diff --git a/Mage.Sets/src/mage/sets/invasion/HolyDay.java b/Mage.Sets/src/mage/sets/invasion/HolyDay.java index 7daf791e527..a2488195432 100644 --- a/Mage.Sets/src/mage/sets/invasion/HolyDay.java +++ b/Mage.Sets/src/mage/sets/invasion/HolyDay.java @@ -45,7 +45,6 @@ public class HolyDay extends CardImpl { super(ownerId, 20, "Holy Day", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "INV"; - this.color.setWhite(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/invasion/HypnoticCloud.java b/Mage.Sets/src/mage/sets/invasion/HypnoticCloud.java index c813373d516..b7c782b245d 100644 --- a/Mage.Sets/src/mage/sets/invasion/HypnoticCloud.java +++ b/Mage.Sets/src/mage/sets/invasion/HypnoticCloud.java @@ -47,7 +47,6 @@ public class HypnoticCloud extends CardImpl { super(ownerId, 109, "Hypnotic Cloud", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "INV"; - this.color.setBlack(true); // Kicker {4} this.addAbility(new KickerAbility("{4}")); diff --git a/Mage.Sets/src/mage/sets/invasion/KangeeAerieKeeper.java b/Mage.Sets/src/mage/sets/invasion/KangeeAerieKeeper.java index 5b9946c9900..03b960bc457 100644 --- a/Mage.Sets/src/mage/sets/invasion/KangeeAerieKeeper.java +++ b/Mage.Sets/src/mage/sets/invasion/KangeeAerieKeeper.java @@ -74,8 +74,6 @@ public class KangeeAerieKeeper extends CardImpl { this.subtype.add("Bird"); 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/invasion/KavuScout.java b/Mage.Sets/src/mage/sets/invasion/KavuScout.java index 4629f24cc22..0bc501a55d0 100644 --- a/Mage.Sets/src/mage/sets/invasion/KavuScout.java +++ b/Mage.Sets/src/mage/sets/invasion/KavuScout.java @@ -52,7 +52,6 @@ public class KavuScout extends CardImpl { this.subtype.add("Kavu"); this.subtype.add("Scout"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/invasion/KavuTitan.java b/Mage.Sets/src/mage/sets/invasion/KavuTitan.java index fc79256dae9..84a39593671 100644 --- a/Mage.Sets/src/mage/sets/invasion/KavuTitan.java +++ b/Mage.Sets/src/mage/sets/invasion/KavuTitan.java @@ -53,7 +53,6 @@ public class KavuTitan extends CardImpl { this.expansionSetCode = "INV"; this.subtype.add("Kavu"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/invasion/ManipulateFate.java b/Mage.Sets/src/mage/sets/invasion/ManipulateFate.java index e9e75003a7a..d7c1e1ac846 100644 --- a/Mage.Sets/src/mage/sets/invasion/ManipulateFate.java +++ b/Mage.Sets/src/mage/sets/invasion/ManipulateFate.java @@ -53,7 +53,6 @@ public class ManipulateFate extends CardImpl { super(ownerId, 60, "Manipulate Fate", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{U}"); this.expansionSetCode = "INV"; - this.color.setBlue(true); // Search your library for three cards, exile them, then shuffle your library. this.getSpellAbility().addEffect(new ManipulateFateEffect()); diff --git a/Mage.Sets/src/mage/sets/invasion/MetathranZombie.java b/Mage.Sets/src/mage/sets/invasion/MetathranZombie.java index d5566a097f8..478380d5672 100644 --- a/Mage.Sets/src/mage/sets/invasion/MetathranZombie.java +++ b/Mage.Sets/src/mage/sets/invasion/MetathranZombie.java @@ -49,7 +49,6 @@ public class MetathranZombie extends CardImpl { this.subtype.add("Metathran"); this.subtype.add("Zombie"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/invasion/NomadicElf.java b/Mage.Sets/src/mage/sets/invasion/NomadicElf.java index c957caf33ff..302826f2c67 100644 --- a/Mage.Sets/src/mage/sets/invasion/NomadicElf.java +++ b/Mage.Sets/src/mage/sets/invasion/NomadicElf.java @@ -47,7 +47,6 @@ public class NomadicElf extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Nomad"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/invasion/Obliterate.java b/Mage.Sets/src/mage/sets/invasion/Obliterate.java index 86fe481c414..5d4e4068258 100644 --- a/Mage.Sets/src/mage/sets/invasion/Obliterate.java +++ b/Mage.Sets/src/mage/sets/invasion/Obliterate.java @@ -56,7 +56,6 @@ public class Obliterate extends CardImpl { super(ownerId, 156, "Obliterate", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{6}{R}{R}"); this.expansionSetCode = "INV"; - this.color.setRed(true); // Obliterate can't be countered. this.addAbility(new CantBeCounteredAbility()); diff --git a/Mage.Sets/src/mage/sets/invasion/Opt.java b/Mage.Sets/src/mage/sets/invasion/Opt.java index 57ff0adb745..00a8fe58780 100644 --- a/Mage.Sets/src/mage/sets/invasion/Opt.java +++ b/Mage.Sets/src/mage/sets/invasion/Opt.java @@ -44,7 +44,6 @@ public class Opt extends CardImpl { super(ownerId, 64, "Opt", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "INV"; - this.color.setBlue(true); // Look at the top card of your library. You may put that card on the bottom of your library. this.getSpellAbility().addEffect(new LookLibraryMayPutToBottomEffect()); diff --git a/Mage.Sets/src/mage/sets/invasion/PhyrexianDelver.java b/Mage.Sets/src/mage/sets/invasion/PhyrexianDelver.java index 6f0fb7c0166..eb4c4a5174d 100644 --- a/Mage.Sets/src/mage/sets/invasion/PhyrexianDelver.java +++ b/Mage.Sets/src/mage/sets/invasion/PhyrexianDelver.java @@ -55,7 +55,6 @@ public class PhyrexianDelver extends CardImpl { this.expansionSetCode = "INV"; 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/invasion/Prohibit.java b/Mage.Sets/src/mage/sets/invasion/Prohibit.java index d32d45462d3..9cdecbbdcf5 100644 --- a/Mage.Sets/src/mage/sets/invasion/Prohibit.java +++ b/Mage.Sets/src/mage/sets/invasion/Prohibit.java @@ -60,7 +60,6 @@ public class Prohibit extends CardImpl { super(ownerId, 67, "Prohibit", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "INV"; - this.color.setBlue(true); // Kicker {2} this.addAbility(new KickerAbility("{2}")); diff --git a/Mage.Sets/src/mage/sets/invasion/QuirionSentinel.java b/Mage.Sets/src/mage/sets/invasion/QuirionSentinel.java index cd3286a8e9e..e64c7ead196 100644 --- a/Mage.Sets/src/mage/sets/invasion/QuirionSentinel.java +++ b/Mage.Sets/src/mage/sets/invasion/QuirionSentinel.java @@ -50,7 +50,6 @@ public class QuirionSentinel extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/invasion/RagingKavu.java b/Mage.Sets/src/mage/sets/invasion/RagingKavu.java index 67c35a5eb80..731826d046a 100644 --- a/Mage.Sets/src/mage/sets/invasion/RagingKavu.java +++ b/Mage.Sets/src/mage/sets/invasion/RagingKavu.java @@ -46,8 +46,6 @@ public class RagingKavu extends CardImpl { this.expansionSetCode = "INV"; this.subtype.add("Kavu"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/invasion/Recoil.java b/Mage.Sets/src/mage/sets/invasion/Recoil.java index 7b3fa24b306..f062d0bb68b 100644 --- a/Mage.Sets/src/mage/sets/invasion/Recoil.java +++ b/Mage.Sets/src/mage/sets/invasion/Recoil.java @@ -50,8 +50,6 @@ public class Recoil extends CardImpl { super(ownerId, 264, "Recoil", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{B}"); this.expansionSetCode = "INV"; - this.color.setBlue(true); - this.color.setBlack(true); // Return target permanent to its owner's hand. Then that player discards a card. this.getSpellAbility().addEffect(new RecoilEffect()); diff --git a/Mage.Sets/src/mage/sets/invasion/Recover.java b/Mage.Sets/src/mage/sets/invasion/Recover.java index e7b82d22d0d..48aea53055e 100644 --- a/Mage.Sets/src/mage/sets/invasion/Recover.java +++ b/Mage.Sets/src/mage/sets/invasion/Recover.java @@ -49,7 +49,6 @@ public class Recover extends CardImpl { super(ownerId, 122, "Recover", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "INV"; - 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/invasion/Repulse.java b/Mage.Sets/src/mage/sets/invasion/Repulse.java index e3e3bf833dc..968912678e4 100644 --- a/Mage.Sets/src/mage/sets/invasion/Repulse.java +++ b/Mage.Sets/src/mage/sets/invasion/Repulse.java @@ -45,7 +45,6 @@ public class Repulse extends CardImpl { super(ownerId, 70, "Repulse", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "INV"; - this.color.setBlue(true); // Return target creature to its owner's hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/invasion/Restock.java b/Mage.Sets/src/mage/sets/invasion/Restock.java index 34670333b98..dcda6f6772c 100644 --- a/Mage.Sets/src/mage/sets/invasion/Restock.java +++ b/Mage.Sets/src/mage/sets/invasion/Restock.java @@ -47,7 +47,6 @@ public class Restock extends CardImpl { super(ownerId, 206, "Restock", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); this.expansionSetCode = "INV"; - this.color.setGreen(true); // Return two target cards from your graveyard to your hand. Exile Restock. Effect effect = new ReturnFromGraveyardToHandTargetEffect(); diff --git a/Mage.Sets/src/mage/sets/invasion/RithTheAwakener.java b/Mage.Sets/src/mage/sets/invasion/RithTheAwakener.java index 52468a645e7..ef30b2379f9 100644 --- a/Mage.Sets/src/mage/sets/invasion/RithTheAwakener.java +++ b/Mage.Sets/src/mage/sets/invasion/RithTheAwakener.java @@ -59,9 +59,6 @@ public class RithTheAwakener extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Dragon"); - this.color.setRed(true); - this.color.setGreen(true); - this.color.setWhite(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/invasion/Shackles.java b/Mage.Sets/src/mage/sets/invasion/Shackles.java index 87c8cb0a78f..25c9c9ee308 100644 --- a/Mage.Sets/src/mage/sets/invasion/Shackles.java +++ b/Mage.Sets/src/mage/sets/invasion/Shackles.java @@ -57,7 +57,6 @@ public class Shackles extends CardImpl { this.expansionSetCode = "INV"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/invasion/Skizzik.java b/Mage.Sets/src/mage/sets/invasion/Skizzik.java index 607de4c0b73..8405f44dea9 100644 --- a/Mage.Sets/src/mage/sets/invasion/Skizzik.java +++ b/Mage.Sets/src/mage/sets/invasion/Skizzik.java @@ -53,7 +53,6 @@ public class Skizzik extends CardImpl { this.expansionSetCode = "INV"; 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/invasion/SlinkingSerpent.java b/Mage.Sets/src/mage/sets/invasion/SlinkingSerpent.java index d42dd835ed3..93dd92b2a5e 100644 --- a/Mage.Sets/src/mage/sets/invasion/SlinkingSerpent.java +++ b/Mage.Sets/src/mage/sets/invasion/SlinkingSerpent.java @@ -45,8 +45,6 @@ public class SlinkingSerpent extends CardImpl { this.expansionSetCode = "INV"; this.subtype.add("Serpent"); - 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/invasion/SpinalEmbrace.java b/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java index c4b2eef51cb..70df654b48c 100644 --- a/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java +++ b/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java @@ -71,7 +71,6 @@ public class SpinalEmbrace extends CardImpl { super(ownerId, 276, "Spinal Embrace", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}{U}{B}"); this.expansionSetCode = "INV"; - this.color.setBlue(true); // Cast Spinal Embrace only during combat. Ability ability = new SimpleStaticAbility(Zone.ALL, new SpinalEmbraceEffect()); diff --git a/Mage.Sets/src/mage/sets/invasion/SterlingGrove.java b/Mage.Sets/src/mage/sets/invasion/SterlingGrove.java index aab356cad21..536b6a80c0f 100644 --- a/Mage.Sets/src/mage/sets/invasion/SterlingGrove.java +++ b/Mage.Sets/src/mage/sets/invasion/SterlingGrove.java @@ -67,8 +67,6 @@ public class SterlingGrove extends CardImpl { super(ownerId, 278, "Sterling Grove", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}{W}"); this.expansionSetCode = "INV"; - this.color.setWhite(true); - this.color.setGreen(true); // Other enchantments you control have shroud. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filterPermanent, true))); diff --git a/Mage.Sets/src/mage/sets/invasion/TaintedWell.java b/Mage.Sets/src/mage/sets/invasion/TaintedWell.java index 37c25f96774..54b3a425704 100644 --- a/Mage.Sets/src/mage/sets/invasion/TaintedWell.java +++ b/Mage.Sets/src/mage/sets/invasion/TaintedWell.java @@ -55,7 +55,6 @@ public class TaintedWell extends CardImpl { this.expansionSetCode = "INV"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/invasion/Tangle.java b/Mage.Sets/src/mage/sets/invasion/Tangle.java index ef00ba867d5..112e525cc3b 100644 --- a/Mage.Sets/src/mage/sets/invasion/Tangle.java +++ b/Mage.Sets/src/mage/sets/invasion/Tangle.java @@ -55,7 +55,6 @@ public class Tangle extends CardImpl { super(ownerId, 213, "Tangle", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "INV"; - 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/invasion/ThunderscapeApprentice.java b/Mage.Sets/src/mage/sets/invasion/ThunderscapeApprentice.java index 0c36fb47359..ac9240e15c3 100644 --- a/Mage.Sets/src/mage/sets/invasion/ThunderscapeApprentice.java +++ b/Mage.Sets/src/mage/sets/invasion/ThunderscapeApprentice.java @@ -53,7 +53,6 @@ public class ThunderscapeApprentice extends CardImpl { this.subtype.add("Human"); 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/invasion/ThunderscapeMaster.java b/Mage.Sets/src/mage/sets/invasion/ThunderscapeMaster.java index cafb5219bd9..2bf9ea9a478 100644 --- a/Mage.Sets/src/mage/sets/invasion/ThunderscapeMaster.java +++ b/Mage.Sets/src/mage/sets/invasion/ThunderscapeMaster.java @@ -56,7 +56,6 @@ public class ThunderscapeMaster 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/invasion/TribalFlames.java b/Mage.Sets/src/mage/sets/invasion/TribalFlames.java index e18a87eb9d4..d4003c4147a 100644 --- a/Mage.Sets/src/mage/sets/invasion/TribalFlames.java +++ b/Mage.Sets/src/mage/sets/invasion/TribalFlames.java @@ -45,7 +45,6 @@ public class TribalFlames extends CardImpl { super(ownerId, 176, "Tribal Flames", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "INV"; - this.color.setRed(true); // Domain - Tribal Flames deals X damage to target creature or player, where X is the number of basic land types among lands you control. this.getSpellAbility().addEffect(new DamageTargetEffect(new DomainValue())); diff --git a/Mage.Sets/src/mage/sets/invasion/TsaboTavoc.java b/Mage.Sets/src/mage/sets/invasion/TsaboTavoc.java index 00ef8fc1045..e84e8f4eb6e 100644 --- a/Mage.Sets/src/mage/sets/invasion/TsaboTavoc.java +++ b/Mage.Sets/src/mage/sets/invasion/TsaboTavoc.java @@ -64,8 +64,6 @@ public class TsaboTavoc extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Horror"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(7); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/invasion/Undermine.java b/Mage.Sets/src/mage/sets/invasion/Undermine.java index 636dc322dc3..ba312be76a4 100644 --- a/Mage.Sets/src/mage/sets/invasion/Undermine.java +++ b/Mage.Sets/src/mage/sets/invasion/Undermine.java @@ -46,8 +46,6 @@ public class Undermine extends CardImpl { super(ownerId, 282, "Undermine", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{U}{U}{B}"); this.expansionSetCode = "INV"; - this.color.setBlue(true); - this.color.setBlack(true); // Counter target spell. Its controller loses 3 life. this.getSpellAbility().addTarget(new TargetSpell(new FilterSpell())); diff --git a/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java b/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java index 2ac38daaca7..6a5a08663fd 100644 --- a/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java +++ b/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java @@ -56,7 +56,6 @@ public class UrborgSkeleton extends CardImpl { this.expansionSetCode = "INV"; this.subtype.add("Skeleton"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/invasion/UtopiaTree.java b/Mage.Sets/src/mage/sets/invasion/UtopiaTree.java index 0ca00854c7a..45286e1c77f 100644 --- a/Mage.Sets/src/mage/sets/invasion/UtopiaTree.java +++ b/Mage.Sets/src/mage/sets/invasion/UtopiaTree.java @@ -45,7 +45,6 @@ public class UtopiaTree extends CardImpl { this.expansionSetCode = "INV"; 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/invasion/VerdelothTheAncient.java b/Mage.Sets/src/mage/sets/invasion/VerdelothTheAncient.java index be09267f92c..054639bed0e 100644 --- a/Mage.Sets/src/mage/sets/invasion/VerdelothTheAncient.java +++ b/Mage.Sets/src/mage/sets/invasion/VerdelothTheAncient.java @@ -65,7 +65,6 @@ public class VerdelothTheAncient extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Treefolk"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/invasion/ViashinoGrappler.java b/Mage.Sets/src/mage/sets/invasion/ViashinoGrappler.java index 4ff496267ec..1e5e9b96a65 100644 --- a/Mage.Sets/src/mage/sets/invasion/ViashinoGrappler.java +++ b/Mage.Sets/src/mage/sets/invasion/ViashinoGrappler.java @@ -48,7 +48,6 @@ public class ViashinoGrappler extends CardImpl { this.expansionSetCode = "INV"; this.subtype.add("Viashino"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/invasion/Void.java b/Mage.Sets/src/mage/sets/invasion/Void.java index bf6a0d6dc70..987da536e67 100644 --- a/Mage.Sets/src/mage/sets/invasion/Void.java +++ b/Mage.Sets/src/mage/sets/invasion/Void.java @@ -60,8 +60,6 @@ public class Void extends CardImpl { super(ownerId, 287, "Void", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}{R}"); this.expansionSetCode = "INV"; - this.color.setRed(true); - this.color.setBlack(true); // Choose a number. Destroy all artifacts and creatures with converted mana cost equal to that number. Then target player reveals his or her hand and discards all nonland cards with converted mana cost equal to the number. Choice numberChoice = new ChoiceImpl(); diff --git a/Mage.Sets/src/mage/sets/invasion/WashOut.java b/Mage.Sets/src/mage/sets/invasion/WashOut.java index 8e02088e79d..9ec97a631bb 100644 --- a/Mage.Sets/src/mage/sets/invasion/WashOut.java +++ b/Mage.Sets/src/mage/sets/invasion/WashOut.java @@ -60,7 +60,6 @@ public class WashOut extends CardImpl { super(ownerId, 87, "Wash Out", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "INV"; - this.color.setBlue(true); // Return all permanents of the color of your choice to their owners' hands. this.getSpellAbility().addChoice(new ChoiceColor()); diff --git a/Mage.Sets/src/mage/sets/invasion/YawgmothsAgenda.java b/Mage.Sets/src/mage/sets/invasion/YawgmothsAgenda.java index c76df717f6b..cc6b266c700 100644 --- a/Mage.Sets/src/mage/sets/invasion/YawgmothsAgenda.java +++ b/Mage.Sets/src/mage/sets/invasion/YawgmothsAgenda.java @@ -61,7 +61,6 @@ public class YawgmothsAgenda extends CardImpl { super(ownerId, 135, "Yawgmoth's Agenda", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{B}"); this.expansionSetCode = "INV"; - this.color.setBlack(true); // You can't cast more than one spell each turn. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCastMoreThanOneSpellEffect(TargetController.YOU))); diff --git a/Mage.Sets/src/mage/sets/invasion/Zap.java b/Mage.Sets/src/mage/sets/invasion/Zap.java index 1325e05a566..a795a8dad64 100644 --- a/Mage.Sets/src/mage/sets/invasion/Zap.java +++ b/Mage.Sets/src/mage/sets/invasion/Zap.java @@ -45,7 +45,6 @@ public class Zap extends CardImpl { super(ownerId, 180, "Zap", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "INV"; - this.color.setRed(true); // Zap deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/jacevschandra/FathomSeer.java b/Mage.Sets/src/mage/sets/jacevschandra/FathomSeer.java index 4bb0680c422..2e09bf16856 100644 --- a/Mage.Sets/src/mage/sets/jacevschandra/FathomSeer.java +++ b/Mage.Sets/src/mage/sets/jacevschandra/FathomSeer.java @@ -56,7 +56,6 @@ public class FathomSeer extends CardImpl { this.expansionSetCode = "DD2"; this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Gush.java b/Mage.Sets/src/mage/sets/jacevschandra/Gush.java index 5170fde3ba3..70e1f87bb28 100644 --- a/Mage.Sets/src/mage/sets/jacevschandra/Gush.java +++ b/Mage.Sets/src/mage/sets/jacevschandra/Gush.java @@ -52,7 +52,6 @@ public class Gush extends CardImpl { super(ownerId, 27, "Gush", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{U}"); this.expansionSetCode = "DD2"; - this.color.setBlue(true); // You may return two Islands you control to their owner's hand rather than pay Gush's mana cost. AlternativeCostSourceAbility ability; diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/AeonChronicler.java b/Mage.Sets/src/mage/sets/jacevsvraska/AeonChronicler.java index 194717174cd..f801f9e50c7 100644 --- a/Mage.Sets/src/mage/sets/jacevsvraska/AeonChronicler.java +++ b/Mage.Sets/src/mage/sets/jacevsvraska/AeonChronicler.java @@ -57,7 +57,6 @@ public class AeonChronicler extends CardImpl { this.expansionSetCode = "DDM"; this.subtype.add("Avatar"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/BodyDouble.java b/Mage.Sets/src/mage/sets/jacevsvraska/BodyDouble.java index 834f4e39a57..ef7d31f7976 100644 --- a/Mage.Sets/src/mage/sets/jacevsvraska/BodyDouble.java +++ b/Mage.Sets/src/mage/sets/jacevsvraska/BodyDouble.java @@ -59,7 +59,6 @@ public class BodyDouble extends CardImpl { this.expansionSetCode = "DDM"; 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/jacevsvraska/DreamStalker.java b/Mage.Sets/src/mage/sets/jacevsvraska/DreamStalker.java index 42678d4cb04..903581e7422 100644 --- a/Mage.Sets/src/mage/sets/jacevsvraska/DreamStalker.java +++ b/Mage.Sets/src/mage/sets/jacevsvraska/DreamStalker.java @@ -47,7 +47,6 @@ public class DreamStalker extends CardImpl { this.expansionSetCode = "DDM"; this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/KrovikanMist.java b/Mage.Sets/src/mage/sets/jacevsvraska/KrovikanMist.java index 4e2d3f7f8fe..8d45bafda3c 100644 --- a/Mage.Sets/src/mage/sets/jacevsvraska/KrovikanMist.java +++ b/Mage.Sets/src/mage/sets/jacevsvraska/KrovikanMist.java @@ -58,7 +58,6 @@ public class KrovikanMist extends CardImpl { this.expansionSetCode = "DDM"; this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/SadisticAugermage.java b/Mage.Sets/src/mage/sets/jacevsvraska/SadisticAugermage.java index f0490d292e1..c741bf448b4 100644 --- a/Mage.Sets/src/mage/sets/jacevsvraska/SadisticAugermage.java +++ b/Mage.Sets/src/mage/sets/jacevsvraska/SadisticAugermage.java @@ -53,7 +53,6 @@ public class SadisticAugermage extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/AegisOfTheGods.java b/Mage.Sets/src/mage/sets/journeyintonyx/AegisOfTheGods.java index 6f108d7a519..1895383dc14 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/AegisOfTheGods.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/AegisOfTheGods.java @@ -50,7 +50,6 @@ public class AegisOfTheGods 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/journeyintonyx/AerialFormation.java b/Mage.Sets/src/mage/sets/journeyintonyx/AerialFormation.java index 39427eb6d4e..557ff24d9ca 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/AerialFormation.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/AerialFormation.java @@ -49,7 +49,6 @@ public class AerialFormation extends CardImpl { super(ownerId, 30, "Aerial Formation", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "JOU"; - this.color.setBlue(true); // Strive — Aerial Formation costs {2}{U} more to cast for each target beyond the first. this.addAbility(new StriveAbility("{2}{U}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/AgentOfErebos.java b/Mage.Sets/src/mage/sets/journeyintonyx/AgentOfErebos.java index 1ab85ac1018..b20ed134863 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/AgentOfErebos.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/AgentOfErebos.java @@ -48,7 +48,6 @@ public class AgentOfErebos extends CardImpl { this.expansionSetCode = "JOU"; 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/journeyintonyx/AjaniMentorOfHeroes.java b/Mage.Sets/src/mage/sets/journeyintonyx/AjaniMentorOfHeroes.java index dbb7c67427a..82266793698 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/AjaniMentorOfHeroes.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/AjaniMentorOfHeroes.java @@ -76,8 +76,6 @@ public class AjaniMentorOfHeroes extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Ajani"); - this.color.setGreen(true); - this.color.setWhite(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false)); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/AjanisPresence.java b/Mage.Sets/src/mage/sets/journeyintonyx/AjanisPresence.java index b8144310ca0..07f738d7a25 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/AjanisPresence.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/AjanisPresence.java @@ -49,7 +49,6 @@ public class AjanisPresence extends CardImpl { super(ownerId, 2, "Ajani's Presence", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "JOU"; - this.color.setWhite(true); // Strive - Ajani's Presence costs {2}{W} more to cast for each target beyond the first. this.addAbility(new StriveAbility("{2}{W}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/AkroanLineBreaker.java b/Mage.Sets/src/mage/sets/journeyintonyx/AkroanLineBreaker.java index 42b8bd3268f..11dced34e24 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/AkroanLineBreaker.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/AkroanLineBreaker.java @@ -52,7 +52,6 @@ public class AkroanLineBreaker 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/journeyintonyx/AkroanMastiff.java b/Mage.Sets/src/mage/sets/journeyintonyx/AkroanMastiff.java index 6e80bfd785e..9da8d646441 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/AkroanMastiff.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/AkroanMastiff.java @@ -51,7 +51,6 @@ public class AkroanMastiff extends CardImpl { this.expansionSetCode = "JOU"; 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/journeyintonyx/ArmamentOfNyx.java b/Mage.Sets/src/mage/sets/journeyintonyx/ArmamentOfNyx.java index c11e3c6cfe6..81d9aa80d3c 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ArmamentOfNyx.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ArmamentOfNyx.java @@ -70,7 +70,6 @@ public class ArmamentOfNyx extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/AspectOfGorgon.java b/Mage.Sets/src/mage/sets/journeyintonyx/AspectOfGorgon.java index 4606d62339e..9e3366b636c 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/AspectOfGorgon.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/AspectOfGorgon.java @@ -57,7 +57,6 @@ public class AspectOfGorgon extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java b/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java index 672ff9d126a..59c9e325d88 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java @@ -75,8 +75,6 @@ public class AthreosGodOfPassage extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("God"); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/BanishingLight.java b/Mage.Sets/src/mage/sets/journeyintonyx/BanishingLight.java index 63346de0752..feaed29eaec 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/BanishingLight.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/BanishingLight.java @@ -62,7 +62,6 @@ public class BanishingLight extends CardImpl { super(ownerId, 5, "Banishing Light", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "JOU"; - this.color.setWhite(true); // When Banishing Light enters the battlefield, exile target nonland permanent an opponent controls until Banishing Light leaves the battlefield. Ability ability = new EntersBattlefieldTriggeredAbility(new BanishingLightExileEffect()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/BassaraTowerArcher.java b/Mage.Sets/src/mage/sets/journeyintonyx/BassaraTowerArcher.java index d4e23d022d7..91f5e65b04f 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/BassaraTowerArcher.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/BassaraTowerArcher.java @@ -47,7 +47,6 @@ public class BassaraTowerArcher extends CardImpl { this.subtype.add("Human"); this.subtype.add("Archer"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/BattlefieldThaumaturge.java b/Mage.Sets/src/mage/sets/journeyintonyx/BattlefieldThaumaturge.java index 2d89304b91d..c4c0705a944 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/BattlefieldThaumaturge.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/BattlefieldThaumaturge.java @@ -66,7 +66,6 @@ public class BattlefieldThaumaturge 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/journeyintonyx/BearerOfTheHeavens.java b/Mage.Sets/src/mage/sets/journeyintonyx/BearerOfTheHeavens.java index fadcaf64a97..4e5e7bdaf1e 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/BearerOfTheHeavens.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/BearerOfTheHeavens.java @@ -51,7 +51,6 @@ public class BearerOfTheHeavens extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Giant"); - this.color.setRed(true); this.power = new MageInt(10); this.toughness = new MageInt(10); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/BlindingFlare.java b/Mage.Sets/src/mage/sets/journeyintonyx/BlindingFlare.java index d6e39ad60f2..b8fe62ddd85 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/BlindingFlare.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/BlindingFlare.java @@ -47,7 +47,6 @@ public class BlindingFlare extends CardImpl { super(ownerId, 91, "Blinding Flare", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "JOU"; - this.color.setRed(true); // Strive — Blinding Flare costs {R} more to cast for each target beyond the first. this.addAbility(new StriveAbility("{R}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/BloodcrazedHoplite.java b/Mage.Sets/src/mage/sets/journeyintonyx/BloodcrazedHoplite.java index 3e76252f344..f7cf7470313 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/BloodcrazedHoplite.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/BloodcrazedHoplite.java @@ -64,7 +64,6 @@ public class BloodcrazedHoplite 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/journeyintonyx/BrainMaggot.java b/Mage.Sets/src/mage/sets/journeyintonyx/BrainMaggot.java index 7f732a973fd..81dff8b6534 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/BrainMaggot.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/BrainMaggot.java @@ -67,7 +67,6 @@ public class BrainMaggot extends CardImpl { this.expansionSetCode = "JOU"; 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/journeyintonyx/CastIntoDarkness.java b/Mage.Sets/src/mage/sets/journeyintonyx/CastIntoDarkness.java index 89e266c9f31..9ce4230f4b6 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/CastIntoDarkness.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/CastIntoDarkness.java @@ -56,7 +56,6 @@ public class CastIntoDarkness extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/CloakedSiren.java b/Mage.Sets/src/mage/sets/journeyintonyx/CloakedSiren.java index fba2c69c480..40de77e2dad 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/CloakedSiren.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/CloakedSiren.java @@ -46,7 +46,6 @@ public class CloakedSiren extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Siren"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/ColossalHeroics.java b/Mage.Sets/src/mage/sets/journeyintonyx/ColossalHeroics.java index 9f87d53c08c..12fa93be0d1 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ColossalHeroics.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ColossalHeroics.java @@ -48,7 +48,6 @@ public class ColossalHeroics extends CardImpl { super(ownerId, 118, "Colossal Heroics", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "JOU"; - this.color.setGreen(true); // Strive - Colossal Heroics costs {1}{G} more to cast for each target beyond the first. this.addAbility(new StriveAbility("{1}{G}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/ConsignToDust.java b/Mage.Sets/src/mage/sets/journeyintonyx/ConsignToDust.java index 68ae8ea4c47..e8f7dcb676a 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ConsignToDust.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ConsignToDust.java @@ -56,7 +56,6 @@ public class ConsignToDust extends CardImpl { super(ownerId, 119, "Consign to Dust", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "JOU"; - this.color.setGreen(true); // Strive - Consign to Dust costs 2G more to cast for each target beyond the first. this.addAbility(new StriveAbility("{2}{G}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Countermand.java b/Mage.Sets/src/mage/sets/journeyintonyx/Countermand.java index 10f7505016e..005a6cefb8f 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Countermand.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Countermand.java @@ -52,7 +52,6 @@ public class Countermand extends CardImpl { super(ownerId, 33, "Countermand", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); this.expansionSetCode = "JOU"; - this.color.setBlue(true); // Counter target spell. Its controller puts the top four cards of his or her library into his or her graveyard. this.getSpellAbility().addTarget(new TargetSpell(new FilterSpell())); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/CruelFeeding.java b/Mage.Sets/src/mage/sets/journeyintonyx/CruelFeeding.java index cb1e8795ea3..92190d7aef1 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/CruelFeeding.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/CruelFeeding.java @@ -49,7 +49,6 @@ public class CruelFeeding extends CardImpl { super(ownerId, 64, "Cruel Feeding", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "JOU"; - this.color.setBlack(true); // Strive - Cruel Feeding costs {2}{B} more to cast for each target beyond the first. this.addAbility(new StriveAbility("{2}{B}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/CrystallineNautilus.java b/Mage.Sets/src/mage/sets/journeyintonyx/CrystallineNautilus.java index 596e9c18e4c..c39bc108836 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/CrystallineNautilus.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/CrystallineNautilus.java @@ -55,7 +55,6 @@ public class CrystallineNautilus extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Nautilus"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/CyclopsOfEternalFury.java b/Mage.Sets/src/mage/sets/journeyintonyx/CyclopsOfEternalFury.java index 7a7ec9c5505..b1184b037d2 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/CyclopsOfEternalFury.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/CyclopsOfEternalFury.java @@ -52,7 +52,6 @@ public class CyclopsOfEternalFury extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Cyclops"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DakraMystic.java b/Mage.Sets/src/mage/sets/journeyintonyx/DakraMystic.java index b609ee7bb8b..862ae462b97 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DakraMystic.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DakraMystic.java @@ -56,7 +56,6 @@ public class DakraMystic 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/journeyintonyx/DaringThief.java b/Mage.Sets/src/mage/sets/journeyintonyx/DaringThief.java index 95c78101073..a93397e9fee 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DaringThief.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DaringThief.java @@ -63,7 +63,6 @@ public class DaringThief extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DawnbringerCharioteers.java b/Mage.Sets/src/mage/sets/journeyintonyx/DawnbringerCharioteers.java index 3150cf80268..04fb6c3bc57 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DawnbringerCharioteers.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DawnbringerCharioteers.java @@ -50,7 +50,6 @@ public class DawnbringerCharioteers 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/journeyintonyx/Deicide.java b/Mage.Sets/src/mage/sets/journeyintonyx/Deicide.java index 37b300288da..3c32456e99e 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Deicide.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Deicide.java @@ -53,7 +53,6 @@ public class Deicide extends CardImpl { super(ownerId, 7, "Deicide", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "JOU"; - this.color.setWhite(true); // Exile target enchantment. If the exiled card is a God card, search its controller's graveyard, hand, and library for any number of cards with the same name as that card and exile them, then that player shuffles his or her library. this.getSpellAbility().addEffect(new DeicideExileEffect()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DesecrationPlague.java b/Mage.Sets/src/mage/sets/journeyintonyx/DesecrationPlague.java index 69912a120f1..f1d4ed5e191 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DesecrationPlague.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DesecrationPlague.java @@ -53,7 +53,6 @@ public class DesecrationPlague extends CardImpl { super(ownerId, 120, "Desecration Plague", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "JOU"; - this.color.setGreen(true); // Destroy target enchantment or land. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DesperateStand.java b/Mage.Sets/src/mage/sets/journeyintonyx/DesperateStand.java index 1c347b60d10..201f8f7bf87 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DesperateStand.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DesperateStand.java @@ -50,8 +50,6 @@ public class DesperateStand extends CardImpl { super(ownerId, 147, "Desperate Stand", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{R}{W}"); this.expansionSetCode = "JOU"; - this.color.setRed(true); - this.color.setWhite(true); // Strive - Desperate Stand costs RW more to cast for each target beyond the first. this.addAbility(new StriveAbility("{R}{W}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfErebos.java b/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfErebos.java index 24c93deee7b..6fd46c4aaf0 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfErebos.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfErebos.java @@ -55,7 +55,6 @@ public class DictateOfErebos extends CardImpl { super(ownerId, 65, "Dictate of Erebos", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{B}"); this.expansionSetCode = "JOU"; - this.color.setBlack(true); // Flash this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfHeliod.java b/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfHeliod.java index b3b2ba0a175..0bbdd12cf83 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfHeliod.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfHeliod.java @@ -47,7 +47,6 @@ public class DictateOfHeliod extends CardImpl { super(ownerId, 8, "Dictate of Heliod", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}{W}"); this.expansionSetCode = "JOU"; - this.color.setWhite(true); // Flash this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKarametra.java b/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKarametra.java index 85bc5e7b0f5..89cb0e797ca 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKarametra.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKarametra.java @@ -47,7 +47,6 @@ public class DictateOfKarametra extends CardImpl { super(ownerId, 121, "Dictate of Karametra", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}{G}"); this.expansionSetCode = "JOU"; - this.color.setGreen(true); // Flash this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKruphix.java b/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKruphix.java index ad7adfa55bd..ccbaf681714 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKruphix.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKruphix.java @@ -49,7 +49,6 @@ public class DictateOfKruphix extends CardImpl { super(ownerId, 37, "Dictate of Kruphix", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}{U}"); this.expansionSetCode = "JOU"; - this.color.setBlue(true); // Flash this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfTheTwinGods.java b/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfTheTwinGods.java index adeedcc96a9..3dff0c98a2a 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfTheTwinGods.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfTheTwinGods.java @@ -57,7 +57,6 @@ public class DictateOfTheTwinGods extends CardImpl { super(ownerId, 93, "Dictate of the Twin Gods", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}{R}"); this.expansionSetCode = "JOU"; - this.color.setRed(true); // Flash this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DiscipleOfDeceit.java b/Mage.Sets/src/mage/sets/journeyintonyx/DiscipleOfDeceit.java index 39295217f2e..0604b7b6604 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DiscipleOfDeceit.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DiscipleOfDeceit.java @@ -62,8 +62,6 @@ public class DiscipleOfDeceit 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(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DreadbringerLampads.java b/Mage.Sets/src/mage/sets/journeyintonyx/DreadbringerLampads.java index 1698c16933d..da6e9541486 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DreadbringerLampads.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DreadbringerLampads.java @@ -50,7 +50,6 @@ public class DreadbringerLampads extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Nymph"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/EagleOfTheWatch.java b/Mage.Sets/src/mage/sets/journeyintonyx/EagleOfTheWatch.java index f9c38bd200b..a6e81aafd41 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/EagleOfTheWatch.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/EagleOfTheWatch.java @@ -46,7 +46,6 @@ public class EagleOfTheWatch extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Bird"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfBlossoms.java b/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfBlossoms.java index b4144945bbd..81a1e5124a8 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfBlossoms.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfBlossoms.java @@ -46,7 +46,6 @@ public class EidolonOfBlossoms extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Spirit"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfRhetoric.java b/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfRhetoric.java index ab747317237..100a3dc3240 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfRhetoric.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfRhetoric.java @@ -48,7 +48,6 @@ public class EidolonOfRhetoric extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Spirit"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfTheGreatRevel.java b/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfTheGreatRevel.java index 62174fa331d..988022c3b70 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfTheGreatRevel.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfTheGreatRevel.java @@ -52,7 +52,6 @@ public class EidolonOfTheGreatRevel extends CardImpl { this.expansionSetCode = "JOU"; 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/journeyintonyx/ExtinguishAllHope.java b/Mage.Sets/src/mage/sets/journeyintonyx/ExtinguishAllHope.java index 6e0e4a7fbb0..009d362c771 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ExtinguishAllHope.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ExtinguishAllHope.java @@ -54,7 +54,6 @@ public class ExtinguishAllHope extends CardImpl { super(ownerId, 68, "Extinguish All Hope", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{B}{B}"); this.expansionSetCode = "JOU"; - this.color.setBlack(true); // Destroy all nonenchantment creatures. this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/FeastOfDreams.java b/Mage.Sets/src/mage/sets/journeyintonyx/FeastOfDreams.java index ed4efe82512..a37cebd83e0 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/FeastOfDreams.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/FeastOfDreams.java @@ -59,7 +59,6 @@ public class FeastOfDreams extends CardImpl { super(ownerId, 69, "Feast of Dreams", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "JOU"; - this.color.setBlack(true); // Destroy target enchanted creature or enchantment creature. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/FelhidePetrifier.java b/Mage.Sets/src/mage/sets/journeyintonyx/FelhidePetrifier.java index de698fb5141..18fb46c8312 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/FelhidePetrifier.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/FelhidePetrifier.java @@ -51,7 +51,6 @@ public class FelhidePetrifier extends CardImpl { this.subtype.add("Minotaur"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/FlamespeakersWill.java b/Mage.Sets/src/mage/sets/journeyintonyx/FlamespeakersWill.java index 086299b5086..c2a79efb211 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/FlamespeakersWill.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/FlamespeakersWill.java @@ -59,7 +59,6 @@ public class FlamespeakersWill extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature you control TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/FleetfeatherCockatrice.java b/Mage.Sets/src/mage/sets/journeyintonyx/FleetfeatherCockatrice.java index f3377b64058..e5d2364aa42 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/FleetfeatherCockatrice.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/FleetfeatherCockatrice.java @@ -48,8 +48,6 @@ public class FleetfeatherCockatrice extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Cockatrice"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/FlurryOfHorns.java b/Mage.Sets/src/mage/sets/journeyintonyx/FlurryOfHorns.java index 37ae28a923e..20e66d67ad0 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/FlurryOfHorns.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/FlurryOfHorns.java @@ -47,7 +47,6 @@ public class FlurryOfHorns extends CardImpl { super(ownerId, 96, "Flurry of Horns", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{R}"); this.expansionSetCode = "JOU"; - this.color.setRed(true); // Put two 2/3 red Minotaur creature tokens with haste onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new FlurryOfHornsMinotaurToken(), 2)); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/FontOfFertility.java b/Mage.Sets/src/mage/sets/journeyintonyx/FontOfFertility.java index c55471c9fc2..62f93dc3206 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/FontOfFertility.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/FontOfFertility.java @@ -51,7 +51,6 @@ public class FontOfFertility extends CardImpl { super(ownerId, 123, "Font of Fertility", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "JOU"; - this.color.setGreen(true); // {1}{G}, Sacrifice Font of Fertility: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(new FilterBasicLandCard()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/FontOfFortunes.java b/Mage.Sets/src/mage/sets/journeyintonyx/FontOfFortunes.java index 288a110c872..dd09b04190e 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/FontOfFortunes.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/FontOfFortunes.java @@ -48,7 +48,6 @@ public class FontOfFortunes extends CardImpl { super(ownerId, 38, "Font of Fortunes", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "JOU"; - this.color.setBlue(true); // {1}{U}, Sacrifice Font of Fortunes: Draw two cards. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl("{1}{U}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/FontOfIre.java b/Mage.Sets/src/mage/sets/journeyintonyx/FontOfIre.java index 7d8aaba6a14..37b0bf49884 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/FontOfIre.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/FontOfIre.java @@ -49,7 +49,6 @@ public class FontOfIre extends CardImpl { super(ownerId, 97, "Font of Ire", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); this.expansionSetCode = "JOU"; - this.color.setRed(true); // {3}{R}, Sacrifice Font of Ire: Font of Ire deals 5 damage to target player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new ManaCostsImpl("{3}{R}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/FontOfReturn.java b/Mage.Sets/src/mage/sets/journeyintonyx/FontOfReturn.java index fb45358eedf..7d8c0cd8eab 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/FontOfReturn.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/FontOfReturn.java @@ -50,7 +50,6 @@ public class FontOfReturn extends CardImpl { super(ownerId, 71, "Font of Return", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "JOU"; - this.color.setBlack(true); // {3}{B}, Sacrifice Font of Return: Return up to three target creature cards from your graveyard to your hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl("{3}{B}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/FontOfVigor.java b/Mage.Sets/src/mage/sets/journeyintonyx/FontOfVigor.java index 91953d9f6d6..bc76bfcaf66 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/FontOfVigor.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/FontOfVigor.java @@ -48,7 +48,6 @@ public class FontOfVigor extends CardImpl { super(ownerId, 11, "Font of Vigor", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "JOU"; - this.color.setWhite(true); // {2}{W}, Sacrifice Font of Vigor: You gain 7 life. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(7), new ManaCostsImpl("{2}{W}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/ForgebornOreads.java b/Mage.Sets/src/mage/sets/journeyintonyx/ForgebornOreads.java index 103e0ae4785..82235589921 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ForgebornOreads.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ForgebornOreads.java @@ -48,7 +48,6 @@ public class ForgebornOreads extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Nymph"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/GluttonousCyclops.java b/Mage.Sets/src/mage/sets/journeyintonyx/GluttonousCyclops.java index 3f3cedaaa24..d5c1e44f3d6 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/GluttonousCyclops.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/GluttonousCyclops.java @@ -45,7 +45,6 @@ public class GluttonousCyclops extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Cyclops"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/GnarledScarhide.java b/Mage.Sets/src/mage/sets/journeyintonyx/GnarledScarhide.java index 3a27ddd22d5..dbaa6028c67 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/GnarledScarhide.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/GnarledScarhide.java @@ -54,7 +54,6 @@ public class GnarledScarhide extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Minotaur"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/GodhunterOctopus.java b/Mage.Sets/src/mage/sets/journeyintonyx/GodhunterOctopus.java index 1567b4a85da..1559ba3dd2c 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/GodhunterOctopus.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/GodhunterOctopus.java @@ -59,7 +59,6 @@ public class GodhunterOctopus extends CardImpl { this.expansionSetCode = "JOU"; 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/journeyintonyx/Godsend.java b/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java index 850681044f9..f9034448b6e 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java @@ -75,7 +75,6 @@ public class Godsend extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Equipment"); - this.color.setWhite(true); // Equipped creature gets +3/+3. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3,3,Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/GoldenHind.java b/Mage.Sets/src/mage/sets/journeyintonyx/GoldenHind.java index efd469c41b9..50dd62cad53 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/GoldenHind.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/GoldenHind.java @@ -45,7 +45,6 @@ public class GoldenHind extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Elk"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/GoldenhideOx.java b/Mage.Sets/src/mage/sets/journeyintonyx/GoldenhideOx.java index 16aa383a16d..5965764adb4 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/GoldenhideOx.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/GoldenhideOx.java @@ -49,7 +49,6 @@ public class GoldenhideOx extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Ox"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/GrimGuardian.java b/Mage.Sets/src/mage/sets/journeyintonyx/GrimGuardian.java index 4a5e3fb901f..07fba6d6704 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/GrimGuardian.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/GrimGuardian.java @@ -46,7 +46,6 @@ public class GrimGuardian extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/HarnessByForce.java b/Mage.Sets/src/mage/sets/journeyintonyx/HarnessByForce.java index fbc690149b0..288e9d46b64 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/HarnessByForce.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/HarnessByForce.java @@ -50,7 +50,6 @@ public class HarnessByForce extends CardImpl { super(ownerId, 100, "Harness by Force", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); this.expansionSetCode = "JOU"; - this.color.setRed(true); // Strive - Harness by Force costs {2}{R} more to cast for each target beyond the first. this.addAbility(new StriveAbility("{2}{R}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/HarvestguardAlseids.java b/Mage.Sets/src/mage/sets/journeyintonyx/HarvestguardAlseids.java index d47b6df7349..c659ae8facb 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/HarvestguardAlseids.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/HarvestguardAlseids.java @@ -49,7 +49,6 @@ public class HarvestguardAlseids extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Nymph"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/HeroesBane.java b/Mage.Sets/src/mage/sets/journeyintonyx/HeroesBane.java index 9da49f5dacf..a2f08c020b2 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/HeroesBane.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/HeroesBane.java @@ -52,7 +52,6 @@ public class HeroesBane extends CardImpl { this.expansionSetCode = "JOU"; 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/journeyintonyx/HourOfNeed.java b/Mage.Sets/src/mage/sets/journeyintonyx/HourOfNeed.java index 4effa4214b0..c4d109b2b42 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/HourOfNeed.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/HourOfNeed.java @@ -55,7 +55,6 @@ public class HourOfNeed extends CardImpl { super(ownerId, 40, "Hour of Need", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "JOU"; - this.color.setBlue(true); // Strive — Hour of Need costs {1}{U} more to cast for each target beyond the first. this.addAbility(new StriveAbility("{1}{U}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Hubris.java b/Mage.Sets/src/mage/sets/journeyintonyx/Hubris.java index 15195ac5e13..c9ac8245496 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Hubris.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Hubris.java @@ -52,7 +52,6 @@ public class Hubris extends CardImpl { super(ownerId, 41, "Hubris", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "JOU"; - this.color.setBlue(true); // Return target creature and all Auras attached to it to their owners' hand. this.getSpellAbility().addEffect(new HubrisReturnEffect()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/HumblerOfMortals.java b/Mage.Sets/src/mage/sets/journeyintonyx/HumblerOfMortals.java index a9b9900d002..44971a53b5c 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/HumblerOfMortals.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/HumblerOfMortals.java @@ -49,7 +49,6 @@ public class HumblerOfMortals extends CardImpl { this.expansionSetCode = "JOU"; 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/journeyintonyx/HydraBroodmaster.java b/Mage.Sets/src/mage/sets/journeyintonyx/HydraBroodmaster.java index 57e99b33f7b..5035fb7b2c2 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/HydraBroodmaster.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/HydraBroodmaster.java @@ -54,7 +54,6 @@ public class HydraBroodmaster extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Hydra"); - this.color.setGreen(true); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/HypnoticSiren.java b/Mage.Sets/src/mage/sets/journeyintonyx/HypnoticSiren.java index d42dc03130e..656eba4032f 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/HypnoticSiren.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/HypnoticSiren.java @@ -55,7 +55,6 @@ public class HypnoticSiren extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Siren"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/InterpretTheSigns.java b/Mage.Sets/src/mage/sets/journeyintonyx/InterpretTheSigns.java index 5e98ddcfe0e..69f76dd1361 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/InterpretTheSigns.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/InterpretTheSigns.java @@ -50,7 +50,6 @@ public class InterpretTheSigns extends CardImpl { super(ownerId, 43, "Interpret the Signs", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{5}{U}"); this.expansionSetCode = "JOU"; - this.color.setBlue(true); // Scry 3, then reveal the top card of your library. Draw cards equal to that card's converted mana cost. this.getSpellAbility().addEffect(new ScryEffect(3)); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/IroasGodOfVictory.java b/Mage.Sets/src/mage/sets/journeyintonyx/IroasGodOfVictory.java index e0748dab76e..df7d828c636 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/IroasGodOfVictory.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/IroasGodOfVictory.java @@ -67,8 +67,6 @@ public class IroasGodOfVictory extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("God"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(7); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java b/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java index 5cf4a82c50c..8f18a5ff389 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java @@ -64,8 +64,6 @@ public class KeranosGodOfStorms extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("God"); - this.color.setRed(true); - this.color.setBlue(true); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/KingMacarTheGoldCursed.java b/Mage.Sets/src/mage/sets/journeyintonyx/KingMacarTheGoldCursed.java index 151d966b871..7df19d3cc8d 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/KingMacarTheGoldCursed.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/KingMacarTheGoldCursed.java @@ -54,7 +54,6 @@ public class KingMacarTheGoldCursed extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/KiorasDismissal.java b/Mage.Sets/src/mage/sets/journeyintonyx/KiorasDismissal.java index 21e99708408..4544e72ac40 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/KiorasDismissal.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/KiorasDismissal.java @@ -47,7 +47,6 @@ public class KiorasDismissal extends CardImpl { super(ownerId, 44, "Kiora's Dismissal", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "JOU"; - this.color.setBlue(true); // Strive - Kiora's Dismissal costs U more to cast for each target beyond the first. this.addAbility(new StriveAbility("{U}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/KnowledgeAndPower.java b/Mage.Sets/src/mage/sets/journeyintonyx/KnowledgeAndPower.java index ed84a47fb22..f9869338b55 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/KnowledgeAndPower.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/KnowledgeAndPower.java @@ -55,7 +55,6 @@ public class KnowledgeAndPower extends CardImpl { super(ownerId, 101, "Knowledge and Power", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}"); this.expansionSetCode = "JOU"; - this.color.setRed(true); // Whenever you scry, you may pay 2. If you do. Knowledge and Power deals 2 damage to target creature or player. this.addAbility(new ScryTriggeredAbility() ); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/KruphixGodOfHorizons.java b/Mage.Sets/src/mage/sets/journeyintonyx/KruphixGodOfHorizons.java index f8ee7af6e90..16098b34543 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/KruphixGodOfHorizons.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/KruphixGodOfHorizons.java @@ -59,8 +59,6 @@ public class KruphixGodOfHorizons extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("God"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/KruphixsInsight.java b/Mage.Sets/src/mage/sets/journeyintonyx/KruphixsInsight.java index 4bb4b9031e4..d7312749c09 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/KruphixsInsight.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/KruphixsInsight.java @@ -53,7 +53,6 @@ public class KruphixsInsight extends CardImpl { super(ownerId, 129, "Kruphix's Insight", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "JOU"; - this.color.setGreen(true); // Reveal the top six cards of your library. Put up to three enchantment cards from among them into your hand and the rest of the revealed cards into your graveyard. this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect(new StaticValue(6), false, new StaticValue(3), filter, Zone.GRAVEYARD, false, true, true,Zone.HAND, false)); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/LagonnaBandTrailblazer.java b/Mage.Sets/src/mage/sets/journeyintonyx/LagonnaBandTrailblazer.java index b1c63669753..d5e33035680 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/LagonnaBandTrailblazer.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/LagonnaBandTrailblazer.java @@ -48,7 +48,6 @@ public class LagonnaBandTrailblazer extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Scout"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/LaunchTheFleet.java b/Mage.Sets/src/mage/sets/journeyintonyx/LaunchTheFleet.java index 9ee46851d84..06a23370e8d 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/LaunchTheFleet.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/LaunchTheFleet.java @@ -50,7 +50,6 @@ public class LaunchTheFleet extends CardImpl { super(ownerId, 15, "Launch the Fleet", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{W}"); this.expansionSetCode = "JOU"; - this.color.setWhite(true); // Strive - Launch the Fleet costs 1 more to cast for each target beyond the first. this.addAbility(new StriveAbility("{1}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/LeoninIconoclast.java b/Mage.Sets/src/mage/sets/journeyintonyx/LeoninIconoclast.java index 94573d36a24..da28d9f855d 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/LeoninIconoclast.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/LeoninIconoclast.java @@ -61,7 +61,6 @@ public class LeoninIconoclast extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Monk"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/LightningDiadem.java b/Mage.Sets/src/mage/sets/journeyintonyx/LightningDiadem.java index da98feb842b..25c2003d0ee 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/LightningDiadem.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/LightningDiadem.java @@ -56,7 +56,6 @@ public class LightningDiadem extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/MarketFestival.java b/Mage.Sets/src/mage/sets/journeyintonyx/MarketFestival.java index ab27a8de487..b1e9946c821 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/MarketFestival.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/MarketFestival.java @@ -59,7 +59,6 @@ public class MarketFestival extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/MasterOfTheFeast.java b/Mage.Sets/src/mage/sets/journeyintonyx/MasterOfTheFeast.java index ceb9d67836b..f7017e0a4aa 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/MasterOfTheFeast.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/MasterOfTheFeast.java @@ -48,7 +48,6 @@ public class MasterOfTheFeast extends CardImpl { this.expansionSetCode = "JOU"; 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/journeyintonyx/MogissWarhound.java b/Mage.Sets/src/mage/sets/journeyintonyx/MogissWarhound.java index 8ec8db708ca..0295fbddaee 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/MogissWarhound.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/MogissWarhound.java @@ -54,7 +54,6 @@ public class MogissWarhound extends CardImpl { this.expansionSetCode = "JOU"; 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/journeyintonyx/MortalObstinacy.java b/Mage.Sets/src/mage/sets/journeyintonyx/MortalObstinacy.java index 2b290f3c0e7..41db761d453 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/MortalObstinacy.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/MortalObstinacy.java @@ -62,7 +62,6 @@ public class MortalObstinacy extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature you control TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/NaturesPanoply.java b/Mage.Sets/src/mage/sets/journeyintonyx/NaturesPanoply.java index cc7f70e9120..83b9cbc1956 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/NaturesPanoply.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/NaturesPanoply.java @@ -47,7 +47,6 @@ public class NaturesPanoply extends CardImpl { super(ownerId, 131, "Nature's Panoply", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "JOU"; - this.color.setGreen(true); // Strive - Nature's Panoply costs {2}{G} more to cast for each target beyond the first. this.addAbility(new StriveAbility("{2}{G}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/NessianGameWarden.java b/Mage.Sets/src/mage/sets/journeyintonyx/NessianGameWarden.java index 38f350bee2e..4fc4e9d651e 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/NessianGameWarden.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/NessianGameWarden.java @@ -61,7 +61,6 @@ public class NessianGameWarden extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/NightmarishEnd.java b/Mage.Sets/src/mage/sets/journeyintonyx/NightmarishEnd.java index 3b4b1fd366c..f98f12d33d1 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/NightmarishEnd.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/NightmarishEnd.java @@ -49,7 +49,6 @@ public class NightmarishEnd extends CardImpl { super(ownerId, 76, "Nightmarish End", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "JOU"; - this.color.setBlack(true); // Target creature gets -X/-X until end of turn, where X is the number of cards in your hand. DynamicValue xValue = new SignInversionDynamicValue(new CardsInControllerHandCount()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/NyxFleeceRam.java b/Mage.Sets/src/mage/sets/journeyintonyx/NyxFleeceRam.java index f6b7c90ac24..6e340f165ec 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/NyxFleeceRam.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/NyxFleeceRam.java @@ -47,7 +47,6 @@ public class NyxFleeceRam extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Sheep"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/NyxInfusion.java b/Mage.Sets/src/mage/sets/journeyintonyx/NyxInfusion.java index 620ddd5d9fc..77e719ddd80 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/NyxInfusion.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/NyxInfusion.java @@ -64,7 +64,6 @@ public class NyxInfusion extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/NyxWeaver.java b/Mage.Sets/src/mage/sets/journeyintonyx/NyxWeaver.java index a5f612dc342..ddc8298d7b8 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/NyxWeaver.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/NyxWeaver.java @@ -55,8 +55,6 @@ public class NyxWeaver extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Spider"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/OakheartDryads.java b/Mage.Sets/src/mage/sets/journeyintonyx/OakheartDryads.java index fff6b1a3fb5..072c5bada3c 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/OakheartDryads.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/OakheartDryads.java @@ -50,7 +50,6 @@ public class OakheartDryads extends CardImpl { this.subtype.add("Nymph"); this.subtype.add("Dryad"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/OppressiveRays.java b/Mage.Sets/src/mage/sets/journeyintonyx/OppressiveRays.java index 56b325b77f1..a22d2e1fd2f 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/OppressiveRays.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/OppressiveRays.java @@ -63,7 +63,6 @@ public class OppressiveRays extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/OreskosSwiftclaw.java b/Mage.Sets/src/mage/sets/journeyintonyx/OreskosSwiftclaw.java index d542e05bfd3..523d7cbc2d7 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/OreskosSwiftclaw.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/OreskosSwiftclaw.java @@ -45,7 +45,6 @@ public class OreskosSwiftclaw extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Warrior"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/PensiveMinotaur.java b/Mage.Sets/src/mage/sets/journeyintonyx/PensiveMinotaur.java index 61edf99a95f..81c49ed6e25 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/PensiveMinotaur.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/PensiveMinotaur.java @@ -44,7 +44,6 @@ public class PensiveMinotaur extends CardImpl { this.expansionSetCode = "JOU"; 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/journeyintonyx/PhalanxFormation.java b/Mage.Sets/src/mage/sets/journeyintonyx/PhalanxFormation.java index a1413d55fbe..92f072f778d 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/PhalanxFormation.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/PhalanxFormation.java @@ -48,7 +48,6 @@ public class PhalanxFormation extends CardImpl { super(ownerId, 21, "Phalanx Formation", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "JOU"; - this.color.setWhite(true); // Strive — Phalanx Formation costs {1}{W} more to cast for each target beyond the first. this.addAbility(new StriveAbility("{1}{W}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/PharikaGodOfAffliction.java b/Mage.Sets/src/mage/sets/journeyintonyx/PharikaGodOfAffliction.java index e53b2053676..996c3571de2 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/PharikaGodOfAffliction.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/PharikaGodOfAffliction.java @@ -65,8 +65,6 @@ public class PharikaGodOfAffliction extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("God"); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/PharikasChosen.java b/Mage.Sets/src/mage/sets/journeyintonyx/PharikasChosen.java index 10c23d8e02d..aa6157705a6 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/PharikasChosen.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/PharikasChosen.java @@ -45,7 +45,6 @@ public class PharikasChosen extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Snake"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/PheresBandThunderhoof.java b/Mage.Sets/src/mage/sets/journeyintonyx/PheresBandThunderhoof.java index 660a3208f7a..f418320f3f9 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/PheresBandThunderhoof.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/PheresBandThunderhoof.java @@ -48,7 +48,6 @@ public class PheresBandThunderhoof extends CardImpl { this.subtype.add("Centaur"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/PheresBandWarchief.java b/Mage.Sets/src/mage/sets/journeyintonyx/PheresBandWarchief.java index 6591a1b664b..ef75fc97276 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/PheresBandWarchief.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/PheresBandWarchief.java @@ -65,7 +65,6 @@ public class PheresBandWarchief 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/journeyintonyx/PinToTheEarth.java b/Mage.Sets/src/mage/sets/journeyintonyx/PinToTheEarth.java index 8a2e05dd01b..13fc26ad97b 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/PinToTheEarth.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/PinToTheEarth.java @@ -53,7 +53,6 @@ public class PinToTheEarth extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/PropheticFlamespeaker.java b/Mage.Sets/src/mage/sets/journeyintonyx/PropheticFlamespeaker.java index 811de9e798d..52724502644 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/PropheticFlamespeaker.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/PropheticFlamespeaker.java @@ -62,7 +62,6 @@ public class PropheticFlamespeaker extends CardImpl { this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/PullFromTheDeep.java b/Mage.Sets/src/mage/sets/journeyintonyx/PullFromTheDeep.java index 2b4b9b0834a..6e16ff61958 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/PullFromTheDeep.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/PullFromTheDeep.java @@ -57,7 +57,6 @@ public class PullFromTheDeep extends CardImpl { super(ownerId, 47, "Pull from the Deep", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}{U}"); this.expansionSetCode = "JOU"; - this.color.setBlue(true); // Return up to one target instant card and up to one target sorcery card from your graveyard to your hand. Exile Pull from the Deep. Effect effect = new ReturnToHandTargetEffect(); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/QuarryColossus.java b/Mage.Sets/src/mage/sets/journeyintonyx/QuarryColossus.java index 75843aaabaf..bc3084b4b15 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/QuarryColossus.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/QuarryColossus.java @@ -60,7 +60,6 @@ public class QuarryColossus extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Giant"); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RavenousLeucrocota.java b/Mage.Sets/src/mage/sets/journeyintonyx/RavenousLeucrocota.java index 78141218a78..106854c8835 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RavenousLeucrocota.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RavenousLeucrocota.java @@ -46,7 +46,6 @@ public class RavenousLeucrocota extends CardImpl { this.expansionSetCode = "JOU"; 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/journeyintonyx/RenownedWeaver.java b/Mage.Sets/src/mage/sets/journeyintonyx/RenownedWeaver.java index 2752290d25b..d688f2ba054 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RenownedWeaver.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RenownedWeaver.java @@ -54,7 +54,6 @@ public class RenownedWeaver 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/journeyintonyx/ReturnedReveler.java b/Mage.Sets/src/mage/sets/journeyintonyx/ReturnedReveler.java index d101aabf45a..1301478a9a0 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ReturnedReveler.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ReturnedReveler.java @@ -48,7 +48,6 @@ public class ReturnedReveler extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Satyr"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RevelOfTheFallenGod.java b/Mage.Sets/src/mage/sets/journeyintonyx/RevelOfTheFallenGod.java index bb7af5ad491..dcb43b14003 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RevelOfTheFallenGod.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RevelOfTheFallenGod.java @@ -47,8 +47,6 @@ public class RevelOfTheFallenGod extends CardImpl { super(ownerId, 155, "Revel of the Fallen God", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{R}{R}{G}{G}"); this.expansionSetCode = "JOU"; - this.color.setRed(true); - this.color.setGreen(true); // Put four 2/2 red and green Satyr creature tokens with haste onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new RevelOfTheFallenGodSatyrToken(), 4)); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RevivingMelody.java b/Mage.Sets/src/mage/sets/journeyintonyx/RevivingMelody.java index d86858bd8a8..a170d328a39 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RevivingMelody.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RevivingMelody.java @@ -54,7 +54,6 @@ public class RevivingMelody extends CardImpl { super(ownerId, 138, "Reviving Melody", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "JOU"; - this.color.setGreen(true); // Choose one or both - this.getSpellAbility().getModes().setMinModes(1); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java b/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java index 0166ff7a1aa..173d0126f9d 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java @@ -53,7 +53,6 @@ public class RiddleOfLightning extends CardImpl { super(ownerId, 107, "Riddle of Lightning", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{R}{R}"); this.expansionSetCode = "JOU"; - this.color.setRed(true); // Choose target creature or player. Scry 3, then reveal the top card of your library. Riddle of Lightning deals damage equal to that card's converted mana cost to that creature or player. this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RiptideChimera.java b/Mage.Sets/src/mage/sets/journeyintonyx/RiptideChimera.java index e5e19277707..e48bb462eb8 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RiptideChimera.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RiptideChimera.java @@ -58,7 +58,6 @@ public class RiptideChimera extends CardImpl { this.expansionSetCode = "JOU"; 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/journeyintonyx/RiseOfEagles.java b/Mage.Sets/src/mage/sets/journeyintonyx/RiseOfEagles.java index e63ace78518..3566ae82728 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RiseOfEagles.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RiseOfEagles.java @@ -48,7 +48,6 @@ public class RiseOfEagles extends CardImpl { super(ownerId, 49, "Rise of Eagles", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{U}{U}"); this.expansionSetCode = "JOU"; - this.color.setBlue(true); // Put two 2/2 blue Bird enchantment creature tokens with flying onto the battlefield. Scry 1. this.getSpellAbility().addEffect(new CreateTokenEffect(new RiseOfEaglesBirdToken(), 2)); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RitualOfTheReturned.java b/Mage.Sets/src/mage/sets/journeyintonyx/RitualOfTheReturned.java index e106671e433..6697a2301bc 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RitualOfTheReturned.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RitualOfTheReturned.java @@ -55,7 +55,6 @@ public class RitualOfTheReturned extends CardImpl { super(ownerId, 80, "Ritual of the Returned", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{B}"); this.expansionSetCode = "JOU"; - this.color.setBlack(true); // Exile target creature card from your graveyard. Put a black Zombie creature token onto the battlefield with power equal to the exiled card's power and toughness equal to the exiled card's toughness. this.getSpellAbility().addEffect(new RitualOfTheReturnedExileEffect()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RollickOfAbandon.java b/Mage.Sets/src/mage/sets/journeyintonyx/RollickOfAbandon.java index 7a490d0add7..5a1618ec0d4 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RollickOfAbandon.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RollickOfAbandon.java @@ -44,7 +44,6 @@ public class RollickOfAbandon extends CardImpl { super(ownerId, 108, "Rollick of Abandon", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); this.expansionSetCode = "JOU"; - this.color.setRed(true); // All creatures get +2/-2 until end of turn. this.getSpellAbility().addEffect(new BoostAllEffect(2,-2, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RottedHulk.java b/Mage.Sets/src/mage/sets/journeyintonyx/RottedHulk.java index b82af5d8d5d..53b6e016078 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RottedHulk.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RottedHulk.java @@ -44,7 +44,6 @@ public class RottedHulk extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Elemental"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RouseTheMob.java b/Mage.Sets/src/mage/sets/journeyintonyx/RouseTheMob.java index d1b94627048..b019ab5b0ba 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RouseTheMob.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RouseTheMob.java @@ -49,7 +49,6 @@ public class RouseTheMob extends CardImpl { super(ownerId, 109, "Rouse the Mob", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "JOU"; - this.color.setRed(true); // Strive — Rouse the Mob costs {2}{R} more to cast for each target beyond the first. this.addAbility(new StriveAbility("{2}{R}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SageOfHours.java b/Mage.Sets/src/mage/sets/journeyintonyx/SageOfHours.java index 0222107dc61..533f233b829 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SageOfHours.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SageOfHours.java @@ -60,7 +60,6 @@ public class SageOfHours 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/journeyintonyx/SatyrGrovedancer.java b/Mage.Sets/src/mage/sets/journeyintonyx/SatyrGrovedancer.java index 93a2e81b3de..5b5d905529c 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SatyrGrovedancer.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SatyrGrovedancer.java @@ -50,7 +50,6 @@ public class SatyrGrovedancer extends CardImpl { this.subtype.add("Satyr"); 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/journeyintonyx/SatyrHoplite.java b/Mage.Sets/src/mage/sets/journeyintonyx/SatyrHoplite.java index a5d9a683d41..f61cc25c99f 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SatyrHoplite.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SatyrHoplite.java @@ -48,7 +48,6 @@ public class SatyrHoplite extends CardImpl { this.subtype.add("Satyr"); 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/journeyintonyx/ScourgeOfFleets.java b/Mage.Sets/src/mage/sets/journeyintonyx/ScourgeOfFleets.java index 0852057bda2..b6b3b9e6720 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ScourgeOfFleets.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ScourgeOfFleets.java @@ -60,7 +60,6 @@ public class ScourgeOfFleets extends CardImpl { this.expansionSetCode = "JOU"; 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/journeyintonyx/SetessanTactics.java b/Mage.Sets/src/mage/sets/journeyintonyx/SetessanTactics.java index 132b4e13b5b..f00fc8f3810 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SetessanTactics.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SetessanTactics.java @@ -61,7 +61,6 @@ public class SetessanTactics extends CardImpl { super(ownerId, 140, "Setessan Tactics", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "JOU"; - this.color.setGreen(true); // Strive - Setessan Tactics costs G more to cast for each target beyond the first. this.addAbility(new StriveAbility("{G}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SightlessBrawler.java b/Mage.Sets/src/mage/sets/journeyintonyx/SightlessBrawler.java index 5dcd5a336e2..c12742e364e 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SightlessBrawler.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SightlessBrawler.java @@ -55,7 +55,6 @@ public class SightlessBrawler extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SigiledSkink.java b/Mage.Sets/src/mage/sets/journeyintonyx/SigiledSkink.java index 37087fbd298..21ed9b2a765 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SigiledSkink.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SigiledSkink.java @@ -46,7 +46,6 @@ public class SigiledSkink extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Lizard"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SigiledStarfish.java b/Mage.Sets/src/mage/sets/journeyintonyx/SigiledStarfish.java index 8cc6bcc67c2..db92d2ff773 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SigiledStarfish.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SigiledStarfish.java @@ -48,7 +48,6 @@ public class SigiledStarfish extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Starfish"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SilenceTheBelievers.java b/Mage.Sets/src/mage/sets/journeyintonyx/SilenceTheBelievers.java index 78d29ca350b..e194c646121 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SilenceTheBelievers.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SilenceTheBelievers.java @@ -54,7 +54,6 @@ public class SilenceTheBelievers extends CardImpl { super(ownerId, 82, "Silence the Believers", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{B}{B}"); this.expansionSetCode = "JOU"; - this.color.setBlack(true); // Strive - Silence the Believers costs 2B more to cast for each target beyond the first. this.addAbility(new StriveAbility("{2}{B}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Skybind.java b/Mage.Sets/src/mage/sets/journeyintonyx/Skybind.java index 93ba4ddb917..7bcf210b7fa 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Skybind.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Skybind.java @@ -61,7 +61,6 @@ public class Skybind extends CardImpl { super(ownerId, 25, "Skybind", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}{W}"); this.expansionSetCode = "JOU"; - this.color.setWhite(true); // Constellation — When Skybind or another enchantment enters the battlefield under your control, exile target nonenchantment permanent. Return that card to the battlefield under its owner's control at the beginning of the next end step. Ability ability = new ConstellationAbility(new SkybindEffect(), false); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SkyspearCavalry.java b/Mage.Sets/src/mage/sets/journeyintonyx/SkyspearCavalry.java index 13eef416094..fdaa52cba3b 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SkyspearCavalry.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SkyspearCavalry.java @@ -47,7 +47,6 @@ public class SkyspearCavalry 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/journeyintonyx/SolidarityOfHeroes.java b/Mage.Sets/src/mage/sets/journeyintonyx/SolidarityOfHeroes.java index 516d67a6d6b..9295b597724 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SolidarityOfHeroes.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SolidarityOfHeroes.java @@ -51,7 +51,6 @@ public class SolidarityOfHeroes extends CardImpl { super(ownerId, 141, "Solidarity of Heroes", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "JOU"; - this.color.setGreen(true); // Strive - Solidarity of Heroes costs {1}{G} more to cast for each target beyond the first. this.addAbility(new StriveAbility("{1}{G}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SpawnOfThraxes.java b/Mage.Sets/src/mage/sets/journeyintonyx/SpawnOfThraxes.java index fd3b37e525b..7c317645665 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SpawnOfThraxes.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SpawnOfThraxes.java @@ -58,7 +58,6 @@ public class SpawnOfThraxes extends CardImpl { this.expansionSetCode = "JOU"; 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/journeyintonyx/Spirespine.java b/Mage.Sets/src/mage/sets/journeyintonyx/Spirespine.java index c1cd59089fc..ec6da3c4243 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Spirespine.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Spirespine.java @@ -54,7 +54,6 @@ public class Spirespine extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SpiteOfMogis.java b/Mage.Sets/src/mage/sets/journeyintonyx/SpiteOfMogis.java index f65e576fdfe..484a3dacd3a 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SpiteOfMogis.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SpiteOfMogis.java @@ -47,7 +47,6 @@ public class SpiteOfMogis extends CardImpl { super(ownerId, 113, "Spite of Mogis", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "JOU"; - this.color.setRed(true); // Spite of Mogis deals damage to target creature equal to the number of instant and sorcery cards in your graveyard. Scry 1. this.getSpellAbility().addEffect(new DamageTargetEffect(new CardsInControllerGraveyardCount(new FilterInstantOrSorceryCard("instant and sorcery cards")))); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SpitefulBlow.java b/Mage.Sets/src/mage/sets/journeyintonyx/SpitefulBlow.java index be4944c2074..48dbb0da2ce 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SpitefulBlow.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SpitefulBlow.java @@ -48,7 +48,6 @@ public class SpitefulBlow extends CardImpl { super(ownerId, 83, "Spiteful Blow", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{B}{B}"); this.expansionSetCode = "JOU"; - this.color.setBlack(true); // Destroy target creature and target land. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SquelchingLeeches.java b/Mage.Sets/src/mage/sets/journeyintonyx/SquelchingLeeches.java index 4303a61ea4f..2b6fc54dff7 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SquelchingLeeches.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SquelchingLeeches.java @@ -57,7 +57,6 @@ public class SquelchingLeeches extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Leech"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Starfall.java b/Mage.Sets/src/mage/sets/journeyintonyx/Starfall.java index 9af9fd4a2e0..6bd88fd895a 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Starfall.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Starfall.java @@ -50,7 +50,6 @@ public class Starfall extends CardImpl { super(ownerId, 114, "Starfall", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{R}"); this.expansionSetCode = "JOU"; - this.color.setRed(true); // Starfall deals 3 damage to target creature. If that creature is an enchantment, Starfall deals 3 damage to that creature's controller. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/StonewiseFortifier.java b/Mage.Sets/src/mage/sets/journeyintonyx/StonewiseFortifier.java index 0d5cd2a7524..040a3db307f 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/StonewiseFortifier.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/StonewiseFortifier.java @@ -55,7 +55,6 @@ public class StonewiseFortifier 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/journeyintonyx/StormchaserChimera.java b/Mage.Sets/src/mage/sets/journeyintonyx/StormchaserChimera.java index c1662707e90..c57b27c9e55 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/StormchaserChimera.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/StormchaserChimera.java @@ -60,8 +60,6 @@ public class StormchaserChimera extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Chimera"); - this.color.setRed(true); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/StrengthFromTheFallen.java b/Mage.Sets/src/mage/sets/journeyintonyx/StrengthFromTheFallen.java index 329641a007d..2c6830444f2 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/StrengthFromTheFallen.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/StrengthFromTheFallen.java @@ -50,7 +50,6 @@ public class StrengthFromTheFallen extends CardImpl { super(ownerId, 143, "Strength from the Fallen", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "JOU"; - this.color.setGreen(true); // Constellation - Whenever Strength from the Fallen or another entchantment enters the battlefield under your control, target creature gets +X/+X until end of turn, where X is the number of creature cards in your graveyard. DynamicValue xValue = new CardsInControllerGraveyardCount(new FilterCreatureCard("creature cards")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SupplyLineCranes.java b/Mage.Sets/src/mage/sets/journeyintonyx/SupplyLineCranes.java index b7194261b06..3c94a776604 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SupplyLineCranes.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SupplyLineCranes.java @@ -50,7 +50,6 @@ public class SupplyLineCranes extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Bird"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SwarmbornGiant.java b/Mage.Sets/src/mage/sets/journeyintonyx/SwarmbornGiant.java index 9d176adb922..dd3ca1dd5ac 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SwarmbornGiant.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SwarmbornGiant.java @@ -58,7 +58,6 @@ public class SwarmbornGiant extends CardImpl { this.expansionSetCode = "JOU"; 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/journeyintonyx/TethmosHighPriest.java b/Mage.Sets/src/mage/sets/journeyintonyx/TethmosHighPriest.java index 0a25e391514..95518eb7c98 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/TethmosHighPriest.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/TethmosHighPriest.java @@ -60,7 +60,6 @@ public class TethmosHighPriest extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/ThassasDevourer.java b/Mage.Sets/src/mage/sets/journeyintonyx/ThassasDevourer.java index 1db68b64085..e388828d1c4 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ThassasDevourer.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ThassasDevourer.java @@ -48,7 +48,6 @@ public class ThassasDevourer extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/ThassasIre.java b/Mage.Sets/src/mage/sets/journeyintonyx/ThassasIre.java index fd46c0cc0e1..e6d32b637ba 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ThassasIre.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ThassasIre.java @@ -49,7 +49,6 @@ public class ThassasIre extends CardImpl { super(ownerId, 54, "Thassa's Ire", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{U}"); this.expansionSetCode = "JOU"; - this.color.setBlue(true); // {3}{U}: You may tap or untap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl("{3}{U}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/ThoughtrenderLamia.java b/Mage.Sets/src/mage/sets/journeyintonyx/ThoughtrenderLamia.java index 6eda4232b48..bb13547a4b9 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ThoughtrenderLamia.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ThoughtrenderLamia.java @@ -48,7 +48,6 @@ public class ThoughtrenderLamia extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Lamia"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/TormentedThoughts.java b/Mage.Sets/src/mage/sets/journeyintonyx/TormentedThoughts.java index 9bcd23a386e..929c02d4a7a 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/TormentedThoughts.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/TormentedThoughts.java @@ -53,7 +53,6 @@ public class TormentedThoughts extends CardImpl { super(ownerId, 86, "Tormented Thoughts", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "JOU"; - this.color.setBlack(true); // As an additional cost to cast Tormented Thoughts, 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/journeyintonyx/TritonCavalry.java b/Mage.Sets/src/mage/sets/journeyintonyx/TritonCavalry.java index e02f803f1fe..f402d368d6e 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/TritonCavalry.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/TritonCavalry.java @@ -49,7 +49,6 @@ public class TritonCavalry extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/TritonShorestalker.java b/Mage.Sets/src/mage/sets/journeyintonyx/TritonShorestalker.java index 5696b006d42..ab968c34c45 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/TritonShorestalker.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/TritonShorestalker.java @@ -46,7 +46,6 @@ public class TritonShorestalker extends CardImpl { this.subtype.add("Merfolk"); 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/journeyintonyx/Twinflame.java b/Mage.Sets/src/mage/sets/journeyintonyx/Twinflame.java index 1b1556ddb82..ae132b9f1a8 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Twinflame.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Twinflame.java @@ -58,7 +58,6 @@ public class Twinflame extends CardImpl { super(ownerId, 115, "Twinflame", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "JOU"; - this.color.setRed(true); // Strive - Twinflame costs 2R more to cast for each target beyond the first. this.addAbility(new StriveAbility("{2}{R}")); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/UnderworldCoinsmith.java b/Mage.Sets/src/mage/sets/journeyintonyx/UnderworldCoinsmith.java index ad4837ec45a..80e8f29977a 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/UnderworldCoinsmith.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/UnderworldCoinsmith.java @@ -53,8 +53,6 @@ public class UnderworldCoinsmith extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - 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/journeyintonyx/WarWingSiren.java b/Mage.Sets/src/mage/sets/journeyintonyx/WarWingSiren.java index 5b0a6069251..1e37c5c964d 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/WarWingSiren.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/WarWingSiren.java @@ -49,7 +49,6 @@ public class WarWingSiren extends CardImpl { this.subtype.add("Siren"); 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/journeyintonyx/WildfireCerberus.java b/Mage.Sets/src/mage/sets/journeyintonyx/WildfireCerberus.java index 48331a721a8..3440fda134d 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/WildfireCerberus.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/WildfireCerberus.java @@ -59,7 +59,6 @@ public class WildfireCerberus extends CardImpl { this.expansionSetCode = "JOU"; this.subtype.add("Hound"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/WorstFears.java b/Mage.Sets/src/mage/sets/journeyintonyx/WorstFears.java index b5ea6bf9a01..2c2e336e9c2 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/WorstFears.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/WorstFears.java @@ -45,7 +45,6 @@ public class WorstFears extends CardImpl { super(ownerId, 87, "Worst Fears", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{7}{B}"); this.expansionSetCode = "JOU"; - this.color.setBlack(true); // You control target player during that player's next turn. Exile Worst Fears. (You see all cards that player could see and make all decisions for that player.) this.getSpellAbility().addEffect(new ControlTargetPlayerNextTurnEffect()); diff --git a/Mage.Sets/src/mage/sets/judgment/Anger.java b/Mage.Sets/src/mage/sets/judgment/Anger.java index 95ef0b14964..a2d56fc038b 100644 --- a/Mage.Sets/src/mage/sets/judgment/Anger.java +++ b/Mage.Sets/src/mage/sets/judgment/Anger.java @@ -65,7 +65,6 @@ public class Anger extends CardImpl { this.expansionSetCode = "JUD"; this.subtype.add("Incarnation"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/judgment/BattleScreech.java b/Mage.Sets/src/mage/sets/judgment/BattleScreech.java index 00f66d98db1..316c620ae76 100644 --- a/Mage.Sets/src/mage/sets/judgment/BattleScreech.java +++ b/Mage.Sets/src/mage/sets/judgment/BattleScreech.java @@ -62,7 +62,6 @@ public class BattleScreech extends CardImpl { super(ownerId, 3, "Battle Screech", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{W}{W}"); this.expansionSetCode = "JUD"; - this.color.setWhite(true); // Put two 1/1 white Bird creature tokens with flying onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new BirdToken(), 2)); diff --git a/Mage.Sets/src/mage/sets/judgment/BorderPatrol.java b/Mage.Sets/src/mage/sets/judgment/BorderPatrol.java index 13947d2c1b8..008ed019709 100644 --- a/Mage.Sets/src/mage/sets/judgment/BorderPatrol.java +++ b/Mage.Sets/src/mage/sets/judgment/BorderPatrol.java @@ -46,7 +46,6 @@ public class BorderPatrol extends CardImpl { this.subtype.add("Human"); this.subtype.add("Nomad"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/judgment/Brawn.java b/Mage.Sets/src/mage/sets/judgment/Brawn.java index 4ddf55283b3..fc26c8512e9 100644 --- a/Mage.Sets/src/mage/sets/judgment/Brawn.java +++ b/Mage.Sets/src/mage/sets/judgment/Brawn.java @@ -65,7 +65,6 @@ public class Brawn extends CardImpl { this.expansionSetCode = "JUD"; this.subtype.add("Incarnation"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/judgment/Browbeat.java b/Mage.Sets/src/mage/sets/judgment/Browbeat.java index cf1b55a36f4..7884cf7a6e2 100644 --- a/Mage.Sets/src/mage/sets/judgment/Browbeat.java +++ b/Mage.Sets/src/mage/sets/judgment/Browbeat.java @@ -55,7 +55,6 @@ public class Browbeat extends CardImpl { super(ownerId, 82, "Browbeat", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "JUD"; - this.color.setRed(true); // Any player may have Browbeat deal 5 damage to him or her. If no one does, target player draws three cards. this.getSpellAbility().addEffect(new BrowbeatDrawEffect()); diff --git a/Mage.Sets/src/mage/sets/judgment/BurningWish.java b/Mage.Sets/src/mage/sets/judgment/BurningWish.java index 2980cf86e9f..412d18b6db0 100644 --- a/Mage.Sets/src/mage/sets/judgment/BurningWish.java +++ b/Mage.Sets/src/mage/sets/judgment/BurningWish.java @@ -56,7 +56,6 @@ public class BurningWish extends CardImpl { super(ownerId, 83, "Burning Wish", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "JUD"; - this.color.setRed(true); // You may choose a sorcery card you own from outside the game, reveal that card, and put it into your hand. Exile Burning Wish. this.getSpellAbility().addEffect(new BurningWishEffect()); diff --git a/Mage.Sets/src/mage/sets/judgment/CunningWish.java b/Mage.Sets/src/mage/sets/judgment/CunningWish.java index e622722c9bd..aa28eab96f4 100644 --- a/Mage.Sets/src/mage/sets/judgment/CunningWish.java +++ b/Mage.Sets/src/mage/sets/judgment/CunningWish.java @@ -56,7 +56,6 @@ public class CunningWish extends CardImpl { super(ownerId, 37, "Cunning Wish", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "JUD"; - this.color.setBlue(true); // You may choose an instant card you own from outside the game, reveal that card, and put it into your hand. Exile Cunning Wish. this.getSpellAbility().addEffect(new CunningWishEffect()); diff --git a/Mage.Sets/src/mage/sets/judgment/DeathWish.java b/Mage.Sets/src/mage/sets/judgment/DeathWish.java index a68b1991d98..8f083160b88 100644 --- a/Mage.Sets/src/mage/sets/judgment/DeathWish.java +++ b/Mage.Sets/src/mage/sets/judgment/DeathWish.java @@ -55,7 +55,6 @@ public class DeathWish extends CardImpl { super(ownerId, 64, "Death Wish", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{B}{B}"); this.expansionSetCode = "JUD"; - this.color.setBlack(true); // You may choose a card you own from outside the game and put it into your hand. You lose half your life, rounded up. Exile Death Wish. this.getSpellAbility().addEffect(new DeathWishEffect()); diff --git a/Mage.Sets/src/mage/sets/judgment/EarsplittingRats.java b/Mage.Sets/src/mage/sets/judgment/EarsplittingRats.java index 5f656478e5e..1d1b3a5c82a 100644 --- a/Mage.Sets/src/mage/sets/judgment/EarsplittingRats.java +++ b/Mage.Sets/src/mage/sets/judgment/EarsplittingRats.java @@ -51,7 +51,6 @@ public class EarsplittingRats extends CardImpl { this.expansionSetCode = "JUD"; 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/judgment/ElephantGuide.java b/Mage.Sets/src/mage/sets/judgment/ElephantGuide.java index 54bb90f0bc4..3f94d9905ee 100644 --- a/Mage.Sets/src/mage/sets/judgment/ElephantGuide.java +++ b/Mage.Sets/src/mage/sets/judgment/ElephantGuide.java @@ -56,7 +56,6 @@ public class ElephantGuide extends CardImpl { this.expansionSetCode = "JUD"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/judgment/Envelop.java b/Mage.Sets/src/mage/sets/judgment/Envelop.java index cee58226d86..7a522b74895 100644 --- a/Mage.Sets/src/mage/sets/judgment/Envelop.java +++ b/Mage.Sets/src/mage/sets/judgment/Envelop.java @@ -52,7 +52,6 @@ public class Envelop extends CardImpl { super(ownerId, 39, "Envelop", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "JUD"; - this.color.setBlue(true); // Counter target sorcery spell. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/judgment/ErhnamDjinn.java b/Mage.Sets/src/mage/sets/judgment/ErhnamDjinn.java index 384c0c7563b..29da0bee89b 100644 --- a/Mage.Sets/src/mage/sets/judgment/ErhnamDjinn.java +++ b/Mage.Sets/src/mage/sets/judgment/ErhnamDjinn.java @@ -63,7 +63,6 @@ public class ErhnamDjinn extends CardImpl { this.expansionSetCode = "JUD"; this.subtype.add("Djinn"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/judgment/Filth.java b/Mage.Sets/src/mage/sets/judgment/Filth.java index 8ddf79501e3..6f634a4be63 100644 --- a/Mage.Sets/src/mage/sets/judgment/Filth.java +++ b/Mage.Sets/src/mage/sets/judgment/Filth.java @@ -65,7 +65,6 @@ public class Filth extends CardImpl { this.expansionSetCode = "JUD"; this.subtype.add("Incarnation"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/judgment/FlaringPain.java b/Mage.Sets/src/mage/sets/judgment/FlaringPain.java index 656a1c26f60..6b91ffa2000 100644 --- a/Mage.Sets/src/mage/sets/judgment/FlaringPain.java +++ b/Mage.Sets/src/mage/sets/judgment/FlaringPain.java @@ -51,7 +51,6 @@ public class FlaringPain extends CardImpl { super(ownerId, 89, "Flaring Pain", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "JUD"; - this.color.setRed(true); // Damage can't be prevented this turn. this.getSpellAbility().addEffect(new DamageCantBePreventedEffect()); diff --git a/Mage.Sets/src/mage/sets/judgment/FlashOfInsight.java b/Mage.Sets/src/mage/sets/judgment/FlashOfInsight.java index 9f9f8c89fb8..421391c7998 100644 --- a/Mage.Sets/src/mage/sets/judgment/FlashOfInsight.java +++ b/Mage.Sets/src/mage/sets/judgment/FlashOfInsight.java @@ -66,7 +66,6 @@ public class FlashOfInsight extends CardImpl { super(ownerId, 40, "Flash of Insight", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{1}{U}"); this.expansionSetCode = "JUD"; - this.color.setBlue(true); // Look at the top X 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 FlashOfInsightEffect()); diff --git a/Mage.Sets/src/mage/sets/judgment/Genesis.java b/Mage.Sets/src/mage/sets/judgment/Genesis.java index 9c70bbb7ecc..6a7c31f03a4 100644 --- a/Mage.Sets/src/mage/sets/judgment/Genesis.java +++ b/Mage.Sets/src/mage/sets/judgment/Genesis.java @@ -54,7 +54,6 @@ public class Genesis extends CardImpl { this.expansionSetCode = "JUD"; this.subtype.add("Incarnation"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/judgment/GiantWarthog.java b/Mage.Sets/src/mage/sets/judgment/GiantWarthog.java index d8600d354f9..a3436c4366c 100644 --- a/Mage.Sets/src/mage/sets/judgment/GiantWarthog.java +++ b/Mage.Sets/src/mage/sets/judgment/GiantWarthog.java @@ -46,7 +46,6 @@ public class GiantWarthog extends CardImpl { this.subtype.add("Boar"); 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/judgment/GoldenWish.java b/Mage.Sets/src/mage/sets/judgment/GoldenWish.java index 3a62df024bd..6d701bd779f 100644 --- a/Mage.Sets/src/mage/sets/judgment/GoldenWish.java +++ b/Mage.Sets/src/mage/sets/judgment/GoldenWish.java @@ -57,7 +57,6 @@ public class GoldenWish extends CardImpl { super(ownerId, 12, "Golden Wish", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{W}{W}"); this.expansionSetCode = "JUD"; - this.color.setWhite(true); // You may choose an artifact or enchantment card you own from outside the game, reveal that card, and put it into your hand. Exile Golden Wish. this.getSpellAbility().addEffect(new GoldenWishEffect()); diff --git a/Mage.Sets/src/mage/sets/judgment/GoretuskFirebeast.java b/Mage.Sets/src/mage/sets/judgment/GoretuskFirebeast.java index 46e88fe45bf..fbe48470e65 100644 --- a/Mage.Sets/src/mage/sets/judgment/GoretuskFirebeast.java +++ b/Mage.Sets/src/mage/sets/judgment/GoretuskFirebeast.java @@ -50,7 +50,6 @@ public class GoretuskFirebeast extends CardImpl { this.subtype.add("Boar"); 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/judgment/GrizzlyFate.java b/Mage.Sets/src/mage/sets/judgment/GrizzlyFate.java index 0a6f5633e24..1c9daf18a91 100644 --- a/Mage.Sets/src/mage/sets/judgment/GrizzlyFate.java +++ b/Mage.Sets/src/mage/sets/judgment/GrizzlyFate.java @@ -50,7 +50,6 @@ public class GrizzlyFate extends CardImpl { super(ownerId, 119, "Grizzly Fate", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); this.expansionSetCode = "JUD"; - this.color.setGreen(true); // Put two 2/2 green Bear creature tokens onto the battlefield. // Threshold - Put four 2/2 green Bear creature tokens onto the battlefield instead if seven or more cards are in your graveyard. diff --git a/Mage.Sets/src/mage/sets/judgment/HaplessResearcher.java b/Mage.Sets/src/mage/sets/judgment/HaplessResearcher.java index 4080480673f..17951e2be82 100644 --- a/Mage.Sets/src/mage/sets/judgment/HaplessResearcher.java +++ b/Mage.Sets/src/mage/sets/judgment/HaplessResearcher.java @@ -49,7 +49,6 @@ public class HaplessResearcher 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/judgment/KeepWatch.java b/Mage.Sets/src/mage/sets/judgment/KeepWatch.java index 7d34e6bb5e1..dc24fb36cf9 100644 --- a/Mage.Sets/src/mage/sets/judgment/KeepWatch.java +++ b/Mage.Sets/src/mage/sets/judgment/KeepWatch.java @@ -44,7 +44,6 @@ public class KeepWatch extends CardImpl { super(ownerId, 43, "Keep Watch", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "JUD"; - this.color.setBlue(true); // Draw a card for each attacking creature. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(new AttackingCreatureCount())); diff --git a/Mage.Sets/src/mage/sets/judgment/LivingWish.java b/Mage.Sets/src/mage/sets/judgment/LivingWish.java index 1bca9e2ae31..3f83b6ef145 100644 --- a/Mage.Sets/src/mage/sets/judgment/LivingWish.java +++ b/Mage.Sets/src/mage/sets/judgment/LivingWish.java @@ -57,7 +57,6 @@ public class LivingWish extends CardImpl { super(ownerId, 124, "Living Wish", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "JUD"; - this.color.setGreen(true); // You may choose a creature or land card you own from outside the game, reveal that card, and put it into your hand. Exile Living Wish. this.getSpellAbility().addEffect(new LivingWishEffect()); diff --git a/Mage.Sets/src/mage/sets/judgment/MentalNote.java b/Mage.Sets/src/mage/sets/judgment/MentalNote.java index 7cedcaa500e..ae332b61e44 100644 --- a/Mage.Sets/src/mage/sets/judgment/MentalNote.java +++ b/Mage.Sets/src/mage/sets/judgment/MentalNote.java @@ -44,7 +44,6 @@ public class MentalNote extends CardImpl { super(ownerId, 46, "Mental Note", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "JUD"; - this.color.setBlue(true); // Put the top two cards of your library into your graveyard. this.getSpellAbility().addEffect(new PutTopCardOfLibraryIntoGraveControllerEffect(2)); diff --git a/Mage.Sets/src/mage/sets/judgment/MirarisWake.java b/Mage.Sets/src/mage/sets/judgment/MirarisWake.java index 044d254d5e2..c0dbc7a9af3 100644 --- a/Mage.Sets/src/mage/sets/judgment/MirarisWake.java +++ b/Mage.Sets/src/mage/sets/judgment/MirarisWake.java @@ -50,8 +50,6 @@ public class MirarisWake extends CardImpl { super(ownerId, 139, "Mirari's Wake", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}{W}"); this.expansionSetCode = "JUD"; - this.color.setGreen(true); - 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/judgment/PhantomNomad.java b/Mage.Sets/src/mage/sets/judgment/PhantomNomad.java index 5b217596838..d2824d5319d 100644 --- a/Mage.Sets/src/mage/sets/judgment/PhantomNomad.java +++ b/Mage.Sets/src/mage/sets/judgment/PhantomNomad.java @@ -58,7 +58,6 @@ public class PhantomNomad extends CardImpl { this.subtype.add("Spirit"); this.subtype.add("Nomad"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/judgment/QuietSpeculation.java b/Mage.Sets/src/mage/sets/judgment/QuietSpeculation.java index 655b1197296..a5dff4aa08e 100644 --- a/Mage.Sets/src/mage/sets/judgment/QuietSpeculation.java +++ b/Mage.Sets/src/mage/sets/judgment/QuietSpeculation.java @@ -64,7 +64,6 @@ public class QuietSpeculation extends CardImpl { super(ownerId, 49, "Quiet Speculation", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{U}"); this.expansionSetCode = "JUD"; - this.color.setBlue(true); // Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles his or her library. TargetCardInLibrary target = new TargetCardInLibrary(0, 3, filterCard); diff --git a/Mage.Sets/src/mage/sets/judgment/SolitaryConfinement.java b/Mage.Sets/src/mage/sets/judgment/SolitaryConfinement.java index 62fd3a65072..c7435e2543d 100644 --- a/Mage.Sets/src/mage/sets/judgment/SolitaryConfinement.java +++ b/Mage.Sets/src/mage/sets/judgment/SolitaryConfinement.java @@ -54,7 +54,6 @@ public class SolitaryConfinement extends CardImpl { super(ownerId, 24, "Solitary Confinement", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "JUD"; - this.color.setWhite(true); // At the beginning of your upkeep, sacrifice Solitary Confinement unless you discard a card. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new DiscardTargetCost(new TargetCardInHand())), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/judgment/SuddenStrength.java b/Mage.Sets/src/mage/sets/judgment/SuddenStrength.java index cc7028b2b33..ff146477061 100644 --- a/Mage.Sets/src/mage/sets/judgment/SuddenStrength.java +++ b/Mage.Sets/src/mage/sets/judgment/SuddenStrength.java @@ -46,7 +46,6 @@ public class SuddenStrength extends CardImpl { super(ownerId, 132, "Sudden Strength", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{G}"); this.expansionSetCode = "JUD"; - 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/judgment/SylvanSafekeeper.java b/Mage.Sets/src/mage/sets/judgment/SylvanSafekeeper.java index 9e70f6a2794..7f4da8c0574 100644 --- a/Mage.Sets/src/mage/sets/judgment/SylvanSafekeeper.java +++ b/Mage.Sets/src/mage/sets/judgment/SylvanSafekeeper.java @@ -55,7 +55,6 @@ public class SylvanSafekeeper extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/judgment/ThrissNantukoPrimus.java b/Mage.Sets/src/mage/sets/judgment/ThrissNantukoPrimus.java index da5fe509ed2..7b490e6caa6 100644 --- a/Mage.Sets/src/mage/sets/judgment/ThrissNantukoPrimus.java +++ b/Mage.Sets/src/mage/sets/judgment/ThrissNantukoPrimus.java @@ -53,7 +53,6 @@ public class ThrissNantukoPrimus extends CardImpl { this.subtype.add("Insect"); this.subtype.add("Druid"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/judgment/UnquestionedAuthority.java b/Mage.Sets/src/mage/sets/judgment/UnquestionedAuthority.java index 77b1615618a..f073324bde7 100644 --- a/Mage.Sets/src/mage/sets/judgment/UnquestionedAuthority.java +++ b/Mage.Sets/src/mage/sets/judgment/UnquestionedAuthority.java @@ -59,7 +59,6 @@ public class UnquestionedAuthority extends CardImpl { this.expansionSetCode = "JUD"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/judgment/Valor.java b/Mage.Sets/src/mage/sets/judgment/Valor.java index 0f8b9e189f6..556d33ccb17 100644 --- a/Mage.Sets/src/mage/sets/judgment/Valor.java +++ b/Mage.Sets/src/mage/sets/judgment/Valor.java @@ -65,7 +65,6 @@ public class Valor extends CardImpl { this.expansionSetCode = "JUD"; this.subtype.add("Incarnation"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/judgment/Wonder.java b/Mage.Sets/src/mage/sets/judgment/Wonder.java index 291d7745c81..14b2a876c4e 100644 --- a/Mage.Sets/src/mage/sets/judgment/Wonder.java +++ b/Mage.Sets/src/mage/sets/judgment/Wonder.java @@ -66,7 +66,6 @@ public class Wonder extends CardImpl { this.expansionSetCode = "JUD"; this.subtype.add("Incarnation"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/judgment/WorldgorgerDragon.java b/Mage.Sets/src/mage/sets/judgment/WorldgorgerDragon.java index 9faac36e7f0..131c7a9395f 100644 --- a/Mage.Sets/src/mage/sets/judgment/WorldgorgerDragon.java +++ b/Mage.Sets/src/mage/sets/judgment/WorldgorgerDragon.java @@ -64,7 +64,6 @@ public class WorldgorgerDragon extends CardImpl { this.subtype.add("Nightmare"); this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/AbominationOfGudul.java b/Mage.Sets/src/mage/sets/khansoftarkir/AbominationOfGudul.java index acfd85f3325..f2bc41adc4d 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/AbominationOfGudul.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/AbominationOfGudul.java @@ -50,9 +50,6 @@ public class AbominationOfGudul extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Horror"); - this.color.setBlue(true); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/AbzanAscendancy.java b/Mage.Sets/src/mage/sets/khansoftarkir/AbzanAscendancy.java index ab45b58498c..f1e1c4a4cb6 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/AbzanAscendancy.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/AbzanAscendancy.java @@ -61,9 +61,6 @@ public class AbzanAscendancy extends CardImpl { super(ownerId, 160, "Abzan Ascendancy", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{W}{B}{G}"); this.expansionSetCode = "KTK"; - this.color.setGreen(true); - this.color.setBlack(true); - this.color.setWhite(true); // When Abzan Ascendancy enters the battlefield, put a +1/+1 counter on each creature you control. this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), new FilterControlledCreaturePermanent()), false)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/AbzanBattlePriest.java b/Mage.Sets/src/mage/sets/khansoftarkir/AbzanBattlePriest.java index 285a1299761..234cdae7f73 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/AbzanBattlePriest.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/AbzanBattlePriest.java @@ -67,7 +67,6 @@ public class AbzanBattlePriest extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/AbzanCharm.java b/Mage.Sets/src/mage/sets/khansoftarkir/AbzanCharm.java index 4267cbac8ca..8294c22e25f 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/AbzanCharm.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/AbzanCharm.java @@ -64,9 +64,6 @@ public class AbzanCharm extends CardImpl { super(ownerId, 161, "Abzan Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}{B}{G}"); this.expansionSetCode = "KTK"; - this.color.setGreen(true); - this.color.setBlack(true); - this.color.setWhite(true); // Choose one - // *Exile target creature with power 3 or greater diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/AbzanFalconer.java b/Mage.Sets/src/mage/sets/khansoftarkir/AbzanFalconer.java index 3bdaeae7377..5ff19a0591b 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/AbzanFalconer.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/AbzanFalconer.java @@ -66,7 +66,6 @@ public class AbzanFalconer 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/khansoftarkir/AbzanGuide.java b/Mage.Sets/src/mage/sets/khansoftarkir/AbzanGuide.java index 770986373e8..afc264a7a27 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/AbzanGuide.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/AbzanGuide.java @@ -48,9 +48,6 @@ public class AbzanGuide extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setGreen(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/khansoftarkir/AinokBondKin.java b/Mage.Sets/src/mage/sets/khansoftarkir/AinokBondKin.java index fdb625d9df3..2d4da282eb4 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/AinokBondKin.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/AinokBondKin.java @@ -68,7 +68,6 @@ public class AinokBondKin extends CardImpl { this.subtype.add("Hound"); 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/khansoftarkir/AinokTracker.java b/Mage.Sets/src/mage/sets/khansoftarkir/AinokTracker.java index 76856425343..250536b4339 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/AinokTracker.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/AinokTracker.java @@ -48,7 +48,6 @@ public class AinokTracker extends CardImpl { this.subtype.add("Hound"); 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/khansoftarkir/AlabasterKirin.java b/Mage.Sets/src/mage/sets/khansoftarkir/AlabasterKirin.java index 8dc8de04a6e..369f3c1c2b9 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/AlabasterKirin.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/AlabasterKirin.java @@ -46,7 +46,6 @@ public class AlabasterKirin extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Kirin"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/AlpineGrizzly.java b/Mage.Sets/src/mage/sets/khansoftarkir/AlpineGrizzly.java index 935528598a9..3b9d7a407bc 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/AlpineGrizzly.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/AlpineGrizzly.java @@ -44,7 +44,6 @@ public class AlpineGrizzly extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Bear"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/AnkleShanker.java b/Mage.Sets/src/mage/sets/khansoftarkir/AnkleShanker.java index 71946ca9399..df46fcebeec 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/AnkleShanker.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/AnkleShanker.java @@ -57,9 +57,6 @@ public class AnkleShanker extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Berserker"); - this.color.setRed(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/khansoftarkir/ArchersParapet.java b/Mage.Sets/src/mage/sets/khansoftarkir/ArchersParapet.java index 4344aab3c9b..ad740ba623e 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/ArchersParapet.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/ArchersParapet.java @@ -51,7 +51,6 @@ public class ArchersParapet extends CardImpl { this.expansionSetCode = "KTK"; 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/khansoftarkir/ArmamentCorps.java b/Mage.Sets/src/mage/sets/khansoftarkir/ArmamentCorps.java index c0cce18210a..66e27e47e9a 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/ArmamentCorps.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/ArmamentCorps.java @@ -54,9 +54,6 @@ public class ArmamentCorps extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setGreen(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/khansoftarkir/ArrowStorm.java b/Mage.Sets/src/mage/sets/khansoftarkir/ArrowStorm.java index 85ab14724f9..f0e161b8b6e 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/ArrowStorm.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/ArrowStorm.java @@ -48,7 +48,6 @@ public class ArrowStorm extends CardImpl { super(ownerId, 98, "Arrow Storm", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); // Arrow Storm deals 4 damage to target creature or player. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/AvalancheTusker.java b/Mage.Sets/src/mage/sets/khansoftarkir/AvalancheTusker.java index 26cb95683d3..7801d64b73b 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/AvalancheTusker.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/AvalancheTusker.java @@ -54,9 +54,6 @@ public class AvalancheTusker extends CardImpl { this.subtype.add("Elephant"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/AwakenTheBear.java b/Mage.Sets/src/mage/sets/khansoftarkir/AwakenTheBear.java index 868d486a261..fd6077817b3 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/AwakenTheBear.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/AwakenTheBear.java @@ -48,7 +48,6 @@ public class AwakenTheBear extends CardImpl { super(ownerId, 129, "Awaken the Bear", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "KTK"; - this.color.setGreen(true); // Target creature gets +3/+3 and gains trample until end of turn Effect effect = new BoostTargetEffect(3, 3, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/BarrageOfBoulders.java b/Mage.Sets/src/mage/sets/khansoftarkir/BarrageOfBoulders.java index e04932a486f..109f30af424 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/BarrageOfBoulders.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/BarrageOfBoulders.java @@ -58,7 +58,6 @@ public class BarrageOfBoulders extends CardImpl { super(ownerId, 100, "Barrage of Boulders", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); // Barrage of Boulders deals 1 damage to each creature you don't control. this.getSpellAbility().addEffect(new DamageAllEffect(1, filter)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/BearsCompanion.java b/Mage.Sets/src/mage/sets/khansoftarkir/BearsCompanion.java index 8b824435336..2dc51d7c4c3 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/BearsCompanion.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/BearsCompanion.java @@ -48,9 +48,6 @@ public class BearsCompanion extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/BecomeImmense.java b/Mage.Sets/src/mage/sets/khansoftarkir/BecomeImmense.java index ab15e35e87b..bb4a2bf6436 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/BecomeImmense.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/BecomeImmense.java @@ -46,7 +46,6 @@ public class BecomeImmense extends CardImpl { super(ownerId, 130, "Become Immense", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{5}{G}"); this.expansionSetCode = "KTK"; - this.color.setGreen(true); // Delve this.addAbility(new DelveAbility()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/BellowingSaddlebrute.java b/Mage.Sets/src/mage/sets/khansoftarkir/BellowingSaddlebrute.java index cd27fae968f..640c5395532 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/BellowingSaddlebrute.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/BellowingSaddlebrute.java @@ -51,7 +51,6 @@ public class BellowingSaddlebrute extends CardImpl { this.subtype.add("Orc"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/BitterRevelation.java b/Mage.Sets/src/mage/sets/khansoftarkir/BitterRevelation.java index 5a0557d2efd..0c858075ea0 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/BitterRevelation.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/BitterRevelation.java @@ -54,7 +54,6 @@ public class BitterRevelation extends CardImpl { super(ownerId, 65, "Bitter Revelation", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "KTK"; - this.color.setBlack(true); // Look at the top four cards of your library. Put two of them into your hand and the rest into your graveyard. You lose 2 life. this.getSpellAbility().addEffect(new BitterRevelationEffect()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/BlindingSpray.java b/Mage.Sets/src/mage/sets/khansoftarkir/BlindingSpray.java index d4790321b91..8d7b549a198 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/BlindingSpray.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/BlindingSpray.java @@ -54,7 +54,6 @@ public class BlindingSpray extends CardImpl { super(ownerId, 32, "Blinding Spray", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{U}"); this.expansionSetCode = "KTK"; - this.color.setBlue(true); // Creatures your opponents control get -4/-0 until end of turn. this.getSpellAbility().addEffect(new BoostAllEffect(-4, 0, Duration.EndOfTurn, filter, false)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/BloodfireExpert.java b/Mage.Sets/src/mage/sets/khansoftarkir/BloodfireExpert.java index ca313602225..a341867277d 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/BloodfireExpert.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/BloodfireExpert.java @@ -46,7 +46,6 @@ public class BloodfireExpert extends CardImpl { this.subtype.add("Efreet"); this.subtype.add("Monk"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/BloodfireMentor.java b/Mage.Sets/src/mage/sets/khansoftarkir/BloodfireMentor.java index 5ffb130cd15..510eb26444f 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/BloodfireMentor.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/BloodfireMentor.java @@ -51,7 +51,6 @@ public class BloodfireMentor extends CardImpl { this.subtype.add("Efreet"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/BloodsoakedChampion.java b/Mage.Sets/src/mage/sets/khansoftarkir/BloodsoakedChampion.java index 80932c85023..d1f817295aa 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/BloodsoakedChampion.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/BloodsoakedChampion.java @@ -53,7 +53,6 @@ public class BloodsoakedChampion 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/khansoftarkir/BraveTheSands.java b/Mage.Sets/src/mage/sets/khansoftarkir/BraveTheSands.java index 063de1d9d98..3c0d2128304 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/BraveTheSands.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/BraveTheSands.java @@ -49,7 +49,6 @@ public class BraveTheSands extends CardImpl { super(ownerId, 5, "Brave the Sands", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "KTK"; - 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/khansoftarkir/BringLow.java b/Mage.Sets/src/mage/sets/khansoftarkir/BringLow.java index 37ad5e63883..f53c051c995 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/BringLow.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/BringLow.java @@ -50,7 +50,6 @@ public class BringLow extends CardImpl { super(ownerId, 103, "Bring Low", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{R}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); // Bring Low deals 3 damage to target creature. If that creature has a +1/+1 counter on it, Bring Low deals 5 damage to it instead. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/BurnAway.java b/Mage.Sets/src/mage/sets/khansoftarkir/BurnAway.java index 2162a8bc805..31fd65bff71 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/BurnAway.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/BurnAway.java @@ -55,7 +55,6 @@ public class BurnAway extends CardImpl { super(ownerId, 104, "Burn Away", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{R}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); // Burn Away deals 6 damage to target creature. When that creature dies this turn, exile all cards from its controller's graveyard. this.getSpellAbility().addEffect(new DamageTargetEffect(6)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/ButcherOfTheHorde.java b/Mage.Sets/src/mage/sets/khansoftarkir/ButcherOfTheHorde.java index 3d18f486f8e..d24de33f7a5 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/ButcherOfTheHorde.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/ButcherOfTheHorde.java @@ -73,9 +73,6 @@ public class ButcherOfTheHorde extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Demon"); - this.color.setRed(true); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/CanyonLurkers.java b/Mage.Sets/src/mage/sets/khansoftarkir/CanyonLurkers.java index aa65c42bfd7..cba6ab05f06 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/CanyonLurkers.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/CanyonLurkers.java @@ -47,7 +47,6 @@ public class CanyonLurkers extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/ChiefOfTheEdge.java b/Mage.Sets/src/mage/sets/khansoftarkir/ChiefOfTheEdge.java index 4805654b3fe..d0dc8cc3e7b 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/ChiefOfTheEdge.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/ChiefOfTheEdge.java @@ -57,8 +57,6 @@ public class ChiefOfTheEdge extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/ChiefOfTheScale.java b/Mage.Sets/src/mage/sets/khansoftarkir/ChiefOfTheScale.java index d755de07676..adc9a6d6b85 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/ChiefOfTheScale.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/ChiefOfTheScale.java @@ -57,8 +57,6 @@ public class ChiefOfTheScale extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/CleverImpersonator.java b/Mage.Sets/src/mage/sets/khansoftarkir/CleverImpersonator.java index fdc6412b1ee..2e0cc1e3a3f 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/CleverImpersonator.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/CleverImpersonator.java @@ -49,7 +49,6 @@ public class CleverImpersonator extends CardImpl { this.expansionSetCode = "KTK"; 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/khansoftarkir/CracklingDoom.java b/Mage.Sets/src/mage/sets/khansoftarkir/CracklingDoom.java index 8dc7fc83f07..39d2fb0fadd 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/CracklingDoom.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/CracklingDoom.java @@ -57,9 +57,6 @@ public class CracklingDoom extends CardImpl { super(ownerId, 171, "Crackling Doom", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{R}{W}{B}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); - this.color.setBlack(true); - this.color.setWhite(true); // Crackling Doom deals 2 damage to each opponent. Each opponent sacrifices a creature with the greatest power among creatures he or she controls. this.getSpellAbility().addEffect(new DamagePlayersEffect(2, TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/DazzlingRamparts.java b/Mage.Sets/src/mage/sets/khansoftarkir/DazzlingRamparts.java index dc0a9e87cd1..e50aca96487 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/DazzlingRamparts.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/DazzlingRamparts.java @@ -52,7 +52,6 @@ public class DazzlingRamparts extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Wall"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/DeadDrop.java b/Mage.Sets/src/mage/sets/khansoftarkir/DeadDrop.java index e4e0fd7dd0b..67b4f228053 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/DeadDrop.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/DeadDrop.java @@ -46,7 +46,6 @@ public class DeadDrop extends CardImpl { super(ownerId, 67, "Dead Drop", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{9}{B}"); this.expansionSetCode = "KTK"; - this.color.setBlack(true); // Delve this.addAbility(new DelveAbility()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/DeathFrenzy.java b/Mage.Sets/src/mage/sets/khansoftarkir/DeathFrenzy.java index f50bc02d626..79fe7c6df26 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/DeathFrenzy.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/DeathFrenzy.java @@ -51,8 +51,6 @@ public class DeathFrenzy extends CardImpl { super(ownerId, 172, "Death Frenzy", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{G}"); this.expansionSetCode = "KTK"; - this.color.setGreen(true); - this.color.setBlack(true); // All creatures get -2/-2 until end of turn. Whenever a creature dies this turn, you gain 1 life. this.getSpellAbility().addEffect(new BoostAllEffect(-2, -2, Duration.EndOfTurn, new FilterCreaturePermanent("All creatures"), false)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/DebilitatingInjury.java b/Mage.Sets/src/mage/sets/khansoftarkir/DebilitatingInjury.java index a354f6cc375..4ebf3cbf328 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/DebilitatingInjury.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/DebilitatingInjury.java @@ -53,7 +53,6 @@ public class DebilitatingInjury extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/DefiantStrike.java b/Mage.Sets/src/mage/sets/khansoftarkir/DefiantStrike.java index 7444e496c2f..e68bbfd651a 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/DefiantStrike.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/DefiantStrike.java @@ -47,7 +47,6 @@ public class DefiantStrike extends CardImpl { super(ownerId, 7, "Defiant Strike", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "KTK"; - this.color.setWhite(true); // Target creature gets +1/+0 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/DeflectingPalm.java b/Mage.Sets/src/mage/sets/khansoftarkir/DeflectingPalm.java index 3dac8bfcc67..a3a55908669 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/DeflectingPalm.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/DeflectingPalm.java @@ -54,8 +54,6 @@ public class DeflectingPalm extends CardImpl { super(ownerId, 173, "Deflecting Palm", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{R}{W}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); - this.color.setWhite(true); // The next time a source of your choice would deal damage to you this turn, prevent that damage. If damage is prevented this way, Deflecting Palm deals that much damage to that source's controller. this.getSpellAbility().addEffect(new DeflectingPalmEffect()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/DigThroughTime.java b/Mage.Sets/src/mage/sets/khansoftarkir/DigThroughTime.java index 11985e68db2..8903dd81fe5 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/DigThroughTime.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/DigThroughTime.java @@ -47,7 +47,6 @@ public class DigThroughTime extends CardImpl { super(ownerId, 36, "Dig Through Time", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{6}{U}{U}"); this.expansionSetCode = "KTK"; - this.color.setBlue(true); // Delve this.addAbility(new DelveAbility()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/DisdainfulStroke.java b/Mage.Sets/src/mage/sets/khansoftarkir/DisdainfulStroke.java index 1670b93085c..c9b20dbab60 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/DisdainfulStroke.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/DisdainfulStroke.java @@ -52,7 +52,6 @@ public class DisdainfulStroke extends CardImpl { super(ownerId, 37, "Disdainful Stroke", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "KTK"; - this.color.setBlue(true); // Counter target spell with converted mana cost 4 or greater. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/DisownedAncestor.java b/Mage.Sets/src/mage/sets/khansoftarkir/DisownedAncestor.java index 3da5778dfb5..93a3943b9e8 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/DisownedAncestor.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/DisownedAncestor.java @@ -47,7 +47,6 @@ public class DisownedAncestor extends CardImpl { this.subtype.add("Spirit"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/DragonGrip.java b/Mage.Sets/src/mage/sets/khansoftarkir/DragonGrip.java index daeee25b8e8..e3d6b782778 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/DragonGrip.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/DragonGrip.java @@ -61,7 +61,6 @@ public class DragonGrip extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Aura"); - this.color.setRed(true); // Ferocious - If you control a creature with power 4 or greater, you may cast Dragon Grip as though it had flash. AsThoughEffect effect = new CastAsThoughItHadFlashSourceEffect(Duration.EndOfGame); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/DragonStyleTwins.java b/Mage.Sets/src/mage/sets/khansoftarkir/DragonStyleTwins.java index cb7d98f6121..1d2fd6b5588 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/DragonStyleTwins.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/DragonStyleTwins.java @@ -47,7 +47,6 @@ public class DragonStyleTwins extends CardImpl { this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/DragonsEyeSavants.java b/Mage.Sets/src/mage/sets/khansoftarkir/DragonsEyeSavants.java index 19712ad2993..34708b6e9ea 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/DragonsEyeSavants.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/DragonsEyeSavants.java @@ -61,7 +61,6 @@ public class DragonsEyeSavants extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/DragonscaleBoon.java b/Mage.Sets/src/mage/sets/khansoftarkir/DragonscaleBoon.java index 574703c333b..0d92cf06e43 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/DragonscaleBoon.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/DragonscaleBoon.java @@ -47,7 +47,6 @@ public class DragonscaleBoon extends CardImpl { super(ownerId, 131, "Dragonscale Boon", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{G}"); this.expansionSetCode = "KTK"; - this.color.setGreen(true); // Put two +1/+1 counters on target creature and untap it this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance(2))); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/Duneblast.java b/Mage.Sets/src/mage/sets/khansoftarkir/Duneblast.java index 80e933b7522..34d4495c712 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/Duneblast.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/Duneblast.java @@ -51,9 +51,6 @@ public class Duneblast extends CardImpl { super(ownerId, 174, "Duneblast", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{W}{G}{B}"); this.expansionSetCode = "KTK"; - this.color.setBlack(true); - this.color.setGreen(true); - this.color.setWhite(true); // Choose up to one creature. Destroy the rest. this.getSpellAbility().addEffect(new DuneblastEffect()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/DutifulReturn.java b/Mage.Sets/src/mage/sets/khansoftarkir/DutifulReturn.java index deceb692327..8a3dd4b3da0 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/DutifulReturn.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/DutifulReturn.java @@ -45,7 +45,6 @@ public class DutifulReturn extends CardImpl { super(ownerId, 71, "Dutiful Return", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "KTK"; - 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/khansoftarkir/EfreetWeaponmaster.java b/Mage.Sets/src/mage/sets/khansoftarkir/EfreetWeaponmaster.java index cae5e775c3f..18ddd026920 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/EfreetWeaponmaster.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/EfreetWeaponmaster.java @@ -59,9 +59,6 @@ public class EfreetWeaponmaster extends CardImpl { this.subtype.add("Efreet"); this.subtype.add("Monk"); - this.color.setRed(true); - 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/khansoftarkir/EmbodimentOfSpring.java b/Mage.Sets/src/mage/sets/khansoftarkir/EmbodimentOfSpring.java index 48440e53c46..f4176040a3a 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/EmbodimentOfSpring.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/EmbodimentOfSpring.java @@ -52,7 +52,6 @@ public class EmbodimentOfSpring extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/EmptyThePits.java b/Mage.Sets/src/mage/sets/khansoftarkir/EmptyThePits.java index e3e2851bdf6..242f7104d07 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/EmptyThePits.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/EmptyThePits.java @@ -46,7 +46,6 @@ public class EmptyThePits extends CardImpl { super(ownerId, 72, "Empty the Pits", Rarity.MYTHIC, new CardType[]{CardType.INSTANT}, "{X}{X}{B}{B}{B}{B}"); this.expansionSetCode = "KTK"; - this.color.setBlack(true); // Delve this.addAbility(new DelveAbility()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/EndHostilities.java b/Mage.Sets/src/mage/sets/khansoftarkir/EndHostilities.java index 367e11be39c..cb0e8dd9469 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/EndHostilities.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/EndHostilities.java @@ -49,7 +49,6 @@ public class EndHostilities extends CardImpl { super(ownerId, 8, "End Hostilities", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{W}{W}"); this.expansionSetCode = "KTK"; - this.color.setWhite(true); // Destroy all creatures and all permanents attached to creatures. this.getSpellAbility().addEffect(new EndHostilitiesEffect()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/FeatOfResistance.java b/Mage.Sets/src/mage/sets/khansoftarkir/FeatOfResistance.java index 172c51de0df..b56bf6c6c50 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/FeatOfResistance.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/FeatOfResistance.java @@ -48,7 +48,6 @@ public class FeatOfResistance extends CardImpl { super(ownerId, 10, "Feat of Resistance", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "KTK"; - this.color.setWhite(true); // Put a +1/+1 counter on target creature you control. It gains protection from the color of your choice until end of turn. this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/FirehoofCavalry.java b/Mage.Sets/src/mage/sets/khansoftarkir/FirehoofCavalry.java index 9e3e984661e..d1d77f4a808 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/FirehoofCavalry.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/FirehoofCavalry.java @@ -54,7 +54,6 @@ public class FirehoofCavalry extends CardImpl { this.subtype.add("Human"); this.subtype.add("Berserker"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/FlyingCraneTechnique.java b/Mage.Sets/src/mage/sets/khansoftarkir/FlyingCraneTechnique.java index 6a4c2e8a666..a8247c78cc3 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/FlyingCraneTechnique.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/FlyingCraneTechnique.java @@ -49,9 +49,6 @@ public class FlyingCraneTechnique extends CardImpl { super(ownerId, 176, "Flying Crane Technique", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}{R}{W}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); - this.color.setBlue(true); - this.color.setWhite(true); // Untap all creatures you control. They gain flying and double strike until end of turn. FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures"); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/GlacialStalker.java b/Mage.Sets/src/mage/sets/khansoftarkir/GlacialStalker.java index c5e93fb9f46..980da6f4f08 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/GlacialStalker.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/GlacialStalker.java @@ -46,7 +46,6 @@ public class GlacialStalker extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/Goblinslide.java b/Mage.Sets/src/mage/sets/khansoftarkir/Goblinslide.java index 71f60987189..1effee12c3a 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/Goblinslide.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/Goblinslide.java @@ -58,7 +58,6 @@ public class Goblinslide extends CardImpl { super(ownerId, 109, "Goblinslide", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); // Whenever you cast a noncreature spell, you may pay {1}. If you do, put a 1/1 red Goblin creature token with haste onto the battlefield. this.addAbility(new SpellCastControllerTriggeredAbility(new DoIfCostPaid(new CreateTokenEffect(new GoblinslideGoblinToken()), new GenericManaCost(1)), filter, false)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/GrimHaruspex.java b/Mage.Sets/src/mage/sets/khansoftarkir/GrimHaruspex.java index 6ba3f7031a7..cc1af9622b0 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/GrimHaruspex.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/GrimHaruspex.java @@ -63,7 +63,6 @@ public class GrimHaruspex extends CardImpl { this.subtype.add("Human"); 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/khansoftarkir/GurmagSwiftwing.java b/Mage.Sets/src/mage/sets/khansoftarkir/GurmagSwiftwing.java index c5f0ae56624..89324025c37 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/GurmagSwiftwing.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/GurmagSwiftwing.java @@ -47,7 +47,6 @@ public class GurmagSwiftwing extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Bat"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/HardenedScales.java b/Mage.Sets/src/mage/sets/khansoftarkir/HardenedScales.java index fc97f226593..3ecbf0b73e9 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/HardenedScales.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/HardenedScales.java @@ -53,7 +53,6 @@ public class HardenedScales extends CardImpl { super(ownerId, 133, "Hardened Scales", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "KTK"; - this.color.setGreen(true); // If one or more +1/+1 counters would be placed on a creature you control, that many plus one +1/+1 counters are placed on it instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HardenedScalesEffect())); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/HeirOfTheWilds.java b/Mage.Sets/src/mage/sets/khansoftarkir/HeirOfTheWilds.java index 2fc592474ee..66ec9881a84 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/HeirOfTheWilds.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/HeirOfTheWilds.java @@ -52,7 +52,6 @@ public class HeirOfTheWilds 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/khansoftarkir/HeraldOfAnafenza.java b/Mage.Sets/src/mage/sets/khansoftarkir/HeraldOfAnafenza.java index b75afd4d4c2..d1383261c6f 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/HeraldOfAnafenza.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/HeraldOfAnafenza.java @@ -55,7 +55,6 @@ public class HeraldOfAnafenza 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/khansoftarkir/HighSentinelsOfArashin.java b/Mage.Sets/src/mage/sets/khansoftarkir/HighSentinelsOfArashin.java index 803275ee3e9..255a10960d1 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/HighSentinelsOfArashin.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/HighSentinelsOfArashin.java @@ -67,7 +67,6 @@ public class HighSentinelsOfArashin extends CardImpl { this.subtype.add("Bird"); 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/khansoftarkir/HighlandGame.java b/Mage.Sets/src/mage/sets/khansoftarkir/HighlandGame.java index bd4f5b0253e..3b0e4ac900c 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/HighlandGame.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/HighlandGame.java @@ -46,7 +46,6 @@ public class HighlandGame extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Elk"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/HighspireMantis.java b/Mage.Sets/src/mage/sets/khansoftarkir/HighspireMantis.java index 8efab842a9b..c97cb79f8c5 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/HighspireMantis.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/HighspireMantis.java @@ -46,8 +46,6 @@ public class HighspireMantis extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Insect"); - this.color.setRed(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/HoodedHydra.java b/Mage.Sets/src/mage/sets/khansoftarkir/HoodedHydra.java index c4762f87199..227068991af 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/HoodedHydra.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/HoodedHydra.java @@ -65,7 +65,6 @@ public class HoodedHydra extends CardImpl { this.subtype.add("Snake"); 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/khansoftarkir/HootingMandrills.java b/Mage.Sets/src/mage/sets/khansoftarkir/HootingMandrills.java index 35d48963b44..52a4d3723b9 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/HootingMandrills.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/HootingMandrills.java @@ -46,7 +46,6 @@ public class HootingMandrills extends CardImpl { this.expansionSetCode = "KTK"; 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/khansoftarkir/HordeAmbusher.java b/Mage.Sets/src/mage/sets/khansoftarkir/HordeAmbusher.java index ecc8febea6b..e2352896769 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/HordeAmbusher.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/HordeAmbusher.java @@ -64,7 +64,6 @@ public class HordeAmbusher extends CardImpl { this.subtype.add("Human"); 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/khansoftarkir/HordelingOutburst.java b/Mage.Sets/src/mage/sets/khansoftarkir/HordelingOutburst.java index f11b2a52c9a..663895c7925 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/HordelingOutburst.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/HordelingOutburst.java @@ -44,7 +44,6 @@ public class HordelingOutburst extends CardImpl { super(ownerId, 111, "Hordeling Outburst", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); // Put 3 1/1 red Goblin creature tokens onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new GoblinToken(expansionSetCode), 3)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/HowlOfTheHorde.java b/Mage.Sets/src/mage/sets/khansoftarkir/HowlOfTheHorde.java index f2c46a92407..7cb80467959 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/HowlOfTheHorde.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/HowlOfTheHorde.java @@ -54,7 +54,6 @@ public class HowlOfTheHorde extends CardImpl { super(ownerId, 112, "Howl of the Horde", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); // When you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy. Effect effect = new CreateDelayedTriggeredAbilityEffect(new HowlOfTheHordeDelayedTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/IcefeatherAven.java b/Mage.Sets/src/mage/sets/khansoftarkir/IcefeatherAven.java index 6071e276db7..cb92fe09558 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/IcefeatherAven.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/IcefeatherAven.java @@ -60,8 +60,6 @@ public class IcefeatherAven extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Shaman"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/IcyBlast.java b/Mage.Sets/src/mage/sets/khansoftarkir/IcyBlast.java index 754ed081a70..91cd8e0c7f3 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/IcyBlast.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/IcyBlast.java @@ -53,7 +53,6 @@ public class IcyBlast extends CardImpl { super(ownerId, 42, "Icy Blast", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{U}"); this.expansionSetCode = "KTK"; - this.color.setBlue(true); // Tap X target creatures. this.getSpellAbility().addEffect(new TapTargetEffect("X target creatures")); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/IvorytuskFortress.java b/Mage.Sets/src/mage/sets/khansoftarkir/IvorytuskFortress.java index c7a8b59906e..417015d1740 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/IvorytuskFortress.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/IvorytuskFortress.java @@ -56,9 +56,6 @@ public class IvorytuskFortress extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Elephant"); - this.color.setGreen(true); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/JeeringInstigator.java b/Mage.Sets/src/mage/sets/khansoftarkir/JeeringInstigator.java index b2a5ad0eaa6..eb12993a8a3 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/JeeringInstigator.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/JeeringInstigator.java @@ -65,7 +65,6 @@ public class JeeringInstigator 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/khansoftarkir/JeskaiAscendancy.java b/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiAscendancy.java index 59fc620725a..ed7bfaf4c27 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiAscendancy.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiAscendancy.java @@ -60,9 +60,6 @@ public class JeskaiAscendancy extends CardImpl { super(ownerId, 180, "Jeskai Ascendancy", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{U}{R}{W}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); - this.color.setBlue(true); - this.color.setWhite(true); // Whenever you cast a noncreature spell, creatures you control get +1/+1 until end of turn. Untap those creatures. Effect effect = new BoostControlledEffect(1,1,Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiCharm.java b/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiCharm.java index e3f468c7467..962fc0a4a7a 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiCharm.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiCharm.java @@ -53,9 +53,6 @@ public class JeskaiCharm extends CardImpl { super(ownerId, 181, "Jeskai Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}{R}{W}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); - this.color.setBlue(true); - this.color.setWhite(true); // Choose one - // - Put target creature on top of its owner's library. diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiElder.java b/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiElder.java index b19cfce3c16..80262877238 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiElder.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiElder.java @@ -49,7 +49,6 @@ public class JeskaiElder extends CardImpl { this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiStudent.java b/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiStudent.java index 5d00f047669..e97cc28e186 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiStudent.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiStudent.java @@ -46,7 +46,6 @@ public class JeskaiStudent extends CardImpl { this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiWindscout.java b/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiWindscout.java index cab05aeffc8..005560bd2ff 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiWindscout.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/JeskaiWindscout.java @@ -47,7 +47,6 @@ public class JeskaiWindscout extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Scout"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/KheruBloodsucker.java b/Mage.Sets/src/mage/sets/khansoftarkir/KheruBloodsucker.java index 16e9fe0651c..0ea2544bf0d 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/KheruBloodsucker.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/KheruBloodsucker.java @@ -73,7 +73,6 @@ public class KheruBloodsucker extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Vampire"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/KheruDreadmaw.java b/Mage.Sets/src/mage/sets/khansoftarkir/KheruDreadmaw.java index c6408538c53..ab7c0b0c99f 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/KheruDreadmaw.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/KheruDreadmaw.java @@ -63,7 +63,6 @@ public class KheruDreadmaw extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Crocodile"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/KheruLichLord.java b/Mage.Sets/src/mage/sets/khansoftarkir/KheruLichLord.java index 78a2ca07b8c..fa93f72f934 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/KheruLichLord.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/KheruLichLord.java @@ -73,9 +73,6 @@ public class KheruLichLord extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Wizard"); - this.color.setBlue(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/khansoftarkir/KheruSpellsnatcher.java b/Mage.Sets/src/mage/sets/khansoftarkir/KheruSpellsnatcher.java index 7f5cbbb6df3..c0f15ac9e3c 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/KheruSpellsnatcher.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/KheruSpellsnatcher.java @@ -65,7 +65,6 @@ public class KheruSpellsnatcher extends CardImpl { this.subtype.add("Naga"); 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/khansoftarkir/KillShot.java b/Mage.Sets/src/mage/sets/khansoftarkir/KillShot.java index cccf061f761..e89a3fd7612 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/KillShot.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/KillShot.java @@ -45,7 +45,6 @@ public class KillShot extends CardImpl { super(ownerId, 15, "Kill Shot", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "KTK"; - this.color.setWhite(true); // Destroy target attacking creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent(new FilterAttackingCreature())); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/KinTreeInvocation.java b/Mage.Sets/src/mage/sets/khansoftarkir/KinTreeInvocation.java index 2a82a4252b5..6e0260b08ec 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/KinTreeInvocation.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/KinTreeInvocation.java @@ -52,8 +52,6 @@ public class KinTreeInvocation extends CardImpl { super(ownerId, 183, "Kin-Tree Invocation", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}{G}"); this.expansionSetCode = "KTK"; - this.color.setGreen(true); - this.color.setBlack(true); // Put an X/X black and green Spirit Warrior creature token onto the battlefield, where X is the greatest toughness among creatures you control. this.getSpellAbility().addEffect(new KinTreeInvocationCreateTokenEffect()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/KinTreeWarden.java b/Mage.Sets/src/mage/sets/khansoftarkir/KinTreeWarden.java index fcad8805c10..bb413100897 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/KinTreeWarden.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/KinTreeWarden.java @@ -51,7 +51,6 @@ public class KinTreeWarden extends CardImpl { this.subtype.add("Human"); 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/khansoftarkir/KrumarBondKin.java b/Mage.Sets/src/mage/sets/khansoftarkir/KrumarBondKin.java index feb4f29ed54..e78eb6a7cec 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/KrumarBondKin.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/KrumarBondKin.java @@ -47,7 +47,6 @@ public class KrumarBondKin extends CardImpl { this.subtype.add("Orc"); 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/khansoftarkir/LeapingMaster.java b/Mage.Sets/src/mage/sets/khansoftarkir/LeapingMaster.java index a3ae04de351..64c09070968 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/LeapingMaster.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/LeapingMaster.java @@ -51,7 +51,6 @@ public class LeapingMaster extends CardImpl { this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/LongshotSquad.java b/Mage.Sets/src/mage/sets/khansoftarkir/LongshotSquad.java index 451d3eb18fe..199f2a58938 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/LongshotSquad.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/LongshotSquad.java @@ -66,7 +66,6 @@ public class LongshotSquad extends CardImpl { this.subtype.add("Hound"); 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/khansoftarkir/MantisRider.java b/Mage.Sets/src/mage/sets/khansoftarkir/MantisRider.java index 01b8f9d4431..fd8669b280b 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MantisRider.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MantisRider.java @@ -48,9 +48,6 @@ public class MantisRider extends CardImpl { this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MarduAscendancy.java b/Mage.Sets/src/mage/sets/khansoftarkir/MarduAscendancy.java index feacf55bc56..86f5efc4b4e 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MarduAscendancy.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MarduAscendancy.java @@ -64,9 +64,6 @@ public class MarduAscendancy extends CardImpl { super(ownerId, 185, "Mardu Ascendancy", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{R}{W}{B}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); - this.color.setBlack(true); - this.color.setWhite(true); // Whenever a nontoken creature you control attacks, put a 1/1 red Goblin creature token onto the battlefield tapped and attacking. this.addAbility(new AttacksCreatureYouControlTriggeredAbility(new CreateTokenEffect(new GoblinToken(expansionSetCode), 1, true, true), false, attackFilter)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MarduBlazebringer.java b/Mage.Sets/src/mage/sets/khansoftarkir/MarduBlazebringer.java index 0603a9ae206..a91b77ae50a 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MarduBlazebringer.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MarduBlazebringer.java @@ -49,7 +49,6 @@ public class MarduBlazebringer extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MarduCharm.java b/Mage.Sets/src/mage/sets/khansoftarkir/MarduCharm.java index cefa5636e5e..44b4423042d 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MarduCharm.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MarduCharm.java @@ -71,9 +71,6 @@ public class MarduCharm extends CardImpl { super(ownerId, 186, "Mardu Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}{W}{B}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); - this.color.setBlack(true); - this.color.setWhite(true); // Choose one - // * Mardu Charm deals 4 damage to target creature. diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MarduHateblade.java b/Mage.Sets/src/mage/sets/khansoftarkir/MarduHateblade.java index 7f96ec4ad05..89c6864af41 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MarduHateblade.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MarduHateblade.java @@ -52,7 +52,6 @@ public class MarduHateblade extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MarduHeartPiercer.java b/Mage.Sets/src/mage/sets/khansoftarkir/MarduHeartPiercer.java index 0756a81e815..033f51b6ca2 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MarduHeartPiercer.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MarduHeartPiercer.java @@ -52,7 +52,6 @@ public class MarduHeartPiercer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Archer"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MarduHordechief.java b/Mage.Sets/src/mage/sets/khansoftarkir/MarduHordechief.java index 5ce88e4d532..299076753d0 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MarduHordechief.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MarduHordechief.java @@ -51,7 +51,6 @@ public class MarduHordechief extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MarduRoughrider.java b/Mage.Sets/src/mage/sets/khansoftarkir/MarduRoughrider.java index 0e9503f9332..171bf2e570f 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MarduRoughrider.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MarduRoughrider.java @@ -49,9 +49,6 @@ public class MarduRoughrider extends CardImpl { this.subtype.add("Orc"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MarduSkullhunter.java b/Mage.Sets/src/mage/sets/khansoftarkir/MarduSkullhunter.java index f8efd6d7449..30527e67f8b 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MarduSkullhunter.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MarduSkullhunter.java @@ -53,7 +53,6 @@ public class MarduSkullhunter 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/khansoftarkir/MarduWarshrieker.java b/Mage.Sets/src/mage/sets/khansoftarkir/MarduWarshrieker.java index 1fbdd4bc6ec..f9b1153e60e 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MarduWarshrieker.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MarduWarshrieker.java @@ -51,7 +51,6 @@ public class MarduWarshrieker extends CardImpl { this.subtype.add("Orc"); 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/khansoftarkir/MasterOfPearls.java b/Mage.Sets/src/mage/sets/khansoftarkir/MasterOfPearls.java index 51dc845943d..af74c7f4bfd 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MasterOfPearls.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MasterOfPearls.java @@ -51,7 +51,6 @@ public class MasterOfPearls extends CardImpl { this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MasterTheWay.java b/Mage.Sets/src/mage/sets/khansoftarkir/MasterTheWay.java index e484af337e8..dcff8fefbe9 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MasterTheWay.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MasterTheWay.java @@ -47,8 +47,6 @@ public class MasterTheWay extends CardImpl { super(ownerId, 188, "Master the Way", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{U}{R}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); - this.color.setBlue(true); // Draw a card. Master the Way deals damage to target creature or player equal to the number of cards in your hand. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MerEkNightblade.java b/Mage.Sets/src/mage/sets/khansoftarkir/MerEkNightblade.java index 2be11cd226f..918f31bec7d 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MerEkNightblade.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MerEkNightblade.java @@ -65,7 +65,6 @@ public class MerEkNightblade extends CardImpl { this.subtype.add("Orc"); this.subtype.add("Assassin"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/Mindswipe.java b/Mage.Sets/src/mage/sets/khansoftarkir/Mindswipe.java index 24d7e944825..90fcbf52c3c 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/Mindswipe.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/Mindswipe.java @@ -54,8 +54,6 @@ public class Mindswipe extends CardImpl { super(ownerId, 189, "Mindswipe", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{U}{R}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); - this.color.setBlue(true); // Counter target spell unless its controller pays {X}. Mindswipe deals X damage to that spell's controller. Effect effect = new CounterUnlessPaysEffect(new ManacostVariableValue()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MistfireWeaver.java b/Mage.Sets/src/mage/sets/khansoftarkir/MistfireWeaver.java index 9f471fe016f..f4198a12041 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MistfireWeaver.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MistfireWeaver.java @@ -55,7 +55,6 @@ public class MistfireWeaver extends CardImpl { this.subtype.add("Djinn"); 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/khansoftarkir/MoltingSnakeskin.java b/Mage.Sets/src/mage/sets/khansoftarkir/MoltingSnakeskin.java index 30d57b1f36e..064f0e199d1 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MoltingSnakeskin.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MoltingSnakeskin.java @@ -58,7 +58,6 @@ public class MoltingSnakeskin extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MonasteryFlock.java b/Mage.Sets/src/mage/sets/khansoftarkir/MonasteryFlock.java index 5fc3af62f0a..baab1f60217 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MonasteryFlock.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MonasteryFlock.java @@ -48,7 +48,6 @@ public class MonasteryFlock extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Bird"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MonasterySwiftspear.java b/Mage.Sets/src/mage/sets/khansoftarkir/MonasterySwiftspear.java index 3294fd61dc4..cfd12beb5f3 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MonasterySwiftspear.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MonasterySwiftspear.java @@ -47,7 +47,6 @@ public class MonasterySwiftspear extends CardImpl { this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MurderousCut.java b/Mage.Sets/src/mage/sets/khansoftarkir/MurderousCut.java index 1ed88c70e37..3f2d85fcb5d 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MurderousCut.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MurderousCut.java @@ -45,7 +45,6 @@ public class MurderousCut extends CardImpl { super(ownerId, 81, "Murderous Cut", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{B}"); this.expansionSetCode = "KTK"; - this.color.setBlack(true); // Delve this.addAbility(new DelveAbility()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MysticOfTheHiddenWay.java b/Mage.Sets/src/mage/sets/khansoftarkir/MysticOfTheHiddenWay.java index f88abc12c87..31cc916d8b7 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MysticOfTheHiddenWay.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MysticOfTheHiddenWay.java @@ -49,7 +49,6 @@ public class MysticOfTheHiddenWay extends CardImpl { this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/NarsetEnlightenedMaster.java b/Mage.Sets/src/mage/sets/khansoftarkir/NarsetEnlightenedMaster.java index 1e83454a4c1..c74254cced0 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/NarsetEnlightenedMaster.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/NarsetEnlightenedMaster.java @@ -63,9 +63,6 @@ public class NarsetEnlightenedMaster extends CardImpl { this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/NecropolisFiend.java b/Mage.Sets/src/mage/sets/khansoftarkir/NecropolisFiend.java index 817e0749e65..9e0b68f457b 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/NecropolisFiend.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/NecropolisFiend.java @@ -67,7 +67,6 @@ public class NecropolisFiend extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Demon"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/PearlLakeAncient.java b/Mage.Sets/src/mage/sets/khansoftarkir/PearlLakeAncient.java index bd0d7a667c1..7da08b80efa 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/PearlLakeAncient.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/PearlLakeAncient.java @@ -53,7 +53,6 @@ public class PearlLakeAncient extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Leviathan"); - this.color.setBlue(true); this.power = new MageInt(6); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/PineWalker.java b/Mage.Sets/src/mage/sets/khansoftarkir/PineWalker.java index 2b2f2794b3b..037809d013a 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/PineWalker.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/PineWalker.java @@ -50,7 +50,6 @@ public class PineWalker extends CardImpl { this.expansionSetCode = "KTK"; 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/khansoftarkir/PonybackBrigade.java b/Mage.Sets/src/mage/sets/khansoftarkir/PonybackBrigade.java index d81f97c68fd..f6f03ca9d0d 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/PonybackBrigade.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/PonybackBrigade.java @@ -56,9 +56,6 @@ public class PonybackBrigade extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(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/khansoftarkir/QuietContemplation.java b/Mage.Sets/src/mage/sets/khansoftarkir/QuietContemplation.java index 1b33a1e0d28..fa97dc711e3 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/QuietContemplation.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/QuietContemplation.java @@ -64,7 +64,6 @@ public class QuietContemplation extends CardImpl { super(ownerId, 50, "Quiet Contemplation", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "KTK"; - this.color.setBlue(true); // Whenever you cast a noncreature spell, you may pay {1}. If you do, tap target creature an opponent controls and it doesn't untap during its controller's next untap step. DoIfCostPaid doIfCostPaid = new DoIfCostPaid(new TapTargetEffect(), new GenericManaCost(1),"Tap creature?"); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/RaidersSpoils.java b/Mage.Sets/src/mage/sets/khansoftarkir/RaidersSpoils.java index 4d617a50cb0..ac64e98c9a4 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/RaidersSpoils.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/RaidersSpoils.java @@ -55,7 +55,6 @@ public class RaidersSpoils extends CardImpl { super(ownerId, 83, "Raiders' Spoils", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}"); this.expansionSetCode = "KTK"; - this.color.setBlack(true); // Creatures you control get +1/+0. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/RakshasaDeathdealer.java b/Mage.Sets/src/mage/sets/khansoftarkir/RakshasaDeathdealer.java index 8d1362c9c5a..90e5985955d 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/RakshasaDeathdealer.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/RakshasaDeathdealer.java @@ -51,8 +51,6 @@ public class RakshasaDeathdealer extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Demon"); - 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/khansoftarkir/RakshasaVizier.java b/Mage.Sets/src/mage/sets/khansoftarkir/RakshasaVizier.java index db3c7fb435c..698428320f6 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/RakshasaVizier.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/RakshasaVizier.java @@ -54,9 +54,6 @@ public class RakshasaVizier extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Demon"); - this.color.setBlue(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/khansoftarkir/RakshasasSecret.java b/Mage.Sets/src/mage/sets/khansoftarkir/RakshasasSecret.java index 278e2d0c4b5..67b3c47cffd 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/RakshasasSecret.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/RakshasasSecret.java @@ -46,7 +46,6 @@ public class RakshasasSecret extends CardImpl { super(ownerId, 84, "Rakshasa's Secret", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "KTK"; - this.color.setBlack(true); // Target opponent discards two cards. Put the top two cards of your library into your graveyard. this.getSpellAbility().addEffect(new DiscardTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/RattleclawMystic.java b/Mage.Sets/src/mage/sets/khansoftarkir/RattleclawMystic.java index debc565a3f2..96e97ce61f4 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/RattleclawMystic.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/RattleclawMystic.java @@ -53,7 +53,6 @@ public class RattleclawMystic extends CardImpl { this.subtype.add("Human"); 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/khansoftarkir/RetributionOfTheAncients.java b/Mage.Sets/src/mage/sets/khansoftarkir/RetributionOfTheAncients.java index 4e984757a47..e77bb0c7a5e 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/RetributionOfTheAncients.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/RetributionOfTheAncients.java @@ -62,7 +62,6 @@ public class RetributionOfTheAncients extends CardImpl { super(ownerId, 85, "Retribution of the Ancients", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "KTK"; - this.color.setBlack(true); DynamicValue xValue = new SignInversionDynamicValue(new GetXValue()); // {B}, Remove X +1/+1 counters from among creatures you control: Target creature gets -X/-X until end of turn. diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/RideDown.java b/Mage.Sets/src/mage/sets/khansoftarkir/RideDown.java index f52921c1873..428d2c85873 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/RideDown.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/RideDown.java @@ -63,8 +63,6 @@ public class RideDown extends CardImpl { super(ownerId, 194, "Ride Down", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}{W}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); - this.color.setWhite(true); // Destroy target blocking creature. Creatures that were blocked by that creature this combat gain trample until end of turn. this.getSpellAbility().addEffect(new RideDownEffect()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/RiteOfTheSerpent.java b/Mage.Sets/src/mage/sets/khansoftarkir/RiteOfTheSerpent.java index adaf6f28665..d4e6411db54 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/RiteOfTheSerpent.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/RiteOfTheSerpent.java @@ -52,7 +52,6 @@ public class RiteOfTheSerpent extends CardImpl { super(ownerId, 86, "Rite of the Serpent", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{B}{B}"); this.expansionSetCode = "KTK"; - this.color.setBlack(true); // Destroy target creature. If that creature had a +1/+1 counter on it, put a 1/1 green Snake creature token onto the battlefield. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/RiverwheelAerialists.java b/Mage.Sets/src/mage/sets/khansoftarkir/RiverwheelAerialists.java index 13a07e37d8a..62bc8c47aba 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/RiverwheelAerialists.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/RiverwheelAerialists.java @@ -47,7 +47,6 @@ public class RiverwheelAerialists extends CardImpl { this.subtype.add("Djinn"); this.subtype.add("Monk"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/RoarOfChallenge.java b/Mage.Sets/src/mage/sets/khansoftarkir/RoarOfChallenge.java index 0079ac213f0..beca54a468c 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/RoarOfChallenge.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/RoarOfChallenge.java @@ -51,7 +51,6 @@ public class RoarOfChallenge extends CardImpl { super(ownerId, 145, "Roar of Challenge", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "KTK"; - this.color.setGreen(true); // All creatures able to block target creature this turn do so. this.getSpellAbility().addEffect(new MustBeBlockedByAllTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/RottingMastodon.java b/Mage.Sets/src/mage/sets/khansoftarkir/RottingMastodon.java index 5f33b80330a..81617aa37ab 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/RottingMastodon.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/RottingMastodon.java @@ -45,7 +45,6 @@ public class RottingMastodon extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Elephant"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(8); } diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/RushOfBattle.java b/Mage.Sets/src/mage/sets/khansoftarkir/RushOfBattle.java index 33ec2786fe4..066ad215da1 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/RushOfBattle.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/RushOfBattle.java @@ -54,7 +54,6 @@ public class RushOfBattle extends CardImpl { super(ownerId, 19, "Rush of Battle", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{W}"); this.expansionSetCode = "KTK"; - this.color.setWhite(true); // Creatures you control get +2/+1 until end of turn. Warrior creatures you control gain lifelink until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(2, 1, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/RuthlessRipper.java b/Mage.Sets/src/mage/sets/khansoftarkir/RuthlessRipper.java index e097bc8f3e5..4000424ad9b 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/RuthlessRipper.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/RuthlessRipper.java @@ -62,7 +62,6 @@ public class RuthlessRipper 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/khansoftarkir/SageEyeHarrier.java b/Mage.Sets/src/mage/sets/khansoftarkir/SageEyeHarrier.java index c0bf09a30d0..61299fa17c7 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SageEyeHarrier.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SageEyeHarrier.java @@ -48,7 +48,6 @@ public class SageEyeHarrier extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Warrior"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SageOfTheInwardEye.java b/Mage.Sets/src/mage/sets/khansoftarkir/SageOfTheInwardEye.java index 300337aba3e..fa0e5438acc 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SageOfTheInwardEye.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SageOfTheInwardEye.java @@ -60,9 +60,6 @@ public class SageOfTheInwardEye extends CardImpl { this.subtype.add("Djinn"); this.subtype.add("Wizard"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SaguArcher.java b/Mage.Sets/src/mage/sets/khansoftarkir/SaguArcher.java index 2bd4dd67587..295d91e9b41 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SaguArcher.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SaguArcher.java @@ -48,7 +48,6 @@ public class SaguArcher extends CardImpl { this.subtype.add("Naga"); this.subtype.add("Archer"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SaguMauler.java b/Mage.Sets/src/mage/sets/khansoftarkir/SaguMauler.java index 7e44ffb13d4..367b8397769 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SaguMauler.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SaguMauler.java @@ -48,8 +48,6 @@ public class SaguMauler extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Beast"); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SaltRoadPatrol.java b/Mage.Sets/src/mage/sets/khansoftarkir/SaltRoadPatrol.java index 5bde2e739fd..1972b9df286 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SaltRoadPatrol.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SaltRoadPatrol.java @@ -47,7 +47,6 @@ public class SaltRoadPatrol extends CardImpl { this.subtype.add("Human"); this.subtype.add("Scout"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SavageKnuckleblade.java b/Mage.Sets/src/mage/sets/khansoftarkir/SavageKnuckleblade.java index 5a1dd84d281..8b3d478dc2c 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SavageKnuckleblade.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SavageKnuckleblade.java @@ -54,9 +54,6 @@ public class SavageKnuckleblade extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/Scaldkin.java b/Mage.Sets/src/mage/sets/khansoftarkir/Scaldkin.java index d79b6fe8cde..332c6cd0e66 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/Scaldkin.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/Scaldkin.java @@ -52,7 +52,6 @@ public class Scaldkin extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/ScionOfGlaciers.java b/Mage.Sets/src/mage/sets/khansoftarkir/ScionOfGlaciers.java index c43d07ca44a..cc97e450a63 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/ScionOfGlaciers.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/ScionOfGlaciers.java @@ -49,7 +49,6 @@ public class ScionOfGlaciers extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/ScoutTheBorders.java b/Mage.Sets/src/mage/sets/khansoftarkir/ScoutTheBorders.java index 477448ba702..3b9f71b4c2e 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/ScoutTheBorders.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/ScoutTheBorders.java @@ -56,7 +56,6 @@ public class ScoutTheBorders extends CardImpl { super(ownerId, 148, "Scout the Borders", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "KTK"; - 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 ScoutTheBordersEffect()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SecretPlans.java b/Mage.Sets/src/mage/sets/khansoftarkir/SecretPlans.java index 7e04365d260..f5458c3d4d0 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SecretPlans.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SecretPlans.java @@ -57,8 +57,6 @@ public class SecretPlans extends CardImpl { super(ownerId, 198, "Secret Plans", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}{U}"); this.expansionSetCode = "KTK"; - this.color.setBlue(true); - this.color.setGreen(true); // Face-down creatures you control get +0/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0,1, Duration.WhileOnBattlefield, filter))); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SeeTheUnwritten.java b/Mage.Sets/src/mage/sets/khansoftarkir/SeeTheUnwritten.java index 265554316f4..ad26154debc 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SeeTheUnwritten.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SeeTheUnwritten.java @@ -59,7 +59,6 @@ public class SeeTheUnwritten extends CardImpl { super(ownerId, 149, "See the Unwritten", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{4}{G}{G}"); this.expansionSetCode = "KTK"; - this.color.setGreen(true); // Reveal the top eight cards of your library. You may put a creature card from among them onto the battlefield. Put the rest into your graveyard. // Ferocious - If you control a creature with power 4 or greater, you may put two creature cards onto the battlefield instead of one. diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SeekerOfTheWay.java b/Mage.Sets/src/mage/sets/khansoftarkir/SeekerOfTheWay.java index 9706a8c400d..d1c860ae50f 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SeekerOfTheWay.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SeekerOfTheWay.java @@ -58,7 +58,6 @@ public class SeekerOfTheWay extends CardImpl { this.subtype.add("Human"); 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/khansoftarkir/SetAdrift.java b/Mage.Sets/src/mage/sets/khansoftarkir/SetAdrift.java index 3ca716f581d..c1f493b4234 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SetAdrift.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SetAdrift.java @@ -45,7 +45,6 @@ public class SetAdrift extends CardImpl { super(ownerId, 54, "Set Adrift", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{5}{U}"); this.expansionSetCode = "KTK"; - this.color.setBlue(true); // Delve this.addAbility(new DelveAbility()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/ShamblingAttendants.java b/Mage.Sets/src/mage/sets/khansoftarkir/ShamblingAttendants.java index 3cfe788cefa..e7f70f24f53 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/ShamblingAttendants.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/ShamblingAttendants.java @@ -46,7 +46,6 @@ public class ShamblingAttendants extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SidisisPet.java b/Mage.Sets/src/mage/sets/khansoftarkir/SidisisPet.java index d8ed4f7c5cb..8593a32feee 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SidisisPet.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SidisisPet.java @@ -48,7 +48,6 @@ public class SidisisPet extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Ape"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SiegeRhino.java b/Mage.Sets/src/mage/sets/khansoftarkir/SiegeRhino.java index 9900eda5393..a546501c3f0 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SiegeRhino.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SiegeRhino.java @@ -50,9 +50,6 @@ public class SiegeRhino extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Rhino"); - this.color.setGreen(true); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/Siegecraft.java b/Mage.Sets/src/mage/sets/khansoftarkir/Siegecraft.java index 0969951c49e..3622d733221 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/Siegecraft.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/Siegecraft.java @@ -53,7 +53,6 @@ public class Siegecraft extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SingingBellStrike.java b/Mage.Sets/src/mage/sets/khansoftarkir/SingingBellStrike.java index 93e98494334..bc7f1c2e472 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SingingBellStrike.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SingingBellStrike.java @@ -61,7 +61,6 @@ public class SingingBellStrike extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SmokeTeller.java b/Mage.Sets/src/mage/sets/khansoftarkir/SmokeTeller.java index 2c855d8eef7..d25ffa3c817 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SmokeTeller.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SmokeTeller.java @@ -66,7 +66,6 @@ public class SmokeTeller extends CardImpl { this.subtype.add("Human"); 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/khansoftarkir/SnowhornRider.java b/Mage.Sets/src/mage/sets/khansoftarkir/SnowhornRider.java index 4f74e3524e8..49437c9d36a 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SnowhornRider.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SnowhornRider.java @@ -48,9 +48,6 @@ public class SnowhornRider extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SorinSolemnVisitor.java b/Mage.Sets/src/mage/sets/khansoftarkir/SorinSolemnVisitor.java index befb135399c..835039e8420 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SorinSolemnVisitor.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SorinSolemnVisitor.java @@ -65,8 +65,6 @@ public class SorinSolemnVisitor extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Sorin"); - this.color.setBlack(true); - this.color.setWhite(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SultaiAscendancy.java b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiAscendancy.java index 0b397101b63..ab1050c0e4b 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SultaiAscendancy.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiAscendancy.java @@ -49,9 +49,6 @@ public class SultaiAscendancy extends CardImpl { super(ownerId, 203, "Sultai Ascendancy", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}{B}{U}"); this.expansionSetCode = "KTK"; - this.color.setBlue(true); - this.color.setBlack(true); - this.color.setGreen(true); // At the beginning of your upkeep, look at the top two cards of your library. Put any number of them into your graveyard and the rest on top of your library in any order. Effect effect = new LookLibraryAndPickControllerEffect( diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SultaiCharm.java b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiCharm.java index 059094ff29f..c81bb8869c1 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SultaiCharm.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiCharm.java @@ -57,9 +57,6 @@ public class SultaiCharm extends CardImpl { super(ownerId, 204, "Sultai Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{B}{G}{U}"); this.expansionSetCode = "KTK"; - this.color.setBlue(true); - this.color.setGreen(true); - this.color.setBlack(true); // Choose one - // * Destroy target monocolored creature. diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SultaiFlayer.java b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiFlayer.java index 6da19b6fcf3..225862c530c 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SultaiFlayer.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiFlayer.java @@ -59,7 +59,6 @@ public class SultaiFlayer extends CardImpl { this.subtype.add("Naga"); 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/khansoftarkir/SultaiScavenger.java b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiScavenger.java index ed382f560d2..c9ece589210 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SultaiScavenger.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiScavenger.java @@ -47,7 +47,6 @@ public class SultaiScavenger extends CardImpl { this.subtype.add("Bird"); 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/khansoftarkir/SultaiSoothsayer.java b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiSoothsayer.java index 0e5e001ebe4..383bd3faddb 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SultaiSoothsayer.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiSoothsayer.java @@ -58,9 +58,6 @@ public class SultaiSoothsayer extends CardImpl { this.subtype.add("Naga"); this.subtype.add("Shaman"); - this.color.setBlue(true); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SummitProwler.java b/Mage.Sets/src/mage/sets/khansoftarkir/SummitProwler.java index 719aa1125a8..ed4c8319688 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SummitProwler.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SummitProwler.java @@ -44,7 +44,6 @@ public class SummitProwler extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Yeti"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SurrakDragonclaw.java b/Mage.Sets/src/mage/sets/khansoftarkir/SurrakDragonclaw.java index 6192947839d..c345f742fdd 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SurrakDragonclaw.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SurrakDragonclaw.java @@ -64,9 +64,6 @@ public class SurrakDragonclaw extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SuspensionField.java b/Mage.Sets/src/mage/sets/khansoftarkir/SuspensionField.java index 0eb6fe8efb7..419d131632d 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SuspensionField.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SuspensionField.java @@ -61,7 +61,6 @@ public class SuspensionField extends CardImpl { super(ownerId, 25, "Suspension Field", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "KTK"; - this.color.setWhite(true); // When Suspension Field enters the battlefield, you may exile target creature with toughness 3 or greater until Suspension Field leaves the battlefield. Ability ability = new EntersBattlefieldTriggeredAbility(new SuspensionFieldExileEffect(), true); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SwarmOfBloodflies.java b/Mage.Sets/src/mage/sets/khansoftarkir/SwarmOfBloodflies.java index 546d1880cb4..a94b637d36a 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SwarmOfBloodflies.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SwarmOfBloodflies.java @@ -50,7 +50,6 @@ public class SwarmOfBloodflies extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Insect"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SwiftKick.java b/Mage.Sets/src/mage/sets/khansoftarkir/SwiftKick.java index 44c522ae9dd..51c0491a9b5 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SwiftKick.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SwiftKick.java @@ -57,7 +57,6 @@ public class SwiftKick extends CardImpl { super(ownerId, 122, "Swift Kick", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{R}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); // Target creature you control gets +1/+0 until end of turn. It fights target creature you don't control. Effect effect = new BoostTargetEffect(1,0,Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/TaigamsScheming.java b/Mage.Sets/src/mage/sets/khansoftarkir/TaigamsScheming.java index 868dd6501f8..a566c32b053 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/TaigamsScheming.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/TaigamsScheming.java @@ -55,7 +55,6 @@ public class TaigamsScheming extends CardImpl { super(ownerId, 57, "Taigam's Scheming", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{U}"); this.expansionSetCode = "KTK"; - this.color.setBlue(true); // Look at the top five cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order this.getSpellAbility().addEffect(new TaigamsSchemingEffect()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/TakeUpArms.java b/Mage.Sets/src/mage/sets/khansoftarkir/TakeUpArms.java index 0b8b0047524..2d448508bb2 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/TakeUpArms.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/TakeUpArms.java @@ -45,7 +45,6 @@ public class TakeUpArms extends CardImpl { super(ownerId, 26, "Take Up Arms", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{W}"); this.expansionSetCode = "KTK"; - this.color.setWhite(true); // Put three 1/1 white Warrior creature tokens onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new TakeUpArmsToken(), 3)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/TemurAscendancy.java b/Mage.Sets/src/mage/sets/khansoftarkir/TemurAscendancy.java index b232983c12e..d0cbcd495b1 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/TemurAscendancy.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/TemurAscendancy.java @@ -58,9 +58,6 @@ public class TemurAscendancy extends CardImpl { super(ownerId, 207, "Temur Ascendancy", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}{U}{R}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); - this.color.setBlue(true); - this.color.setGreen(true); // Creatures you control have haste. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/TemurCharger.java b/Mage.Sets/src/mage/sets/khansoftarkir/TemurCharger.java index a052d0d45d9..07b7903298a 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/TemurCharger.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/TemurCharger.java @@ -62,7 +62,6 @@ public class TemurCharger extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Horse"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/TemurCharm.java b/Mage.Sets/src/mage/sets/khansoftarkir/TemurCharm.java index 9d827a0045e..9db9257fd17 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/TemurCharm.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/TemurCharm.java @@ -66,9 +66,6 @@ public class TemurCharm extends CardImpl { super(ownerId, 208, "Temur Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}{U}{R}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); - this.color.setBlue(true); - this.color.setGreen(true); // Choose one - // ïż½ Target creature you control gets +1/+1 until end of turn. That creature fights target creature you don't control. diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/ThousandWinds.java b/Mage.Sets/src/mage/sets/khansoftarkir/ThousandWinds.java index c990eee5a3b..0a776343fd5 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/ThousandWinds.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/ThousandWinds.java @@ -59,7 +59,6 @@ public class ThousandWinds extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Elemental"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/Throttle.java b/Mage.Sets/src/mage/sets/khansoftarkir/Throttle.java index 7c27dfc5316..bd3bfabb6ea 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/Throttle.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/Throttle.java @@ -45,7 +45,6 @@ public class Throttle extends CardImpl { super(ownerId, 93, "Throttle", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{B}"); this.expansionSetCode = "KTK"; - 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/khansoftarkir/TimelyHordemate.java b/Mage.Sets/src/mage/sets/khansoftarkir/TimelyHordemate.java index e0f0de85368..d6887609b9e 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/TimelyHordemate.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/TimelyHordemate.java @@ -61,7 +61,6 @@ public class TimelyHordemate extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/TormentingVoice.java b/Mage.Sets/src/mage/sets/khansoftarkir/TormentingVoice.java index 30a81b3e096..b39814e03d3 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/TormentingVoice.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/TormentingVoice.java @@ -45,7 +45,6 @@ public class TormentingVoice extends CardImpl { super(ownerId, 123, "Tormenting Voice", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); // As an additional cost to cast Tormenting Voice, discard a card. this.getSpellAbility().addCost(new DiscardTargetCost(new TargetCardInHand())); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/TrapEssence.java b/Mage.Sets/src/mage/sets/khansoftarkir/TrapEssence.java index 457b71439cd..4cbbcb0015a 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/TrapEssence.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/TrapEssence.java @@ -57,9 +57,6 @@ public class TrapEssence extends CardImpl { super(ownerId, 209, "Trap Essence", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{G}{U}{R}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); - this.color.setBlue(true); - this.color.setGreen(true); // Counter target creature spell. Put two +1/+1 counters on up to one target creature. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/TreasureCruise.java b/Mage.Sets/src/mage/sets/khansoftarkir/TreasureCruise.java index 8f22e129d64..30888589ab8 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/TreasureCruise.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/TreasureCruise.java @@ -44,7 +44,6 @@ public class TreasureCruise extends CardImpl { super(ownerId, 59, "Treasure Cruise", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{7}{U}"); this.expansionSetCode = "KTK"; - this.color.setBlue(true); // Delve this.addAbility(new DelveAbility()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/TuskedColossodon.java b/Mage.Sets/src/mage/sets/khansoftarkir/TuskedColossodon.java index 6c3093508b2..cf2a9d368fa 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/TuskedColossodon.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/TuskedColossodon.java @@ -44,7 +44,6 @@ public class TuskedColossodon extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/TuskguardCaptain.java b/Mage.Sets/src/mage/sets/khansoftarkir/TuskguardCaptain.java index 6f3a4e50c81..7834e4f8ffd 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/TuskguardCaptain.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/TuskguardCaptain.java @@ -68,7 +68,6 @@ public class TuskguardCaptain extends CardImpl { this.subtype.add("Human"); 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/khansoftarkir/UnyieldingKrumar.java b/Mage.Sets/src/mage/sets/khansoftarkir/UnyieldingKrumar.java index 8a85641ab76..9794916cf09 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/UnyieldingKrumar.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/UnyieldingKrumar.java @@ -51,7 +51,6 @@ public class UnyieldingKrumar extends CardImpl { this.subtype.add("Orc"); 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/khansoftarkir/UtterEnd.java b/Mage.Sets/src/mage/sets/khansoftarkir/UtterEnd.java index 86ca037f375..b3d8363dea4 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/UtterEnd.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/UtterEnd.java @@ -44,8 +44,6 @@ public class UtterEnd extends CardImpl { super(ownerId, 210, "Utter End", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{W}{B}"); this.expansionSetCode = "KTK"; - this.color.setBlack(true); - this.color.setWhite(true); // Exile target nonland permanent. this.getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/ValleyDasher.java b/Mage.Sets/src/mage/sets/khansoftarkir/ValleyDasher.java index 9d81ed962aa..98c210253de 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/ValleyDasher.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/ValleyDasher.java @@ -47,7 +47,6 @@ public class ValleyDasher extends CardImpl { this.subtype.add("Human"); 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/khansoftarkir/VenerableLammasu.java b/Mage.Sets/src/mage/sets/khansoftarkir/VenerableLammasu.java index 8030479c9d7..2862cbf722b 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/VenerableLammasu.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/VenerableLammasu.java @@ -45,7 +45,6 @@ public class VenerableLammasu extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Lammasu"); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/VillainousWealth.java b/Mage.Sets/src/mage/sets/khansoftarkir/VillainousWealth.java index c52e1e89b3f..9e3a5ed6b37 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/VillainousWealth.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/VillainousWealth.java @@ -58,9 +58,6 @@ public class VillainousWealth extends CardImpl { super(ownerId, 211, "Villainous Wealth", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{B}{G}{U}"); this.expansionSetCode = "KTK"; - this.color.setBlue(true); - this.color.setGreen(true); - this.color.setBlack(true); // Target opponent exiles the top X cards of his or her library. You may cast any number of nonland cards with converted mana cost X or less from among them without paying their mana cost. this.getSpellAbility().addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/WarBehemoth.java b/Mage.Sets/src/mage/sets/khansoftarkir/WarBehemoth.java index 3fc662e4f11..b8f23ed08cb 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/WarBehemoth.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/WarBehemoth.java @@ -46,7 +46,6 @@ public class WarBehemoth extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Beast"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/WarNameAspirant.java b/Mage.Sets/src/mage/sets/khansoftarkir/WarNameAspirant.java index e9c1fd2e716..de69d67f53d 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/WarNameAspirant.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/WarNameAspirant.java @@ -62,7 +62,6 @@ public class WarNameAspirant 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/khansoftarkir/WardenOfTheEye.java b/Mage.Sets/src/mage/sets/khansoftarkir/WardenOfTheEye.java index b7ee9114514..df47def1ad2 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/WardenOfTheEye.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/WardenOfTheEye.java @@ -63,9 +63,6 @@ public class WardenOfTheEye extends CardImpl { this.subtype.add("Djinn"); this.subtype.add("Wizard"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/WatcherOfTheRoost.java b/Mage.Sets/src/mage/sets/khansoftarkir/WatcherOfTheRoost.java index 902c3adf2d5..30d0190cbda 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/WatcherOfTheRoost.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/WatcherOfTheRoost.java @@ -60,7 +60,6 @@ public class WatcherOfTheRoost extends CardImpl { this.subtype.add("Bird"); 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/khansoftarkir/Waterwhirl.java b/Mage.Sets/src/mage/sets/khansoftarkir/Waterwhirl.java index ea41f9878d1..ba99e39fd86 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/Waterwhirl.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/Waterwhirl.java @@ -44,7 +44,6 @@ public class Waterwhirl extends CardImpl { super(ownerId, 60, "Waterwhirl", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{U}{U}"); this.expansionSetCode = "KTK"; - this.color.setBlue(true); // Return up to two target creatures to their owners' hands. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/WeaveFate.java b/Mage.Sets/src/mage/sets/khansoftarkir/WeaveFate.java index 9342da57116..a4428d528af 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/WeaveFate.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/WeaveFate.java @@ -43,7 +43,6 @@ public class WeaveFate extends CardImpl { super(ownerId, 61, "Weave Fate", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "KTK"; - this.color.setBlue(true); // Draw two cards. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/WetlandSambar.java b/Mage.Sets/src/mage/sets/khansoftarkir/WetlandSambar.java index bf51fd3c27e..01ff610edce 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/WetlandSambar.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/WetlandSambar.java @@ -44,7 +44,6 @@ public class WetlandSambar extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Elk"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/WhirlwindAdept.java b/Mage.Sets/src/mage/sets/khansoftarkir/WhirlwindAdept.java index 231379d6a09..00e42f873e8 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/WhirlwindAdept.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/WhirlwindAdept.java @@ -47,7 +47,6 @@ public class WhirlwindAdept extends CardImpl { this.subtype.add("Djinn"); this.subtype.add("Monk"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/WingmateRoc.java b/Mage.Sets/src/mage/sets/khansoftarkir/WingmateRoc.java index 9549713ab45..4d8acfaf0de 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/WingmateRoc.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/WingmateRoc.java @@ -55,7 +55,6 @@ public class WingmateRoc extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Bird"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/Winterflame.java b/Mage.Sets/src/mage/sets/khansoftarkir/Winterflame.java index 4a44fa0c363..7cdf4a00621 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/Winterflame.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/Winterflame.java @@ -46,8 +46,6 @@ public class Winterflame extends CardImpl { super(ownerId, 213, "Winterflame", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{R}"); this.expansionSetCode = "KTK"; - this.color.setRed(true); - this.color.setBlue(true); // Choose one or both - this.getSpellAbility().getModes().setMinModes(1); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/WoollyLoxodon.java b/Mage.Sets/src/mage/sets/khansoftarkir/WoollyLoxodon.java index 3ec8c4b6e25..25174609f5d 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/WoollyLoxodon.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/WoollyLoxodon.java @@ -47,7 +47,6 @@ public class WoollyLoxodon extends CardImpl { this.subtype.add("Elephant"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/CinderWall.java b/Mage.Sets/src/mage/sets/knightsvsdragons/CinderWall.java index df4b11e1088..2b866866008 100644 --- a/Mage.Sets/src/mage/sets/knightsvsdragons/CinderWall.java +++ b/Mage.Sets/src/mage/sets/knightsvsdragons/CinderWall.java @@ -49,7 +49,6 @@ public class CinderWall extends CardImpl { this.expansionSetCode = "DDG"; this.subtype.add("Wall"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/ConeOfFlame.java b/Mage.Sets/src/mage/sets/knightsvsdragons/ConeOfFlame.java index b136c2598a1..297d39ca491 100644 --- a/Mage.Sets/src/mage/sets/knightsvsdragons/ConeOfFlame.java +++ b/Mage.Sets/src/mage/sets/knightsvsdragons/ConeOfFlame.java @@ -49,7 +49,6 @@ public class ConeOfFlame extends CardImpl { super(ownerId, 75, "Cone of Flame", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); this.expansionSetCode = "DDG"; - this.color.setRed(true); // Cone of Flame deals 1 damage to target creature or player, 2 damage to another target creature or player, and 3 damage to a third target creature or player. this.getSpellAbility().addEffect(new ConeOfFlameEffect()); diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/SilverKnight.java b/Mage.Sets/src/mage/sets/knightsvsdragons/SilverKnight.java index 4173669a861..d68f4385c77 100644 --- a/Mage.Sets/src/mage/sets/knightsvsdragons/SilverKnight.java +++ b/Mage.Sets/src/mage/sets/knightsvsdragons/SilverKnight.java @@ -56,7 +56,6 @@ public class SilverKnight 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/legends/Abomination.java b/Mage.Sets/src/mage/sets/legends/Abomination.java index cc5af6221dd..8ccb34a1237 100644 --- a/Mage.Sets/src/mage/sets/legends/Abomination.java +++ b/Mage.Sets/src/mage/sets/legends/Abomination.java @@ -56,7 +56,6 @@ public class Abomination extends CardImpl { this.expansionSetCode = "LEG"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/legends/ActiveVolcano.java b/Mage.Sets/src/mage/sets/legends/ActiveVolcano.java index 22694511c81..553776ba1de 100644 --- a/Mage.Sets/src/mage/sets/legends/ActiveVolcano.java +++ b/Mage.Sets/src/mage/sets/legends/ActiveVolcano.java @@ -58,7 +58,6 @@ public class ActiveVolcano extends CardImpl { super(ownerId, 130, "Active Volcano", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "LEG"; - this.color.setRed(true); // Choose one - Destroy target blue permanent; this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/legends/AdunOakenshield.java b/Mage.Sets/src/mage/sets/legends/AdunOakenshield.java index d9a333f77ae..c137e98628e 100644 --- a/Mage.Sets/src/mage/sets/legends/AdunOakenshield.java +++ b/Mage.Sets/src/mage/sets/legends/AdunOakenshield.java @@ -57,9 +57,6 @@ public class AdunOakenshield extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setBlack(true); - 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/legends/AngusMackenzie.java b/Mage.Sets/src/mage/sets/legends/AngusMackenzie.java index 9e711d4dc21..ea54ac5677b 100644 --- a/Mage.Sets/src/mage/sets/legends/AngusMackenzie.java +++ b/Mage.Sets/src/mage/sets/legends/AngusMackenzie.java @@ -57,9 +57,6 @@ public class AngusMackenzie extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/legends/BarbaryApes.java b/Mage.Sets/src/mage/sets/legends/BarbaryApes.java index f9288e8eb58..349f8f1aa4b 100644 --- a/Mage.Sets/src/mage/sets/legends/BarbaryApes.java +++ b/Mage.Sets/src/mage/sets/legends/BarbaryApes.java @@ -44,7 +44,6 @@ public class BarbaryApes extends CardImpl { this.expansionSetCode = "LEG"; 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/legends/BarktoothWarbeard.java b/Mage.Sets/src/mage/sets/legends/BarktoothWarbeard.java index 9b402863652..7ca5b64c8de 100644 --- a/Mage.Sets/src/mage/sets/legends/BarktoothWarbeard.java +++ b/Mage.Sets/src/mage/sets/legends/BarktoothWarbeard.java @@ -46,8 +46,6 @@ public class BarktoothWarbeard extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/legends/ChainLightning.java b/Mage.Sets/src/mage/sets/legends/ChainLightning.java index d7b201d44c5..7ea83e1c98d 100644 --- a/Mage.Sets/src/mage/sets/legends/ChainLightning.java +++ b/Mage.Sets/src/mage/sets/legends/ChainLightning.java @@ -52,7 +52,6 @@ public class ChainLightning extends CardImpl { super(ownerId, 137, "Chain Lightning", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "LEG"; - this.color.setRed(true); // Chain Lightning deals 3 damage to target creature or player. Then that player or that creature's controller may pay {R}{R}. If the player does, he or she may copy this spell and may choose a new target for that copy. this.getSpellAbility().addEffect(new ChainLightningEffect()); diff --git a/Mage.Sets/src/mage/sets/legends/DemonicTorment.java b/Mage.Sets/src/mage/sets/legends/DemonicTorment.java index 76270f261b1..e4ae770c170 100644 --- a/Mage.Sets/src/mage/sets/legends/DemonicTorment.java +++ b/Mage.Sets/src/mage/sets/legends/DemonicTorment.java @@ -55,7 +55,6 @@ public class DemonicTorment extends CardImpl { this.expansionSetCode = "LEG"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/legends/DevouringDeep.java b/Mage.Sets/src/mage/sets/legends/DevouringDeep.java index c4f52075423..f5b8fea9cb5 100644 --- a/Mage.Sets/src/mage/sets/legends/DevouringDeep.java +++ b/Mage.Sets/src/mage/sets/legends/DevouringDeep.java @@ -45,7 +45,6 @@ public class DevouringDeep extends CardImpl { this.expansionSetCode = "LEG"; this.subtype.add("Fish"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/legends/HazezonTamar.java b/Mage.Sets/src/mage/sets/legends/HazezonTamar.java index 11a0a7b4234..21eca703027 100644 --- a/Mage.Sets/src/mage/sets/legends/HazezonTamar.java +++ b/Mage.Sets/src/mage/sets/legends/HazezonTamar.java @@ -70,9 +70,6 @@ public class HazezonTamar extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); - 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/legends/HeadlessHorseman.java b/Mage.Sets/src/mage/sets/legends/HeadlessHorseman.java index 2ea98f9d8b3..780afc9d677 100644 --- a/Mage.Sets/src/mage/sets/legends/HeadlessHorseman.java +++ b/Mage.Sets/src/mage/sets/legends/HeadlessHorseman.java @@ -45,7 +45,6 @@ public class HeadlessHorseman 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/legends/HornetCobra.java b/Mage.Sets/src/mage/sets/legends/HornetCobra.java index bf2d36a388b..42177ad8483 100644 --- a/Mage.Sets/src/mage/sets/legends/HornetCobra.java +++ b/Mage.Sets/src/mage/sets/legends/HornetCobra.java @@ -45,7 +45,6 @@ public class HornetCobra extends CardImpl { this.expansionSetCode = "LEG"; 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/legends/InTheEyeOfChaos.java b/Mage.Sets/src/mage/sets/legends/InTheEyeOfChaos.java index 3f5bbbd5622..67e8dcf8563 100644 --- a/Mage.Sets/src/mage/sets/legends/InTheEyeOfChaos.java +++ b/Mage.Sets/src/mage/sets/legends/InTheEyeOfChaos.java @@ -59,7 +59,6 @@ public class InTheEyeOfChaos extends CardImpl { this.expansionSetCode = "LEG"; this.supertype.add("World"); - this.color.setBlue(true); // Whenever a player casts an instant spell, counter it unless that player pays {X}, where X is its converted mana cost. this.addAbility(new SpellCastAllTriggeredAbility(Zone.BATTLEFIELD, new InTheEyeOfChaosEffect(), filter, false, true)); diff --git a/Mage.Sets/src/mage/sets/legends/JeditOjanen.java b/Mage.Sets/src/mage/sets/legends/JeditOjanen.java index ed1601afe27..814584270c6 100644 --- a/Mage.Sets/src/mage/sets/legends/JeditOjanen.java +++ b/Mage.Sets/src/mage/sets/legends/JeditOjanen.java @@ -46,8 +46,6 @@ public class JeditOjanen extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Warrior"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/legends/JerrardOfTheClosedFist.java b/Mage.Sets/src/mage/sets/legends/JerrardOfTheClosedFist.java index f320215e96a..4573ddc33cd 100644 --- a/Mage.Sets/src/mage/sets/legends/JerrardOfTheClosedFist.java +++ b/Mage.Sets/src/mage/sets/legends/JerrardOfTheClosedFist.java @@ -46,8 +46,6 @@ public class JerrardOfTheClosedFist extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setRed(true); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/legends/KasimirTheLoneWolf.java b/Mage.Sets/src/mage/sets/legends/KasimirTheLoneWolf.java index 879a48e5765..42fafb3b9bb 100644 --- a/Mage.Sets/src/mage/sets/legends/KasimirTheLoneWolf.java +++ b/Mage.Sets/src/mage/sets/legends/KasimirTheLoneWolf.java @@ -46,8 +46,6 @@ public class KasimirTheLoneWolf extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setBlue(true); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/legends/KeepersOfTheFaith.java b/Mage.Sets/src/mage/sets/legends/KeepersOfTheFaith.java index 138221df7fa..721a3e9986f 100644 --- a/Mage.Sets/src/mage/sets/legends/KeepersOfTheFaith.java +++ b/Mage.Sets/src/mage/sets/legends/KeepersOfTheFaith.java @@ -45,7 +45,6 @@ public class KeepersOfTheFaith extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/legends/LadyOrca.java b/Mage.Sets/src/mage/sets/legends/LadyOrca.java index a4a98f84e14..9ab907d9ab0 100644 --- a/Mage.Sets/src/mage/sets/legends/LadyOrca.java +++ b/Mage.Sets/src/mage/sets/legends/LadyOrca.java @@ -45,8 +45,6 @@ public class LadyOrca extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Demon"); - this.color.setRed(true); - this.color.setBlack(true); this.power = new MageInt(7); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/legends/Moat.java b/Mage.Sets/src/mage/sets/legends/Moat.java index a5cd5b46784..bcba86caf4c 100644 --- a/Mage.Sets/src/mage/sets/legends/Moat.java +++ b/Mage.Sets/src/mage/sets/legends/Moat.java @@ -56,7 +56,6 @@ public class Moat extends CardImpl { super(ownerId, 197, "Moat", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "LEG"; - this.color.setWhite(true); // Creatures without flying can't attack. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllAnyPlayerEffect(Duration.WhileOnBattlefield, filter))); diff --git a/Mage.Sets/src/mage/sets/legends/NetherVoid.java b/Mage.Sets/src/mage/sets/legends/NetherVoid.java index 875e40187b3..b99ccca8498 100644 --- a/Mage.Sets/src/mage/sets/legends/NetherVoid.java +++ b/Mage.Sets/src/mage/sets/legends/NetherVoid.java @@ -47,7 +47,6 @@ public class NetherVoid extends CardImpl { this.expansionSetCode = "LEG"; this.supertype.add("World"); - this.color.setBlack(true); // Whenever a player casts a spell, counter it unless that player pays {3}. this.addAbility(new SpellCastAllTriggeredAbility(new CounterUnlessPaysEffect(new GenericManaCost(3)), new FilterSpell("a spell"), false, true)); diff --git a/Mage.Sets/src/mage/sets/legends/NicolBolas.java b/Mage.Sets/src/mage/sets/legends/NicolBolas.java index 29d4d2076fa..55a7c2b4ab2 100644 --- a/Mage.Sets/src/mage/sets/legends/NicolBolas.java +++ b/Mage.Sets/src/mage/sets/legends/NicolBolas.java @@ -53,9 +53,6 @@ public class NicolBolas extends CardImpl { this.subtype.add("Elder"); this.subtype.add("Dragon"); - 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/legends/RagingBull.java b/Mage.Sets/src/mage/sets/legends/RagingBull.java index 9937b33a82e..9a993b35707 100644 --- a/Mage.Sets/src/mage/sets/legends/RagingBull.java +++ b/Mage.Sets/src/mage/sets/legends/RagingBull.java @@ -44,7 +44,6 @@ public class RagingBull extends CardImpl { this.expansionSetCode = "LEG"; this.subtype.add("Ox"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/legends/RamirezDePietro.java b/Mage.Sets/src/mage/sets/legends/RamirezDePietro.java index 827d5b6d333..f039f5add2e 100644 --- a/Mage.Sets/src/mage/sets/legends/RamirezDePietro.java +++ b/Mage.Sets/src/mage/sets/legends/RamirezDePietro.java @@ -47,8 +47,6 @@ public class RamirezDePietro extends CardImpl { this.subtype.add("Human"); this.subtype.add("Pirate"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/legends/Reset.java b/Mage.Sets/src/mage/sets/legends/Reset.java index 0332cb4e686..18820f1320f 100644 --- a/Mage.Sets/src/mage/sets/legends/Reset.java +++ b/Mage.Sets/src/mage/sets/legends/Reset.java @@ -53,7 +53,6 @@ public class Reset extends CardImpl { super(ownerId, 73, "Reset", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}{U}"); this.expansionSetCode = "LEG"; - this.color.setBlue(true); // Cast Reset only during an opponent's turn after his or her upkeep step. Ability ability = new SimpleStaticAbility(Zone.ALL, new ResetReplacementEffect()); diff --git a/Mage.Sets/src/mage/sets/legends/RighteousAvengers.java b/Mage.Sets/src/mage/sets/legends/RighteousAvengers.java index 50446b0d561..671ea6ccebf 100644 --- a/Mage.Sets/src/mage/sets/legends/RighteousAvengers.java +++ b/Mage.Sets/src/mage/sets/legends/RighteousAvengers.java @@ -46,7 +46,6 @@ public class RighteousAvengers extends CardImpl { this.subtype.add("Human"); 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/legends/SirShandlarOfEberyn.java b/Mage.Sets/src/mage/sets/legends/SirShandlarOfEberyn.java index f598ec27877..2c64acba432 100644 --- a/Mage.Sets/src/mage/sets/legends/SirShandlarOfEberyn.java +++ b/Mage.Sets/src/mage/sets/legends/SirShandlarOfEberyn.java @@ -46,8 +46,6 @@ public class SirShandlarOfEberyn extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - 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/legends/SivitriScarzam.java b/Mage.Sets/src/mage/sets/legends/SivitriScarzam.java index dc99e5bf6e0..abf1359c61a 100644 --- a/Mage.Sets/src/mage/sets/legends/SivitriScarzam.java +++ b/Mage.Sets/src/mage/sets/legends/SivitriScarzam.java @@ -45,8 +45,6 @@ public class SivitriScarzam extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); - this.color.setBlue(true); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/legends/TheLadyOfTheMountain.java b/Mage.Sets/src/mage/sets/legends/TheLadyOfTheMountain.java index 2dd48f0a64d..1aa80fdab65 100644 --- a/Mage.Sets/src/mage/sets/legends/TheLadyOfTheMountain.java +++ b/Mage.Sets/src/mage/sets/legends/TheLadyOfTheMountain.java @@ -45,8 +45,6 @@ public class TheLadyOfTheMountain extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Giant"); - 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/legends/ThunderSpirit.java b/Mage.Sets/src/mage/sets/legends/ThunderSpirit.java index faf16390e7b..191bd8d38a1 100644 --- a/Mage.Sets/src/mage/sets/legends/ThunderSpirit.java +++ b/Mage.Sets/src/mage/sets/legends/ThunderSpirit.java @@ -47,7 +47,6 @@ public class ThunderSpirit extends CardImpl { this.subtype.add("Elemental"); 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/legends/TobiasAndrion.java b/Mage.Sets/src/mage/sets/legends/TobiasAndrion.java index 29fecdddd3b..f6e863b971f 100644 --- a/Mage.Sets/src/mage/sets/legends/TobiasAndrion.java +++ b/Mage.Sets/src/mage/sets/legends/TobiasAndrion.java @@ -46,8 +46,6 @@ public class TobiasAndrion extends CardImpl { this.subtype.add("Human"); this.subtype.add("Advisor"); - 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/legends/TorstenVonUrsus.java b/Mage.Sets/src/mage/sets/legends/TorstenVonUrsus.java index 86eb8548863..42656590c8e 100644 --- a/Mage.Sets/src/mage/sets/legends/TorstenVonUrsus.java +++ b/Mage.Sets/src/mage/sets/legends/TorstenVonUrsus.java @@ -46,8 +46,6 @@ public class TorstenVonUrsus extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); - 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/legends/WallOfEarth.java b/Mage.Sets/src/mage/sets/legends/WallOfEarth.java index e58d01a8e0b..6123d1e684a 100644 --- a/Mage.Sets/src/mage/sets/legends/WallOfEarth.java +++ b/Mage.Sets/src/mage/sets/legends/WallOfEarth.java @@ -45,7 +45,6 @@ public class WallOfEarth extends CardImpl { this.expansionSetCode = "LEG"; this.subtype.add("Wall"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/legends/WallOfHeat.java b/Mage.Sets/src/mage/sets/legends/WallOfHeat.java index c7197dad715..9b137c1f889 100644 --- a/Mage.Sets/src/mage/sets/legends/WallOfHeat.java +++ b/Mage.Sets/src/mage/sets/legends/WallOfHeat.java @@ -45,7 +45,6 @@ public class WallOfHeat extends CardImpl { this.expansionSetCode = "LEG"; this.subtype.add("Wall"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/legends/XiraArien.java b/Mage.Sets/src/mage/sets/legends/XiraArien.java index c053fa70a81..7c616527e33 100644 --- a/Mage.Sets/src/mage/sets/legends/XiraArien.java +++ b/Mage.Sets/src/mage/sets/legends/XiraArien.java @@ -54,9 +54,6 @@ public class XiraArien extends CardImpl { this.subtype.add("Insect"); this.subtype.add("Wizard"); - this.color.setRed(true); - this.color.setGreen(true); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/legions/AvenEnvoy.java b/Mage.Sets/src/mage/sets/legions/AvenEnvoy.java index 25596657e8c..43a9daf6691 100644 --- a/Mage.Sets/src/mage/sets/legions/AvenEnvoy.java +++ b/Mage.Sets/src/mage/sets/legions/AvenEnvoy.java @@ -46,7 +46,6 @@ public class AvenEnvoy extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Soldier"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/legions/BladeSliver.java b/Mage.Sets/src/mage/sets/legions/BladeSliver.java index 2995df5c952..a36949703ad 100644 --- a/Mage.Sets/src/mage/sets/legions/BladeSliver.java +++ b/Mage.Sets/src/mage/sets/legions/BladeSliver.java @@ -49,7 +49,6 @@ public class BladeSliver extends CardImpl { this.expansionSetCode = "LGN"; this.subtype.add("Sliver"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/legions/Brontotherium.java b/Mage.Sets/src/mage/sets/legions/Brontotherium.java index ddceca6b855..9304ff3120b 100644 --- a/Mage.Sets/src/mage/sets/legions/Brontotherium.java +++ b/Mage.Sets/src/mage/sets/legions/Brontotherium.java @@ -46,7 +46,6 @@ public class Brontotherium extends CardImpl { this.expansionSetCode = "LGN"; 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/legions/BroodSliver.java b/Mage.Sets/src/mage/sets/legions/BroodSliver.java index 0067f02c331..48e856b3b72 100644 --- a/Mage.Sets/src/mage/sets/legions/BroodSliver.java +++ b/Mage.Sets/src/mage/sets/legions/BroodSliver.java @@ -50,7 +50,6 @@ public class BroodSliver extends CardImpl { this.expansionSetCode = "LGN"; this.subtype.add("Sliver"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/legions/CryptSliver.java b/Mage.Sets/src/mage/sets/legions/CryptSliver.java index 9a5a1427d51..40b2917fcde 100644 --- a/Mage.Sets/src/mage/sets/legions/CryptSliver.java +++ b/Mage.Sets/src/mage/sets/legions/CryptSliver.java @@ -54,7 +54,6 @@ public class CryptSliver extends CardImpl { this.expansionSetCode = "LGN"; 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/legions/DarkSupplicant.java b/Mage.Sets/src/mage/sets/legions/DarkSupplicant.java index 529d513afdb..867129eb40b 100644 --- a/Mage.Sets/src/mage/sets/legions/DarkSupplicant.java +++ b/Mage.Sets/src/mage/sets/legions/DarkSupplicant.java @@ -70,7 +70,6 @@ public class DarkSupplicant 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/legions/DefiantElf.java b/Mage.Sets/src/mage/sets/legions/DefiantElf.java index 6a8332f5645..0d3f729a71f 100644 --- a/Mage.Sets/src/mage/sets/legions/DefiantElf.java +++ b/Mage.Sets/src/mage/sets/legions/DefiantElf.java @@ -45,7 +45,6 @@ public class DefiantElf extends CardImpl { this.expansionSetCode = "LGN"; 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/legions/GempalmIncinerator.java b/Mage.Sets/src/mage/sets/legions/GempalmIncinerator.java index a4e9f6d52db..669fb8cfd20 100644 --- a/Mage.Sets/src/mage/sets/legions/GempalmIncinerator.java +++ b/Mage.Sets/src/mage/sets/legions/GempalmIncinerator.java @@ -58,7 +58,6 @@ public class GempalmIncinerator extends CardImpl { this.expansionSetCode = "LGN"; 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/legions/Hundroog.java b/Mage.Sets/src/mage/sets/legions/Hundroog.java index 8db24afa1e8..102bd709fe8 100644 --- a/Mage.Sets/src/mage/sets/legions/Hundroog.java +++ b/Mage.Sets/src/mage/sets/legions/Hundroog.java @@ -46,7 +46,6 @@ public class Hundroog extends CardImpl { this.expansionSetCode = "LGN"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/legions/HunterSliver.java b/Mage.Sets/src/mage/sets/legions/HunterSliver.java index 8ad42a6d1f0..45449f1ba84 100644 --- a/Mage.Sets/src/mage/sets/legions/HunterSliver.java +++ b/Mage.Sets/src/mage/sets/legions/HunterSliver.java @@ -55,7 +55,6 @@ public class HunterSliver extends CardImpl { this.expansionSetCode = "LGN"; this.subtype.add("Sliver"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/legions/KeeneyeAven.java b/Mage.Sets/src/mage/sets/legions/KeeneyeAven.java index e522d5de362..856c38a0a9b 100644 --- a/Mage.Sets/src/mage/sets/legions/KeeneyeAven.java +++ b/Mage.Sets/src/mage/sets/legions/KeeneyeAven.java @@ -48,7 +48,6 @@ public class KeeneyeAven 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/legions/MacetailHystrodon.java b/Mage.Sets/src/mage/sets/legions/MacetailHystrodon.java index 7cc55d1266a..881cb226a2f 100644 --- a/Mage.Sets/src/mage/sets/legions/MacetailHystrodon.java +++ b/Mage.Sets/src/mage/sets/legions/MacetailHystrodon.java @@ -48,7 +48,6 @@ public class MacetailHystrodon extends CardImpl { this.expansionSetCode = "LGN"; 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/legions/MagmaSliver.java b/Mage.Sets/src/mage/sets/legions/MagmaSliver.java index 2c0dfc84605..3bb0092a0e7 100644 --- a/Mage.Sets/src/mage/sets/legions/MagmaSliver.java +++ b/Mage.Sets/src/mage/sets/legions/MagmaSliver.java @@ -57,7 +57,6 @@ public class MagmaSliver extends CardImpl { this.expansionSetCode = "LGN"; this.subtype.add("Sliver"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/legions/MerchantOfSecrets.java b/Mage.Sets/src/mage/sets/legions/MerchantOfSecrets.java index 85131da238a..14e95407293 100644 --- a/Mage.Sets/src/mage/sets/legions/MerchantOfSecrets.java +++ b/Mage.Sets/src/mage/sets/legions/MerchantOfSecrets.java @@ -47,7 +47,6 @@ public class MerchantOfSecrets 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/legions/MistformSliver.java b/Mage.Sets/src/mage/sets/legions/MistformSliver.java index 4bddd33dbb7..495458f4e11 100644 --- a/Mage.Sets/src/mage/sets/legions/MistformSliver.java +++ b/Mage.Sets/src/mage/sets/legions/MistformSliver.java @@ -65,7 +65,6 @@ public class MistformSliver extends CardImpl { this.subtype.add("Illusion"); this.subtype.add("Sliver"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/legions/NantukoVigilante.java b/Mage.Sets/src/mage/sets/legions/NantukoVigilante.java index 87a02d191bd..3308c7eb584 100644 --- a/Mage.Sets/src/mage/sets/legions/NantukoVigilante.java +++ b/Mage.Sets/src/mage/sets/legions/NantukoVigilante.java @@ -63,7 +63,6 @@ public class NantukoVigilante extends CardImpl { this.subtype.add("Druid"); this.subtype.add("Mutant"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/legions/NeedleshotGourna.java b/Mage.Sets/src/mage/sets/legions/NeedleshotGourna.java index 91a2035b73e..a6f64688815 100644 --- a/Mage.Sets/src/mage/sets/legions/NeedleshotGourna.java +++ b/Mage.Sets/src/mage/sets/legions/NeedleshotGourna.java @@ -45,7 +45,6 @@ public class NeedleshotGourna extends CardImpl { this.expansionSetCode = "LGN"; 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/legions/PlatedSliver.java b/Mage.Sets/src/mage/sets/legions/PlatedSliver.java index 180c61d25bf..17a2d0e036f 100644 --- a/Mage.Sets/src/mage/sets/legions/PlatedSliver.java +++ b/Mage.Sets/src/mage/sets/legions/PlatedSliver.java @@ -49,7 +49,6 @@ public class PlatedSliver extends CardImpl { this.expansionSetCode = "LGN"; 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/legions/PrimocEscapee.java b/Mage.Sets/src/mage/sets/legions/PrimocEscapee.java index c96fdc1ec69..3a9d5d88f55 100644 --- a/Mage.Sets/src/mage/sets/legions/PrimocEscapee.java +++ b/Mage.Sets/src/mage/sets/legions/PrimocEscapee.java @@ -48,7 +48,6 @@ public class PrimocEscapee extends CardImpl { this.subtype.add("Bird"); this.subtype.add("Beast"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/legions/QuickSliver.java b/Mage.Sets/src/mage/sets/legions/QuickSliver.java index f8df23a6b5a..7ce123a231e 100644 --- a/Mage.Sets/src/mage/sets/legions/QuickSliver.java +++ b/Mage.Sets/src/mage/sets/legions/QuickSliver.java @@ -56,7 +56,6 @@ public class QuickSliver extends CardImpl { this.expansionSetCode = "LGN"; 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/legions/RidgetopRaptor.java b/Mage.Sets/src/mage/sets/legions/RidgetopRaptor.java index 984088c57fa..f0b471e3a73 100644 --- a/Mage.Sets/src/mage/sets/legions/RidgetopRaptor.java +++ b/Mage.Sets/src/mage/sets/legions/RidgetopRaptor.java @@ -46,7 +46,6 @@ public class RidgetopRaptor extends CardImpl { this.subtype.add("Lizard"); this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/legions/RootSliver.java b/Mage.Sets/src/mage/sets/legions/RootSliver.java index 1291064b610..9bb21e30519 100644 --- a/Mage.Sets/src/mage/sets/legions/RootSliver.java +++ b/Mage.Sets/src/mage/sets/legions/RootSliver.java @@ -60,7 +60,6 @@ public class RootSliver extends CardImpl { this.expansionSetCode = "LGN"; 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/legions/ScionOfDarkness.java b/Mage.Sets/src/mage/sets/legions/ScionOfDarkness.java index 8c836befba1..723005e4c80 100644 --- a/Mage.Sets/src/mage/sets/legions/ScionOfDarkness.java +++ b/Mage.Sets/src/mage/sets/legions/ScionOfDarkness.java @@ -60,7 +60,6 @@ public class ScionOfDarkness extends CardImpl { this.expansionSetCode = "LGN"; 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/legions/ShiftingSliver.java b/Mage.Sets/src/mage/sets/legions/ShiftingSliver.java index 73e75f8e43a..656caafaa53 100644 --- a/Mage.Sets/src/mage/sets/legions/ShiftingSliver.java +++ b/Mage.Sets/src/mage/sets/legions/ShiftingSliver.java @@ -61,7 +61,6 @@ public class ShiftingSliver extends CardImpl { this.expansionSetCode = "LGN"; this.subtype.add("Sliver"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/legions/SpectralSliver.java b/Mage.Sets/src/mage/sets/legions/SpectralSliver.java index 5d95e4de48a..9a063458e1d 100644 --- a/Mage.Sets/src/mage/sets/legions/SpectralSliver.java +++ b/Mage.Sets/src/mage/sets/legions/SpectralSliver.java @@ -56,7 +56,6 @@ public class SpectralSliver extends CardImpl { this.subtype.add("Sliver"); 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/legions/SynapseSliver.java b/Mage.Sets/src/mage/sets/legions/SynapseSliver.java index 2d7f727ad12..515a48b5605 100644 --- a/Mage.Sets/src/mage/sets/legions/SynapseSliver.java +++ b/Mage.Sets/src/mage/sets/legions/SynapseSliver.java @@ -49,7 +49,6 @@ public class SynapseSliver extends CardImpl { this.expansionSetCode = "LGN"; this.subtype.add("Sliver"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/legions/ToxinSliver.java b/Mage.Sets/src/mage/sets/legions/ToxinSliver.java index 8901f40af5d..b7aa297b0ee 100644 --- a/Mage.Sets/src/mage/sets/legions/ToxinSliver.java +++ b/Mage.Sets/src/mage/sets/legions/ToxinSliver.java @@ -52,7 +52,6 @@ public class ToxinSliver extends CardImpl { this.expansionSetCode = "LGN"; 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/legions/WardSliver.java b/Mage.Sets/src/mage/sets/legions/WardSliver.java index cdabbc1555e..3731df3c409 100644 --- a/Mage.Sets/src/mage/sets/legions/WardSliver.java +++ b/Mage.Sets/src/mage/sets/legions/WardSliver.java @@ -65,7 +65,6 @@ public class WardSliver extends CardImpl { this.expansionSetCode = "LGN"; 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/legions/WirewoodChanneler.java b/Mage.Sets/src/mage/sets/legions/WirewoodChanneler.java index f2028e62ad8..f878e0563fb 100644 --- a/Mage.Sets/src/mage/sets/legions/WirewoodChanneler.java +++ b/Mage.Sets/src/mage/sets/legions/WirewoodChanneler.java @@ -57,7 +57,6 @@ public class WirewoodChanneler 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/legions/WirewoodHivemaster.java b/Mage.Sets/src/mage/sets/legions/WirewoodHivemaster.java index c2034eea4b4..ce5e2c1723e 100644 --- a/Mage.Sets/src/mage/sets/legions/WirewoodHivemaster.java +++ b/Mage.Sets/src/mage/sets/legions/WirewoodHivemaster.java @@ -59,7 +59,6 @@ public class WirewoodHivemaster extends CardImpl { this.expansionSetCode = "LGN"; 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/limitedalpha/AncestralRecall.java b/Mage.Sets/src/mage/sets/limitedalpha/AncestralRecall.java index 96a136e73d1..d82b5b06ef0 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/AncestralRecall.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/AncestralRecall.java @@ -44,7 +44,6 @@ public class AncestralRecall extends CardImpl { super(ownerId, 48, "Ancestral Recall", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "LEA"; - this.color.setBlue(true); // Target player draws three cards. this.getSpellAbility().addEffect(new DrawCardTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/AnimateDead.java b/Mage.Sets/src/mage/sets/limitedalpha/AnimateDead.java index c868a3738dc..3ab1fcca736 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/AnimateDead.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/AnimateDead.java @@ -70,7 +70,6 @@ public class AnimateDead extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature card in a graveyard TargetCardInGraveyard auraTarget = new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard")); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/AnimateWall.java b/Mage.Sets/src/mage/sets/limitedalpha/AnimateWall.java index 992995d721d..6e15de5467d 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/AnimateWall.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/AnimateWall.java @@ -64,7 +64,6 @@ public class AnimateWall extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant Wall TargetPermanent auraTarget = new TargetCreaturePermanent(filter); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/AspectOfWolf.java b/Mage.Sets/src/mage/sets/limitedalpha/AspectOfWolf.java index 0d453448623..1238509d2d0 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/AspectOfWolf.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/AspectOfWolf.java @@ -56,7 +56,6 @@ public class AspectOfWolf extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Berserk.java b/Mage.Sets/src/mage/sets/limitedalpha/Berserk.java index 904cd5be44c..d1da5c2f49c 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Berserk.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Berserk.java @@ -65,7 +65,6 @@ public class Berserk extends CardImpl { super(ownerId, 94, "Berserk", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "LEA"; - this.color.setGreen(true); // Cast Berserk only before the combat damage step. (Zone = all because it can be at least graveyard or hand) this.addAbility(new SimpleStaticAbility(Zone.ALL, new BerserkReplacementEffect()), new CombatDamageStepStartedWatcher()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/BlueElementalBlast.java b/Mage.Sets/src/mage/sets/limitedalpha/BlueElementalBlast.java index df4e653f477..8bf79b4c92d 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/BlueElementalBlast.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/BlueElementalBlast.java @@ -59,7 +59,6 @@ public class BlueElementalBlast extends CardImpl { super(ownerId, 50, "Blue Elemental Blast", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "LEA"; - this.color.setBlue(true); // Choose one - Counter target red spell; or destroy target red permanent. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Braingeyser.java b/Mage.Sets/src/mage/sets/limitedalpha/Braingeyser.java index c36107a11db..356c719ae6f 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Braingeyser.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Braingeyser.java @@ -46,7 +46,6 @@ public class Braingeyser extends CardImpl { super(ownerId, 51, "Braingeyser", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{U}{U}"); this.expansionSetCode = "LEA"; - this.color.setBlue(true); // Target player draws X cards. this.getSpellAbility().addEffect(new DrawCardTargetEffect(new ManacostVariableValue())); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Burrowing.java b/Mage.Sets/src/mage/sets/limitedalpha/Burrowing.java index c7a28b416a9..786dfa765a6 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Burrowing.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Burrowing.java @@ -60,7 +60,6 @@ public class Burrowing extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant creature // Enchanted creature has mountainwalk. diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Castle.java b/Mage.Sets/src/mage/sets/limitedalpha/Castle.java index 1e4c5699664..f1e88a4c894 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Castle.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Castle.java @@ -48,7 +48,6 @@ public class Castle extends CardImpl { super(ownerId, 193, "Castle", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "LEA"; - this.color.setWhite(true); // Untapped creatures you control get +0/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 2, Duration.WhileOnBattlefield, new FilterUntappedCreature()))); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Cockatrice.java b/Mage.Sets/src/mage/sets/limitedalpha/Cockatrice.java index 066dc7eaa22..8cefbba278b 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Cockatrice.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Cockatrice.java @@ -56,7 +56,6 @@ public class Cockatrice extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Cockatrice"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ControlMagic.java b/Mage.Sets/src/mage/sets/limitedalpha/ControlMagic.java index 0590c87b5c0..6a27d829d84 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/ControlMagic.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/ControlMagic.java @@ -53,7 +53,6 @@ public class ControlMagic extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/CopyArtifact.java b/Mage.Sets/src/mage/sets/limitedalpha/CopyArtifact.java index 2e6dd341e63..2018a4e7f69 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/CopyArtifact.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/CopyArtifact.java @@ -58,7 +58,6 @@ public class CopyArtifact extends CardImpl { super(ownerId, 54, "Copy Artifact", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "LEA"; - this.color.setBlue(true); // You may have Copy Artifact enter the battlefield as a copy of any artifact on the battlefield, except it's an enchantment in addition to its other types. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new EntersBattlefieldEffect( diff --git a/Mage.Sets/src/mage/sets/limitedalpha/DeathWard.java b/Mage.Sets/src/mage/sets/limitedalpha/DeathWard.java index e34827389a5..019a8bc2ec4 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/DeathWard.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/DeathWard.java @@ -45,7 +45,6 @@ public class DeathWard extends CardImpl { super(ownerId, 201, "Death Ward", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "LEA"; - this.color.setWhite(true); // Regenerate target creature. this.getSpellAbility().addEffect(new RegenerateTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/DemonicTutor.java b/Mage.Sets/src/mage/sets/limitedalpha/DemonicTutor.java index f59d49417ed..ccc48950096 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/DemonicTutor.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/DemonicTutor.java @@ -45,7 +45,6 @@ public class DemonicTutor extends CardImpl { super(ownerId, 13, "Demonic Tutor", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "LEA"; - 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/limitedalpha/Disintegrate.java b/Mage.Sets/src/mage/sets/limitedalpha/Disintegrate.java index 72488f9803d..0bf72fdb9c1 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Disintegrate.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Disintegrate.java @@ -51,7 +51,6 @@ public class Disintegrate extends CardImpl { super(ownerId, 141, "Disintegrate", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{X}{R}"); this.expansionSetCode = "LEA"; - this.color.setRed(true); // Disintegrate deals X damage to target creature or player. That creature can't be regenerated this turn. If the creature would die this turn, exile it instead. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/DrainLife.java b/Mage.Sets/src/mage/sets/limitedalpha/DrainLife.java index 7cddea645a6..0a1ae5b2673 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/DrainLife.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/DrainLife.java @@ -61,7 +61,6 @@ public class DrainLife extends CardImpl { super(ownerId, 14, "Drain Life", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{X}{1}{B}"); this.expansionSetCode = "LEA"; - this.color.setBlack(true); // Spend only black mana on X. // Drain Life deals X damage to target creature or player. You gain life equal to the damage dealt, but not more life than the player's life total before Drain Life dealt damage or the creature's toughness. diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Fastbond.java b/Mage.Sets/src/mage/sets/limitedalpha/Fastbond.java index 4d2c3490fd3..d220484fc1c 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Fastbond.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Fastbond.java @@ -51,7 +51,6 @@ public class Fastbond extends CardImpl { super(ownerId, 101, "Fastbond", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "LEA"; - this.color.setGreen(true); // You may play any number of additional lands on each of your turns. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/FrozenShade.java b/Mage.Sets/src/mage/sets/limitedalpha/FrozenShade.java index 57a45cdb867..39e3df8c7a4 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/FrozenShade.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/FrozenShade.java @@ -50,7 +50,6 @@ public class FrozenShade extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Shade"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Fungusaur.java b/Mage.Sets/src/mage/sets/limitedalpha/Fungusaur.java index 0d34c042fdf..aa8a0dd0e15 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Fungusaur.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Fungusaur.java @@ -50,7 +50,6 @@ public class Fungusaur extends CardImpl { this.subtype.add("Fungus"); this.subtype.add("Lizard"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/HowlFromBeyond.java b/Mage.Sets/src/mage/sets/limitedalpha/HowlFromBeyond.java index 26ae3ceac0e..8d873d26efe 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/HowlFromBeyond.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/HowlFromBeyond.java @@ -48,7 +48,6 @@ public class HowlFromBeyond extends CardImpl { super(ownerId, 20, "Howl from Beyond", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{X}{B}"); this.expansionSetCode = "LEA"; - this.color.setBlack(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/limitedalpha/Hurricane.java b/Mage.Sets/src/mage/sets/limitedalpha/Hurricane.java index 7f8b20aa804..5abcfeb4f22 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Hurricane.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Hurricane.java @@ -53,7 +53,6 @@ public class Hurricane extends CardImpl { super(ownerId, 109, "Hurricane", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{G}"); this.expansionSetCode = "LEA"; - this.color.setGreen(true); // Hurricane deals X damage to each creature with flying and each player. this.getSpellAbility().addEffect(new DamageEverythingEffect(new ManacostVariableValue(), filter)); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Invisibility.java b/Mage.Sets/src/mage/sets/limitedalpha/Invisibility.java index e7578814aae..cc7c8671424 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Invisibility.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Invisibility.java @@ -55,7 +55,6 @@ public class Invisibility extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/IronclawOrcs.java b/Mage.Sets/src/mage/sets/limitedalpha/IronclawOrcs.java index 59f3c955792..e4dd0519c63 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/IronclawOrcs.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/IronclawOrcs.java @@ -55,7 +55,6 @@ public class IronclawOrcs extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Orc"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/LeyDruid.java b/Mage.Sets/src/mage/sets/limitedalpha/LeyDruid.java index 65b9ec97c91..ef4dac16c16 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/LeyDruid.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/LeyDruid.java @@ -52,7 +52,6 @@ public class LeyDruid 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/limitedalpha/LivingLands.java b/Mage.Sets/src/mage/sets/limitedalpha/LivingLands.java index a80b2294026..930379988c5 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/LivingLands.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/LivingLands.java @@ -56,7 +56,6 @@ public class LivingLands extends CardImpl { super(ownerId, 118, "Living Lands", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}"); this.expansionSetCode = "LEA"; - this.color.setGreen(true); // All Forests are 1/1 creatures that are still lands. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAllEffect(new LivingLandsToken(), "lands", filter, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ManaShort.java b/Mage.Sets/src/mage/sets/limitedalpha/ManaShort.java index aaae1a44163..68a31f8db1c 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/ManaShort.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/ManaShort.java @@ -52,7 +52,6 @@ public class ManaShort extends CardImpl { super(ownerId, 66, "Mana Short", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "LEA"; - this.color.setBlue(true); // Tap all lands target player controls and empty his or her mana pool. this.getSpellAbility().addEffect(new ManaShortEffect()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/MindTwist.java b/Mage.Sets/src/mage/sets/limitedalpha/MindTwist.java index 91a80776779..56267c41c75 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/MindTwist.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/MindTwist.java @@ -45,7 +45,6 @@ public class MindTwist extends CardImpl { super(ownerId, 24, "Mind Twist", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{B}"); this.expansionSetCode = "LEA"; - this.color.setBlack(true); // Target player discards X cards at random. this.getSpellAbility().addEffect(new DiscardTargetEffect(new ManacostVariableValue(), true)); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/NaturalSelection.java b/Mage.Sets/src/mage/sets/limitedalpha/NaturalSelection.java index ca8beff350c..a9c1236857d 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/NaturalSelection.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/NaturalSelection.java @@ -56,7 +56,6 @@ public class NaturalSelection extends CardImpl { super(ownerId, 121, "Natural Selection", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "LEA"; - this.color.setGreen(true); // Look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle his or her library. this.getSpellAbility().addEffect(new NaturalSelectionEffect()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java b/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java index a589540a93b..ea095f72e54 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java @@ -61,7 +61,6 @@ public class NorthernPaladin 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/limitedalpha/OrcishOriflamme.java b/Mage.Sets/src/mage/sets/limitedalpha/OrcishOriflamme.java index 7862076b35a..a23d1462531 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/OrcishOriflamme.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/OrcishOriflamme.java @@ -47,7 +47,6 @@ public class OrcishOriflamme extends CardImpl { super(ownerId, 167, "Orcish Oriflamme", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); this.expansionSetCode = "LEA"; - this.color.setRed(true); // Attacking creatures you control get +1/+0. BoostControlledEffect boostEffect = new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, new FilterAttackingCreature(), false); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Paralyze.java b/Mage.Sets/src/mage/sets/limitedalpha/Paralyze.java index 997f0f04a9e..26de248aed0 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Paralyze.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Paralyze.java @@ -57,7 +57,6 @@ public class Paralyze extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/PirateShip.java b/Mage.Sets/src/mage/sets/limitedalpha/PirateShip.java index 6276a4f570f..f350c41d9b9 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/PirateShip.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/PirateShip.java @@ -58,7 +58,6 @@ public class PirateShip extends CardImpl { this.subtype.add("Human"); this.subtype.add("Pirate"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/PowerSink.java b/Mage.Sets/src/mage/sets/limitedalpha/PowerSink.java index 9c09ed21186..6f053180675 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/PowerSink.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/PowerSink.java @@ -56,7 +56,6 @@ public class PowerSink extends CardImpl { super(ownerId, 73, "Power Sink", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{X}{U}"); this.expansionSetCode = "LEA"; - this.color.setBlue(true); // Counter target spell unless its controller pays {X}. If he or she doesn't, that player taps all lands with mana abilities he or she controls and empties his or her mana pool. this.getSpellAbility().addEffect(new PowerSinkCounterUnlessPaysEffect()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/PsychicVenom.java b/Mage.Sets/src/mage/sets/limitedalpha/PsychicVenom.java index 4e527acfacd..1071952555a 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/PsychicVenom.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/PsychicVenom.java @@ -58,7 +58,6 @@ public class PsychicVenom extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/RedElementalBlast.java b/Mage.Sets/src/mage/sets/limitedalpha/RedElementalBlast.java index 8ca74b0334e..2d1d94bb20e 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/RedElementalBlast.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/RedElementalBlast.java @@ -58,7 +58,6 @@ public class RedElementalBlast extends CardImpl { super(ownerId, 170, "Red Elemental Blast", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "LEA"; - this.color.setRed(true); // Choose one - Counter target blue spell; or destroy target blue permanent. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Regrowth.java b/Mage.Sets/src/mage/sets/limitedalpha/Regrowth.java index 538694127fd..8c283c65879 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Regrowth.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Regrowth.java @@ -46,7 +46,6 @@ public class Regrowth extends CardImpl { super(ownerId, 123, "Regrowth", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "LEA"; - 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/limitedalpha/Resurrection.java b/Mage.Sets/src/mage/sets/limitedalpha/Resurrection.java index 4ec15348ba3..fb953d1e2df 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Resurrection.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Resurrection.java @@ -52,7 +52,6 @@ public class Resurrection extends CardImpl { super(ownerId, 218, "Resurrection", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{W}{W}"); this.expansionSetCode = "LEA"; - this.color.setWhite(true); // Return target creature card from your graveyard to the battlefield. this.getSpellAbility().addEffect(new ResurrectionEffect()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ReverseDamage.java b/Mage.Sets/src/mage/sets/limitedalpha/ReverseDamage.java index d75c2a9566d..a2dc3130009 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/ReverseDamage.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/ReverseDamage.java @@ -51,7 +51,6 @@ public class ReverseDamage extends CardImpl { super(ownerId, 219, "Reverse Damage", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{W}{W}"); this.expansionSetCode = "LEA"; - this.color.setWhite(true); // The next time a source of your choice would deal damage to you this turn, prevent that damage. You gain life equal to the damage prevented this way. this.getSpellAbility().addEffect(new ReverseDamageEffect()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/RocOfKherRidges.java b/Mage.Sets/src/mage/sets/limitedalpha/RocOfKherRidges.java index fc834e41bcb..0b66a3927de 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/RocOfKherRidges.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/RocOfKherRidges.java @@ -45,7 +45,6 @@ public class RocOfKherRidges extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Bird"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/SeaSerpent.java b/Mage.Sets/src/mage/sets/limitedalpha/SeaSerpent.java index 918738772c8..9ef628a1817 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/SeaSerpent.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/SeaSerpent.java @@ -61,7 +61,6 @@ public class SeaSerpent extends CardImpl { this.expansionSetCode = "LEA"; 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/limitedalpha/Sinkhole.java b/Mage.Sets/src/mage/sets/limitedalpha/Sinkhole.java index b6d1c51c4e0..985cf93102e 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Sinkhole.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Sinkhole.java @@ -44,7 +44,6 @@ public class Sinkhole extends CardImpl { super(ownerId, 38, "Sinkhole", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}{B}"); this.expansionSetCode = "LEA"; - this.color.setBlack(true); // Destroy target land. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Smoke.java b/Mage.Sets/src/mage/sets/limitedalpha/Smoke.java index 562600b86f3..b982edd5084 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Smoke.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Smoke.java @@ -52,7 +52,6 @@ public class Smoke extends CardImpl { super(ownerId, 176, "Smoke", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{R}{R}"); this.expansionSetCode = "LEA"; - this.color.setRed(true); // Players can't untap more than one creature during their untap steps. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SmokeEffect())); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/SpellBlast.java b/Mage.Sets/src/mage/sets/limitedalpha/SpellBlast.java index 1a60d8c2f88..5f57d3da270 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/SpellBlast.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/SpellBlast.java @@ -53,7 +53,6 @@ public class SpellBlast extends CardImpl { super(ownerId, 80, "Spell Blast", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{X}{U}"); this.expansionSetCode = "LEA"; - this.color.setBlue(true); // Counter target spell with converted mana cost X. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ThicketBasilisk.java b/Mage.Sets/src/mage/sets/limitedalpha/ThicketBasilisk.java index aaab3b720d1..448809c03cc 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/ThicketBasilisk.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/ThicketBasilisk.java @@ -55,7 +55,6 @@ public class ThicketBasilisk extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Basilisk"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/TimeWalk.java b/Mage.Sets/src/mage/sets/limitedalpha/TimeWalk.java index cad97d3a38c..8501e64b587 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/TimeWalk.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/TimeWalk.java @@ -48,7 +48,6 @@ public class TimeWalk extends CardImpl { super(ownerId, 84, "Time Walk", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{U}"); this.expansionSetCode = "LEA"; - this.color.setBlue(true); // Take an extra turn after this one. this.getSpellAbility().addEffect(new AddExtraTurnControllerEffect()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Timetwister.java b/Mage.Sets/src/mage/sets/limitedalpha/Timetwister.java index 015dc2f6c23..c35a2e31b6a 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Timetwister.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Timetwister.java @@ -49,7 +49,6 @@ public class Timetwister extends CardImpl { super(ownerId, 85, "Timetwister", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "LEA"; - this.color.setBlue(true); // Each player shuffles his or her hand and graveyard into his or her library, then draws seven cards. this.getSpellAbility().addEffect(new TimetwisterEffect()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/UthdenTroll.java b/Mage.Sets/src/mage/sets/limitedalpha/UthdenTroll.java index 67cd08be729..a08d798ad24 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/UthdenTroll.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/UthdenTroll.java @@ -49,7 +49,6 @@ public class UthdenTroll extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Troll"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WallOfWater.java b/Mage.Sets/src/mage/sets/limitedalpha/WallOfWater.java index 217435031bf..5615ea84e11 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/WallOfWater.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/WallOfWater.java @@ -51,7 +51,6 @@ public class WallOfWater extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Wall"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Web.java b/Mage.Sets/src/mage/sets/limitedalpha/Web.java index 3cdb30b5c09..bff3b0d5097 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Web.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Web.java @@ -53,7 +53,6 @@ public class Web extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WheelOfFortune.java b/Mage.Sets/src/mage/sets/limitedalpha/WheelOfFortune.java index 92a342e738a..5b3d7b0c981 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/WheelOfFortune.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/WheelOfFortune.java @@ -44,7 +44,6 @@ public class WheelOfFortune extends CardImpl { super(ownerId, 184, "Wheel of Fortune", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "LEA"; - this.color.setRed(true); // Each player discards his or her hand, this.getSpellAbility().addEffect(new DiscardHandAllEffect()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WillOTheWisp.java b/Mage.Sets/src/mage/sets/limitedalpha/WillOTheWisp.java index 08f04d0484f..d4df2884afc 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/WillOTheWisp.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/WillOTheWisp.java @@ -49,7 +49,6 @@ public class WillOTheWisp extends CardImpl { this.expansionSetCode = "LEA"; 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/limitedalpha/ZombieMaster.java b/Mage.Sets/src/mage/sets/limitedalpha/ZombieMaster.java index 355cf93c2fb..f5cd33ec398 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/ZombieMaster.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/ZombieMaster.java @@ -62,7 +62,6 @@ public class ZombieMaster extends CardImpl { this.expansionSetCode = "LEA"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Balance.java b/Mage.Sets/src/mage/sets/limitedbeta/Balance.java index b82ea427f65..f6e28cc32bb 100644 --- a/Mage.Sets/src/mage/sets/limitedbeta/Balance.java +++ b/Mage.Sets/src/mage/sets/limitedbeta/Balance.java @@ -57,7 +57,6 @@ public class Balance extends CardImpl { super(ownerId, 188, "Balance", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{W}"); this.expansionSetCode = "LEB"; - this.color.setWhite(true); // Each player chooses a number of lands he or she controls equal to the number of lands controlled by the player who controls the fewest, then sacrifices the rest. Players discard cards and sacrifice creatures the same way. this.getSpellAbility().addEffect(new BalanceEffect()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/AdderStaffBoggart.java b/Mage.Sets/src/mage/sets/lorwyn/AdderStaffBoggart.java index 50eb09d1646..d4df6d9029a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/AdderStaffBoggart.java +++ b/Mage.Sets/src/mage/sets/lorwyn/AdderStaffBoggart.java @@ -49,7 +49,6 @@ public class AdderStaffBoggart 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/lorwyn/ArbiterOfKnollridge.java b/Mage.Sets/src/mage/sets/lorwyn/ArbiterOfKnollridge.java index ca4d5daa5e8..146d923b0ee 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ArbiterOfKnollridge.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ArbiterOfKnollridge.java @@ -53,7 +53,6 @@ public class ArbiterOfKnollridge extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Wizard"); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/lorwyn/AxegrinderGiant.java b/Mage.Sets/src/mage/sets/lorwyn/AxegrinderGiant.java index 47746cfbf01..4413407ed15 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/AxegrinderGiant.java +++ b/Mage.Sets/src/mage/sets/lorwyn/AxegrinderGiant.java @@ -46,7 +46,6 @@ public class AxegrinderGiant extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/BogHoodlums.java b/Mage.Sets/src/mage/sets/lorwyn/BogHoodlums.java index 6abdf415921..ab8b7b589ac 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BogHoodlums.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BogHoodlums.java @@ -50,7 +50,6 @@ public class BogHoodlums extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/lorwyn/BoggartHarbinger.java b/Mage.Sets/src/mage/sets/lorwyn/BoggartHarbinger.java index 352a9321d24..926970af511 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BoggartHarbinger.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BoggartHarbinger.java @@ -56,7 +56,6 @@ public class BoggartHarbinger extends CardImpl { this.subtype.add("Goblin"); 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/lorwyn/BrigidHeroOfKinsbaile.java b/Mage.Sets/src/mage/sets/lorwyn/BrigidHeroOfKinsbaile.java index 11aa4151c27..bdc1a5e46ca 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BrigidHeroOfKinsbaile.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BrigidHeroOfKinsbaile.java @@ -62,7 +62,6 @@ public class BrigidHeroOfKinsbaile extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Archer"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/lorwyn/BurrentonForgeTender.java b/Mage.Sets/src/mage/sets/lorwyn/BurrentonForgeTender.java index 3071d7a9dec..a47bd858ddb 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BurrentonForgeTender.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BurrentonForgeTender.java @@ -62,7 +62,6 @@ public class BurrentonForgeTender extends CardImpl { this.subtype.add("Kithkin"); 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/lorwyn/CloudcrownOak.java b/Mage.Sets/src/mage/sets/lorwyn/CloudcrownOak.java index 91ca2bf5a48..75bd925d07f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/CloudcrownOak.java +++ b/Mage.Sets/src/mage/sets/lorwyn/CloudcrownOak.java @@ -47,7 +47,6 @@ public class CloudcrownOak extends CardImpl { this.subtype.add("Treefolk"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/lorwyn/Cloudthresher.java b/Mage.Sets/src/mage/sets/lorwyn/Cloudthresher.java index 4e60064f424..6ef0a92a1ed 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Cloudthresher.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Cloudthresher.java @@ -59,7 +59,6 @@ public class Cloudthresher extends CardImpl { this.expansionSetCode = "LRW"; 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/lorwyn/CribSwap.java b/Mage.Sets/src/mage/sets/lorwyn/CribSwap.java index c7b88c65cbb..be6f4c28043 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/CribSwap.java +++ b/Mage.Sets/src/mage/sets/lorwyn/CribSwap.java @@ -55,7 +55,6 @@ public class CribSwap extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Shapeshifter"); - this.color.setWhite(true); // Changeling this.addAbility(ChangelingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/CrypticCommand.java b/Mage.Sets/src/mage/sets/lorwyn/CrypticCommand.java index 3cc6e3c77cb..429fd551836 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/CrypticCommand.java +++ b/Mage.Sets/src/mage/sets/lorwyn/CrypticCommand.java @@ -57,7 +57,6 @@ public class CrypticCommand extends CardImpl { super(ownerId, 56, "Cryptic Command", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{U}{U}{U}"); this.expansionSetCode = "LRW"; - this.color.setBlue(true); // Choose two - this.getSpellAbility().getModes().setMinModes(2); diff --git a/Mage.Sets/src/mage/sets/lorwyn/Dawnfluke.java b/Mage.Sets/src/mage/sets/lorwyn/Dawnfluke.java index c9237ce1652..1c1fedc443b 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Dawnfluke.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Dawnfluke.java @@ -52,7 +52,6 @@ public class Dawnfluke extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Elemental"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/lorwyn/DoranTheSiegeTower.java b/Mage.Sets/src/mage/sets/lorwyn/DoranTheSiegeTower.java index 9be51ddef13..9445be3f739 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/DoranTheSiegeTower.java +++ b/Mage.Sets/src/mage/sets/lorwyn/DoranTheSiegeTower.java @@ -66,9 +66,6 @@ public class DoranTheSiegeTower extends CardImpl { this.subtype.add("Treefolk"); this.subtype.add("Shaman"); - this.color.setGreen(true); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/lorwyn/Dread.java b/Mage.Sets/src/mage/sets/lorwyn/Dread.java index ef515938f91..16658558b8a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Dread.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Dread.java @@ -57,7 +57,6 @@ public class Dread extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Incarnation"); - this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/lorwyn/DrownerOfSecrets.java b/Mage.Sets/src/mage/sets/lorwyn/DrownerOfSecrets.java index 21f7c68ca2c..d5d2a22265e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/DrownerOfSecrets.java +++ b/Mage.Sets/src/mage/sets/lorwyn/DrownerOfSecrets.java @@ -64,7 +64,6 @@ public class DrownerOfSecrets 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/lorwyn/ElvishBranchbender.java b/Mage.Sets/src/mage/sets/lorwyn/ElvishBranchbender.java index 0df7f909385..bf991f5c5c5 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ElvishBranchbender.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ElvishBranchbender.java @@ -66,7 +66,6 @@ public class ElvishBranchbender 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/lorwyn/ElvishHarbinger.java b/Mage.Sets/src/mage/sets/lorwyn/ElvishHarbinger.java index e79fad8b646..99d8a070e93 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ElvishHarbinger.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ElvishHarbinger.java @@ -56,7 +56,6 @@ public class ElvishHarbinger 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/lorwyn/EntanglingTrap.java b/Mage.Sets/src/mage/sets/lorwyn/EntanglingTrap.java index 1bd686d9d1b..2df798e1afe 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/EntanglingTrap.java +++ b/Mage.Sets/src/mage/sets/lorwyn/EntanglingTrap.java @@ -60,7 +60,6 @@ public class EntanglingTrap extends CardImpl { super(ownerId, 13, "Entangling Trap", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "LRW"; - this.color.setWhite(true); // Whenever you clash, tap target creature an opponent controls. If you won, that creature doesn't untap during its controller's next untap step. Ability ability = new EntanglingClashTriggeredAbility(); diff --git a/Mage.Sets/src/mage/sets/lorwyn/EyesOfTheWisent.java b/Mage.Sets/src/mage/sets/lorwyn/EyesOfTheWisent.java index bed5bd7c2ac..3ccd3418d76 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/EyesOfTheWisent.java +++ b/Mage.Sets/src/mage/sets/lorwyn/EyesOfTheWisent.java @@ -58,7 +58,6 @@ public class EyesOfTheWisent extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Elemental"); - this.color.setGreen(true); // Whenever an opponent casts a blue spell during your turn, you may put a 4/4 green Elemental creature token onto the battlefield. this.addAbility(new ConditionalTriggeredAbility( diff --git a/Mage.Sets/src/mage/sets/lorwyn/FaerieTrickery.java b/Mage.Sets/src/mage/sets/lorwyn/FaerieTrickery.java index 9bfa142ed79..cc7837bcd12 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FaerieTrickery.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FaerieTrickery.java @@ -55,7 +55,6 @@ public class FaerieTrickery extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Faerie"); - this.color.setBlue(true); // Counter target non-Faerie spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard. this.getSpellAbility().addEffect(new CounterTargetWithReplacementEffect(Zone.EXILED)); diff --git a/Mage.Sets/src/mage/sets/lorwyn/Fallowsage.java b/Mage.Sets/src/mage/sets/lorwyn/Fallowsage.java index 8ecc1194a2e..81387b1efed 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Fallowsage.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Fallowsage.java @@ -47,7 +47,6 @@ public class Fallowsage 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/lorwyn/FavorOfTheMighty.java b/Mage.Sets/src/mage/sets/lorwyn/FavorOfTheMighty.java index 8d0c853f31b..c7df9ae6120 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FavorOfTheMighty.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FavorOfTheMighty.java @@ -62,7 +62,6 @@ public class FavorOfTheMighty extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Giant"); - this.color.setWhite(true); // Each creature with the highest converted mana cost has protection from all colors. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FavorOfTheMightyEffect())); diff --git a/Mage.Sets/src/mage/sets/lorwyn/FistfulOfForce.java b/Mage.Sets/src/mage/sets/lorwyn/FistfulOfForce.java index 989ccf828e5..1ab35ef409d 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FistfulOfForce.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FistfulOfForce.java @@ -56,7 +56,6 @@ public class FistfulOfForce extends CardImpl { super(ownerId, 212, "Fistful of Force", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "LRW"; - this.color.setGreen(true); // Target creature gets +2/+2 until end of turn. Clash with an opponent. If you win, that creature gets an additional +2/+2 and gains trample until end of turn. this.getSpellAbility().addEffect(new FistfulOfForceEffect()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/FlamekinBladewhirl.java b/Mage.Sets/src/mage/sets/lorwyn/FlamekinBladewhirl.java index e9c767d16ce..baf9090e30a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FlamekinBladewhirl.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FlamekinBladewhirl.java @@ -56,7 +56,6 @@ public class FlamekinBladewhirl extends CardImpl { this.subtype.add("Elemental"); 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/lorwyn/ForcedFruition.java b/Mage.Sets/src/mage/sets/lorwyn/ForcedFruition.java index 1d8e716864d..57b9fe7418b 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ForcedFruition.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ForcedFruition.java @@ -49,7 +49,6 @@ public class ForcedFruition extends CardImpl { super(ownerId, 66, "Forced Fruition", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}{U}"); this.expansionSetCode = "LRW"; - this.color.setBlue(true); // Whenever an opponent casts a spell, that player draws seven cards. this.addAbility(new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(7), diff --git a/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java b/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java index 688a91c5598..ce010a6fbe2 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java @@ -55,8 +55,6 @@ public class GaddockTeeg extends CardImpl { this.subtype.add("Kithkin"); this.subtype.add("Advisor"); - 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/lorwyn/GiltLeafSeer.java b/Mage.Sets/src/mage/sets/lorwyn/GiltLeafSeer.java index e5c44d38b29..2ce188e232e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GiltLeafSeer.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GiltLeafSeer.java @@ -52,7 +52,6 @@ public class GiltLeafSeer 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/lorwyn/Glarewielder.java b/Mage.Sets/src/mage/sets/lorwyn/Glarewielder.java index 6944e57f655..ecd32f931f2 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Glarewielder.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Glarewielder.java @@ -53,7 +53,6 @@ public class Glarewielder extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Shaman"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java b/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java index 5fc4aaa02ce..b0543634b68 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java @@ -59,7 +59,6 @@ public class GlimmerdustNap extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant tapped creature TargetPermanent auraTarget = new TargetCreaturePermanent(filter); diff --git a/Mage.Sets/src/mage/sets/lorwyn/GoldmeadowStalwart.java b/Mage.Sets/src/mage/sets/lorwyn/GoldmeadowStalwart.java index f36146bf07a..fbbea813c4e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GoldmeadowStalwart.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GoldmeadowStalwart.java @@ -56,7 +56,6 @@ public class GoldmeadowStalwart 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/lorwyn/HillcomberGiant.java b/Mage.Sets/src/mage/sets/lorwyn/HillcomberGiant.java index af380f792f1..28288fdc311 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HillcomberGiant.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HillcomberGiant.java @@ -47,7 +47,6 @@ public class HillcomberGiant extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Scout"); - this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/lorwyn/HoardersGreed.java b/Mage.Sets/src/mage/sets/lorwyn/HoardersGreed.java index 6b03711ab11..1fca4665842 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HoardersGreed.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HoardersGreed.java @@ -48,7 +48,6 @@ public class HoardersGreed extends CardImpl { super(ownerId, 117, "Hoarder's Greed", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "LRW"; - this.color.setBlack(true); // You lose 2 life and draw two cards, then clash with an opponent. If you win, repeat this process. this.getSpellAbility().addEffect(new HoardersGreedEffect()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java b/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java index ca15e61e219..f868e4fdedd 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java @@ -58,7 +58,6 @@ public class ImmaculateMagistrate 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/lorwyn/IngotChewer.java b/Mage.Sets/src/mage/sets/lorwyn/IngotChewer.java index d08a9562f84..709f6ebc6d2 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/IngotChewer.java +++ b/Mage.Sets/src/mage/sets/lorwyn/IngotChewer.java @@ -50,7 +50,6 @@ public class IngotChewer extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/lorwyn/InnerFlameAcolyte.java b/Mage.Sets/src/mage/sets/lorwyn/InnerFlameAcolyte.java index 6bb7c9febbd..3b649b47c43 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/InnerFlameAcolyte.java +++ b/Mage.Sets/src/mage/sets/lorwyn/InnerFlameAcolyte.java @@ -53,7 +53,6 @@ public class InnerFlameAcolyte 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/lorwyn/JaggedScarArchers.java b/Mage.Sets/src/mage/sets/lorwyn/JaggedScarArchers.java index 444423e5bb1..7e1f3f243ba 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/JaggedScarArchers.java +++ b/Mage.Sets/src/mage/sets/lorwyn/JaggedScarArchers.java @@ -68,7 +68,6 @@ public class JaggedScarArchers extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Archer"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/lorwyn/KnightOfMeadowgrain.java b/Mage.Sets/src/mage/sets/lorwyn/KnightOfMeadowgrain.java index 8b61e50eff4..4b4496bd980 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/KnightOfMeadowgrain.java +++ b/Mage.Sets/src/mage/sets/lorwyn/KnightOfMeadowgrain.java @@ -48,7 +48,6 @@ public class KnightOfMeadowgrain extends CardImpl { this.subtype.add("Kithkin"); 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/lorwyn/Lignify.java b/Mage.Sets/src/mage/sets/lorwyn/Lignify.java index f54f69057a1..7f3fa5b50a2 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Lignify.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Lignify.java @@ -56,7 +56,6 @@ public class Lignify extends CardImpl { this.subtype.add("Treefolk"); this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/lorwyn/MerrowCommerce.java b/Mage.Sets/src/mage/sets/lorwyn/MerrowCommerce.java index 36b3c47d8ff..2ebf6cc58fb 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MerrowCommerce.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MerrowCommerce.java @@ -53,7 +53,6 @@ public class MerrowCommerce extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Merfolk"); - this.color.setBlue(true); // At the beginning of your end step, untap all Merfolk you control. this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new UntapAllControllerEffect(filter, "untap all Merfolk you control"), false)); diff --git a/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java b/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java index f3f494ff899..2405de5d1b7 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java @@ -68,7 +68,6 @@ public class MerrowReejerey 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/lorwyn/MirrorEntity.java b/Mage.Sets/src/mage/sets/lorwyn/MirrorEntity.java index eecdf3cb932..6ea39f60c35 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MirrorEntity.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MirrorEntity.java @@ -58,7 +58,6 @@ public class MirrorEntity extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Shapeshifter"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/lorwyn/MoongloveWinnower.java b/Mage.Sets/src/mage/sets/lorwyn/MoongloveWinnower.java index f7180271cd3..6e58062b661 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MoongloveWinnower.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MoongloveWinnower.java @@ -47,7 +47,6 @@ public class MoongloveWinnower extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java b/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java index cea1deb3ac9..0e3f814c5c8 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java @@ -49,7 +49,6 @@ public class Mournwhelk extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Elemental"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/lorwyn/NamelessInversion.java b/Mage.Sets/src/mage/sets/lorwyn/NamelessInversion.java index f7f9642cb4b..24005d1c8c8 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/NamelessInversion.java +++ b/Mage.Sets/src/mage/sets/lorwyn/NamelessInversion.java @@ -49,7 +49,6 @@ public class NamelessInversion extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Shapeshifter"); - this.color.setBlack(true); // Changeling this.addAbility(ChangelingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/NathOfTheGiltLeaf.java b/Mage.Sets/src/mage/sets/lorwyn/NathOfTheGiltLeaf.java index 909d59dbe5e..2d1b16fdd3e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/NathOfTheGiltLeaf.java +++ b/Mage.Sets/src/mage/sets/lorwyn/NathOfTheGiltLeaf.java @@ -56,8 +56,6 @@ public class NathOfTheGiltLeaf extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); - 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/lorwyn/NathsElite.java b/Mage.Sets/src/mage/sets/lorwyn/NathsElite.java index d04c46064a6..5a3bfe2430e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/NathsElite.java +++ b/Mage.Sets/src/mage/sets/lorwyn/NathsElite.java @@ -53,7 +53,6 @@ public class NathsElite extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/lorwyn/OakenBrawler.java b/Mage.Sets/src/mage/sets/lorwyn/OakenBrawler.java index 1aa05ed9bda..404200e1525 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/OakenBrawler.java +++ b/Mage.Sets/src/mage/sets/lorwyn/OakenBrawler.java @@ -49,7 +49,6 @@ public class OakenBrawler extends CardImpl { this.subtype.add("Treefolk"); this.subtype.add("Warrior"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/lorwyn/OakgnarlWarrior.java b/Mage.Sets/src/mage/sets/lorwyn/OakgnarlWarrior.java index 992c86ff439..0c821934478 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/OakgnarlWarrior.java +++ b/Mage.Sets/src/mage/sets/lorwyn/OakgnarlWarrior.java @@ -48,7 +48,6 @@ public class OakgnarlWarrior extends CardImpl { this.subtype.add("Treefolk"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/lorwyn/OonasProwler.java b/Mage.Sets/src/mage/sets/lorwyn/OonasProwler.java index 6f557bd7294..037075c7a22 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/OonasProwler.java +++ b/Mage.Sets/src/mage/sets/lorwyn/OonasProwler.java @@ -53,7 +53,6 @@ public class OonasProwler extends CardImpl { this.subtype.add("Faerie"); 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/lorwyn/PaperfinRascal.java b/Mage.Sets/src/mage/sets/lorwyn/PaperfinRascal.java index 5f366df41be..347b5fd205c 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/PaperfinRascal.java +++ b/Mage.Sets/src/mage/sets/lorwyn/PaperfinRascal.java @@ -49,7 +49,6 @@ public class PaperfinRascal 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/lorwyn/Pestermite.java b/Mage.Sets/src/mage/sets/lorwyn/Pestermite.java index 9f3d4df2dfa..60c31e41176 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Pestermite.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Pestermite.java @@ -51,7 +51,6 @@ public class Pestermite 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/lorwyn/PloverKnights.java b/Mage.Sets/src/mage/sets/lorwyn/PloverKnights.java index 72adc67e8ea..734eca369c9 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/PloverKnights.java +++ b/Mage.Sets/src/mage/sets/lorwyn/PloverKnights.java @@ -48,7 +48,6 @@ public class PloverKnights extends CardImpl { this.subtype.add("Kithkin"); 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/lorwyn/PrimalCommand.java b/Mage.Sets/src/mage/sets/lorwyn/PrimalCommand.java index d0275362f3d..8c241d4b727 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/PrimalCommand.java +++ b/Mage.Sets/src/mage/sets/lorwyn/PrimalCommand.java @@ -66,7 +66,6 @@ public class PrimalCommand extends CardImpl { super(ownerId, 233, "Primal Command", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); this.expansionSetCode = "LRW"; - this.color.setGreen(true); // Choose two - this.getSpellAbility().getModes().setMinModes(2); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ScarredVinebreeder.java b/Mage.Sets/src/mage/sets/lorwyn/ScarredVinebreeder.java index 88671ed57c2..0c337864536 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ScarredVinebreeder.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ScarredVinebreeder.java @@ -61,7 +61,6 @@ public class ScarredVinebreeder extends CardImpl { this.subtype.add("Elf"); 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/lorwyn/SentinelsOfGlenElendra.java b/Mage.Sets/src/mage/sets/lorwyn/SentinelsOfGlenElendra.java index b374131e4cb..fd857edd50b 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SentinelsOfGlenElendra.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SentinelsOfGlenElendra.java @@ -48,7 +48,6 @@ public class SentinelsOfGlenElendra extends CardImpl { this.subtype.add("Faerie"); 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/lorwyn/SilvergillAdept.java b/Mage.Sets/src/mage/sets/lorwyn/SilvergillAdept.java index a95554b5ca8..bf85fd0790d 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SilvergillAdept.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SilvergillAdept.java @@ -59,7 +59,6 @@ public class SilvergillAdept 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/lorwyn/SpellstutterSprite.java b/Mage.Sets/src/mage/sets/lorwyn/SpellstutterSprite.java index 69c4632aac5..c61a1bf4e3f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SpellstutterSprite.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SpellstutterSprite.java @@ -69,7 +69,6 @@ public class SpellstutterSprite extends CardImpl { this.subtype.add("Faerie"); 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/lorwyn/SqueakingPieSneak.java b/Mage.Sets/src/mage/sets/lorwyn/SqueakingPieSneak.java index 2aaf6d7495a..c005f81ba2b 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SqueakingPieSneak.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SqueakingPieSneak.java @@ -57,7 +57,6 @@ public class SqueakingPieSneak extends CardImpl { this.subtype.add("Goblin"); 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/lorwyn/StinkdrinkerDaredevil.java b/Mage.Sets/src/mage/sets/lorwyn/StinkdrinkerDaredevil.java index f8c1dbaeaa9..6866a7ae04a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/StinkdrinkerDaredevil.java +++ b/Mage.Sets/src/mage/sets/lorwyn/StinkdrinkerDaredevil.java @@ -57,7 +57,6 @@ public class StinkdrinkerDaredevil extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Rogue"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/lorwyn/StonybrookAngler.java b/Mage.Sets/src/mage/sets/lorwyn/StonybrookAngler.java index dcbd6d596f5..282c8dd87bf 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/StonybrookAngler.java +++ b/Mage.Sets/src/mage/sets/lorwyn/StonybrookAngler.java @@ -53,7 +53,6 @@ public class StonybrookAngler extends CardImpl { this.subtype.add("Merfolk"); 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/lorwyn/StreambedAquitects.java b/Mage.Sets/src/mage/sets/lorwyn/StreambedAquitects.java index 40c8baf7f47..0f9fedacea2 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/StreambedAquitects.java +++ b/Mage.Sets/src/mage/sets/lorwyn/StreambedAquitects.java @@ -64,7 +64,6 @@ public class StreambedAquitects 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/lorwyn/Surgespanner.java b/Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java index 4740adc4205..d7ded0f1762 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java @@ -51,7 +51,6 @@ public class Surgespanner 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/lorwyn/SyggRiverGuide.java b/Mage.Sets/src/mage/sets/lorwyn/SyggRiverGuide.java index f3501d3e338..866ecda9d83 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SyggRiverGuide.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SyggRiverGuide.java @@ -63,8 +63,6 @@ public class SyggRiverGuide 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/lorwyn/Thoughtseize.java b/Mage.Sets/src/mage/sets/lorwyn/Thoughtseize.java index e1cc736bc52..10244c120c5 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Thoughtseize.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Thoughtseize.java @@ -55,7 +55,6 @@ public class Thoughtseize extends CardImpl { super(ownerId, 145, "Thoughtseize", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "LRW"; - this.color.setBlack(true); // Target player reveals his or her hand. You choose a nonland card from it. That player discards that card. You lose 2 life. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/TreefolkHarbinger.java b/Mage.Sets/src/mage/sets/lorwyn/TreefolkHarbinger.java index 6eadcdc6c75..5fba662eb23 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/TreefolkHarbinger.java +++ b/Mage.Sets/src/mage/sets/lorwyn/TreefolkHarbinger.java @@ -56,7 +56,6 @@ public class TreefolkHarbinger extends CardImpl { this.subtype.add("Treefolk"); 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/lorwyn/Vigor.java b/Mage.Sets/src/mage/sets/lorwyn/Vigor.java index e05719190d5..af064b86519 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Vigor.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Vigor.java @@ -58,7 +58,6 @@ public class Vigor extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Incarnation"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/lorwyn/WanderwineProphets.java b/Mage.Sets/src/mage/sets/lorwyn/WanderwineProphets.java index ef72c42f32c..69cf8b5c340 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WanderwineProphets.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WanderwineProphets.java @@ -59,7 +59,6 @@ public class WanderwineProphets extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/lorwyn/WarrenScourgeElf.java b/Mage.Sets/src/mage/sets/lorwyn/WarrenScourgeElf.java index f8a7f274b71..289174bc75d 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WarrenScourgeElf.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WarrenScourgeElf.java @@ -55,7 +55,6 @@ public class WarrenScourgeElf 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/lorwyn/WeedStrangle.java b/Mage.Sets/src/mage/sets/lorwyn/WeedStrangle.java index 1e154253f45..97ea5b476a9 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WeedStrangle.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WeedStrangle.java @@ -50,7 +50,6 @@ public class WeedStrangle extends CardImpl { super(ownerId, 147, "Weed Strangle", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "LRW"; - this.color.setBlack(true); // Destroy target creature. Clash with an opponent. If you win, you gain life equal to that creature's toughness. this.getSpellAbility().addEffect(new WeedStrangleEffect()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/Wispmare.java b/Mage.Sets/src/mage/sets/lorwyn/Wispmare.java index 54d5a7b9c96..2394c234eae 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Wispmare.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Wispmare.java @@ -52,7 +52,6 @@ public class Wispmare extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Elemental"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/lorwyn/WrensRunPackmaster.java b/Mage.Sets/src/mage/sets/lorwyn/WrensRunPackmaster.java index cab7077aa8e..ad836b2b29f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WrensRunPackmaster.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WrensRunPackmaster.java @@ -66,7 +66,6 @@ public class WrensRunPackmaster extends CardImpl { this.subtype.add("Elf"); 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/lorwyn/WrensRunVanquisher.java b/Mage.Sets/src/mage/sets/lorwyn/WrensRunVanquisher.java index 770bb2db5d7..8431bedf873 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WrensRunVanquisher.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WrensRunVanquisher.java @@ -57,7 +57,6 @@ public class WrensRunVanquisher 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/magic2010/BurningInquiry.java b/Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java index af563846a3b..a539fbf38c9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java +++ b/Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java @@ -45,7 +45,6 @@ public class BurningInquiry extends CardImpl { super(ownerId, 128, "Burning Inquiry", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "M10"; - this.color.setRed(true); // Each player draws three cards, then discards three cards at random. this.getSpellAbility().addEffect(new DrawCardAllEffect(3)); diff --git a/Mage.Sets/src/mage/sets/magic2010/CapriciousEfreet.java b/Mage.Sets/src/mage/sets/magic2010/CapriciousEfreet.java index 507af3cf264..ca97c2119c8 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CapriciousEfreet.java +++ b/Mage.Sets/src/mage/sets/magic2010/CapriciousEfreet.java @@ -64,7 +64,6 @@ public class CapriciousEfreet extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Efreet"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2010/CentaurCourser.java b/Mage.Sets/src/mage/sets/magic2010/CentaurCourser.java index 5849664a915..6ee2b86ab48 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CentaurCourser.java +++ b/Mage.Sets/src/mage/sets/magic2010/CentaurCourser.java @@ -45,7 +45,6 @@ public class CentaurCourser 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/magic2010/ConsumeSpirit.java b/Mage.Sets/src/mage/sets/magic2010/ConsumeSpirit.java index 7adedde0fb9..112184f4141 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ConsumeSpirit.java +++ b/Mage.Sets/src/mage/sets/magic2010/ConsumeSpirit.java @@ -59,7 +59,6 @@ public class ConsumeSpirit extends CardImpl { super(ownerId, 89, "Consume Spirit", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{1}{B}"); this.expansionSetCode = "M10"; - this.color.setBlack(true); // Spend only black mana on X. // Consume Spirit deals X damage to target creature or player and you gain X life. diff --git a/Mage.Sets/src/mage/sets/magic2010/ConvincingMirage.java b/Mage.Sets/src/mage/sets/magic2010/ConvincingMirage.java index 4f727dd0530..5ee4db516fb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ConvincingMirage.java +++ b/Mage.Sets/src/mage/sets/magic2010/ConvincingMirage.java @@ -67,7 +67,6 @@ public class ConvincingMirage extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2010/DivineVerdict.java b/Mage.Sets/src/mage/sets/magic2010/DivineVerdict.java index 1810dea9d06..7dd43260bfb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DivineVerdict.java +++ b/Mage.Sets/src/mage/sets/magic2010/DivineVerdict.java @@ -45,7 +45,6 @@ public class DivineVerdict extends CardImpl { super(ownerId, 8, "Divine Verdict", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "M10"; - this.color.setWhite(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2010/DragonWhelp.java b/Mage.Sets/src/mage/sets/magic2010/DragonWhelp.java index b637bdd578c..9b6ce7495f7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DragonWhelp.java +++ b/Mage.Sets/src/mage/sets/magic2010/DragonWhelp.java @@ -57,7 +57,6 @@ public class DragonWhelp extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2010/DreadWarlock.java b/Mage.Sets/src/mage/sets/magic2010/DreadWarlock.java index e6562bb319d..2ee1ab461ab 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DreadWarlock.java +++ b/Mage.Sets/src/mage/sets/magic2010/DreadWarlock.java @@ -51,7 +51,6 @@ public class DreadWarlock 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/magic2010/ElvishPiper.java b/Mage.Sets/src/mage/sets/magic2010/ElvishPiper.java index 6c0a6d39ad4..c29ae7ffdd7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ElvishPiper.java +++ b/Mage.Sets/src/mage/sets/magic2010/ElvishPiper.java @@ -51,7 +51,6 @@ public class ElvishPiper 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/magic2010/EnormousBaloth.java b/Mage.Sets/src/mage/sets/magic2010/EnormousBaloth.java index e5cf0f2a970..a100863dde7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/EnormousBaloth.java +++ b/Mage.Sets/src/mage/sets/magic2010/EnormousBaloth.java @@ -44,7 +44,6 @@ public class EnormousBaloth extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(7); this.toughness = new MageInt(7); } diff --git a/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java b/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java index 763088190ac..ba726d79e00 100644 --- a/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java +++ b/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java @@ -59,7 +59,6 @@ public class EntanglingVines extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant tapped creature TargetPermanent auraTarget = new TargetCreaturePermanent(filter); diff --git a/Mage.Sets/src/mage/sets/magic2010/EssenceScatter.java b/Mage.Sets/src/mage/sets/magic2010/EssenceScatter.java index 7e72bd282a0..1c2224e0b27 100644 --- a/Mage.Sets/src/mage/sets/magic2010/EssenceScatter.java +++ b/Mage.Sets/src/mage/sets/magic2010/EssenceScatter.java @@ -52,7 +52,6 @@ public class EssenceScatter extends CardImpl { super(ownerId, 51, "Essence Scatter", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); this.getSpellAbility().addTarget(new TargetSpell(filter)); this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2010/HarmsWay.java b/Mage.Sets/src/mage/sets/magic2010/HarmsWay.java index 4dc73f4e9b0..bfdce00dd2b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HarmsWay.java +++ b/Mage.Sets/src/mage/sets/magic2010/HarmsWay.java @@ -53,7 +53,6 @@ public class HarmsWay extends CardImpl { super(ownerId, 14, "Harm's Way", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "M10"; - this.color.setWhite(true); // The next 2 damage that a source of your choice would deal to you and/or permanents you control this turn is dealt to target creature or player instead. this.getSpellAbility().addEffect(new HarmsWayPreventDamageTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2010/HypnoticSpecter.java b/Mage.Sets/src/mage/sets/magic2010/HypnoticSpecter.java index 75fc50f4ca9..c72c755c858 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HypnoticSpecter.java +++ b/Mage.Sets/src/mage/sets/magic2010/HypnoticSpecter.java @@ -48,7 +48,6 @@ public class HypnoticSpecter extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Specter"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2010/IgniteDisorder.java b/Mage.Sets/src/mage/sets/magic2010/IgniteDisorder.java index a833995f018..2ee9bd6430d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/IgniteDisorder.java +++ b/Mage.Sets/src/mage/sets/magic2010/IgniteDisorder.java @@ -56,7 +56,6 @@ public class IgniteDisorder extends CardImpl { super(ownerId, 141, "Ignite Disorder", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "M10"; - this.color.setRed(true); // Ignite Disorder deals 3 damage divided as you choose among one, two, or three target white and/or blue creatures. this.getSpellAbility().addEffect(new DamageMultiEffect(3)); diff --git a/Mage.Sets/src/mage/sets/magic2010/IllusionaryServant.java b/Mage.Sets/src/mage/sets/magic2010/IllusionaryServant.java index 192da98bf65..eb5481cef42 100644 --- a/Mage.Sets/src/mage/sets/magic2010/IllusionaryServant.java +++ b/Mage.Sets/src/mage/sets/magic2010/IllusionaryServant.java @@ -47,7 +47,6 @@ public class IllusionaryServant extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Illusion"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2010/Indestructibility.java b/Mage.Sets/src/mage/sets/magic2010/Indestructibility.java index 6717949cae3..78301d6dc07 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Indestructibility.java +++ b/Mage.Sets/src/mage/sets/magic2010/Indestructibility.java @@ -54,7 +54,6 @@ public class Indestructibility extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant permanent TargetPermanent auraTarget = new TargetPermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2010/InfernoElemental.java b/Mage.Sets/src/mage/sets/magic2010/InfernoElemental.java index eaa3502c683..13d5adfafa6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/InfernoElemental.java +++ b/Mage.Sets/src/mage/sets/magic2010/InfernoElemental.java @@ -46,7 +46,6 @@ public class InfernoElemental extends CardImpl { this.expansionSetCode = "M10"; 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/magic2010/JackalFamiliar.java b/Mage.Sets/src/mage/sets/magic2010/JackalFamiliar.java index 7e736fc563a..3b37baf1bd1 100644 --- a/Mage.Sets/src/mage/sets/magic2010/JackalFamiliar.java +++ b/Mage.Sets/src/mage/sets/magic2010/JackalFamiliar.java @@ -46,7 +46,6 @@ public class JackalFamiliar extends CardImpl { this.expansionSetCode = "M10"; 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/magic2010/KalonianBehemoth.java b/Mage.Sets/src/mage/sets/magic2010/KalonianBehemoth.java index 0b53f941ef1..5a5ca329167 100644 --- a/Mage.Sets/src/mage/sets/magic2010/KalonianBehemoth.java +++ b/Mage.Sets/src/mage/sets/magic2010/KalonianBehemoth.java @@ -45,7 +45,6 @@ public class KalonianBehemoth extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(9); this.toughness = new MageInt(9); diff --git a/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java b/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java index 52660fedb72..b85a1364463 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java +++ b/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java @@ -60,7 +60,6 @@ public class LightwielderPaladin extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2010/LurkingPredators.java b/Mage.Sets/src/mage/sets/magic2010/LurkingPredators.java index d7a7b3348d4..be9f78607e3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LurkingPredators.java +++ b/Mage.Sets/src/mage/sets/magic2010/LurkingPredators.java @@ -52,7 +52,6 @@ public class LurkingPredators extends CardImpl { super(ownerId, 190, "Lurking Predators", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}{G}"); this.expansionSetCode = "M10"; - this.color.setGreen(true); // Whenever an opponent casts a spell, reveal the top card of your library. If it's a creature card, put it onto the battlefield. Otherwise, you may put that card on the bottom of your library. this.addAbility(new SpellCastOpponentTriggeredAbility(new LurkingPredatorsEffect(), false)); diff --git a/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java b/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java index d29b969a9ef..b728b90a2aa 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java +++ b/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java @@ -55,7 +55,6 @@ public class MesaEnchantress extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2010/MindShatter.java b/Mage.Sets/src/mage/sets/magic2010/MindShatter.java index 17f592320af..e1040ba86ce 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MindShatter.java +++ b/Mage.Sets/src/mage/sets/magic2010/MindShatter.java @@ -46,7 +46,6 @@ public class MindShatter extends CardImpl { super(ownerId, 106, "Mind Shatter", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{B}{B}"); this.expansionSetCode = "M10"; - this.color.setBlack(true); // Target player discards X cards at random. this.getSpellAbility().addEffect(new DiscardTargetEffect(new ManacostVariableValue(), true)); diff --git a/Mage.Sets/src/mage/sets/magic2010/MoldAdder.java b/Mage.Sets/src/mage/sets/magic2010/MoldAdder.java index 809522a35e4..12883c3f935 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MoldAdder.java +++ b/Mage.Sets/src/mage/sets/magic2010/MoldAdder.java @@ -59,7 +59,6 @@ public class MoldAdder extends CardImpl { this.subtype.add("Fungus"); 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/magic2010/OpenTheVaults.java b/Mage.Sets/src/mage/sets/magic2010/OpenTheVaults.java index 544773e6f7d..7b44f6e0f01 100644 --- a/Mage.Sets/src/mage/sets/magic2010/OpenTheVaults.java +++ b/Mage.Sets/src/mage/sets/magic2010/OpenTheVaults.java @@ -52,7 +52,6 @@ public class OpenTheVaults extends CardImpl { super(ownerId, 21, "Open the Vaults", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{W}{W}"); this.expansionSetCode = "M10"; - this.color.setWhite(true); // Return all artifact and enchantment cards from all graveyards to the battlefield under their owners' control. this.getSpellAbility().addEffect(new OpenTheVaultsEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2010/PanicAttack.java b/Mage.Sets/src/mage/sets/magic2010/PanicAttack.java index fd1176e4b46..d280d8b6840 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PanicAttack.java +++ b/Mage.Sets/src/mage/sets/magic2010/PanicAttack.java @@ -45,7 +45,6 @@ public class PanicAttack extends CardImpl { super(ownerId, 150, "Panic Attack", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "M10"; - this.color.setRed(true); // Up to three target creatures can't block this turn. this.getSpellAbility().addEffect(new CantBlockTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/magic2010/Polymorph.java b/Mage.Sets/src/mage/sets/magic2010/Polymorph.java index 6f86d8f598b..504714b1a9c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Polymorph.java +++ b/Mage.Sets/src/mage/sets/magic2010/Polymorph.java @@ -56,7 +56,6 @@ public class Polymorph extends CardImpl { super(ownerId, 67, "Polymorph", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); // Destroy target creature. It can't be regenerated. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/magic2010/Ponder.java b/Mage.Sets/src/mage/sets/magic2010/Ponder.java index dd5842ed9e0..4e4932c19a9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Ponder.java +++ b/Mage.Sets/src/mage/sets/magic2010/Ponder.java @@ -44,7 +44,6 @@ public class Ponder extends CardImpl { super(ownerId, 68, "Ponder", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); // Look at the top three cards of your library, then put them back in any order. You may shuffle your library. this.getSpellAbility().addEffect(new LookLibraryControllerEffect(3, true)); diff --git a/Mage.Sets/src/mage/sets/magic2010/RazorfootGriffin.java b/Mage.Sets/src/mage/sets/magic2010/RazorfootGriffin.java index 46df5313e2e..9bf5de99b5d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RazorfootGriffin.java +++ b/Mage.Sets/src/mage/sets/magic2010/RazorfootGriffin.java @@ -46,7 +46,6 @@ public class RazorfootGriffin extends CardImpl { this.expansionSetCode = "M10"; 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/magic2010/SageOwl.java b/Mage.Sets/src/mage/sets/magic2010/SageOwl.java index c9c09b2babd..113f96e47af 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SageOwl.java +++ b/Mage.Sets/src/mage/sets/magic2010/SageOwl.java @@ -47,7 +47,6 @@ public class SageOwl extends CardImpl { this.expansionSetCode = "M10"; 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/magic2010/SanguineBond.java b/Mage.Sets/src/mage/sets/magic2010/SanguineBond.java index de85e2c05d0..b56127071c6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SanguineBond.java +++ b/Mage.Sets/src/mage/sets/magic2010/SanguineBond.java @@ -48,7 +48,6 @@ public class SanguineBond extends CardImpl { super(ownerId, 111, "Sanguine Bond", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{B}"); this.expansionSetCode = "M10"; - this.color.setBlack(true); // Whenever you gain life, target opponent loses that much life. SanguineBondTriggeredAbility ability = new SanguineBondTriggeredAbility(); diff --git a/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java b/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java index 12fa6e25bc3..128af115c13 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java +++ b/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java @@ -59,7 +59,6 @@ public class SerpentOfTheEndlessSea extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Serpent"); - this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/magic2010/SoulBleed.java b/Mage.Sets/src/mage/sets/magic2010/SoulBleed.java index ebfdcbc9c13..bb86cac9900 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SoulBleed.java +++ b/Mage.Sets/src/mage/sets/magic2010/SoulBleed.java @@ -53,7 +53,6 @@ public class SoulBleed extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2010/SphinxAmbassador.java b/Mage.Sets/src/mage/sets/magic2010/SphinxAmbassador.java index 3048ddac031..d695774a914 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SphinxAmbassador.java +++ b/Mage.Sets/src/mage/sets/magic2010/SphinxAmbassador.java @@ -59,7 +59,6 @@ public class SphinxAmbassador extends CardImpl { this.expansionSetCode = "M10"; 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/magic2010/StoneGiant.java b/Mage.Sets/src/mage/sets/magic2010/StoneGiant.java index 62d8025e734..c43cc027e97 100644 --- a/Mage.Sets/src/mage/sets/magic2010/StoneGiant.java +++ b/Mage.Sets/src/mage/sets/magic2010/StoneGiant.java @@ -60,7 +60,6 @@ public class StoneGiant extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Giant"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(4); // {tap}: Target creature you control with toughness less than Stone Giant's power gains flying until end of turn. diff --git a/Mage.Sets/src/mage/sets/magic2010/UnderworldDreams.java b/Mage.Sets/src/mage/sets/magic2010/UnderworldDreams.java index 7a77d02b4a6..d6026349ea8 100644 --- a/Mage.Sets/src/mage/sets/magic2010/UnderworldDreams.java +++ b/Mage.Sets/src/mage/sets/magic2010/UnderworldDreams.java @@ -49,7 +49,6 @@ public class UnderworldDreams extends CardImpl { super(ownerId, 115, "Underworld Dreams", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}{B}{B}"); this.expansionSetCode = "M10"; - this.color.setBlack(true); // Whenever an opponent draws a card, Underworld Dreams deals 1 damage to him or her. this.addAbility(new DrawCardOpponentTriggeredAbility(new DamageTargetEffect(1, true, "him or her"), false, true)); diff --git a/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java b/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java index ca46f9c1b5e..48e1bf123e7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java +++ b/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java @@ -62,7 +62,6 @@ public class VampireNocturnus extends CardImpl { this.expansionSetCode = "M10"; 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/magic2010/ViashinoSpearhunter.java b/Mage.Sets/src/mage/sets/magic2010/ViashinoSpearhunter.java index 55be2117d18..b502066778d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ViashinoSpearhunter.java +++ b/Mage.Sets/src/mage/sets/magic2010/ViashinoSpearhunter.java @@ -46,7 +46,6 @@ public class ViashinoSpearhunter extends CardImpl { this.subtype.add("Viashino"); 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/magic2010/WarpWorld.java b/Mage.Sets/src/mage/sets/magic2010/WarpWorld.java index 4cc58229313..252ec357935 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WarpWorld.java +++ b/Mage.Sets/src/mage/sets/magic2010/WarpWorld.java @@ -57,7 +57,6 @@ public class WarpWorld extends CardImpl { super(ownerId, 163, "Warp World", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{R}{R}{R}"); this.expansionSetCode = "M10"; - this.color.setRed(true); // Each player shuffles all permanents he or she owns into his or her library, then reveals that many cards from the top of his or her library. Each player puts all artifact, creature, and land cards revealed this way onto the battlefield, then does the same for enchantment cards, then puts all cards revealed this way that weren't put onto the battlefield on the bottom of his or her library. this.getSpellAbility().addEffect(new WarpWorldEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2010/Windstorm.java b/Mage.Sets/src/mage/sets/magic2010/Windstorm.java index fa34d2c5818..8c8efe94c02 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Windstorm.java +++ b/Mage.Sets/src/mage/sets/magic2010/Windstorm.java @@ -53,7 +53,6 @@ public class Windstorm extends CardImpl { super(ownerId, 205, "Windstorm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{G}"); this.expansionSetCode = "M10"; - this.color.setGreen(true); this.getSpellAbility().addEffect(new DamageAllEffect(new ManacostVariableValue(), filter)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/XathridDemon.java b/Mage.Sets/src/mage/sets/magic2010/XathridDemon.java index fc1f47665c8..baa2d023c17 100644 --- a/Mage.Sets/src/mage/sets/magic2010/XathridDemon.java +++ b/Mage.Sets/src/mage/sets/magic2010/XathridDemon.java @@ -60,7 +60,6 @@ public class XathridDemon extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Demon"); - this.color.setBlack(true); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/magic2010/YawningFissure.java b/Mage.Sets/src/mage/sets/magic2010/YawningFissure.java index e7c63c86e25..1601d4f36a9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/YawningFissure.java +++ b/Mage.Sets/src/mage/sets/magic2010/YawningFissure.java @@ -44,7 +44,6 @@ public class YawningFissure extends CardImpl { super(ownerId, 164, "Yawning Fissure", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{R}"); this.expansionSetCode = "M10"; - this.color.setRed(true); // Each opponent sacrifices a land. this.getSpellAbility().addEffect(new SacrificeOpponentsEffect(new FilterControlledLandPermanent("a land"))); diff --git a/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java index fae2ecddb6e..7bddf67e3e6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java +++ b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java @@ -49,7 +49,6 @@ public class AetherAdept 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/magic2011/EarthServant.java b/Mage.Sets/src/mage/sets/magic2011/EarthServant.java index b4c5f753871..279c1d99549 100644 --- a/Mage.Sets/src/mage/sets/magic2011/EarthServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/EarthServant.java @@ -61,7 +61,6 @@ public class EarthServant extends CardImpl { this.expansionSetCode = "M11"; 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/magic2011/GoldenglowMoth.java b/Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java index 7a19f615f44..28cc2059110 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java +++ b/Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java @@ -48,7 +48,6 @@ public class GoldenglowMoth extends CardImpl { this.expansionSetCode = "M11"; this.subtype.add("Insect"); - this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java b/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java index c8c36fbc7d1..774b59f86f1 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java +++ b/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java @@ -49,7 +49,6 @@ public class PhantomBeast extends CardImpl { this.subtype.add("Illusion"); this.subtype.add("Beast"); - this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2012/AmphinCutthroat.java b/Mage.Sets/src/mage/sets/magic2012/AmphinCutthroat.java index 2045d74fd3b..4643c614ec0 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AmphinCutthroat.java +++ b/Mage.Sets/src/mage/sets/magic2012/AmphinCutthroat.java @@ -45,7 +45,6 @@ public class AmphinCutthroat extends CardImpl { this.subtype.add("Salamander"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java b/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java index d0eacdfbf62..8bd0579c31a 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java +++ b/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java @@ -72,7 +72,6 @@ public class ArachnusSpinner extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Spider"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java b/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java index 0371316c25a..86eb7031310 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java +++ b/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java @@ -57,7 +57,6 @@ public class ArachnusWeb extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Aura"); - this.color.setGreen(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2012/ArbalestElite.java b/Mage.Sets/src/mage/sets/magic2012/ArbalestElite.java index 854b7205375..15b27862f78 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ArbalestElite.java +++ b/Mage.Sets/src/mage/sets/magic2012/ArbalestElite.java @@ -54,7 +54,6 @@ public class ArbalestElite extends CardImpl { this.subtype.add("Human"); this.subtype.add("Archer"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java b/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java index 7d11fbfab63..8232fdb70e0 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java +++ b/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java @@ -67,7 +67,6 @@ public class BloodlordOfVaasgoth extends CardImpl { this.subtype.add("Vampire"); 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/magic2012/BloodrageVampire.java b/Mage.Sets/src/mage/sets/magic2012/BloodrageVampire.java index 3cb2e333bb9..c8123206036 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BloodrageVampire.java +++ b/Mage.Sets/src/mage/sets/magic2012/BloodrageVampire.java @@ -45,7 +45,6 @@ public class BloodrageVampire extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Vampire"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2012/CallToTheGrave.java b/Mage.Sets/src/mage/sets/magic2012/CallToTheGrave.java index e4221b38f78..d549b78829d 100644 --- a/Mage.Sets/src/mage/sets/magic2012/CallToTheGrave.java +++ b/Mage.Sets/src/mage/sets/magic2012/CallToTheGrave.java @@ -63,7 +63,6 @@ public class CallToTheGrave extends CardImpl { super(ownerId, 85, "Call to the Grave", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{B}"); this.expansionSetCode = "M12"; - this.color.setBlack(true); // At the beginning of each player's upkeep, that player sacrifices a non-Zombie creature. Ability ability = new BeginningOfUpkeepTriggeredAbility(new SacrificeEffect(filter, 1, "that player "), TargetController.ANY, false); diff --git a/Mage.Sets/src/mage/sets/magic2012/CarnageWurm.java b/Mage.Sets/src/mage/sets/magic2012/CarnageWurm.java index bc2bdf56da1..9421d09de8b 100644 --- a/Mage.Sets/src/mage/sets/magic2012/CarnageWurm.java +++ b/Mage.Sets/src/mage/sets/magic2012/CarnageWurm.java @@ -46,7 +46,6 @@ public class CarnageWurm extends CardImpl { this.expansionSetCode = "M12"; 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/magic2012/ChandrasPhoenix.java b/Mage.Sets/src/mage/sets/magic2012/ChandrasPhoenix.java index a6bcbee55da..39fde9af860 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ChandrasPhoenix.java +++ b/Mage.Sets/src/mage/sets/magic2012/ChandrasPhoenix.java @@ -53,7 +53,6 @@ public class ChandrasPhoenix extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Phoenix"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2012/CircleOfFlame.java b/Mage.Sets/src/mage/sets/magic2012/CircleOfFlame.java index 5c46d0cf35b..7377f637e5f 100644 --- a/Mage.Sets/src/mage/sets/magic2012/CircleOfFlame.java +++ b/Mage.Sets/src/mage/sets/magic2012/CircleOfFlame.java @@ -52,7 +52,6 @@ public class CircleOfFlame extends CardImpl { super(ownerId, 127, "Circle of Flame", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); this.expansionSetCode = "M12"; - this.color.setRed(true); // Whenever a creature without flying attacks you or a planeswalker you control, Circle of Flame deals 1 damage to that creature. this.addAbility(new CircleOfFlameTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2012/DoublingChant.java b/Mage.Sets/src/mage/sets/magic2012/DoublingChant.java index 072532c8cee..6b66ea382e3 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DoublingChant.java +++ b/Mage.Sets/src/mage/sets/magic2012/DoublingChant.java @@ -57,7 +57,6 @@ public class DoublingChant extends CardImpl { super(ownerId, 170, "Doubling Chant", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{G}"); this.expansionSetCode = "M12"; - this.color.setGreen(true); this.getSpellAbility().addEffect(new DoublingChantEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2012/DungroveElder.java b/Mage.Sets/src/mage/sets/magic2012/DungroveElder.java index c3ead678a7e..5c67063cde3 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DungroveElder.java +++ b/Mage.Sets/src/mage/sets/magic2012/DungroveElder.java @@ -60,7 +60,6 @@ public class DungroveElder extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Treefolk"); - this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/magic2012/DuskhunterBat.java b/Mage.Sets/src/mage/sets/magic2012/DuskhunterBat.java index 02734f2c4df..265051bdee8 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DuskhunterBat.java +++ b/Mage.Sets/src/mage/sets/magic2012/DuskhunterBat.java @@ -46,7 +46,6 @@ public class DuskhunterBat extends CardImpl { this.expansionSetCode = "M12"; 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/magic2012/FrostBreath.java b/Mage.Sets/src/mage/sets/magic2012/FrostBreath.java index 37178309ee4..70c33976fdd 100644 --- a/Mage.Sets/src/mage/sets/magic2012/FrostBreath.java +++ b/Mage.Sets/src/mage/sets/magic2012/FrostBreath.java @@ -45,7 +45,6 @@ public class FrostBreath extends CardImpl { super(ownerId, 54, "Frost Breath", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "M12"; - this.color.setBlue(true); // Tap up to two target creatures. Those creatures don't untap during their controller's next untap step. this.getSpellAbility().addEffect(new TapTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2012/FurybornHellkite.java b/Mage.Sets/src/mage/sets/magic2012/FurybornHellkite.java index ece40635d09..8db2a0af064 100644 --- a/Mage.Sets/src/mage/sets/magic2012/FurybornHellkite.java +++ b/Mage.Sets/src/mage/sets/magic2012/FurybornHellkite.java @@ -46,7 +46,6 @@ public class FurybornHellkite extends CardImpl { this.expansionSetCode = "M12"; 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/magic2012/GarruksHorde.java b/Mage.Sets/src/mage/sets/magic2012/GarruksHorde.java index 75daf200821..0d13b2816d5 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GarruksHorde.java +++ b/Mage.Sets/src/mage/sets/magic2012/GarruksHorde.java @@ -50,7 +50,6 @@ public class GarruksHorde extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/magic2012/GoblinBangchuckers.java b/Mage.Sets/src/mage/sets/magic2012/GoblinBangchuckers.java index 4cf91cea73a..7f9a5487524 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GoblinBangchuckers.java +++ b/Mage.Sets/src/mage/sets/magic2012/GoblinBangchuckers.java @@ -56,7 +56,6 @@ public class GoblinBangchuckers 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/magic2012/GorehornMinotaurs.java b/Mage.Sets/src/mage/sets/magic2012/GorehornMinotaurs.java index c4a51e40d73..5351de55962 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GorehornMinotaurs.java +++ b/Mage.Sets/src/mage/sets/magic2012/GorehornMinotaurs.java @@ -46,7 +46,6 @@ public class GorehornMinotaurs extends CardImpl { this.subtype.add("Minotaur"); 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/magic2012/GrandAbolisher.java b/Mage.Sets/src/mage/sets/magic2012/GrandAbolisher.java index e836a032e63..bdcfd7aa261 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GrandAbolisher.java +++ b/Mage.Sets/src/mage/sets/magic2012/GrandAbolisher.java @@ -55,7 +55,6 @@ public class GrandAbolisher 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/magic2012/GrimLavamancer.java b/Mage.Sets/src/mage/sets/magic2012/GrimLavamancer.java index 7e79efef3d3..75cbe97f573 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GrimLavamancer.java +++ b/Mage.Sets/src/mage/sets/magic2012/GrimLavamancer.java @@ -57,7 +57,6 @@ public class GrimLavamancer extends CardImpl { this.subtype.add("Human"); 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/magic2012/HideousVisage.java b/Mage.Sets/src/mage/sets/magic2012/HideousVisage.java index c33749d9939..220b208d6b3 100644 --- a/Mage.Sets/src/mage/sets/magic2012/HideousVisage.java +++ b/Mage.Sets/src/mage/sets/magic2012/HideousVisage.java @@ -47,7 +47,6 @@ public class HideousVisage extends CardImpl { super(ownerId, 100, "Hideous Visage", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "M12"; - this.color.setBlack(true); this.getSpellAbility().addEffect(new GainAbilityControlledEffect(IntimidateAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures"))); } diff --git a/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java b/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java index eaf04040408..2e54d863365 100644 --- a/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java +++ b/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java @@ -52,7 +52,6 @@ public class HuntersInsight extends CardImpl { super(ownerId, 180, "Hunter's Insight", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "M12"; - this.color.setGreen(true); // Choose target creature you control. Whenever that creature deals combat damage to a player or planeswalker this turn, draw that many cards. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new HuntersInsightTriggeredAbility(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java b/Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java index d2c8c90386b..58b5b0f98c3 100644 --- a/Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java +++ b/Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java @@ -55,7 +55,6 @@ public class JaceMemoryAdept extends CardImpl { this.expansionSetCode = "M12"; 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/magic2012/JacesArchivist.java b/Mage.Sets/src/mage/sets/magic2012/JacesArchivist.java index c2de4cfb3e1..5836f1f85d2 100644 --- a/Mage.Sets/src/mage/sets/magic2012/JacesArchivist.java +++ b/Mage.Sets/src/mage/sets/magic2012/JacesArchivist.java @@ -52,7 +52,6 @@ public class JacesArchivist 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/magic2012/LurkingCrocodile.java b/Mage.Sets/src/mage/sets/magic2012/LurkingCrocodile.java index 24a17fbb7fa..b2a871fbfc7 100644 --- a/Mage.Sets/src/mage/sets/magic2012/LurkingCrocodile.java +++ b/Mage.Sets/src/mage/sets/magic2012/LurkingCrocodile.java @@ -46,7 +46,6 @@ public class LurkingCrocodile extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Crocodile"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2012/MindUnbound.java b/Mage.Sets/src/mage/sets/magic2012/MindUnbound.java index 890c1017e88..9aa5d70d32a 100644 --- a/Mage.Sets/src/mage/sets/magic2012/MindUnbound.java +++ b/Mage.Sets/src/mage/sets/magic2012/MindUnbound.java @@ -50,7 +50,6 @@ public class MindUnbound extends CardImpl { super(ownerId, 68, "Mind Unbound", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}{U}"); this.expansionSetCode = "M12"; - this.color.setBlue(true); // At the beginning of your upkeep, put a lore counter on Mind Unbound, then draw a card for each lore counter on Mind Unbound. Ability ability = new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.LORE.createInstance()), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/magic2012/Monomania.java b/Mage.Sets/src/mage/sets/magic2012/Monomania.java index 07428f16815..3af809a1c33 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Monomania.java +++ b/Mage.Sets/src/mage/sets/magic2012/Monomania.java @@ -53,7 +53,6 @@ public class Monomania extends CardImpl { super(ownerId, 102, "Monomania", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "M12"; - this.color.setBlack(true); // Target player chooses a card in his or her hand and discards the rest. this.getSpellAbility().addEffect(new MonomaniaEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2012/PersonalSanctuary.java b/Mage.Sets/src/mage/sets/magic2012/PersonalSanctuary.java index a0a1e70dc7c..52bcb8548f1 100644 --- a/Mage.Sets/src/mage/sets/magic2012/PersonalSanctuary.java +++ b/Mage.Sets/src/mage/sets/magic2012/PersonalSanctuary.java @@ -50,7 +50,6 @@ public class PersonalSanctuary extends CardImpl { super(ownerId, 30, "Personal Sanctuary", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "M12"; - this.color.setWhite(true); // During your turn, prevent all damage that would be dealt to you. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PersonalSanctuaryEffect())); diff --git a/Mage.Sets/src/mage/sets/magic2012/PhantasmalBear.java b/Mage.Sets/src/mage/sets/magic2012/PhantasmalBear.java index 4f4b4998877..325927b5ebc 100644 --- a/Mage.Sets/src/mage/sets/magic2012/PhantasmalBear.java +++ b/Mage.Sets/src/mage/sets/magic2012/PhantasmalBear.java @@ -47,7 +47,6 @@ public class PhantasmalBear extends CardImpl { this.subtype.add("Bear"); 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/magic2012/PhantasmalDragon.java b/Mage.Sets/src/mage/sets/magic2012/PhantasmalDragon.java index 6ad73b4efa8..62fb4092795 100644 --- a/Mage.Sets/src/mage/sets/magic2012/PhantasmalDragon.java +++ b/Mage.Sets/src/mage/sets/magic2012/PhantasmalDragon.java @@ -48,7 +48,6 @@ public class PhantasmalDragon extends CardImpl { this.subtype.add("Dragon"); 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/magic2012/RitesOfFlourishing.java b/Mage.Sets/src/mage/sets/magic2012/RitesOfFlourishing.java index 680e71373ba..14f33e50ca2 100644 --- a/Mage.Sets/src/mage/sets/magic2012/RitesOfFlourishing.java +++ b/Mage.Sets/src/mage/sets/magic2012/RitesOfFlourishing.java @@ -49,7 +49,6 @@ public class RitesOfFlourishing extends CardImpl { super(ownerId, 192, "Rites of Flourishing", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "M12"; - this.color.setGreen(true); // At the beginning of each player's draw step, that player draws an additional card. this.addAbility(new RitesOfFlourishingAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2012/Scrambleverse.java b/Mage.Sets/src/mage/sets/magic2012/Scrambleverse.java index ef65b148cc4..27b559d840f 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Scrambleverse.java +++ b/Mage.Sets/src/mage/sets/magic2012/Scrambleverse.java @@ -58,7 +58,6 @@ public class Scrambleverse extends CardImpl { super(ownerId, 153, "Scrambleverse", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{6}{R}{R}"); this.expansionSetCode = "M12"; - this.color.setRed(true); // For each nonland permanent, choose a player at random. Then each player gains control of each permanent for which he or she was chosen. Untap those permanents. this.getSpellAbility().addEffect(new ScrambleverseEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2012/Skinshifter.java b/Mage.Sets/src/mage/sets/magic2012/Skinshifter.java index 30bcdf95dee..2905efc8d3d 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Skinshifter.java +++ b/Mage.Sets/src/mage/sets/magic2012/Skinshifter.java @@ -55,7 +55,6 @@ public class Skinshifter 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/magic2012/SkywinderDrake.java b/Mage.Sets/src/mage/sets/magic2012/SkywinderDrake.java index abd6e2f2898..e42dcf741f9 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SkywinderDrake.java +++ b/Mage.Sets/src/mage/sets/magic2012/SkywinderDrake.java @@ -46,7 +46,6 @@ public class SkywinderDrake extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2012/Smallpox.java b/Mage.Sets/src/mage/sets/magic2012/Smallpox.java index f6d83a34ad6..29a9c7fe647 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Smallpox.java +++ b/Mage.Sets/src/mage/sets/magic2012/Smallpox.java @@ -52,7 +52,6 @@ public class Smallpox extends CardImpl { super(ownerId, 108, "Smallpox", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}{B}"); this.expansionSetCode = "M12"; - this.color.setBlack(true); // Each player loses 1 life, discards a card, sacrifices a creature, then sacrifices a land. this.getSpellAbility().addEffect(new LoseLifeAllPlayersEffect(1)); diff --git a/Mage.Sets/src/mage/sets/magic2012/SpiritMantle.java b/Mage.Sets/src/mage/sets/magic2012/SpiritMantle.java index b6ddf39b0e7..040926145e4 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SpiritMantle.java +++ b/Mage.Sets/src/mage/sets/magic2012/SpiritMantle.java @@ -52,7 +52,6 @@ public class SpiritMantle extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Aura"); - this.color.setWhite(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2012/StaveOff.java b/Mage.Sets/src/mage/sets/magic2012/StaveOff.java index e189663762d..08d870aac41 100644 --- a/Mage.Sets/src/mage/sets/magic2012/StaveOff.java +++ b/Mage.Sets/src/mage/sets/magic2012/StaveOff.java @@ -45,7 +45,6 @@ public class StaveOff extends CardImpl { super(ownerId, 36, "Stave Off", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "M12"; - this.color.setWhite(true); // Target creature 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/magic2012/StonehornDignitary.java b/Mage.Sets/src/mage/sets/magic2012/StonehornDignitary.java index ddaf13bd797..3030d2fb4d4 100644 --- a/Mage.Sets/src/mage/sets/magic2012/StonehornDignitary.java +++ b/Mage.Sets/src/mage/sets/magic2012/StonehornDignitary.java @@ -55,7 +55,6 @@ public class StonehornDignitary extends CardImpl { this.subtype.add("Rhino"); 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/magic2012/StormbloodBerserker.java b/Mage.Sets/src/mage/sets/magic2012/StormbloodBerserker.java index 4a974f4d6b5..26dc53dad5a 100644 --- a/Mage.Sets/src/mage/sets/magic2012/StormbloodBerserker.java +++ b/Mage.Sets/src/mage/sets/magic2012/StormbloodBerserker.java @@ -48,7 +48,6 @@ public class StormbloodBerserker extends CardImpl { this.subtype.add("Human"); 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/magic2012/SuturedGhoul.java b/Mage.Sets/src/mage/sets/magic2012/SuturedGhoul.java index f293171d7a5..42a2b16593f 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SuturedGhoul.java +++ b/Mage.Sets/src/mage/sets/magic2012/SuturedGhoul.java @@ -60,7 +60,6 @@ public class SuturedGhoul extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java b/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java index 6709e5d53e5..24c54246ef8 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java +++ b/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java @@ -50,7 +50,6 @@ public class TectonicRift extends CardImpl { super(ownerId, 157, "Tectonic Rift", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "M12"; - this.color.setRed(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/sets/magic2012/VampireOutcasts.java b/Mage.Sets/src/mage/sets/magic2012/VampireOutcasts.java index 4ee8c621408..ba0be7d146f 100644 --- a/Mage.Sets/src/mage/sets/magic2012/VampireOutcasts.java +++ b/Mage.Sets/src/mage/sets/magic2012/VampireOutcasts.java @@ -46,7 +46,6 @@ public class VampireOutcasts extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Vampire"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2012/VisionsOfBeyond.java b/Mage.Sets/src/mage/sets/magic2012/VisionsOfBeyond.java index e44c414c037..b3cadb96a61 100644 --- a/Mage.Sets/src/mage/sets/magic2012/VisionsOfBeyond.java +++ b/Mage.Sets/src/mage/sets/magic2012/VisionsOfBeyond.java @@ -48,7 +48,6 @@ public class VisionsOfBeyond extends CardImpl { super(ownerId, 80, "Visions of Beyond", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "M12"; - this.color.setBlue(true); // Draw a card. If a graveyard has twenty or more cards in it, draw three cards instead. this.getSpellAbility().addEffect(new VisionsOfBeyondEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java b/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java index 6c363132b00..dac1f2a8dab 100644 --- a/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java +++ b/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java @@ -54,7 +54,6 @@ public class WarstormSurge extends CardImpl { super(ownerId, 160, "Warstorm Surge", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{5}{R}"); this.expansionSetCode = "M12"; - this.color.setRed(true); Ability ability = new WarstormSurgeTriggeredAbility(); ability.addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/magic2012/ZombieInfestation.java b/Mage.Sets/src/mage/sets/magic2012/ZombieInfestation.java index 62e07a708c4..09c3d728579 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ZombieInfestation.java +++ b/Mage.Sets/src/mage/sets/magic2012/ZombieInfestation.java @@ -49,7 +49,6 @@ public class ZombieInfestation extends CardImpl { super(ownerId, 120, "Zombie Infestation", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "M12"; - this.color.setBlack(true); // Discard two cards: Put a 2/2 black Zombie creature token onto the battlefield. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java b/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java index 70d5abc0bf6..9c4305c3bef 100644 --- a/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java +++ b/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java @@ -60,7 +60,6 @@ public class AjaniCallerOfThePride extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Ajani"); - this.color.setWhite(true); } @Override diff --git a/Mage.Sets/src/mage/sets/magic2013/AjanisSunstriker.java b/Mage.Sets/src/mage/sets/magic2013/AjanisSunstriker.java index e1bd0278c4c..1b46fac28b7 100644 --- a/Mage.Sets/src/mage/sets/magic2013/AjanisSunstriker.java +++ b/Mage.Sets/src/mage/sets/magic2013/AjanisSunstriker.java @@ -46,7 +46,6 @@ public class AjanisSunstriker 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/magic2013/Archaeomancer.java b/Mage.Sets/src/mage/sets/magic2013/Archaeomancer.java index 89d91552fdf..b218614c878 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Archaeomancer.java +++ b/Mage.Sets/src/mage/sets/magic2013/Archaeomancer.java @@ -60,7 +60,6 @@ public class Archaeomancer 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/magic2013/ArcticAven.java b/Mage.Sets/src/mage/sets/magic2013/ArcticAven.java index 3e531b6ab45..6eb8fe22a86 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ArcticAven.java +++ b/Mage.Sets/src/mage/sets/magic2013/ArcticAven.java @@ -62,7 +62,6 @@ public class ArcticAven extends CardImpl { this.subtype.add("Bird"); 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/magic2013/ArmsDealer.java b/Mage.Sets/src/mage/sets/magic2013/ArmsDealer.java index 17445ac32c8..3edda165efc 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ArmsDealer.java +++ b/Mage.Sets/src/mage/sets/magic2013/ArmsDealer.java @@ -60,7 +60,6 @@ public class ArmsDealer 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/magic2013/AttendedKnight.java b/Mage.Sets/src/mage/sets/magic2013/AttendedKnight.java index 73b4cf64ec0..8a6bf437aef 100644 --- a/Mage.Sets/src/mage/sets/magic2013/AttendedKnight.java +++ b/Mage.Sets/src/mage/sets/magic2013/AttendedKnight.java @@ -49,7 +49,6 @@ public class AttendedKnight 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/magic2013/AugurOfBolas.java b/Mage.Sets/src/mage/sets/magic2013/AugurOfBolas.java index 851e98444db..dd963cf2758 100644 --- a/Mage.Sets/src/mage/sets/magic2013/AugurOfBolas.java +++ b/Mage.Sets/src/mage/sets/magic2013/AugurOfBolas.java @@ -56,7 +56,6 @@ public class AugurOfBolas 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/magic2013/BattleflightEagle.java b/Mage.Sets/src/mage/sets/magic2013/BattleflightEagle.java index 34ca542c0cb..eabad6d8c73 100644 --- a/Mage.Sets/src/mage/sets/magic2013/BattleflightEagle.java +++ b/Mage.Sets/src/mage/sets/magic2013/BattleflightEagle.java @@ -52,7 +52,6 @@ public class BattleflightEagle extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/BloodReckoning.java b/Mage.Sets/src/mage/sets/magic2013/BloodReckoning.java index 749dd5c3e05..ad16db66da8 100644 --- a/Mage.Sets/src/mage/sets/magic2013/BloodReckoning.java +++ b/Mage.Sets/src/mage/sets/magic2013/BloodReckoning.java @@ -51,7 +51,6 @@ public class BloodReckoning extends CardImpl { super(ownerId, 81, "Blood Reckoning", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}"); this.expansionSetCode = "M13"; - this.color.setBlack(true); // Whenever a creature attacks you or a planeswalker you control, that creature's controller loses 1 life. this.addAbility(new BloodReckoningTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2013/BloodhunterBat.java b/Mage.Sets/src/mage/sets/magic2013/BloodhunterBat.java index 34c1c6bcbd3..d60f174cae0 100644 --- a/Mage.Sets/src/mage/sets/magic2013/BloodhunterBat.java +++ b/Mage.Sets/src/mage/sets/magic2013/BloodhunterBat.java @@ -50,7 +50,6 @@ public class BloodhunterBat extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/BondBeetle.java b/Mage.Sets/src/mage/sets/magic2013/BondBeetle.java index 16304f2b4c6..991f360c235 100644 --- a/Mage.Sets/src/mage/sets/magic2013/BondBeetle.java +++ b/Mage.Sets/src/mage/sets/magic2013/BondBeetle.java @@ -50,7 +50,6 @@ public class BondBeetle extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/BoundlessRealms.java b/Mage.Sets/src/mage/sets/magic2013/BoundlessRealms.java index c415f7089a1..9896e6a5422 100644 --- a/Mage.Sets/src/mage/sets/magic2013/BoundlessRealms.java +++ b/Mage.Sets/src/mage/sets/magic2013/BoundlessRealms.java @@ -56,7 +56,6 @@ public class BoundlessRealms extends CardImpl { super(ownerId, 162, "Boundless Realms", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{6}{G}"); this.expansionSetCode = "M13"; - this.color.setGreen(true); // Search your library for up to X basic land cards, where X is the number of lands you control, and put them onto the battlefield tapped. Then shuffle your library. this.getSpellAbility().addEffect(new BoundlessRealmsEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2013/CaptainsCall.java b/Mage.Sets/src/mage/sets/magic2013/CaptainsCall.java index edbdcfe79e2..56cd83290e4 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CaptainsCall.java +++ b/Mage.Sets/src/mage/sets/magic2013/CaptainsCall.java @@ -44,7 +44,6 @@ public class CaptainsCall extends CardImpl { super(ownerId, 9, "Captain's Call", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{W}"); this.expansionSetCode = "M13"; - this.color.setWhite(true); } @Override diff --git a/Mage.Sets/src/mage/sets/magic2013/ChandrasFury.java b/Mage.Sets/src/mage/sets/magic2013/ChandrasFury.java index 6f6dc488008..31635ea5212 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ChandrasFury.java +++ b/Mage.Sets/src/mage/sets/magic2013/ChandrasFury.java @@ -46,7 +46,6 @@ public class ChandrasFury extends CardImpl { super(ownerId, 124, "Chandra's Fury", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{R}"); this.expansionSetCode = "M13"; - this.color.setRed(true); // Chandra's Fury deals 4 damage to target player and 1 damage to each creature that player controls. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); diff --git a/Mage.Sets/src/mage/sets/magic2013/CleaverRiot.java b/Mage.Sets/src/mage/sets/magic2013/CleaverRiot.java index 8adb2ebfb5b..a1740f65831 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CleaverRiot.java +++ b/Mage.Sets/src/mage/sets/magic2013/CleaverRiot.java @@ -46,7 +46,6 @@ public class CleaverRiot extends CardImpl { super(ownerId, 125, "Cleaver Riot", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{R}"); this.expansionSetCode = "M13"; - this.color.setRed(true); // Creatures you control gain double strike until end of turn. this.getSpellAbility().addEffect(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/sets/magic2013/CourtlyProvocateur.java b/Mage.Sets/src/mage/sets/magic2013/CourtlyProvocateur.java index fe79c945c90..b5c8d548e59 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CourtlyProvocateur.java +++ b/Mage.Sets/src/mage/sets/magic2013/CourtlyProvocateur.java @@ -56,7 +56,6 @@ public class CourtlyProvocateur 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/magic2013/CowerInFear.java b/Mage.Sets/src/mage/sets/magic2013/CowerInFear.java index 70c53452220..b07b659bb3b 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CowerInFear.java +++ b/Mage.Sets/src/mage/sets/magic2013/CowerInFear.java @@ -54,7 +54,6 @@ public class CowerInFear extends CardImpl { super(ownerId, 84, "Cower in Fear", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{B}{B}"); this.expansionSetCode = "M13"; - this.color.setBlack(true); // Creatures your opponents control get -1/-1 until end of turn. this.getSpellAbility().addEffect(new BoostAllEffect(-1, -1, Duration.EndOfTurn, filter, false)); diff --git a/Mage.Sets/src/mage/sets/magic2013/Craterize.java b/Mage.Sets/src/mage/sets/magic2013/Craterize.java index 1cfd9fae252..71d085362f8 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Craterize.java +++ b/Mage.Sets/src/mage/sets/magic2013/Craterize.java @@ -44,7 +44,6 @@ public class Craterize extends CardImpl { super(ownerId, 126, "Craterize", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "M13"; - this.color.setRed(true); // Destroy target land. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2013/CrimsonMuckwader.java b/Mage.Sets/src/mage/sets/magic2013/CrimsonMuckwader.java index 44927c9ec83..526e0f4f99f 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CrimsonMuckwader.java +++ b/Mage.Sets/src/mage/sets/magic2013/CrimsonMuckwader.java @@ -58,7 +58,6 @@ public class CrimsonMuckwader extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Lizard"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2013/CripplingBlight.java b/Mage.Sets/src/mage/sets/magic2013/CripplingBlight.java index e23cd4ba094..d017b9c73bc 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CripplingBlight.java +++ b/Mage.Sets/src/mage/sets/magic2013/CripplingBlight.java @@ -54,7 +54,6 @@ public class CripplingBlight extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent target = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2013/CrusaderOfOdric.java b/Mage.Sets/src/mage/sets/magic2013/CrusaderOfOdric.java index 616ed8a48aa..0fabf78be59 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CrusaderOfOdric.java +++ b/Mage.Sets/src/mage/sets/magic2013/CrusaderOfOdric.java @@ -52,7 +52,6 @@ public class CrusaderOfOdric 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/magic2013/DiabolicRevelation.java b/Mage.Sets/src/mage/sets/magic2013/DiabolicRevelation.java index 83905630b28..1d602cf2b47 100644 --- a/Mage.Sets/src/mage/sets/magic2013/DiabolicRevelation.java +++ b/Mage.Sets/src/mage/sets/magic2013/DiabolicRevelation.java @@ -53,7 +53,6 @@ public class DiabolicRevelation extends CardImpl { super(ownerId, 87, "Diabolic Revelation", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{3}{B}{B}"); this.expansionSetCode = "M13"; - this.color.setBlack(true); // Search your library for up to X cards and put those cards into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new DiabolicRevelationEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java b/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java index fa9004e0870..ff6ade6ed3f 100644 --- a/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java +++ b/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java @@ -59,7 +59,6 @@ public class DiscipleOfBolas 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/magic2013/Downpour.java b/Mage.Sets/src/mage/sets/magic2013/Downpour.java index 93d9ab9a1c7..221e5c790dc 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Downpour.java +++ b/Mage.Sets/src/mage/sets/magic2013/Downpour.java @@ -44,7 +44,6 @@ public class Downpour extends CardImpl { super(ownerId, 48, "Downpour", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "M13"; - this.color.setBlue(true); // Tap up to three target creatures. this.getSpellAbility().addEffect(new TapTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2013/DragonHatchling.java b/Mage.Sets/src/mage/sets/magic2013/DragonHatchling.java index 4ad0b7b4240..4e00b736220 100644 --- a/Mage.Sets/src/mage/sets/magic2013/DragonHatchling.java +++ b/Mage.Sets/src/mage/sets/magic2013/DragonHatchling.java @@ -50,7 +50,6 @@ public class DragonHatchling extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2013/DuskmantleProwler.java b/Mage.Sets/src/mage/sets/magic2013/DuskmantleProwler.java index 97d2009acbc..c804c27389f 100644 --- a/Mage.Sets/src/mage/sets/magic2013/DuskmantleProwler.java +++ b/Mage.Sets/src/mage/sets/magic2013/DuskmantleProwler.java @@ -47,7 +47,6 @@ public class DuskmantleProwler extends CardImpl { this.subtype.add("Vampire"); 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/magic2013/DutyBoundDead.java b/Mage.Sets/src/mage/sets/magic2013/DutyBoundDead.java index ea3ed48db08..88cad5cc6ce 100644 --- a/Mage.Sets/src/mage/sets/magic2013/DutyBoundDead.java +++ b/Mage.Sets/src/mage/sets/magic2013/DutyBoundDead.java @@ -49,7 +49,6 @@ public class DutyBoundDead extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Skeleton"); - this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2013/ElderscaleWurm.java b/Mage.Sets/src/mage/sets/magic2013/ElderscaleWurm.java index bcff4b51d52..ae076d44e66 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ElderscaleWurm.java +++ b/Mage.Sets/src/mage/sets/magic2013/ElderscaleWurm.java @@ -53,7 +53,6 @@ public class ElderscaleWurm extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/Encrust.java b/Mage.Sets/src/mage/sets/magic2013/Encrust.java index e552be7bd39..42e2c085d83 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Encrust.java +++ b/Mage.Sets/src/mage/sets/magic2013/Encrust.java @@ -64,7 +64,6 @@ public class Encrust extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/FaerieInvaders.java b/Mage.Sets/src/mage/sets/magic2013/FaerieInvaders.java index 24b1be8c229..56ec1fc75c9 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FaerieInvaders.java +++ b/Mage.Sets/src/mage/sets/magic2013/FaerieInvaders.java @@ -47,7 +47,6 @@ public class FaerieInvaders extends CardImpl { this.subtype.add("Faerie"); this.subtype.add("Rogue"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java b/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java index c40581bf663..2c31751a9e7 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java +++ b/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java @@ -50,7 +50,6 @@ public class FaithsReward extends CardImpl { super(ownerId, 14, "Faith's Reward", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "M13"; - this.color.setWhite(true); // Return to the battlefield all permanent cards in your graveyard that were put there from the battlefield this turn. this.getSpellAbility().addEffect(new FaithsRewardEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2013/Fervor.java b/Mage.Sets/src/mage/sets/magic2013/Fervor.java index b1ed7ceec0a..3d186de4286 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Fervor.java +++ b/Mage.Sets/src/mage/sets/magic2013/Fervor.java @@ -48,7 +48,6 @@ public class Fervor extends CardImpl { super(ownerId, 129, "Fervor", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "M13"; - this.color.setRed(true); // Creatures you control have haste. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( diff --git a/Mage.Sets/src/mage/sets/magic2013/FireElemental.java b/Mage.Sets/src/mage/sets/magic2013/FireElemental.java index deccb49b2b6..c63f838746c 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FireElemental.java +++ b/Mage.Sets/src/mage/sets/magic2013/FireElemental.java @@ -44,7 +44,6 @@ public class FireElemental extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Elemental"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/magic2013/FirewingPhoenix.java b/Mage.Sets/src/mage/sets/magic2013/FirewingPhoenix.java index 2edf34186bb..fc7f0158e2a 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FirewingPhoenix.java +++ b/Mage.Sets/src/mage/sets/magic2013/FirewingPhoenix.java @@ -49,7 +49,6 @@ public class FirewingPhoenix extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Phoenix"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2013/FlamesOfTheFirebrand.java b/Mage.Sets/src/mage/sets/magic2013/FlamesOfTheFirebrand.java index acfafdb6dfd..54a04f3065f 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FlamesOfTheFirebrand.java +++ b/Mage.Sets/src/mage/sets/magic2013/FlamesOfTheFirebrand.java @@ -44,7 +44,6 @@ public class FlamesOfTheFirebrand extends CardImpl { super(ownerId, 132, "Flames of the Firebrand", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "M13"; - this.color.setRed(true); // Flames of the Firebrand deals 3 damage divided as you choose among one, two, or three target creatures and/or players. this.getSpellAbility().addEffect(new DamageMultiEffect(3)); diff --git a/Mage.Sets/src/mage/sets/magic2013/FlinthoofBoar.java b/Mage.Sets/src/mage/sets/magic2013/FlinthoofBoar.java index 2069b4b44ff..4796fd75cb1 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FlinthoofBoar.java +++ b/Mage.Sets/src/mage/sets/magic2013/FlinthoofBoar.java @@ -60,7 +60,6 @@ public class FlinthoofBoar extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Boar"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2013/FungalSprouting.java b/Mage.Sets/src/mage/sets/magic2013/FungalSprouting.java index 8eaa7fbd402..eae18596cad 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FungalSprouting.java +++ b/Mage.Sets/src/mage/sets/magic2013/FungalSprouting.java @@ -55,7 +55,6 @@ public class FungalSprouting extends CardImpl { super(ownerId, 173, "Fungal Sprouting", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "M13"; - this.color.setGreen(true); // Put X 1/1 green Saproling creature tokens onto the battlefield, where X is the greatest power among creatures you control. this.getSpellAbility().addEffect(new FungalSproutingEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java b/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java index 85577dd6292..1283abb7f2d 100644 --- a/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java +++ b/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java @@ -58,7 +58,6 @@ public class GoblinBattleJester extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/GriffinProtector.java b/Mage.Sets/src/mage/sets/magic2013/GriffinProtector.java index 6de6c08a013..118b084cb33 100644 --- a/Mage.Sets/src/mage/sets/magic2013/GriffinProtector.java +++ b/Mage.Sets/src/mage/sets/magic2013/GriffinProtector.java @@ -49,7 +49,6 @@ public class GriffinProtector extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/GroundSeal.java b/Mage.Sets/src/mage/sets/magic2013/GroundSeal.java index b1794b6d025..863514e966a 100644 --- a/Mage.Sets/src/mage/sets/magic2013/GroundSeal.java +++ b/Mage.Sets/src/mage/sets/magic2013/GroundSeal.java @@ -54,7 +54,6 @@ public class GroundSeal extends CardImpl { super(ownerId, 176, "Ground Seal", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "M13"; - this.color.setGreen(true); // When Ground Seal enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); diff --git a/Mage.Sets/src/mage/sets/magic2013/GuardianLions.java b/Mage.Sets/src/mage/sets/magic2013/GuardianLions.java index 64d4f458888..f304ce3d6e5 100644 --- a/Mage.Sets/src/mage/sets/magic2013/GuardianLions.java +++ b/Mage.Sets/src/mage/sets/magic2013/GuardianLions.java @@ -45,7 +45,6 @@ public class GuardianLions extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Cat"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java b/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java index e52b0593eff..83c91c3983b 100644 --- a/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java +++ b/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java @@ -57,7 +57,6 @@ public class HamletbackGoliath extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/magic2013/HealerOfThePride.java b/Mage.Sets/src/mage/sets/magic2013/HealerOfThePride.java index 935807c8d67..a7309ad99dd 100644 --- a/Mage.Sets/src/mage/sets/magic2013/HealerOfThePride.java +++ b/Mage.Sets/src/mage/sets/magic2013/HealerOfThePride.java @@ -47,7 +47,6 @@ public class HealerOfThePride extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java b/Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java index e1e3c843e6f..bb90b51f95b 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java +++ b/Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java @@ -45,7 +45,6 @@ public class Hydrosurge extends CardImpl { super(ownerId, 54, "Hydrosurge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "M13"; - this.color.setBlue(true); // Target creature gets -5/-0 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-5, 0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/magic2013/JacesPhantasm.java b/Mage.Sets/src/mage/sets/magic2013/JacesPhantasm.java index 4c1cdd23783..80a775a8ce9 100644 --- a/Mage.Sets/src/mage/sets/magic2013/JacesPhantasm.java +++ b/Mage.Sets/src/mage/sets/magic2013/JacesPhantasm.java @@ -52,7 +52,6 @@ public class JacesPhantasm extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/KnightOfGlory.java b/Mage.Sets/src/mage/sets/magic2013/KnightOfGlory.java index db4aa370a78..53572bddc40 100644 --- a/Mage.Sets/src/mage/sets/magic2013/KnightOfGlory.java +++ b/Mage.Sets/src/mage/sets/magic2013/KnightOfGlory.java @@ -56,7 +56,6 @@ public class KnightOfGlory 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/magic2013/KnightOfInfamy.java b/Mage.Sets/src/mage/sets/magic2013/KnightOfInfamy.java index e1a3881af05..3363b712dfd 100644 --- a/Mage.Sets/src/mage/sets/magic2013/KnightOfInfamy.java +++ b/Mage.Sets/src/mage/sets/magic2013/KnightOfInfamy.java @@ -56,7 +56,6 @@ public class KnightOfInfamy extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2013/KrenkoMobBoss.java b/Mage.Sets/src/mage/sets/magic2013/KrenkoMobBoss.java index ef9477dc5db..01532312728 100644 --- a/Mage.Sets/src/mage/sets/magic2013/KrenkoMobBoss.java +++ b/Mage.Sets/src/mage/sets/magic2013/KrenkoMobBoss.java @@ -60,7 +60,6 @@ public class KrenkoMobBoss extends CardImpl { this.subtype.add("Goblin"); 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/magic2013/KrenkosCommand.java b/Mage.Sets/src/mage/sets/magic2013/KrenkosCommand.java index 38618927c07..2c2253f2995 100644 --- a/Mage.Sets/src/mage/sets/magic2013/KrenkosCommand.java +++ b/Mage.Sets/src/mage/sets/magic2013/KrenkosCommand.java @@ -44,7 +44,6 @@ public class KrenkosCommand extends CardImpl { super(ownerId, 139, "Krenko's Command", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "M13"; - 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/magic2013/LilianaOfTheDarkRealms.java b/Mage.Sets/src/mage/sets/magic2013/LilianaOfTheDarkRealms.java index 480275d07d7..5eb20f16df4 100644 --- a/Mage.Sets/src/mage/sets/magic2013/LilianaOfTheDarkRealms.java +++ b/Mage.Sets/src/mage/sets/magic2013/LilianaOfTheDarkRealms.java @@ -78,7 +78,6 @@ public class LilianaOfTheDarkRealms extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Liliana"); - this.color.setBlack(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), false)); diff --git a/Mage.Sets/src/mage/sets/magic2013/LilianasShade.java b/Mage.Sets/src/mage/sets/magic2013/LilianasShade.java index 6c866033a08..dc935d96974 100644 --- a/Mage.Sets/src/mage/sets/magic2013/LilianasShade.java +++ b/Mage.Sets/src/mage/sets/magic2013/LilianasShade.java @@ -60,7 +60,6 @@ public class LilianasShade extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/Magmaquake.java b/Mage.Sets/src/mage/sets/magic2013/Magmaquake.java index 256ace5732a..803a7bf3566 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Magmaquake.java +++ b/Mage.Sets/src/mage/sets/magic2013/Magmaquake.java @@ -59,7 +59,6 @@ public class Magmaquake extends CardImpl { super(ownerId, 140, "Magmaquake", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{R}{R}"); this.expansionSetCode = "M13"; - this.color.setRed(true); // Magmaquake deals X damage to each creature without flying and each planeswalker. this.getSpellAbility().addEffect(new DamageAllEffect(new ManacostVariableValue(), filter)); diff --git a/Mage.Sets/src/mage/sets/magic2013/MarkOfTheVampire.java b/Mage.Sets/src/mage/sets/magic2013/MarkOfTheVampire.java index 16cfe0005ef..49afd237e6e 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MarkOfTheVampire.java +++ b/Mage.Sets/src/mage/sets/magic2013/MarkOfTheVampire.java @@ -55,7 +55,6 @@ public class MarkOfTheVampire extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent target = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2013/MasterOfThePearlTrident.java b/Mage.Sets/src/mage/sets/magic2013/MasterOfThePearlTrident.java index f5232251230..9cba182abd6 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MasterOfThePearlTrident.java +++ b/Mage.Sets/src/mage/sets/magic2013/MasterOfThePearlTrident.java @@ -58,7 +58,6 @@ public class MasterOfThePearlTrident extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/MindSculpt.java b/Mage.Sets/src/mage/sets/magic2013/MindSculpt.java index 82aefe5e9b1..9bfcbda44cc 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MindSculpt.java +++ b/Mage.Sets/src/mage/sets/magic2013/MindSculpt.java @@ -44,7 +44,6 @@ public class MindSculpt extends CardImpl { super(ownerId, 61, "Mind Sculpt", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{U}"); this.expansionSetCode = "M13"; - this.color.setBlue(true); // Target opponent puts the top seven cards of his or her library into his or her graveyard. this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(7)); diff --git a/Mage.Sets/src/mage/sets/magic2013/MindclawShaman.java b/Mage.Sets/src/mage/sets/magic2013/MindclawShaman.java index c4cb42cf084..efb3c3fe931 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MindclawShaman.java +++ b/Mage.Sets/src/mage/sets/magic2013/MindclawShaman.java @@ -60,7 +60,6 @@ public class MindclawShaman extends CardImpl { this.subtype.add("Viashino"); 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/magic2013/MoggFlunkies.java b/Mage.Sets/src/mage/sets/magic2013/MoggFlunkies.java index 75083c7d407..79bd8785521 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MoggFlunkies.java +++ b/Mage.Sets/src/mage/sets/magic2013/MoggFlunkies.java @@ -46,7 +46,6 @@ public class MoggFlunkies extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Goblin"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2013/Murder.java b/Mage.Sets/src/mage/sets/magic2013/Murder.java index e9cabd3bf27..2fb67874584 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Murder.java +++ b/Mage.Sets/src/mage/sets/magic2013/Murder.java @@ -44,7 +44,6 @@ public class Murder extends CardImpl { super(ownerId, 101, "Murder", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}{B}"); this.expansionSetCode = "M13"; - this.color.setBlack(true); // Destroy target creature. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2013/Mutilate.java b/Mage.Sets/src/mage/sets/magic2013/Mutilate.java index 3b2dafd3d5a..305f63b667b 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Mutilate.java +++ b/Mage.Sets/src/mage/sets/magic2013/Mutilate.java @@ -61,7 +61,6 @@ public class Mutilate extends CardImpl { super(ownerId, 102, "Mutilate", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{B}{B}"); this.expansionSetCode = "M13"; - this.color.setBlack(true); // All creatures get -1/-1 until end of turn for each Swamp you control. PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter, -1); diff --git a/Mage.Sets/src/mage/sets/magic2013/MwonvuliBeastTracker.java b/Mage.Sets/src/mage/sets/magic2013/MwonvuliBeastTracker.java index 3f2cdea7c85..b845fb502e5 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MwonvuliBeastTracker.java +++ b/Mage.Sets/src/mage/sets/magic2013/MwonvuliBeastTracker.java @@ -67,7 +67,6 @@ public class MwonvuliBeastTracker extends CardImpl { this.subtype.add("Human"); this.subtype.add("Scout"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2013/NefaroxOverlordOfGrixis.java b/Mage.Sets/src/mage/sets/magic2013/NefaroxOverlordOfGrixis.java index 3f2f7cd85be..9dc0c2910a3 100644 --- a/Mage.Sets/src/mage/sets/magic2013/NefaroxOverlordOfGrixis.java +++ b/Mage.Sets/src/mage/sets/magic2013/NefaroxOverlordOfGrixis.java @@ -56,7 +56,6 @@ public class NefaroxOverlordOfGrixis extends CardImpl { this.supertype.add("Legendary"); 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/magic2013/OdricMasterTactician.java b/Mage.Sets/src/mage/sets/magic2013/OdricMasterTactician.java index b73b61801a1..7ccca5333b5 100644 --- a/Mage.Sets/src/mage/sets/magic2013/OdricMasterTactician.java +++ b/Mage.Sets/src/mage/sets/magic2013/OdricMasterTactician.java @@ -52,7 +52,6 @@ public class OdricMasterTactician extends CardImpl { this.subtype.add("Human"); 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/magic2013/Omniscience.java b/Mage.Sets/src/mage/sets/magic2013/Omniscience.java index 64ccdbf9a0c..6c9b7cf9322 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Omniscience.java +++ b/Mage.Sets/src/mage/sets/magic2013/Omniscience.java @@ -61,7 +61,6 @@ public class Omniscience extends CardImpl { super(ownerId, 63, "Omniscience", Rarity.MYTHIC, new CardType[]{CardType.ENCHANTMENT}, "{7}{U}{U}{U}"); this.expansionSetCode = "M13"; - this.color.setBlue(true); // You may cast nonland cards from your hand without paying their mana costs. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OmniscienceCastingEffect())); diff --git a/Mage.Sets/src/mage/sets/magic2013/PredatoryRampage.java b/Mage.Sets/src/mage/sets/magic2013/PredatoryRampage.java index 05e131a9246..58262e9f5d8 100644 --- a/Mage.Sets/src/mage/sets/magic2013/PredatoryRampage.java +++ b/Mage.Sets/src/mage/sets/magic2013/PredatoryRampage.java @@ -61,7 +61,6 @@ public class PredatoryRampage extends CardImpl { super(ownerId, 180, "Predatory Rampage", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); this.expansionSetCode = "M13"; - this.color.setGreen(true); // Creatures you control get +3/+3 until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(3, 3, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/magic2013/PrimalHuntbeast.java b/Mage.Sets/src/mage/sets/magic2013/PrimalHuntbeast.java index 7354e638dab..f40f91d6e64 100644 --- a/Mage.Sets/src/mage/sets/magic2013/PrimalHuntbeast.java +++ b/Mage.Sets/src/mage/sets/magic2013/PrimalHuntbeast.java @@ -45,7 +45,6 @@ public class PrimalHuntbeast extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/PublicExecution.java b/Mage.Sets/src/mage/sets/magic2013/PublicExecution.java index 1dbe9998751..aa8db6a0cd9 100644 --- a/Mage.Sets/src/mage/sets/magic2013/PublicExecution.java +++ b/Mage.Sets/src/mage/sets/magic2013/PublicExecution.java @@ -61,7 +61,6 @@ public class PublicExecution extends CardImpl { super(ownerId, 105, "Public Execution", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{5}{B}"); this.expansionSetCode = "M13"; - this.color.setBlack(true); // Destroy target creature an opponent controls. Each other creature that player controls gets -2/-0 until end of turn. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2013/RainOfBlades.java b/Mage.Sets/src/mage/sets/magic2013/RainOfBlades.java index f3b172affe4..119d6833750 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RainOfBlades.java +++ b/Mage.Sets/src/mage/sets/magic2013/RainOfBlades.java @@ -44,7 +44,6 @@ public class RainOfBlades extends CardImpl { super(ownerId, 28, "Rain of Blades", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "M13"; - this.color.setWhite(true); // Rain of Blades deals 1 damage to each attacking creature. this.getSpellAbility().addEffect(new DamageAllEffect(1, new FilterAttackingCreature())); diff --git a/Mage.Sets/src/mage/sets/magic2013/RangersPath.java b/Mage.Sets/src/mage/sets/magic2013/RangersPath.java index d58a6e62234..a5773c19a8d 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RangersPath.java +++ b/Mage.Sets/src/mage/sets/magic2013/RangersPath.java @@ -52,7 +52,6 @@ public class RangersPath extends CardImpl { super(ownerId, 186, "Ranger's Path", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "M13"; - this.color.setGreen(true); // Search your library for up to two Forest cards and put them onto the battlefield tapped. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, filter), true)); diff --git a/Mage.Sets/src/mage/sets/magic2013/RecklessBrute.java b/Mage.Sets/src/mage/sets/magic2013/RecklessBrute.java index f24debd020c..30614def15f 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RecklessBrute.java +++ b/Mage.Sets/src/mage/sets/magic2013/RecklessBrute.java @@ -47,7 +47,6 @@ public class RecklessBrute extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Warrior"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2013/Revive.java b/Mage.Sets/src/mage/sets/magic2013/Revive.java index 579d53d45f7..ff6746937e1 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Revive.java +++ b/Mage.Sets/src/mage/sets/magic2013/Revive.java @@ -53,7 +53,6 @@ public class Revive extends CardImpl { super(ownerId, 187, "Revive", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "M13"; - this.color.setGreen(true); // Return target green card from your graveyard to your hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2013/RoaringPrimadox.java b/Mage.Sets/src/mage/sets/magic2013/RoaringPrimadox.java index 1b24ea3cdc1..f2a2062eb01 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RoaringPrimadox.java +++ b/Mage.Sets/src/mage/sets/magic2013/RoaringPrimadox.java @@ -56,7 +56,6 @@ public class RoaringPrimadox extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/RummagingGoblin.java b/Mage.Sets/src/mage/sets/magic2013/RummagingGoblin.java index 0590bb028f8..f7e0f563d66 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RummagingGoblin.java +++ b/Mage.Sets/src/mage/sets/magic2013/RummagingGoblin.java @@ -51,7 +51,6 @@ public class RummagingGoblin 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/magic2013/SearingSpear.java b/Mage.Sets/src/mage/sets/magic2013/SearingSpear.java index 2a883669b59..ca85de2fa73 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SearingSpear.java +++ b/Mage.Sets/src/mage/sets/magic2013/SearingSpear.java @@ -44,7 +44,6 @@ public class SearingSpear extends CardImpl { super(ownerId, 147, "Searing Spear", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "M13"; - this.color.setRed(true); // Searing Spear deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/magic2013/SentinelSpider.java b/Mage.Sets/src/mage/sets/magic2013/SentinelSpider.java index 5bf1d7ce8fe..2dcdd134f7c 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SentinelSpider.java +++ b/Mage.Sets/src/mage/sets/magic2013/SentinelSpider.java @@ -46,7 +46,6 @@ public class SentinelSpider extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/SerpentsGift.java b/Mage.Sets/src/mage/sets/magic2013/SerpentsGift.java index 0e3cbe99b86..217fbf3372c 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SerpentsGift.java +++ b/Mage.Sets/src/mage/sets/magic2013/SerpentsGift.java @@ -46,7 +46,6 @@ public class SerpentsGift extends CardImpl { super(ownerId, 190, "Serpent's Gift", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "M13"; - this.color.setGreen(true); // Target creature gains deathtouch until end of turn. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/magic2013/ServantOfNefarox.java b/Mage.Sets/src/mage/sets/magic2013/ServantOfNefarox.java index 29a285f9d44..febc45cbd75 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ServantOfNefarox.java +++ b/Mage.Sets/src/mage/sets/magic2013/ServantOfNefarox.java @@ -46,7 +46,6 @@ public class ServantOfNefarox extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2013/ShowOfValor.java b/Mage.Sets/src/mage/sets/magic2013/ShowOfValor.java index 1cf89f77603..832fc80b60e 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ShowOfValor.java +++ b/Mage.Sets/src/mage/sets/magic2013/ShowOfValor.java @@ -45,7 +45,6 @@ public class ShowOfValor extends CardImpl { super(ownerId, 34, "Show of Valor", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "M13"; - this.color.setWhite(true); // Target creature gets +2/+4 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(2, 4, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/magic2013/SlumberingDragon.java b/Mage.Sets/src/mage/sets/magic2013/SlumberingDragon.java index 07c91c4277d..31bef35ef92 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SlumberingDragon.java +++ b/Mage.Sets/src/mage/sets/magic2013/SlumberingDragon.java @@ -58,7 +58,6 @@ public class SlumberingDragon extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2013/Smelt.java b/Mage.Sets/src/mage/sets/magic2013/Smelt.java index 8f68821a611..ff67773bb90 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Smelt.java +++ b/Mage.Sets/src/mage/sets/magic2013/Smelt.java @@ -44,7 +44,6 @@ public class Smelt extends CardImpl { super(ownerId, 149, "Smelt", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "M13"; - this.color.setRed(true); // Destroy target artifact. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2013/Spelltwine.java b/Mage.Sets/src/mage/sets/magic2013/Spelltwine.java index 4500412d842..518d0f0a236 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Spelltwine.java +++ b/Mage.Sets/src/mage/sets/magic2013/Spelltwine.java @@ -68,7 +68,6 @@ public class Spelltwine extends CardImpl { super(ownerId, 68, "Spelltwine", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{U}"); this.expansionSetCode = "M13"; - this.color.setBlue(true); // Exile target instant or sorcery card from your graveyard and target instant or sorcery card from an opponent's graveyard. Copy those cards. Cast the copies if able without paying their mana costs. Exile Spelltwine. this.getSpellAbility().addEffect(new SpelltwineEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2013/SpikedBaloth.java b/Mage.Sets/src/mage/sets/magic2013/SpikedBaloth.java index 0c7f753a68b..083dba794ae 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SpikedBaloth.java +++ b/Mage.Sets/src/mage/sets/magic2013/SpikedBaloth.java @@ -45,7 +45,6 @@ public class SpikedBaloth extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/Switcheroo.java b/Mage.Sets/src/mage/sets/magic2013/Switcheroo.java index 0868440b820..6e4088e23da 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Switcheroo.java +++ b/Mage.Sets/src/mage/sets/magic2013/Switcheroo.java @@ -47,7 +47,6 @@ public class Switcheroo extends CardImpl { super(ownerId, 71, "Switcheroo", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{U}"); this.expansionSetCode = "M13"; - this.color.setBlue(true); // Exchange control of two target creatures. this.getSpellAbility().addEffect(new ExchangeControlTargetEffect(Duration.EndOfGame, rule)); diff --git a/Mage.Sets/src/mage/sets/magic2013/TalrandSkySummoner.java b/Mage.Sets/src/mage/sets/magic2013/TalrandSkySummoner.java index 6cc729e7678..1d1fa607dba 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TalrandSkySummoner.java +++ b/Mage.Sets/src/mage/sets/magic2013/TalrandSkySummoner.java @@ -60,7 +60,6 @@ public class TalrandSkySummoner 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/magic2013/TalrandsInvocation.java b/Mage.Sets/src/mage/sets/magic2013/TalrandsInvocation.java index f2488820e8c..6e83b6247c3 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TalrandsInvocation.java +++ b/Mage.Sets/src/mage/sets/magic2013/TalrandsInvocation.java @@ -44,7 +44,6 @@ public class TalrandsInvocation extends CardImpl { super(ownerId, 73, "Talrand's Invocation", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}{U}"); this.expansionSetCode = "M13"; - this.color.setBlue(true); // Put two 2/2 blue Drake creature tokens with flying onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new DrakeToken(), 2)); diff --git a/Mage.Sets/src/mage/sets/magic2013/ThundermawHellkite.java b/Mage.Sets/src/mage/sets/magic2013/ThundermawHellkite.java index 58cc788da3f..73d9bdb8794 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ThundermawHellkite.java +++ b/Mage.Sets/src/mage/sets/magic2013/ThundermawHellkite.java @@ -65,7 +65,6 @@ public class ThundermawHellkite extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/TimberpackWolf.java b/Mage.Sets/src/mage/sets/magic2013/TimberpackWolf.java index b7916356805..353b7eb7e2b 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TimberpackWolf.java +++ b/Mage.Sets/src/mage/sets/magic2013/TimberpackWolf.java @@ -61,7 +61,6 @@ public class TimberpackWolf extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/TouchOfTheEternal.java b/Mage.Sets/src/mage/sets/magic2013/TouchOfTheEternal.java index 1ab091cf95a..80347ef43b4 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TouchOfTheEternal.java +++ b/Mage.Sets/src/mage/sets/magic2013/TouchOfTheEternal.java @@ -48,7 +48,6 @@ public class TouchOfTheEternal extends CardImpl { super(ownerId, 37, "Touch of the Eternal", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{5}{W}{W}"); this.expansionSetCode = "M13"; - this.color.setWhite(true); // At the beginning of your upkeep, count the number of permanents you control. Your life total becomes that number. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new TouchOfTheEternalEffect(), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/magic2013/TricksOfTheTrade.java b/Mage.Sets/src/mage/sets/magic2013/TricksOfTheTrade.java index 3853f0cd5c7..b439ea09cb6 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TricksOfTheTrade.java +++ b/Mage.Sets/src/mage/sets/magic2013/TricksOfTheTrade.java @@ -54,7 +54,6 @@ public class TricksOfTheTrade extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant creature TargetPermanent target = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2013/VeilbornGhoul.java b/Mage.Sets/src/mage/sets/magic2013/VeilbornGhoul.java index 24117049478..8cdcfbac140 100644 --- a/Mage.Sets/src/mage/sets/magic2013/VeilbornGhoul.java +++ b/Mage.Sets/src/mage/sets/magic2013/VeilbornGhoul.java @@ -56,7 +56,6 @@ public class VeilbornGhoul extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/VileRebirth.java b/Mage.Sets/src/mage/sets/magic2013/VileRebirth.java index 4207a65bdc6..2daa3aca0f9 100644 --- a/Mage.Sets/src/mage/sets/magic2013/VileRebirth.java +++ b/Mage.Sets/src/mage/sets/magic2013/VileRebirth.java @@ -49,7 +49,6 @@ public class VileRebirth extends CardImpl { super(ownerId, 115, "Vile Rebirth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "M13"; - this.color.setBlack(true); // Exile target creature card from a graveyard. this.getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2013/VoidStalker.java b/Mage.Sets/src/mage/sets/magic2013/VoidStalker.java index e64efb61285..516e26059b9 100644 --- a/Mage.Sets/src/mage/sets/magic2013/VoidStalker.java +++ b/Mage.Sets/src/mage/sets/magic2013/VoidStalker.java @@ -56,7 +56,6 @@ public class VoidStalker extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/VolcanicGeyser.java b/Mage.Sets/src/mage/sets/magic2013/VolcanicGeyser.java index 48fe87d7661..cb231710e5a 100644 --- a/Mage.Sets/src/mage/sets/magic2013/VolcanicGeyser.java +++ b/Mage.Sets/src/mage/sets/magic2013/VolcanicGeyser.java @@ -45,7 +45,6 @@ public class VolcanicGeyser extends CardImpl { super(ownerId, 154, "Volcanic Geyser", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{R}{R}"); this.expansionSetCode = "M13"; - this.color.setRed(true); // Volcanic Geyser deals X damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); diff --git a/Mage.Sets/src/mage/sets/magic2013/WarFalcon.java b/Mage.Sets/src/mage/sets/magic2013/WarFalcon.java index 31e96d1d15c..0da4910a20e 100644 --- a/Mage.Sets/src/mage/sets/magic2013/WarFalcon.java +++ b/Mage.Sets/src/mage/sets/magic2013/WarFalcon.java @@ -56,7 +56,6 @@ public class WarFalcon extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Bird"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2013/WarclampMastiff.java b/Mage.Sets/src/mage/sets/magic2013/WarclampMastiff.java index 4747c2b0836..f963aa76405 100644 --- a/Mage.Sets/src/mage/sets/magic2013/WarclampMastiff.java +++ b/Mage.Sets/src/mage/sets/magic2013/WarclampMastiff.java @@ -45,7 +45,6 @@ public class WarclampMastiff extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/Watercourser.java b/Mage.Sets/src/mage/sets/magic2013/Watercourser.java index 50f9ce0067c..0958c35423c 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Watercourser.java +++ b/Mage.Sets/src/mage/sets/magic2013/Watercourser.java @@ -49,7 +49,6 @@ public class Watercourser extends CardImpl { this.expansionSetCode = "M13"; 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/magic2013/WildGuess.java b/Mage.Sets/src/mage/sets/magic2013/WildGuess.java index 87b8bd4041b..58951964729 100644 --- a/Mage.Sets/src/mage/sets/magic2013/WildGuess.java +++ b/Mage.Sets/src/mage/sets/magic2013/WildGuess.java @@ -45,7 +45,6 @@ public class WildGuess extends CardImpl { super(ownerId, 157, "Wild Guess", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}{R}"); this.expansionSetCode = "M13"; - this.color.setRed(true); // As an additional cost to cast Wild Guess, discard a card. this.getSpellAbility().addCost(new DiscardTargetCost(new TargetCardInHand())); diff --git a/Mage.Sets/src/mage/sets/magic2013/WitsEnd.java b/Mage.Sets/src/mage/sets/magic2013/WitsEnd.java index 0557d21bb48..d8d42cfe03b 100644 --- a/Mage.Sets/src/mage/sets/magic2013/WitsEnd.java +++ b/Mage.Sets/src/mage/sets/magic2013/WitsEnd.java @@ -50,7 +50,6 @@ public class WitsEnd extends CardImpl { super(ownerId, 117, "Wit's End", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{B}{B}"); this.expansionSetCode = "M13"; - this.color.setBlack(true); // Target player discards his or her hand. this.getSpellAbility().addEffect(new WitsEndEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2013/Worldfire.java b/Mage.Sets/src/mage/sets/magic2013/Worldfire.java index 2d6536f61ba..4ef69e58ec6 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Worldfire.java +++ b/Mage.Sets/src/mage/sets/magic2013/Worldfire.java @@ -51,7 +51,6 @@ public class Worldfire extends CardImpl { super(ownerId, 158, "Worldfire", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{6}{R}{R}{R}"); this.expansionSetCode = "M13"; - this.color.setRed(true); // Exile all permanents. Exile all cards from all hands and graveyards. Each player's life total becomes 1. this.getSpellAbility().addEffect(new WorldfireEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java b/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java index d63f2f0b44e..08f653ee691 100644 --- a/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java +++ b/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java @@ -63,7 +63,6 @@ public class XathridGorgon extends CardImpl { this.expansionSetCode = "M13"; this.subtype.add("Gorgon"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/magic2013/YevaNaturesHerald.java b/Mage.Sets/src/mage/sets/magic2013/YevaNaturesHerald.java index e5a81957613..7bdac7aaf6e 100644 --- a/Mage.Sets/src/mage/sets/magic2013/YevaNaturesHerald.java +++ b/Mage.Sets/src/mage/sets/magic2013/YevaNaturesHerald.java @@ -59,7 +59,6 @@ public class YevaNaturesHerald extends CardImpl { this.subtype.add("Elf"); 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/magic2013/YevasForcemage.java b/Mage.Sets/src/mage/sets/magic2013/YevasForcemage.java index ff27edc4bc6..5cff3e723cd 100644 --- a/Mage.Sets/src/mage/sets/magic2013/YevasForcemage.java +++ b/Mage.Sets/src/mage/sets/magic2013/YevasForcemage.java @@ -50,7 +50,6 @@ public class YevasForcemage 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/magic2014/AcademyRaider.java b/Mage.Sets/src/mage/sets/magic2014/AcademyRaider.java index 761c283ed78..19bfedc8976 100644 --- a/Mage.Sets/src/mage/sets/magic2014/AcademyRaider.java +++ b/Mage.Sets/src/mage/sets/magic2014/AcademyRaider.java @@ -52,7 +52,6 @@ public class AcademyRaider 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/magic2014/AccursedSpirit.java b/Mage.Sets/src/mage/sets/magic2014/AccursedSpirit.java index 002dec9e588..93680453d2f 100644 --- a/Mage.Sets/src/mage/sets/magic2014/AccursedSpirit.java +++ b/Mage.Sets/src/mage/sets/magic2014/AccursedSpirit.java @@ -45,7 +45,6 @@ public class AccursedSpirit extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/AdvocateOfTheBeast.java b/Mage.Sets/src/mage/sets/magic2014/AdvocateOfTheBeast.java index 6e87fd92c89..33b6e0d6b3e 100644 --- a/Mage.Sets/src/mage/sets/magic2014/AdvocateOfTheBeast.java +++ b/Mage.Sets/src/mage/sets/magic2014/AdvocateOfTheBeast.java @@ -61,7 +61,6 @@ public class AdvocateOfTheBeast extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2014/AjanisChosen.java b/Mage.Sets/src/mage/sets/magic2014/AjanisChosen.java index 5d37d655367..d4f12cbb1f8 100644 --- a/Mage.Sets/src/mage/sets/magic2014/AjanisChosen.java +++ b/Mage.Sets/src/mage/sets/magic2014/AjanisChosen.java @@ -63,7 +63,6 @@ public class AjanisChosen extends CardImpl { this.subtype.add("Cat"); 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/magic2014/AngelicAccord.java b/Mage.Sets/src/mage/sets/magic2014/AngelicAccord.java index 8df4cbc6f36..a8e352bf09a 100644 --- a/Mage.Sets/src/mage/sets/magic2014/AngelicAccord.java +++ b/Mage.Sets/src/mage/sets/magic2014/AngelicAccord.java @@ -52,7 +52,6 @@ public class AngelicAccord extends CardImpl { super(ownerId, 3, "Angelic Accord", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "M14"; - this.color.setWhite(true); // At the beginning of each end step, if you gained 4 or more life this turn, put a 4/4 white Angel creature token with flying onto the battlefield. this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new AngelToken()), TargetController.ANY, new YouGainedLifeCondition(Condition.ComparisonType.GreaterThan, 3), false), new PlayerGainedLifeWatcher()); diff --git a/Mage.Sets/src/mage/sets/magic2014/ArchangelOfThune.java b/Mage.Sets/src/mage/sets/magic2014/ArchangelOfThune.java index 09f5b3b8040..35ac93db9ba 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ArchangelOfThune.java +++ b/Mage.Sets/src/mage/sets/magic2014/ArchangelOfThune.java @@ -53,7 +53,6 @@ public class ArchangelOfThune extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/ArtificersHex.java b/Mage.Sets/src/mage/sets/magic2014/ArtificersHex.java index 623c97ef5a9..c11f0e8ec25 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ArtificersHex.java +++ b/Mage.Sets/src/mage/sets/magic2014/ArtificersHex.java @@ -63,7 +63,6 @@ public class ArtificersHex extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant Equipment TargetPermanent auraTarget = new TargetPermanent(filter); diff --git a/Mage.Sets/src/mage/sets/magic2014/AwakenTheAncient.java b/Mage.Sets/src/mage/sets/magic2014/AwakenTheAncient.java index 2f03942f7d0..c0c713ddefc 100644 --- a/Mage.Sets/src/mage/sets/magic2014/AwakenTheAncient.java +++ b/Mage.Sets/src/mage/sets/magic2014/AwakenTheAncient.java @@ -64,7 +64,6 @@ public class AwakenTheAncient extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Aura"); - this.color.setRed(true); // Enchant Mountain TargetPermanent auraTarget = new TargetLandPermanent(filter); diff --git a/Mage.Sets/src/mage/sets/magic2014/BanisherPriest.java b/Mage.Sets/src/mage/sets/magic2014/BanisherPriest.java index eb9577c0652..6f3baeec946 100644 --- a/Mage.Sets/src/mage/sets/magic2014/BanisherPriest.java +++ b/Mage.Sets/src/mage/sets/magic2014/BanisherPriest.java @@ -64,7 +64,6 @@ public class BanisherPriest 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/magic2014/BarrageOfExpendables.java b/Mage.Sets/src/mage/sets/magic2014/BarrageOfExpendables.java index ffe0aadca01..a38ca811e3a 100644 --- a/Mage.Sets/src/mage/sets/magic2014/BarrageOfExpendables.java +++ b/Mage.Sets/src/mage/sets/magic2014/BarrageOfExpendables.java @@ -50,7 +50,6 @@ public class BarrageOfExpendables extends CardImpl { super(ownerId, 127, "Barrage of Expendables", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{R}"); this.expansionSetCode = "M14"; - this.color.setRed(true); // {R}, Sacrifice a creature: Barrage of Expendables deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); diff --git a/Mage.Sets/src/mage/sets/magic2014/BattleSliver.java b/Mage.Sets/src/mage/sets/magic2014/BattleSliver.java index 2ea9a11441a..fca6598458f 100644 --- a/Mage.Sets/src/mage/sets/magic2014/BattleSliver.java +++ b/Mage.Sets/src/mage/sets/magic2014/BattleSliver.java @@ -49,7 +49,6 @@ public class BattleSliver extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Sliver"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2014/Blightcaster.java b/Mage.Sets/src/mage/sets/magic2014/Blightcaster.java index 2bccbf6b489..0f3a75f1806 100644 --- a/Mage.Sets/src/mage/sets/magic2014/Blightcaster.java +++ b/Mage.Sets/src/mage/sets/magic2014/Blightcaster.java @@ -58,7 +58,6 @@ public class Blightcaster extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2014/BloodBairn.java b/Mage.Sets/src/mage/sets/magic2014/BloodBairn.java index 3afced0a23e..7d3a14c61ea 100644 --- a/Mage.Sets/src/mage/sets/magic2014/BloodBairn.java +++ b/Mage.Sets/src/mage/sets/magic2014/BloodBairn.java @@ -57,7 +57,6 @@ public class BloodBairn extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Vampire"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2014/BlurSliver.java b/Mage.Sets/src/mage/sets/magic2014/BlurSliver.java index 1c402fc04c7..f90d9718fa4 100644 --- a/Mage.Sets/src/mage/sets/magic2014/BlurSliver.java +++ b/Mage.Sets/src/mage/sets/magic2014/BlurSliver.java @@ -50,7 +50,6 @@ public class BlurSliver extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Sliver"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2014/BogbrewWitch.java b/Mage.Sets/src/mage/sets/magic2014/BogbrewWitch.java index f6529361d7b..f48ca417113 100644 --- a/Mage.Sets/src/mage/sets/magic2014/BogbrewWitch.java +++ b/Mage.Sets/src/mage/sets/magic2014/BogbrewWitch.java @@ -61,7 +61,6 @@ public class BogbrewWitch extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2014/BonescytheSliver.java b/Mage.Sets/src/mage/sets/magic2014/BonescytheSliver.java index c700e714d7a..ba34ae6acf9 100644 --- a/Mage.Sets/src/mage/sets/magic2014/BonescytheSliver.java +++ b/Mage.Sets/src/mage/sets/magic2014/BonescytheSliver.java @@ -54,7 +54,6 @@ public class BonescytheSliver extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/BurningEarth.java b/Mage.Sets/src/mage/sets/magic2014/BurningEarth.java index 4737d18cd10..7c62477e23a 100644 --- a/Mage.Sets/src/mage/sets/magic2014/BurningEarth.java +++ b/Mage.Sets/src/mage/sets/magic2014/BurningEarth.java @@ -46,7 +46,6 @@ public class BurningEarth extends CardImpl { super(ownerId, 130, "Burning Earth", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); this.expansionSetCode = "M14"; - this.color.setRed(true); // Whenever a player taps a nonbasic land for mana, Burning Earth deals 1 damage to that player. this.addAbility(new TapForManaAllTriggeredAbility( diff --git a/Mage.Sets/src/mage/sets/magic2014/CelestialFlare.java b/Mage.Sets/src/mage/sets/magic2014/CelestialFlare.java index b1bbf3852c2..a3278a0f366 100644 --- a/Mage.Sets/src/mage/sets/magic2014/CelestialFlare.java +++ b/Mage.Sets/src/mage/sets/magic2014/CelestialFlare.java @@ -47,7 +47,6 @@ public class CelestialFlare extends CardImpl { super(ownerId, 12, "Celestial Flare", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}{W}"); this.expansionSetCode = "M14"; - this.color.setWhite(true); // Target player sacrifices an attacking or blocking creature. this.getSpellAbility().addEffect(new SacrificeEffect(filter, 1, "Target player")); diff --git a/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java b/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java index d563262834e..2e653e7eab8 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java +++ b/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java @@ -75,7 +75,6 @@ public class ChandraPyromaster extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Chandra"); - this.color.setRed(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false)); diff --git a/Mage.Sets/src/mage/sets/magic2014/ChargingGriffin.java b/Mage.Sets/src/mage/sets/magic2014/ChargingGriffin.java index b874acc9e9e..281659df913 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ChargingGriffin.java +++ b/Mage.Sets/src/mage/sets/magic2014/ChargingGriffin.java @@ -48,7 +48,6 @@ public class ChargingGriffin extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/ColossalWhale.java b/Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java index 28dc2a17166..b6f2de8f329 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java +++ b/Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java @@ -60,7 +60,6 @@ public class ColossalWhale extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Whale"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2014/CorpseHauler.java b/Mage.Sets/src/mage/sets/magic2014/CorpseHauler.java index c2986a41a59..36621c85eca 100644 --- a/Mage.Sets/src/mage/sets/magic2014/CorpseHauler.java +++ b/Mage.Sets/src/mage/sets/magic2014/CorpseHauler.java @@ -61,7 +61,6 @@ public class CorpseHauler extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2014/CyclopsTyrant.java b/Mage.Sets/src/mage/sets/magic2014/CyclopsTyrant.java index 1fb4edabfde..18981570ffb 100644 --- a/Mage.Sets/src/mage/sets/magic2014/CyclopsTyrant.java +++ b/Mage.Sets/src/mage/sets/magic2014/CyclopsTyrant.java @@ -56,7 +56,6 @@ public class CyclopsTyrant extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Cyclops"); - this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2014/DarkProphecy.java b/Mage.Sets/src/mage/sets/magic2014/DarkProphecy.java index 271f7bb7cf8..416208588f3 100644 --- a/Mage.Sets/src/mage/sets/magic2014/DarkProphecy.java +++ b/Mage.Sets/src/mage/sets/magic2014/DarkProphecy.java @@ -54,7 +54,6 @@ public class DarkProphecy extends CardImpl { super(ownerId, 93, "Dark Prophecy", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}{B}{B}"); this.expansionSetCode = "M14"; - this.color.setBlack(true); // Whenever a creature you control dies, you draw a card and lose 1 life. Ability ability = new DiesCreatureTriggeredAbility(new DrawCardSourceControllerEffect(1), false, filter); diff --git a/Mage.Sets/src/mage/sets/magic2014/DawnstrikePaladin.java b/Mage.Sets/src/mage/sets/magic2014/DawnstrikePaladin.java index da6abd0009d..4d641cafc25 100644 --- a/Mage.Sets/src/mage/sets/magic2014/DawnstrikePaladin.java +++ b/Mage.Sets/src/mage/sets/magic2014/DawnstrikePaladin.java @@ -47,7 +47,6 @@ public class DawnstrikePaladin extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2014/DeathgazeCockatrice.java b/Mage.Sets/src/mage/sets/magic2014/DeathgazeCockatrice.java index 953ca1d6931..f6b0651919e 100644 --- a/Mage.Sets/src/mage/sets/magic2014/DeathgazeCockatrice.java +++ b/Mage.Sets/src/mage/sets/magic2014/DeathgazeCockatrice.java @@ -46,7 +46,6 @@ public class DeathgazeCockatrice extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Cockatrice"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2014/DevoutInvocation.java b/Mage.Sets/src/mage/sets/magic2014/DevoutInvocation.java index 712d33eeb21..6e918f15df8 100644 --- a/Mage.Sets/src/mage/sets/magic2014/DevoutInvocation.java +++ b/Mage.Sets/src/mage/sets/magic2014/DevoutInvocation.java @@ -55,7 +55,6 @@ public class DevoutInvocation extends CardImpl { super(ownerId, 16, "Devout Invocation", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{6}{W}"); this.expansionSetCode = "M14"; - this.color.setWhite(true); // Tap any number of untapped creatures you control. Put a 4/4 white Angel creature token with flying onto the battlefield for each creature tapped this way. this.getSpellAbility().addEffect(new DevoutInvocationEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2014/DismissIntoDream.java b/Mage.Sets/src/mage/sets/magic2014/DismissIntoDream.java index e2e8a93aaa0..3c3f298df38 100644 --- a/Mage.Sets/src/mage/sets/magic2014/DismissIntoDream.java +++ b/Mage.Sets/src/mage/sets/magic2014/DismissIntoDream.java @@ -57,7 +57,6 @@ public class DismissIntoDream extends CardImpl { super(ownerId, 50, "Dismiss into Dream", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{6}{U}"); this.expansionSetCode = "M14"; - this.color.setBlue(true); // Each creature your opponents control is an Illusion in addition to its other types // and has "When this creature becomes the target of a spell or ability, sacrifice it." diff --git a/Mage.Sets/src/mage/sets/magic2014/DragonEgg.java b/Mage.Sets/src/mage/sets/magic2014/DragonEgg.java index a76e04221d6..23921d34272 100644 --- a/Mage.Sets/src/mage/sets/magic2014/DragonEgg.java +++ b/Mage.Sets/src/mage/sets/magic2014/DragonEgg.java @@ -54,7 +54,6 @@ public class DragonEgg extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Dragon"); - this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2014/EliteArcanist.java b/Mage.Sets/src/mage/sets/magic2014/EliteArcanist.java index cf29b600682..a6096095dd2 100644 --- a/Mage.Sets/src/mage/sets/magic2014/EliteArcanist.java +++ b/Mage.Sets/src/mage/sets/magic2014/EliteArcanist.java @@ -61,7 +61,6 @@ public class EliteArcanist 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/magic2014/ElvishMystic.java b/Mage.Sets/src/mage/sets/magic2014/ElvishMystic.java index 65d0502d3e8..06e62cd41cb 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ElvishMystic.java +++ b/Mage.Sets/src/mage/sets/magic2014/ElvishMystic.java @@ -46,7 +46,6 @@ public class ElvishMystic 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/magic2014/Enlarge.java b/Mage.Sets/src/mage/sets/magic2014/Enlarge.java index ee62676fa94..34f55950d04 100644 --- a/Mage.Sets/src/mage/sets/magic2014/Enlarge.java +++ b/Mage.Sets/src/mage/sets/magic2014/Enlarge.java @@ -48,7 +48,6 @@ public class Enlarge extends CardImpl { super(ownerId, 170, "Enlarge", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); this.expansionSetCode = "M14"; - this.color.setGreen(true); // Target creature gets +7/+7 and gains trample until end of turn. It must be blocked this turn if able. this.getSpellAbility().addEffect(new BoostTargetEffect(7,7, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/magic2014/FesteringNewt.java b/Mage.Sets/src/mage/sets/magic2014/FesteringNewt.java index deae0381d0a..245ceb00a0c 100644 --- a/Mage.Sets/src/mage/sets/magic2014/FesteringNewt.java +++ b/Mage.Sets/src/mage/sets/magic2014/FesteringNewt.java @@ -63,7 +63,6 @@ public class FesteringNewt extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Salamander"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2014/FiendslayerPaladin.java b/Mage.Sets/src/mage/sets/magic2014/FiendslayerPaladin.java index 4123b44e3e0..1f4efab0209 100644 --- a/Mage.Sets/src/mage/sets/magic2014/FiendslayerPaladin.java +++ b/Mage.Sets/src/mage/sets/magic2014/FiendslayerPaladin.java @@ -59,7 +59,6 @@ public class FiendslayerPaladin 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/magic2014/FleshpulperGiant.java b/Mage.Sets/src/mage/sets/magic2014/FleshpulperGiant.java index f30627e1f2d..c2413ea1d74 100644 --- a/Mage.Sets/src/mage/sets/magic2014/FleshpulperGiant.java +++ b/Mage.Sets/src/mage/sets/magic2014/FleshpulperGiant.java @@ -57,7 +57,6 @@ public class FleshpulperGiant extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/GaleriderSliver.java b/Mage.Sets/src/mage/sets/magic2014/GaleriderSliver.java index 10430583f72..c8a51deb247 100644 --- a/Mage.Sets/src/mage/sets/magic2014/GaleriderSliver.java +++ b/Mage.Sets/src/mage/sets/magic2014/GaleriderSliver.java @@ -51,7 +51,6 @@ public class GaleriderSliver extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Sliver"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2014/GarrukCallerOfBeasts.java b/Mage.Sets/src/mage/sets/magic2014/GarrukCallerOfBeasts.java index dbf13065f68..33dce957c07 100644 --- a/Mage.Sets/src/mage/sets/magic2014/GarrukCallerOfBeasts.java +++ b/Mage.Sets/src/mage/sets/magic2014/GarrukCallerOfBeasts.java @@ -73,7 +73,6 @@ public class GarrukCallerOfBeasts extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Garruk"); - this.color.setGreen(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false)); diff --git a/Mage.Sets/src/mage/sets/magic2014/GlimpseTheFuture.java b/Mage.Sets/src/mage/sets/magic2014/GlimpseTheFuture.java index a5ebb5488bc..670830ddbc6 100644 --- a/Mage.Sets/src/mage/sets/magic2014/GlimpseTheFuture.java +++ b/Mage.Sets/src/mage/sets/magic2014/GlimpseTheFuture.java @@ -53,7 +53,6 @@ public class GlimpseTheFuture extends CardImpl { super(ownerId, 58, "Glimpse the Future", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "M14"; - this.color.setBlue(true); // Look at the top three cards of your library. Put one of them into your hand and the rest into your graveyard. this.getSpellAbility().addEffect(new GlimpseTheFutureEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2014/GnawingZombie.java b/Mage.Sets/src/mage/sets/magic2014/GnawingZombie.java index ad34e11a4c5..629d696523d 100644 --- a/Mage.Sets/src/mage/sets/magic2014/GnawingZombie.java +++ b/Mage.Sets/src/mage/sets/magic2014/GnawingZombie.java @@ -53,7 +53,6 @@ public class GnawingZombie extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2014/GoblinDiplomats.java b/Mage.Sets/src/mage/sets/magic2014/GoblinDiplomats.java index fbfd88cc9b0..444d4409eb8 100644 --- a/Mage.Sets/src/mage/sets/magic2014/GoblinDiplomats.java +++ b/Mage.Sets/src/mage/sets/magic2014/GoblinDiplomats.java @@ -52,7 +52,6 @@ public class GoblinDiplomats extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/GrimReturn.java b/Mage.Sets/src/mage/sets/magic2014/GrimReturn.java index efc2d5604ab..0a93db0e9f8 100644 --- a/Mage.Sets/src/mage/sets/magic2014/GrimReturn.java +++ b/Mage.Sets/src/mage/sets/magic2014/GrimReturn.java @@ -56,7 +56,6 @@ public class GrimReturn extends CardImpl { super(ownerId, 100, "Grim Return", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "M14"; - this.color.setBlack(true); // Choose target creature card in a graveyard that was put there from the battlefield this turn. Put that card onto the battlefield under your control. Effect effect = new ReturnFromGraveyardToBattlefieldTargetEffect(); diff --git a/Mage.Sets/src/mage/sets/magic2014/GroundshakerSliver.java b/Mage.Sets/src/mage/sets/magic2014/GroundshakerSliver.java index 205e72b5478..b971c28e3c4 100644 --- a/Mage.Sets/src/mage/sets/magic2014/GroundshakerSliver.java +++ b/Mage.Sets/src/mage/sets/magic2014/GroundshakerSliver.java @@ -52,7 +52,6 @@ public class GroundshakerSliver extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Sliver"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2014/HiveStirrings.java b/Mage.Sets/src/mage/sets/magic2014/HiveStirrings.java index c5e33374aa1..2d378cc5167 100644 --- a/Mage.Sets/src/mage/sets/magic2014/HiveStirrings.java +++ b/Mage.Sets/src/mage/sets/magic2014/HiveStirrings.java @@ -45,7 +45,6 @@ public class HiveStirrings extends CardImpl { super(ownerId, 21, "Hive Stirrings", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{W}"); this.expansionSetCode = "M14"; - this.color.setWhite(true); // Put two 1/1 colorless Sliver creature tokens onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new SliverToken(), 2)); diff --git a/Mage.Sets/src/mage/sets/magic2014/HuntTheWeak.java b/Mage.Sets/src/mage/sets/magic2014/HuntTheWeak.java index c697c0f52fb..b8abdb2ef04 100644 --- a/Mage.Sets/src/mage/sets/magic2014/HuntTheWeak.java +++ b/Mage.Sets/src/mage/sets/magic2014/HuntTheWeak.java @@ -57,7 +57,6 @@ public class HuntTheWeak extends CardImpl { super(ownerId, 179, "Hunt the Weak", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "M14"; - this.color.setGreen(true); // Put a +1/+1 counter on target creature you control. Then that creature fights target creature you don't control. Effect effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2014/IllusionaryArmor.java b/Mage.Sets/src/mage/sets/magic2014/IllusionaryArmor.java index c3fa032b679..0a6947cbb50 100644 --- a/Mage.Sets/src/mage/sets/magic2014/IllusionaryArmor.java +++ b/Mage.Sets/src/mage/sets/magic2014/IllusionaryArmor.java @@ -57,7 +57,6 @@ public class IllusionaryArmor extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant Creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2014/ImposingSovereign.java b/Mage.Sets/src/mage/sets/magic2014/ImposingSovereign.java index 3cd6ad8d374..c9f35721b65 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ImposingSovereign.java +++ b/Mage.Sets/src/mage/sets/magic2014/ImposingSovereign.java @@ -53,7 +53,6 @@ public class ImposingSovereign extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Human"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2014/IntoTheWilds.java b/Mage.Sets/src/mage/sets/magic2014/IntoTheWilds.java index 0a5779b20fa..6317d0a0c7b 100644 --- a/Mage.Sets/src/mage/sets/magic2014/IntoTheWilds.java +++ b/Mage.Sets/src/mage/sets/magic2014/IntoTheWilds.java @@ -54,7 +54,6 @@ public class IntoTheWilds extends CardImpl { super(ownerId, 180, "Into the Wilds", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}"); this.expansionSetCode = "M14"; - this.color.setGreen(true); // At the beginning of your upkeep, look at the top card of your library. If it's a land card, you may put it onto the battlefield. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new IntoTheWildsEffect(), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/magic2014/JacesMindseeker.java b/Mage.Sets/src/mage/sets/magic2014/JacesMindseeker.java index 06f3eee5317..615e47223df 100644 --- a/Mage.Sets/src/mage/sets/magic2014/JacesMindseeker.java +++ b/Mage.Sets/src/mage/sets/magic2014/JacesMindseeker.java @@ -60,7 +60,6 @@ public class JacesMindseeker extends CardImpl { this.subtype.add("Fish"); 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/magic2014/KalonianHydra.java b/Mage.Sets/src/mage/sets/magic2014/KalonianHydra.java index 7947bd1fe98..2d213fea075 100644 --- a/Mage.Sets/src/mage/sets/magic2014/KalonianHydra.java +++ b/Mage.Sets/src/mage/sets/magic2014/KalonianHydra.java @@ -59,7 +59,6 @@ public class KalonianHydra extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/KalonianTusker.java b/Mage.Sets/src/mage/sets/magic2014/KalonianTusker.java index fa967dff318..3df70a75f38 100644 --- a/Mage.Sets/src/mage/sets/magic2014/KalonianTusker.java +++ b/Mage.Sets/src/mage/sets/magic2014/KalonianTusker.java @@ -44,7 +44,6 @@ public class KalonianTusker extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/LifebaneZombie.java b/Mage.Sets/src/mage/sets/magic2014/LifebaneZombie.java index 17be7c74b91..32879064c9f 100644 --- a/Mage.Sets/src/mage/sets/magic2014/LifebaneZombie.java +++ b/Mage.Sets/src/mage/sets/magic2014/LifebaneZombie.java @@ -61,7 +61,6 @@ public class LifebaneZombie 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/magic2014/LilianasReaver.java b/Mage.Sets/src/mage/sets/magic2014/LilianasReaver.java index ef84c6a607c..8e1cc16edf6 100644 --- a/Mage.Sets/src/mage/sets/magic2014/LilianasReaver.java +++ b/Mage.Sets/src/mage/sets/magic2014/LilianasReaver.java @@ -50,7 +50,6 @@ public class LilianasReaver extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Zombie"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2014/LiturgyOfBlood.java b/Mage.Sets/src/mage/sets/magic2014/LiturgyOfBlood.java index 394d9545c5a..1686965860f 100644 --- a/Mage.Sets/src/mage/sets/magic2014/LiturgyOfBlood.java +++ b/Mage.Sets/src/mage/sets/magic2014/LiturgyOfBlood.java @@ -46,7 +46,6 @@ public class LiturgyOfBlood extends CardImpl { super(ownerId, 104, "Liturgy of Blood", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "M14"; - this.color.setBlack(true); // Destroy target creature. Add {B}{B}{B} to your mana pool. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2014/ManaweftSliver.java b/Mage.Sets/src/mage/sets/magic2014/ManaweftSliver.java index 9905ff948a5..c47bf45f31d 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ManaweftSliver.java +++ b/Mage.Sets/src/mage/sets/magic2014/ManaweftSliver.java @@ -51,7 +51,6 @@ public class ManaweftSliver extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/MaraudingMaulhorn.java b/Mage.Sets/src/mage/sets/magic2014/MaraudingMaulhorn.java index 257d0a29e54..e5fa803cc8b 100644 --- a/Mage.Sets/src/mage/sets/magic2014/MaraudingMaulhorn.java +++ b/Mage.Sets/src/mage/sets/magic2014/MaraudingMaulhorn.java @@ -58,7 +58,6 @@ public class MaraudingMaulhorn extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Beast"); - this.color.setRed(true); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java b/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java index c840bfb8a5d..3c7072088f9 100644 --- a/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java +++ b/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java @@ -53,7 +53,6 @@ public class MasterOfDiversion extends CardImpl { this.subtype.add("Human"); 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/magic2014/MeganticSliver.java b/Mage.Sets/src/mage/sets/magic2014/MeganticSliver.java index d99818611e3..498efb80658 100644 --- a/Mage.Sets/src/mage/sets/magic2014/MeganticSliver.java +++ b/Mage.Sets/src/mage/sets/magic2014/MeganticSliver.java @@ -49,7 +49,6 @@ public class MeganticSliver extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Sliver"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2014/MessengerDrake.java b/Mage.Sets/src/mage/sets/magic2014/MessengerDrake.java index 19773fd6023..b988b3310e4 100644 --- a/Mage.Sets/src/mage/sets/magic2014/MessengerDrake.java +++ b/Mage.Sets/src/mage/sets/magic2014/MessengerDrake.java @@ -47,7 +47,6 @@ public class MessengerDrake extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/Mindsparker.java b/Mage.Sets/src/mage/sets/magic2014/Mindsparker.java index e3198d4140f..769fcae1c30 100644 --- a/Mage.Sets/src/mage/sets/magic2014/Mindsparker.java +++ b/Mage.Sets/src/mage/sets/magic2014/Mindsparker.java @@ -69,7 +69,6 @@ public class Mindsparker extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/MinotaurAbomination.java b/Mage.Sets/src/mage/sets/magic2014/MinotaurAbomination.java index fc50f752126..982142e2e15 100644 --- a/Mage.Sets/src/mage/sets/magic2014/MinotaurAbomination.java +++ b/Mage.Sets/src/mage/sets/magic2014/MinotaurAbomination.java @@ -45,7 +45,6 @@ public class MinotaurAbomination extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Minotaur"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(6); } diff --git a/Mage.Sets/src/mage/sets/magic2014/MoltenBirth.java b/Mage.Sets/src/mage/sets/magic2014/MoltenBirth.java index 39c2c1676d7..fe8489ec4ea 100644 --- a/Mage.Sets/src/mage/sets/magic2014/MoltenBirth.java +++ b/Mage.Sets/src/mage/sets/magic2014/MoltenBirth.java @@ -53,7 +53,6 @@ public class MoltenBirth extends CardImpl { super(ownerId, 147, "Molten Birth", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); this.expansionSetCode = "M14"; - this.color.setRed(true); // Put two 1/1 red Elemental creature tokens onto the battlefield. Then flip a coin. If you win the flip, return Molten Birth to its owner's hand. this.getSpellAbility().addEffect(new MoltenBirthEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2014/OathOfTheAncientWood.java b/Mage.Sets/src/mage/sets/magic2014/OathOfTheAncientWood.java index ed04126e40b..bf638803409 100644 --- a/Mage.Sets/src/mage/sets/magic2014/OathOfTheAncientWood.java +++ b/Mage.Sets/src/mage/sets/magic2014/OathOfTheAncientWood.java @@ -58,7 +58,6 @@ public class OathOfTheAncientWood extends CardImpl { super(ownerId, 187, "Oath of the Ancient Wood", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "M14"; - this.color.setGreen(true); // Whenever Oath of the Ancient Wood or another enchantment enters the battlefield under your control, you may put a +1/+1 counter on target creature. Effect effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2014/OgreBattledriver.java b/Mage.Sets/src/mage/sets/magic2014/OgreBattledriver.java index 7ffe9dd3f91..a0b2ae1f5f0 100644 --- a/Mage.Sets/src/mage/sets/magic2014/OgreBattledriver.java +++ b/Mage.Sets/src/mage/sets/magic2014/OgreBattledriver.java @@ -66,7 +66,6 @@ public class OgreBattledriver 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/magic2014/PathOfBravery.java b/Mage.Sets/src/mage/sets/magic2014/PathOfBravery.java index fb60a8a748d..91ecb779aa9 100644 --- a/Mage.Sets/src/mage/sets/magic2014/PathOfBravery.java +++ b/Mage.Sets/src/mage/sets/magic2014/PathOfBravery.java @@ -65,7 +65,6 @@ public class PathOfBravery extends CardImpl { super(ownerId, 26, "Path of Bravery", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "M14"; - this.color.setWhite(true); // As long as your life total is greater than or equal to your starting life total, creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true), new LifeCondition(), rule))); diff --git a/Mage.Sets/src/mage/sets/magic2014/PayNoHeed.java b/Mage.Sets/src/mage/sets/magic2014/PayNoHeed.java index a17b0b702d3..30955010bd1 100644 --- a/Mage.Sets/src/mage/sets/magic2014/PayNoHeed.java +++ b/Mage.Sets/src/mage/sets/magic2014/PayNoHeed.java @@ -43,7 +43,6 @@ public class PayNoHeed extends CardImpl { super(ownerId, 27, "Pay No Heed", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "M14"; - this.color.setWhite(true); // Prevent all damage a source of your choice would deal this turn. this.getSpellAbility().addEffect(new PreventDamageBySourceEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2014/PredatorySliver.java b/Mage.Sets/src/mage/sets/magic2014/PredatorySliver.java index 1835b155d6e..3b652b399e7 100644 --- a/Mage.Sets/src/mage/sets/magic2014/PredatorySliver.java +++ b/Mage.Sets/src/mage/sets/magic2014/PredatorySliver.java @@ -49,7 +49,6 @@ public class PredatorySliver extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/PrimevalBounty.java b/Mage.Sets/src/mage/sets/magic2014/PrimevalBounty.java index 200250464c8..5240cbc894a 100644 --- a/Mage.Sets/src/mage/sets/magic2014/PrimevalBounty.java +++ b/Mage.Sets/src/mage/sets/magic2014/PrimevalBounty.java @@ -63,7 +63,6 @@ public class PrimevalBounty extends CardImpl { super(ownerId, 190, "Primeval Bounty", Rarity.MYTHIC, new CardType[]{CardType.ENCHANTMENT}, "{5}{G}"); this.expansionSetCode = "M14"; - this.color.setGreen(true); // Whenever you cast a creature spell, put a 3/3 green Beast creature token onto the battlefield. this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new BeastToken()), filterCreature, false)); diff --git a/Mage.Sets/src/mage/sets/magic2014/RegathanFirecat.java b/Mage.Sets/src/mage/sets/magic2014/RegathanFirecat.java index 7d0adc4adb6..3d062466956 100644 --- a/Mage.Sets/src/mage/sets/magic2014/RegathanFirecat.java +++ b/Mage.Sets/src/mage/sets/magic2014/RegathanFirecat.java @@ -45,7 +45,6 @@ public class RegathanFirecat extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Cat"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/magic2014/RiseOfTheDarkRealms.java b/Mage.Sets/src/mage/sets/magic2014/RiseOfTheDarkRealms.java index 7767a2ef360..8b84ffb6124 100644 --- a/Mage.Sets/src/mage/sets/magic2014/RiseOfTheDarkRealms.java +++ b/Mage.Sets/src/mage/sets/magic2014/RiseOfTheDarkRealms.java @@ -49,7 +49,6 @@ public class RiseOfTheDarkRealms extends CardImpl { super(ownerId, 111, "Rise of the Dark Realms", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{7}{B}{B}"); this.expansionSetCode = "M14"; - this.color.setBlack(true); // Put all creature cards from all graveyards onto the battlefield under your control. this.getSpellAbility().addEffect(new RiseOfTheDarkRealmsEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2014/RumblingBaloth.java b/Mage.Sets/src/mage/sets/magic2014/RumblingBaloth.java index 13d4ffd7cfe..b3431ee6eff 100644 --- a/Mage.Sets/src/mage/sets/magic2014/RumblingBaloth.java +++ b/Mage.Sets/src/mage/sets/magic2014/RumblingBaloth.java @@ -44,7 +44,6 @@ public class RumblingBaloth extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/SavageSummoning.java b/Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java index 63694af386e..c323b750f90 100644 --- a/Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java +++ b/Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java @@ -64,7 +64,6 @@ public class SavageSummoning extends CardImpl { super(ownerId, 194, "Savage Summoning", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "M14"; - this.color.setGreen(true); // Savage Summoning can't be countered. Ability ability = new CantBeCounteredAbility(); diff --git a/Mage.Sets/src/mage/sets/magic2014/SeacoastDrake.java b/Mage.Sets/src/mage/sets/magic2014/SeacoastDrake.java index cf0e4125d5d..8fb980c066d 100644 --- a/Mage.Sets/src/mage/sets/magic2014/SeacoastDrake.java +++ b/Mage.Sets/src/mage/sets/magic2014/SeacoastDrake.java @@ -45,7 +45,6 @@ public class SeacoastDrake extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Drake"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2014/SeismicStomp.java b/Mage.Sets/src/mage/sets/magic2014/SeismicStomp.java index 75c1a101e28..a8d57175e10 100644 --- a/Mage.Sets/src/mage/sets/magic2014/SeismicStomp.java +++ b/Mage.Sets/src/mage/sets/magic2014/SeismicStomp.java @@ -48,7 +48,6 @@ public class SeismicStomp extends CardImpl { super(ownerId, 152, "Seismic Stomp", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "M14"; - this.color.setRed(true); // Creatures without flying can't block this turn. this.getSpellAbility().addEffect(new SeismicStompEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2014/SentinelSliver.java b/Mage.Sets/src/mage/sets/magic2014/SentinelSliver.java index 0be9ab17e9e..0fc8e32841d 100644 --- a/Mage.Sets/src/mage/sets/magic2014/SentinelSliver.java +++ b/Mage.Sets/src/mage/sets/magic2014/SentinelSliver.java @@ -50,7 +50,6 @@ public class SentinelSliver extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/SeraphOfTheSword.java b/Mage.Sets/src/mage/sets/magic2014/SeraphOfTheSword.java index 8eb7279c8cd..2a45dd4ff04 100644 --- a/Mage.Sets/src/mage/sets/magic2014/SeraphOfTheSword.java +++ b/Mage.Sets/src/mage/sets/magic2014/SeraphOfTheSword.java @@ -50,7 +50,6 @@ public class SeraphOfTheSword extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/ShadowbornApostle.java b/Mage.Sets/src/mage/sets/magic2014/ShadowbornApostle.java index 06c26882ec9..6ff1732c3c7 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ShadowbornApostle.java +++ b/Mage.Sets/src/mage/sets/magic2014/ShadowbornApostle.java @@ -66,7 +66,6 @@ public class ShadowbornApostle 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/magic2014/ShadowbornDemon.java b/Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java index 7d9a49a39c2..08eda6473f3 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java +++ b/Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java @@ -69,7 +69,6 @@ public class ShadowbornDemon extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Demon"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/magic2014/Soulmender.java b/Mage.Sets/src/mage/sets/magic2014/Soulmender.java index d05470343e9..57b6eab28c9 100644 --- a/Mage.Sets/src/mage/sets/magic2014/Soulmender.java +++ b/Mage.Sets/src/mage/sets/magic2014/Soulmender.java @@ -49,7 +49,6 @@ public class Soulmender 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/magic2014/Sporemound.java b/Mage.Sets/src/mage/sets/magic2014/Sporemound.java index bd4e15fb048..54ce6c52292 100644 --- a/Mage.Sets/src/mage/sets/magic2014/Sporemound.java +++ b/Mage.Sets/src/mage/sets/magic2014/Sporemound.java @@ -49,7 +49,6 @@ public class Sporemound extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Fungus"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2014/SteelformSliver.java b/Mage.Sets/src/mage/sets/magic2014/SteelformSliver.java index 2e105d2717b..fe19136504a 100644 --- a/Mage.Sets/src/mage/sets/magic2014/SteelformSliver.java +++ b/Mage.Sets/src/mage/sets/magic2014/SteelformSliver.java @@ -49,7 +49,6 @@ public class SteelformSliver extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/StonehornChanter.java b/Mage.Sets/src/mage/sets/magic2014/StonehornChanter.java index d7a38819179..5c6c005bc46 100644 --- a/Mage.Sets/src/mage/sets/magic2014/StonehornChanter.java +++ b/Mage.Sets/src/mage/sets/magic2014/StonehornChanter.java @@ -53,7 +53,6 @@ public class StonehornChanter extends CardImpl { this.subtype.add("Rhino"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2014/StrikingSliver.java b/Mage.Sets/src/mage/sets/magic2014/StrikingSliver.java index 57eaa6fc1cc..8c282f16f5b 100644 --- a/Mage.Sets/src/mage/sets/magic2014/StrikingSliver.java +++ b/Mage.Sets/src/mage/sets/magic2014/StrikingSliver.java @@ -50,7 +50,6 @@ public class StrikingSliver extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Sliver"); - this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2014/SyphonSliver.java b/Mage.Sets/src/mage/sets/magic2014/SyphonSliver.java index 23d905fba98..65e48edd98f 100644 --- a/Mage.Sets/src/mage/sets/magic2014/SyphonSliver.java +++ b/Mage.Sets/src/mage/sets/magic2014/SyphonSliver.java @@ -50,7 +50,6 @@ public class SyphonSliver extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Sliver"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2014/TenaciousDead.java b/Mage.Sets/src/mage/sets/magic2014/TenaciousDead.java index 7c406c916cc..adcac81c949 100644 --- a/Mage.Sets/src/mage/sets/magic2014/TenaciousDead.java +++ b/Mage.Sets/src/mage/sets/magic2014/TenaciousDead.java @@ -50,7 +50,6 @@ public class TenaciousDead extends CardImpl { this.subtype.add("Skeleton"); 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/magic2014/ThorncasterSliver.java b/Mage.Sets/src/mage/sets/magic2014/ThorncasterSliver.java index aa67600d9d3..25570879634 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ThorncasterSliver.java +++ b/Mage.Sets/src/mage/sets/magic2014/ThorncasterSliver.java @@ -53,7 +53,6 @@ public class ThorncasterSliver extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Sliver"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java b/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java index 607cccf7d4b..09343b1e7e7 100644 --- a/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java +++ b/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java @@ -73,7 +73,6 @@ public class TidebinderMage 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/magic2014/TrainedCondor.java b/Mage.Sets/src/mage/sets/magic2014/TrainedCondor.java index d191194607b..5540aa5c33f 100644 --- a/Mage.Sets/src/mage/sets/magic2014/TrainedCondor.java +++ b/Mage.Sets/src/mage/sets/magic2014/TrainedCondor.java @@ -58,7 +58,6 @@ public class TrainedCondor extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/UndeadMinotaur.java b/Mage.Sets/src/mage/sets/magic2014/UndeadMinotaur.java index 711f4c0fb92..96bb329b557 100644 --- a/Mage.Sets/src/mage/sets/magic2014/UndeadMinotaur.java +++ b/Mage.Sets/src/mage/sets/magic2014/UndeadMinotaur.java @@ -45,7 +45,6 @@ public class UndeadMinotaur extends CardImpl { this.subtype.add("Zombie"); 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/magic2014/VampireWarlord.java b/Mage.Sets/src/mage/sets/magic2014/VampireWarlord.java index 8aa623b493a..a1f54a3b10a 100644 --- a/Mage.Sets/src/mage/sets/magic2014/VampireWarlord.java +++ b/Mage.Sets/src/mage/sets/magic2014/VampireWarlord.java @@ -57,7 +57,6 @@ public class VampireWarlord extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2014/VastwoodHydra.java b/Mage.Sets/src/mage/sets/magic2014/VastwoodHydra.java index 95258947c54..e23e2f01239 100644 --- a/Mage.Sets/src/mage/sets/magic2014/VastwoodHydra.java +++ b/Mage.Sets/src/mage/sets/magic2014/VastwoodHydra.java @@ -66,7 +66,6 @@ public class VastwoodHydra extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/VoraciousWurm.java b/Mage.Sets/src/mage/sets/magic2014/VoraciousWurm.java index c2c98377caf..8b28b3ba84f 100644 --- a/Mage.Sets/src/mage/sets/magic2014/VoraciousWurm.java +++ b/Mage.Sets/src/mage/sets/magic2014/VoraciousWurm.java @@ -49,7 +49,6 @@ public class VoraciousWurm extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2014/WardenOfEvosIsle.java b/Mage.Sets/src/mage/sets/magic2014/WardenOfEvosIsle.java index 8378301f826..22acee229a9 100644 --- a/Mage.Sets/src/mage/sets/magic2014/WardenOfEvosIsle.java +++ b/Mage.Sets/src/mage/sets/magic2014/WardenOfEvosIsle.java @@ -59,7 +59,6 @@ public class WardenOfEvosIsle extends CardImpl { this.subtype.add("Bird"); 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/magic2014/WindreaderSphinx.java b/Mage.Sets/src/mage/sets/magic2014/WindreaderSphinx.java index 694530b7056..bf937abb290 100644 --- a/Mage.Sets/src/mage/sets/magic2014/WindreaderSphinx.java +++ b/Mage.Sets/src/mage/sets/magic2014/WindreaderSphinx.java @@ -53,7 +53,6 @@ public class WindreaderSphinx extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Sphinx"); - this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/magic2014/Witchstalker.java b/Mage.Sets/src/mage/sets/magic2014/Witchstalker.java index 09a6b636074..1a2fe2b3db1 100644 --- a/Mage.Sets/src/mage/sets/magic2014/Witchstalker.java +++ b/Mage.Sets/src/mage/sets/magic2014/Witchstalker.java @@ -56,7 +56,6 @@ public class Witchstalker extends CardImpl { this.expansionSetCode = "M14"; this.subtype.add("Wolf"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2014/WoodbornBehemoth.java b/Mage.Sets/src/mage/sets/magic2014/WoodbornBehemoth.java index 9fb6ff8f3ce..01a5137df7c 100644 --- a/Mage.Sets/src/mage/sets/magic2014/WoodbornBehemoth.java +++ b/Mage.Sets/src/mage/sets/magic2014/WoodbornBehemoth.java @@ -54,7 +54,6 @@ public class WoodbornBehemoth extends CardImpl { this.expansionSetCode = "M14"; 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/magic2014/XathridNecromancer.java b/Mage.Sets/src/mage/sets/magic2014/XathridNecromancer.java index 27873a9a42c..32b7487ad92 100644 --- a/Mage.Sets/src/mage/sets/magic2014/XathridNecromancer.java +++ b/Mage.Sets/src/mage/sets/magic2014/XathridNecromancer.java @@ -60,7 +60,6 @@ public class XathridNecromancer 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/magic2014/YoungPyromancer.java b/Mage.Sets/src/mage/sets/magic2014/YoungPyromancer.java index 062939b61ef..634f9c58256 100644 --- a/Mage.Sets/src/mage/sets/magic2014/YoungPyromancer.java +++ b/Mage.Sets/src/mage/sets/magic2014/YoungPyromancer.java @@ -58,7 +58,6 @@ public class YoungPyromancer extends CardImpl { this.subtype.add("Human"); 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/magic2014/ZephyrCharge.java b/Mage.Sets/src/mage/sets/magic2014/ZephyrCharge.java index 370a24a457a..6a75516eac6 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ZephyrCharge.java +++ b/Mage.Sets/src/mage/sets/magic2014/ZephyrCharge.java @@ -50,7 +50,6 @@ public class ZephyrCharge extends CardImpl { super(ownerId, 82, "Zephyr Charge", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "M14"; - this.color.setBlue(true); // {1}{U}: Target creature gains flying until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{U}")); diff --git a/Mage.Sets/src/mage/sets/magic2015/AEtherspouts.java b/Mage.Sets/src/mage/sets/magic2015/AEtherspouts.java index 8a9251e46d5..20101ee502a 100644 --- a/Mage.Sets/src/mage/sets/magic2015/AEtherspouts.java +++ b/Mage.Sets/src/mage/sets/magic2015/AEtherspouts.java @@ -58,7 +58,6 @@ public class AEtherspouts extends CardImpl { super(ownerId, 44, "AEtherspouts", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); this.expansionSetCode = "M15"; - this.color.setBlue(true); // For each attacking creature, its owner puts it on the top or bottom of his or her library. this.getSpellAbility().addEffect(new AEtherspoutsEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2015/ActOnImpulse.java b/Mage.Sets/src/mage/sets/magic2015/ActOnImpulse.java index 69cdc68f5f3..7779ef4b830 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ActOnImpulse.java +++ b/Mage.Sets/src/mage/sets/magic2015/ActOnImpulse.java @@ -55,7 +55,6 @@ public class ActOnImpulse extends CardImpl { super(ownerId, 126, "Act on Impulse", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "M15"; - this.color.setRed(true); // Exile the top three cards of your library. Until end of turn, you may play cards exiled this way. this.getSpellAbility().addEffect(new ActOnImpulseExileEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2015/AggressiveMining.java b/Mage.Sets/src/mage/sets/magic2015/AggressiveMining.java index 03f0ca72d5f..c5d35f857fb 100644 --- a/Mage.Sets/src/mage/sets/magic2015/AggressiveMining.java +++ b/Mage.Sets/src/mage/sets/magic2015/AggressiveMining.java @@ -56,7 +56,6 @@ public class AggressiveMining extends CardImpl { super(ownerId, 127, "Aggressive Mining", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); this.expansionSetCode = "M15"; - this.color.setRed(true); // You can't play lands. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AggressiveMiningEffect())); diff --git a/Mage.Sets/src/mage/sets/magic2015/AjaniSteadfast.java b/Mage.Sets/src/mage/sets/magic2015/AjaniSteadfast.java index 209d3e6e524..b9283d50ea6 100644 --- a/Mage.Sets/src/mage/sets/magic2015/AjaniSteadfast.java +++ b/Mage.Sets/src/mage/sets/magic2015/AjaniSteadfast.java @@ -77,7 +77,6 @@ public class AjaniSteadfast extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Ajani"); - this.color.setWhite(true); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false)); diff --git a/Mage.Sets/src/mage/sets/magic2015/AltacBloodseeker.java b/Mage.Sets/src/mage/sets/magic2015/AltacBloodseeker.java index 744c9a0a576..05e1bd46eea 100644 --- a/Mage.Sets/src/mage/sets/magic2015/AltacBloodseeker.java +++ b/Mage.Sets/src/mage/sets/magic2015/AltacBloodseeker.java @@ -62,7 +62,6 @@ public class AltacBloodseeker extends CardImpl { this.subtype.add("Human"); this.subtype.add("Berserker"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2015/AvacynGuardianAngel.java b/Mage.Sets/src/mage/sets/magic2015/AvacynGuardianAngel.java index e10658f42ec..05e0d807513 100644 --- a/Mage.Sets/src/mage/sets/magic2015/AvacynGuardianAngel.java +++ b/Mage.Sets/src/mage/sets/magic2015/AvacynGuardianAngel.java @@ -68,7 +68,6 @@ public class AvacynGuardianAngel extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Angel"); - this.color.setWhite(true); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2015/BlastfireBolt.java b/Mage.Sets/src/mage/sets/magic2015/BlastfireBolt.java index 5e81fd879dc..b6e8253013c 100644 --- a/Mage.Sets/src/mage/sets/magic2015/BlastfireBolt.java +++ b/Mage.Sets/src/mage/sets/magic2015/BlastfireBolt.java @@ -51,7 +51,6 @@ public class BlastfireBolt extends CardImpl { super(ownerId, 130, "Blastfire Bolt", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{5}{R}"); this.expansionSetCode = "M15"; - this.color.setRed(true); // Blastfire Bolt deals 5 damage to target creature. Destroy all Equipment attached to that creature. this.getSpellAbility().addEffect(new DamageTargetEffect(5)); diff --git a/Mage.Sets/src/mage/sets/magic2015/BloodHost.java b/Mage.Sets/src/mage/sets/magic2015/BloodHost.java index 9a53ff481ec..5a78192faee 100644 --- a/Mage.Sets/src/mage/sets/magic2015/BloodHost.java +++ b/Mage.Sets/src/mage/sets/magic2015/BloodHost.java @@ -62,7 +62,6 @@ public class BloodHost extends CardImpl { this.expansionSetCode = "M15"; 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/magic2015/BoonweaverGiant.java b/Mage.Sets/src/mage/sets/magic2015/BoonweaverGiant.java index 246164db187..bf8f69116f1 100644 --- a/Mage.Sets/src/mage/sets/magic2015/BoonweaverGiant.java +++ b/Mage.Sets/src/mage/sets/magic2015/BoonweaverGiant.java @@ -60,7 +60,6 @@ public class BoonweaverGiant extends CardImpl { this.subtype.add("Giant"); this.subtype.add("Monk"); - this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2015/BorderlandMarauder.java b/Mage.Sets/src/mage/sets/magic2015/BorderlandMarauder.java index 4dd91356de2..7296f4f3df4 100644 --- a/Mage.Sets/src/mage/sets/magic2015/BorderlandMarauder.java +++ b/Mage.Sets/src/mage/sets/magic2015/BorderlandMarauder.java @@ -48,7 +48,6 @@ public class BorderlandMarauder extends CardImpl { this.subtype.add("Human"); 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/BroodKeeper.java b/Mage.Sets/src/mage/sets/magic2015/BroodKeeper.java index 8f0db0216cb..859e3db0827 100644 --- a/Mage.Sets/src/mage/sets/magic2015/BroodKeeper.java +++ b/Mage.Sets/src/mage/sets/magic2015/BroodKeeper.java @@ -55,7 +55,6 @@ public class BroodKeeper 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/magic2015/BurningAnger.java b/Mage.Sets/src/mage/sets/magic2015/BurningAnger.java index aab509c5fa3..d49f2051ca3 100644 --- a/Mage.Sets/src/mage/sets/magic2015/BurningAnger.java +++ b/Mage.Sets/src/mage/sets/magic2015/BurningAnger.java @@ -60,7 +60,6 @@ public class BurningAnger 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/CarnivorousMossBeast.java b/Mage.Sets/src/mage/sets/magic2015/CarnivorousMossBeast.java index 979207a9c0d..49bc014826b 100644 --- a/Mage.Sets/src/mage/sets/magic2015/CarnivorousMossBeast.java +++ b/Mage.Sets/src/mage/sets/magic2015/CarnivorousMossBeast.java @@ -51,7 +51,6 @@ public class CarnivorousMossBeast extends CardImpl { this.subtype.add("Elemental"); this.subtype.add("Beast"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2015/CarrionCrow.java b/Mage.Sets/src/mage/sets/magic2015/CarrionCrow.java index 199d66b1fb1..a898440290a 100644 --- a/Mage.Sets/src/mage/sets/magic2015/CarrionCrow.java +++ b/Mage.Sets/src/mage/sets/magic2015/CarrionCrow.java @@ -47,7 +47,6 @@ public class CarrionCrow extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Bird"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2015/ChasmSkulker.java b/Mage.Sets/src/mage/sets/magic2015/ChasmSkulker.java index d6d4a00b8d8..874f933c5a9 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ChasmSkulker.java +++ b/Mage.Sets/src/mage/sets/magic2015/ChasmSkulker.java @@ -60,7 +60,6 @@ public class ChasmSkulker extends CardImpl { this.subtype.add("Squid"); 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/magic2015/Chronostutter.java b/Mage.Sets/src/mage/sets/magic2015/Chronostutter.java index 84b7153a011..071623c054f 100644 --- a/Mage.Sets/src/mage/sets/magic2015/Chronostutter.java +++ b/Mage.Sets/src/mage/sets/magic2015/Chronostutter.java @@ -51,7 +51,6 @@ public class Chronostutter extends CardImpl { super(ownerId, 48, "Chronostutter", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{5}{U}"); this.expansionSetCode = "M15"; - this.color.setBlue(true); // Put target creature into its owner's library second from the top. this.getSpellAbility().addEffect(new ChronostutterEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2015/ConstrictingSliver.java b/Mage.Sets/src/mage/sets/magic2015/ConstrictingSliver.java index 343b9cd59b5..5e2e5682c94 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ConstrictingSliver.java +++ b/Mage.Sets/src/mage/sets/magic2015/ConstrictingSliver.java @@ -70,7 +70,6 @@ public class ConstrictingSliver extends CardImpl { this.expansionSetCode = "M15"; 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/magic2015/CoralBarrier.java b/Mage.Sets/src/mage/sets/magic2015/CoralBarrier.java index 642b1d1ff08..6cb1456a3f5 100644 --- a/Mage.Sets/src/mage/sets/magic2015/CoralBarrier.java +++ b/Mage.Sets/src/mage/sets/magic2015/CoralBarrier.java @@ -49,7 +49,6 @@ public class CoralBarrier extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Wall"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2015/CovenantOfBlood.java b/Mage.Sets/src/mage/sets/magic2015/CovenantOfBlood.java index 7acb94039e2..4b06bfd646c 100644 --- a/Mage.Sets/src/mage/sets/magic2015/CovenantOfBlood.java +++ b/Mage.Sets/src/mage/sets/magic2015/CovenantOfBlood.java @@ -47,7 +47,6 @@ public class CovenantOfBlood extends CardImpl { super(ownerId, 91, "Covenant of Blood", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{6}{B}"); this.expansionSetCode = "M15"; - this.color.setBlack(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2015/CrowdsFavor.java b/Mage.Sets/src/mage/sets/magic2015/CrowdsFavor.java index 20a6ec41574..2c85e514ab3 100644 --- a/Mage.Sets/src/mage/sets/magic2015/CrowdsFavor.java +++ b/Mage.Sets/src/mage/sets/magic2015/CrowdsFavor.java @@ -49,7 +49,6 @@ public class CrowdsFavor extends CardImpl { super(ownerId, 138, "Crowd's Favor", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "M15"; - this.color.setRed(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2015/CruelSadist.java b/Mage.Sets/src/mage/sets/magic2015/CruelSadist.java index 5dab19cd0c0..e31b98152a7 100644 --- a/Mage.Sets/src/mage/sets/magic2015/CruelSadist.java +++ b/Mage.Sets/src/mage/sets/magic2015/CruelSadist.java @@ -60,7 +60,6 @@ public class CruelSadist 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/magic2015/DauntlessRiverMarshal.java b/Mage.Sets/src/mage/sets/magic2015/DauntlessRiverMarshal.java index 80ac7b80a10..51eff92b611 100644 --- a/Mage.Sets/src/mage/sets/magic2015/DauntlessRiverMarshal.java +++ b/Mage.Sets/src/mage/sets/magic2015/DauntlessRiverMarshal.java @@ -62,7 +62,6 @@ public class DauntlessRiverMarshal 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/magic2015/DiffusionSliver.java b/Mage.Sets/src/mage/sets/magic2015/DiffusionSliver.java index 93365278754..155d89320aa 100644 --- a/Mage.Sets/src/mage/sets/magic2015/DiffusionSliver.java +++ b/Mage.Sets/src/mage/sets/magic2015/DiffusionSliver.java @@ -56,7 +56,6 @@ public class DiffusionSliver extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Sliver"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2015/EndlessObedience.java b/Mage.Sets/src/mage/sets/magic2015/EndlessObedience.java index 10584e13b33..af027d9520c 100644 --- a/Mage.Sets/src/mage/sets/magic2015/EndlessObedience.java +++ b/Mage.Sets/src/mage/sets/magic2015/EndlessObedience.java @@ -46,7 +46,6 @@ public class EndlessObedience extends CardImpl { super(ownerId, 94, "Endless Obedience", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{B}{B}"); this.expansionSetCode = "M15"; - this.color.setBlack(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2015/EnsoulArtifact.java b/Mage.Sets/src/mage/sets/magic2015/EnsoulArtifact.java index faa4d5d1ab5..4b0dac07969 100644 --- a/Mage.Sets/src/mage/sets/magic2015/EnsoulArtifact.java +++ b/Mage.Sets/src/mage/sets/magic2015/EnsoulArtifact.java @@ -55,7 +55,6 @@ public class EnsoulArtifact extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Aura"); - this.color.setBlue(true); // Enchant artifact TargetPermanent auraTarget = new TargetArtifactPermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2015/EphemeralShields.java b/Mage.Sets/src/mage/sets/magic2015/EphemeralShields.java index a626a324a38..5f144b250c6 100644 --- a/Mage.Sets/src/mage/sets/magic2015/EphemeralShields.java +++ b/Mage.Sets/src/mage/sets/magic2015/EphemeralShields.java @@ -48,7 +48,6 @@ public class EphemeralShields extends CardImpl { super(ownerId, 11, "Ephemeral Shields", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "M15"; - this.color.setWhite(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2015/EternalThirst.java b/Mage.Sets/src/mage/sets/magic2015/EternalThirst.java index a77f5b796b4..1d54fca68d0 100644 --- a/Mage.Sets/src/mage/sets/magic2015/EternalThirst.java +++ b/Mage.Sets/src/mage/sets/magic2015/EternalThirst.java @@ -66,7 +66,6 @@ public class EternalThirst extends CardImpl { this.expansionSetCode = "M15"; this.subtype.add("Aura"); - this.color.setBlack(true); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2015/FeastOnTheFallen.java b/Mage.Sets/src/mage/sets/magic2015/FeastOnTheFallen.java index 2e4440326a1..a83e9ffa539 100644 --- a/Mage.Sets/src/mage/sets/magic2015/FeastOnTheFallen.java +++ b/Mage.Sets/src/mage/sets/magic2015/FeastOnTheFallen.java @@ -53,7 +53,6 @@ public class FeastOnTheFallen extends CardImpl { super(ownerId, 96, "Feast on the Fallen", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "M15"; - this.color.setBlack(true); // At the beginning of each upkeep, if an opponent lost life last turn, put a +1/+1 counter on target creature you control. Ability ability = new ConditionalTriggeredAbility( diff --git a/Mage.Sets/src/mage/sets/magic2015/FeralIncarnation.java b/Mage.Sets/src/mage/sets/magic2015/FeralIncarnation.java index 81a839782a0..0123ea48b26 100644 --- a/Mage.Sets/src/mage/sets/magic2015/FeralIncarnation.java +++ b/Mage.Sets/src/mage/sets/magic2015/FeralIncarnation.java @@ -45,7 +45,6 @@ public class FeralIncarnation extends CardImpl { super(ownerId, 174, "Feral Incarnation", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{8}{G}"); this.expansionSetCode = "M15"; - this.color.setGreen(true); // Convoke this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2015/Festergloom.java b/Mage.Sets/src/mage/sets/magic2015/Festergloom.java index 31a64fe1e5f..6b87821bad7 100644 --- a/Mage.Sets/src/mage/sets/magic2015/Festergloom.java +++ b/Mage.Sets/src/mage/sets/magic2015/Festergloom.java @@ -54,7 +54,6 @@ public class Festergloom extends CardImpl { super(ownerId, 97, "Festergloom", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "M15"; - this.color.setBlack(true); // Nonblack creatures get -1/-1 until end of turn. this.getSpellAbility().addEffect(new BoostAllEffect(-1, -1, Duration.EndOfTurn, filter, false)); diff --git a/Mage.Sets/src/mage/sets/magic2015/FirstResponse.java b/Mage.Sets/src/mage/sets/magic2015/FirstResponse.java index 57c2a3cefe6..87dc7ad335c 100644 --- a/Mage.Sets/src/mage/sets/magic2015/FirstResponse.java +++ b/Mage.Sets/src/mage/sets/magic2015/FirstResponse.java @@ -51,7 +51,6 @@ public class FirstResponse extends CardImpl { super(ownerId, 12, "First Response", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "M15"; - this.color.setWhite(true); // At the beginning of each upkeep, if you lost life last turn, put a 1/1 white Soldier creature token onto the battlefield. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new FirstResponseEffect(), TargetController.ANY, false), new PlayerLostLifeWatcher()); diff --git a/Mage.Sets/src/mage/sets/magic2015/FleshToDust.java b/Mage.Sets/src/mage/sets/magic2015/FleshToDust.java index 9bc22ab67f8..a4244eab53a 100644 --- a/Mage.Sets/src/mage/sets/magic2015/FleshToDust.java +++ b/Mage.Sets/src/mage/sets/magic2015/FleshToDust.java @@ -44,7 +44,6 @@ public class FleshToDust extends CardImpl { super(ownerId, 98, "Flesh to Dust", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{B}{B}"); this.expansionSetCode = "M15"; - this.color.setBlack(true); // Destroy target creature. It can't be regenerated. this.getSpellAbility().addTarget(new TargetCreaturePermanent());