diff --git a/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java b/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java index 967a6f9d408..64c577e98f4 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java +++ b/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java @@ -129,7 +129,7 @@ class LizardToken extends Token { public LizardToken() { super("Lizard", "2/2 green Lizard creature token onto the battlefield"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Lizard"); power = new MageInt(2); toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/alliances/Phelddagrif.java b/Mage.Sets/src/mage/sets/alliances/Phelddagrif.java index 31bb571fd3d..83af692c2fb 100644 --- a/Mage.Sets/src/mage/sets/alliances/Phelddagrif.java +++ b/Mage.Sets/src/mage/sets/alliances/Phelddagrif.java @@ -99,7 +99,7 @@ class HippoToken extends Token { public HippoToken() { super("Hippo", "1/1 green Hippo creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Hippo"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AngelsTomb.java b/Mage.Sets/src/mage/sets/avacynrestored/AngelsTomb.java index 2c8f7841d5d..3e699e9331e 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/AngelsTomb.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/AngelsTomb.java @@ -70,7 +70,8 @@ class AngelTombToken extends Token { super("", "a 3/3 white Angel artifact creature with flying"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Angel"); power = new MageInt(3); toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DemonicRising.java b/Mage.Sets/src/mage/sets/avacynrestored/DemonicRising.java index bd19c6e651a..d9ab0ffcabd 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DemonicRising.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DemonicRising.java @@ -74,7 +74,7 @@ class DemonToken extends Token { public DemonToken() { super("Demon", "a 5/5 black Demon creature token with flying"); cardType.add(CardType.CREATURE); - color = ObjectColor.BLACK; + color.setBlack(true); subtype.add("Demon"); power = new MageInt(5); toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/VoiceOfTheProvinces.java b/Mage.Sets/src/mage/sets/avacynrestored/VoiceOfTheProvinces.java index 6214a4d8061..927d41ec3c3 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/VoiceOfTheProvinces.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/VoiceOfTheProvinces.java @@ -72,7 +72,8 @@ class HumanToken extends Token { public HumanToken() { super("Human", "1/1 white Human creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Human"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/AerieWorshippers.java b/Mage.Sets/src/mage/sets/bornofthegods/AerieWorshippers.java index 3acf48fa06f..97296498c94 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/AerieWorshippers.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/AerieWorshippers.java @@ -76,7 +76,7 @@ class AerieWorshippersBirdToken extends Token { super("Bird", "2/2 blue Bird enchantment creature token with flying"); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.CREATURE); - color = ObjectColor.BLUE; + color.setBlue(true); subtype.add("Bird"); power = new MageInt(2); toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/ForlornPseudamma.java b/Mage.Sets/src/mage/sets/bornofthegods/ForlornPseudamma.java index 66a97858592..03ee932ddde 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/ForlornPseudamma.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/ForlornPseudamma.java @@ -77,7 +77,7 @@ class ForlornPseudammaZombieToken extends Token { super("Zombie", "2/2 black Zombie enchantment creature token"); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.CREATURE); - color = ObjectColor.BLACK; + color.setBlack(true); subtype.add("Zombie"); power = new MageInt(2); toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/GodFavoredGeneral.java b/Mage.Sets/src/mage/sets/bornofthegods/GodFavoredGeneral.java index 4d6ff1c9071..4dc14b963c0 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/GodFavoredGeneral.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/GodFavoredGeneral.java @@ -29,7 +29,6 @@ package mage.sets.bornofthegods; import java.util.UUID; import mage.MageInt; -import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DoIfCostPaid; @@ -75,7 +74,8 @@ class SoldierToken extends Token { super("Soldier", "1/1 white Soldier enchantment creature token"); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Soldier"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/KioraTheCrashingWave.java b/Mage.Sets/src/mage/sets/bornofthegods/KioraTheCrashingWave.java index 257bfe2c0a0..4da5e1dfe7f 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/KioraTheCrashingWave.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/KioraTheCrashingWave.java @@ -194,7 +194,7 @@ class KioraKrakenToken extends Token { public KioraKrakenToken() { super("Kraken", "9/9 blue Kraken creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.BLUE; + color.setBlue(true); subtype.add("Kraken"); power = new MageInt(9); toughness = new MageInt(9); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/Ornitharch.java b/Mage.Sets/src/mage/sets/bornofthegods/Ornitharch.java index 646db75c121..23a5f9d0d12 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/Ornitharch.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/Ornitharch.java @@ -83,7 +83,8 @@ class BirdToken extends Token { super("Bird", "1/1 white Bird creature tokens with flying"); this.setOriginalExpansionSetCode("BNG"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Bird"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/RaisedByWolves.java b/Mage.Sets/src/mage/sets/bornofthegods/RaisedByWolves.java index 5c6b3969552..76eea1a566d 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/RaisedByWolves.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/RaisedByWolves.java @@ -100,7 +100,7 @@ class WolfToken extends Token { super("Wolf", "2/2 green Wolf creature token"); this.setOriginalExpansionSetCode("BNG"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Wolf"); power = new MageInt(2); toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SatyrNyxSmith.java b/Mage.Sets/src/mage/sets/bornofthegods/SatyrNyxSmith.java index b4dfd94e6ca..26653685b4b 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/SatyrNyxSmith.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/SatyrNyxSmith.java @@ -79,7 +79,7 @@ class SatyrNyxSmithElementalToken extends Token { super("Elemental", "3/1 red Elemental enchantment creature token with haste"); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.CREATURE); - color = ObjectColor.RED; + color.setRed(true); subtype.add("Elemental"); power = new MageInt(3); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/CatSoldierCreatureToken.java b/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/CatSoldierCreatureToken.java index 545046f5e21..8ef5d449fb2 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/CatSoldierCreatureToken.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/CatSoldierCreatureToken.java @@ -28,7 +28,6 @@ package mage.sets.bornofthegods.TokenAndCounters; import mage.MageInt; -import mage.ObjectColor; import mage.abilities.keyword.VigilanceAbility; import mage.constants.CardType; import mage.game.permanent.token.Token; @@ -42,7 +41,8 @@ public class CatSoldierCreatureToken extends Token { public CatSoldierCreatureToken() { super("Cat Soldier", "1/1 white Cat Soldier creature token with vigilance"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Cat"); subtype.add("Soldier"); power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/CentaurEnchantmentCreatureToken.java b/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/CentaurEnchantmentCreatureToken.java index 3903156e42a..a60c4602a3d 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/CentaurEnchantmentCreatureToken.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/CentaurEnchantmentCreatureToken.java @@ -42,7 +42,7 @@ public class CentaurEnchantmentCreatureToken extends Token { super("Centaur", "3/3 green Centaur enchantment creature token"); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Centaur"); power = new MageInt(3); toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TatsumasaTheDragonsFang.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TatsumasaTheDragonsFang.java index 7654b0fd965..bfb3fabc821 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TatsumasaTheDragonsFang.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TatsumasaTheDragonsFang.java @@ -157,7 +157,7 @@ class TatsumaDragonToken extends Token { public TatsumaDragonToken() { super("Dragon Spirit", "5/5 blue Dragon Spirit creature token with flying"); cardType.add(CardType.CREATURE); - color = ObjectColor.BLUE; + color.setBlue(true); subtype.add("Dragon"); subtype.add("Spirit"); power = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/commander/DeathByDragons.java b/Mage.Sets/src/mage/sets/commander/DeathByDragons.java index 798ec9c648e..783ebbf02d7 100644 --- a/Mage.Sets/src/mage/sets/commander/DeathByDragons.java +++ b/Mage.Sets/src/mage/sets/commander/DeathByDragons.java @@ -106,7 +106,7 @@ class DragonToken extends Token { public DragonToken() { super("Dragon", "5/5 red Dragon creature token with flying"); cardType.add(CardType.CREATURE); - color = ObjectColor.RED; + color.setRed(true); subtype.add("Dragon"); power = new MageInt(5); toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/commander2013/OneDozenEyes.java b/Mage.Sets/src/mage/sets/commander2013/OneDozenEyes.java index cb73c2e3f68..29e8a7acc07 100644 --- a/Mage.Sets/src/mage/sets/commander2013/OneDozenEyes.java +++ b/Mage.Sets/src/mage/sets/commander2013/OneDozenEyes.java @@ -79,7 +79,7 @@ class OneDozenEyesBeastToken extends Token { public OneDozenEyesBeastToken() { super("Beast", "5/5 green Beast creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Beast"); power = new MageInt(5); toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/commander2013/Ophiomancer.java b/Mage.Sets/src/mage/sets/commander2013/Ophiomancer.java index 2303c0ae0d6..5ed13e25b94 100644 --- a/Mage.Sets/src/mage/sets/commander2013/Ophiomancer.java +++ b/Mage.Sets/src/mage/sets/commander2013/Ophiomancer.java @@ -81,7 +81,7 @@ class OphiomancerSnakeToken extends Token { public OphiomancerSnakeToken() { super("Snake", "1/1 black Snake creature token with deathtouch"); cardType.add(CardType.CREATURE); - color = ObjectColor.BLACK; + color.setBlack(true); subtype.add("Snake"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/commander2013/SpawningGrounds.java b/Mage.Sets/src/mage/sets/commander2013/SpawningGrounds.java index 289e603531e..41001aaf84d 100644 --- a/Mage.Sets/src/mage/sets/commander2013/SpawningGrounds.java +++ b/Mage.Sets/src/mage/sets/commander2013/SpawningGrounds.java @@ -91,7 +91,7 @@ class SpawningGroundsBeastToken extends Token { public SpawningGroundsBeastToken() { super("Beast", "5/5 green Beast creature token with trample"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Beast"); power = new MageInt(5); toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/commander2013/SpringjackPasture.java b/Mage.Sets/src/mage/sets/commander2013/SpringjackPasture.java index 2d1069cc8b3..8fafdc13ef2 100644 --- a/Mage.Sets/src/mage/sets/commander2013/SpringjackPasture.java +++ b/Mage.Sets/src/mage/sets/commander2013/SpringjackPasture.java @@ -143,7 +143,8 @@ class GoatToken extends Token { super("Goat", "0/1 white Goat creature token"); setOriginalExpansionSetCode("EVE"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Goat"); power = new MageInt(0); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/conflux/RakkaMar.java b/Mage.Sets/src/mage/sets/conflux/RakkaMar.java index 82eab4d078c..56672857e83 100644 --- a/Mage.Sets/src/mage/sets/conflux/RakkaMar.java +++ b/Mage.Sets/src/mage/sets/conflux/RakkaMar.java @@ -80,7 +80,7 @@ class ElementalToken extends Token { public ElementalToken() { super("Elemental", "3/1 red Elemental creature with Haste"); cardType.add(CardType.CREATURE); - color = ObjectColor.RED; + color.setRed(true); subtype.add("Elemental"); power = new MageInt(3); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/darkascension/GatherTheTownsfolk.java b/Mage.Sets/src/mage/sets/darkascension/GatherTheTownsfolk.java index 20b15afce7c..6e0e9a25c67 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GatherTheTownsfolk.java +++ b/Mage.Sets/src/mage/sets/darkascension/GatherTheTownsfolk.java @@ -71,7 +71,8 @@ class HumanToken extends Token { public HumanToken() { super("Human", "1/1 white Human creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Human"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/AdventOfTheWurm.java b/Mage.Sets/src/mage/sets/dragonsmaze/AdventOfTheWurm.java index d053d313413..f6a9e025ad7 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/AdventOfTheWurm.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/AdventOfTheWurm.java @@ -71,7 +71,7 @@ public class AdventOfTheWurm extends CardImpl { private WurmToken() { super("Wurm", "5/5 green Wurm creature token with trample"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Wurm"); power = new MageInt(5); toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java b/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java index 90ddd0e160c..c1b5fe2f9f6 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java @@ -90,7 +90,7 @@ public class TurnBurn extends SplitCard { private WeirdToken() { super("Weird", "a red Weird with base power and toughness 0/1"); cardType.add(CardType.CREATURE); - color = ObjectColor.RED; + color.setRed(true); subtype.add("Weird"); power = new MageInt(0); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/eventide/PatrolSignaler.java b/Mage.Sets/src/mage/sets/eventide/PatrolSignaler.java index 84bfe871db4..aae4eaf8673 100644 --- a/Mage.Sets/src/mage/sets/eventide/PatrolSignaler.java +++ b/Mage.Sets/src/mage/sets/eventide/PatrolSignaler.java @@ -79,7 +79,8 @@ class KithkinSoldierToken extends Token { public KithkinSoldierToken() { super("Kithkin Soldier", "1/1 white Kithkin Soldier creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Soldier"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/eventide/SpringjackShepherd.java b/Mage.Sets/src/mage/sets/eventide/SpringjackShepherd.java index 31e8508e68f..1990deac6f7 100644 --- a/Mage.Sets/src/mage/sets/eventide/SpringjackShepherd.java +++ b/Mage.Sets/src/mage/sets/eventide/SpringjackShepherd.java @@ -109,7 +109,7 @@ class GoatToken extends Token { public GoatToken() { super("Goat", "a 0/1 white Goat creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); subtype.add("Goat"); power = new MageInt(0); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java b/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java index 8a5f69a90bb..18507a201c7 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java @@ -105,7 +105,7 @@ class RapidHybridizationToken extends Token { this.setOriginalExpansionSetCode("GTC"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Frog"); subtype.add("Lizard"); diff --git a/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java b/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java index cf04d71524e..a1fe862e629 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java +++ b/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java @@ -96,7 +96,7 @@ class BatToken extends Token { BatToken() { super("Bat", "1/1 black Bat creature token with flying"); cardType.add(CardType.CREATURE); - color = ObjectColor.BLACK; + color.setBlack(true); subtype.add("Bat"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java b/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java index a2cfecfd7e0..30b17f43519 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java +++ b/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java @@ -90,7 +90,7 @@ class WurmweaverCoilToken extends Token { WurmweaverCoilToken() { super("Wurm", "6/6 green Wurm creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Wurm"); power = new MageInt(6); toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/HourOfNeed.java b/Mage.Sets/src/mage/sets/journeyintonyx/HourOfNeed.java index 584421f3c7b..ce775443bf2 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/HourOfNeed.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/HourOfNeed.java @@ -114,7 +114,7 @@ class HourOfNeedSphinxToken extends Token { super("Sphinx", "4/4 blue Sphinx creature token with flying"); this.setOriginalExpansionSetCode("JOU"); cardType.add(CardType.CREATURE); - color = ObjectColor.BLUE; + color.setBlue(true); subtype.add("Sphinx"); power = new MageInt(4); toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/HydraBroodmaster.java b/Mage.Sets/src/mage/sets/journeyintonyx/HydraBroodmaster.java index 5ef32820ae0..57e99b33f7b 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/HydraBroodmaster.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/HydraBroodmaster.java @@ -107,7 +107,7 @@ class HydraBroodmasterToken extends Token { super("Hydra", "green Hydra creature token"); this.setOriginalExpansionSetCode("JOU"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Hydra"); this.power = new MageInt(power); this.toughness = new MageInt(toughness); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RitualOfTheReturned.java b/Mage.Sets/src/mage/sets/journeyintonyx/RitualOfTheReturned.java index 82df2502d68..0eae7fc236f 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RitualOfTheReturned.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RitualOfTheReturned.java @@ -109,7 +109,7 @@ class RitualOfTheReturnedZombieToken extends Token { super("Zombie", "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.setOriginalExpansionSetCode("JOU"); cardType.add(CardType.CREATURE); - color = ObjectColor.BLACK; + color.setBlack(true); subtype.add("Zombie"); this.power = new MageInt(power); this.toughness = new MageInt(toughness); diff --git a/Mage.Sets/src/mage/sets/judgment/BattleScreech.java b/Mage.Sets/src/mage/sets/judgment/BattleScreech.java index aba8e84325a..00f66d98db1 100644 --- a/Mage.Sets/src/mage/sets/judgment/BattleScreech.java +++ b/Mage.Sets/src/mage/sets/judgment/BattleScreech.java @@ -87,7 +87,8 @@ class BirdToken extends Token { super("Bird", "1/1 white Bird creature tokens with flying"); this.setOriginalExpansionSetCode("BNG"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Bird"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/KormusBell.java b/Mage.Sets/src/mage/sets/limitedalpha/KormusBell.java index 8ecf8eff162..3cc4360551d 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/KormusBell.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/KormusBell.java @@ -74,7 +74,7 @@ class KormusBellToken extends Token { cardType.add(CardType.CREATURE); power = new MageInt(1); toughness = new MageInt(1); - color = ObjectColor.BLACK; //Check Oracle, yes they are black + color.setBlack(true); //Check Oracle, yes they are black } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java b/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java index 414f2eae255..b3e5baf47d5 100644 --- a/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java +++ b/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java @@ -96,7 +96,7 @@ class CatToken extends Token { public CatToken() { super("Cat", "2/2 white Cat creature tokens"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); subtype.add("Cat"); power = new MageInt(2); toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2013/TradingPost.java b/Mage.Sets/src/mage/sets/magic2013/TradingPost.java index 8eed7024517..2b933e21b2d 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TradingPost.java +++ b/Mage.Sets/src/mage/sets/magic2013/TradingPost.java @@ -113,7 +113,8 @@ class GoatToken extends Token { public GoatToken() { super("Goat", "a 0/1 white Goat creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Goat"); power = new MageInt(0); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2014/AjanisChosen.java b/Mage.Sets/src/mage/sets/magic2014/AjanisChosen.java index ac053a13fcb..1a35a69b7df 100644 --- a/Mage.Sets/src/mage/sets/magic2014/AjanisChosen.java +++ b/Mage.Sets/src/mage/sets/magic2014/AjanisChosen.java @@ -127,7 +127,8 @@ class CatToken extends Token { public CatToken() { super("Cat", "2/2 white Cat creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Cat"); power = new MageInt(2); toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2014/MoltenBirth.java b/Mage.Sets/src/mage/sets/magic2014/MoltenBirth.java index 598269ad443..6cabd5835e9 100644 --- a/Mage.Sets/src/mage/sets/magic2014/MoltenBirth.java +++ b/Mage.Sets/src/mage/sets/magic2014/MoltenBirth.java @@ -110,7 +110,7 @@ class ElementalToken extends Token { this.setOriginalExpansionSetCode("M14"); this.setTokenType(new Random().nextInt(2) + 1); cardType.add(CardType.CREATURE); - color = ObjectColor.RED; + color.setRed(true); subtype.add("Elemental"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2015/KalonianTwingrove.java b/Mage.Sets/src/mage/sets/magic2015/KalonianTwingrove.java index 64531f2b6ed..db9c9f3eed0 100644 --- a/Mage.Sets/src/mage/sets/magic2015/KalonianTwingrove.java +++ b/Mage.Sets/src/mage/sets/magic2015/KalonianTwingrove.java @@ -92,7 +92,7 @@ class KalonianTwingroveTreefolkWarriorToken extends Token { super("Treefolk Warrior", "green Treefolk Warrior creature token onto the battlefield with \"This creature's power and toughness are each equal to the number of Forests you control.\""); this.setOriginalExpansionSetCode("M15"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Treefolk"); subtype.add("Warrior"); power = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/mirage/WaitingInTheWeeds.java b/Mage.Sets/src/mage/sets/mirage/WaitingInTheWeeds.java index 975ac61e7a1..7b7422072ae 100644 --- a/Mage.Sets/src/mage/sets/mirage/WaitingInTheWeeds.java +++ b/Mage.Sets/src/mage/sets/mirage/WaitingInTheWeeds.java @@ -113,7 +113,7 @@ class CatToken extends Token { public CatToken() { super("Cat", "1/1 green Cat creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Cat"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/WhiteSunsZenith.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/WhiteSunsZenith.java index 18f7e753a03..2f399da8090 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/WhiteSunsZenith.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/WhiteSunsZenith.java @@ -68,7 +68,8 @@ class CatToken extends Token { super("Cat", "2/2 white Cat creature token"); setOriginalExpansionSetCode("SOM"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Cat"); power = new MageInt(2); toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/BeastAttack.java b/Mage.Sets/src/mage/sets/odyssey/BeastAttack.java index a2420c29e69..54534378f6e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BeastAttack.java +++ b/Mage.Sets/src/mage/sets/odyssey/BeastAttack.java @@ -73,7 +73,7 @@ class BeastToken_44 extends Token { public BeastToken_44() { super("Beast", "4/4 green Beast creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Beast"); power = new MageInt(4); toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/odyssey/TestamentOfFaith.java b/Mage.Sets/src/mage/sets/odyssey/TestamentOfFaith.java index 65381c15b22..ed3d9154329 100644 --- a/Mage.Sets/src/mage/sets/odyssey/TestamentOfFaith.java +++ b/Mage.Sets/src/mage/sets/odyssey/TestamentOfFaith.java @@ -188,7 +188,7 @@ class TestamentOfFaithToken extends Token { super("Wall", "an X/X Wall creature with defender"); cardType.add(CardType.CREATURE); this.subtype.add("Wall"); - color = ObjectColor.WHITE; + color.setWhite(true); this.addAbility(DefenderAbility.getInstance()); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java b/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java index 7e3ea705a4c..48a3b536f9b 100644 --- a/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java +++ b/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java @@ -104,7 +104,7 @@ class MinionToken extends Token { public MinionToken() { super("Minion", "1/1 black Minion creature token"); - color = ObjectColor.BLACK; + color.setBlack(true); cardType.add(CardType.CREATURE); this.subtype.add("Minion"); power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java b/Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java index 282c72694b2..44ef20fa4b8 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java +++ b/Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java @@ -81,7 +81,8 @@ class KnightToken extends Token { KnightToken() { super("Knight", "2/2 white Knight creature tokens with first strike"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Knight"); power = new MageInt(2); toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java b/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java index a4e2a75d05b..2fb3b1015fc 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java +++ b/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java @@ -89,7 +89,7 @@ class CentaurToken extends Token { CentaurToken() { super("Centaur", "3/3 green Centaur creature tokens with protection from black"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Centaur"); power = new MageInt(3); toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedLammasu.java b/Mage.Sets/src/mage/sets/ravnika/HuntedLammasu.java index b77be9659c6..99e201c8eec 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HuntedLammasu.java +++ b/Mage.Sets/src/mage/sets/ravnika/HuntedLammasu.java @@ -78,7 +78,7 @@ class HorrorToken extends Token { HorrorToken() { super("Horror", "a 4/4 black Horror creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.BLACK; + color.setBlack(true); subtype.add("Horror"); power = new MageInt(4); toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedTroll.java b/Mage.Sets/src/mage/sets/ravnika/HuntedTroll.java index be82797c874..ff823d635d1 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HuntedTroll.java +++ b/Mage.Sets/src/mage/sets/ravnika/HuntedTroll.java @@ -86,7 +86,7 @@ class FaerieToken extends Token { FaerieToken() { super("Faerie", "1/1 blue Faerie creature tokens with flying"); cardType.add(CardType.CREATURE); - color = ObjectColor.BLUE; + color.setBlue(true); subtype.add("Faerie"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ArmadaWurm.java b/Mage.Sets/src/mage/sets/returntoravnica/ArmadaWurm.java index 977831258de..dd70eee038e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ArmadaWurm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ArmadaWurm.java @@ -77,7 +77,7 @@ public class ArmadaWurm extends CardImpl { private ArmadaWurmToken() { super("Wurm", "a 5/5 green Wurm creature token with trample"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Wurm"); power = new MageInt(5); toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CentaursHerald.java b/Mage.Sets/src/mage/sets/returntoravnica/CentaursHerald.java index ce4b69c170d..0fa3c2b2bca 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CentaursHerald.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CentaursHerald.java @@ -78,7 +78,7 @@ public class CentaursHerald extends CardImpl { public CentaursHeraldToken() { super("Centaur", "3/3 green Centaur creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Centaur"); power = new MageInt(3); toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/UtvaraHellkite.java b/Mage.Sets/src/mage/sets/returntoravnica/UtvaraHellkite.java index c4e8a2d8064..4d8edacf484 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/UtvaraHellkite.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/UtvaraHellkite.java @@ -80,7 +80,7 @@ public class UtvaraHellkite extends CardImpl { private UtvaraHellkiteDragonToken() { super("Dragon", "6/6 red Dragon creature token with flying"); cardType.add(CardType.CREATURE); - color = ObjectColor.RED; + color.setRed(true); subtype.add("Dragon"); power = new MageInt(6); toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DevastatingSummons.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DevastatingSummons.java index 174d770d886..7babffaa7de 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DevastatingSummons.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DevastatingSummons.java @@ -104,7 +104,7 @@ class ElementalToken extends Token { public ElementalToken() { super("Elemental", "X/X red Elemental creature"); cardType.add(CardType.CREATURE); - color = ObjectColor.RED; + color.setRed(true); subtype.add("Elemental"); } } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/TombOfUrami.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/TombOfUrami.java index 47f82401b15..e516c80f1fa 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/TombOfUrami.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/TombOfUrami.java @@ -126,7 +126,7 @@ class UramiToken extends Token { supertype.add("Legendary"); - color = ObjectColor.BLACK; + color.setBlack(true); power = new MageInt(5); toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/KembaKhaRegent.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/KembaKhaRegent.java index 66e62bebff3..26f99c25f20 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/KembaKhaRegent.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/KembaKhaRegent.java @@ -76,7 +76,8 @@ class CatToken extends Token { public CatToken() { super("Cat", "a 2/2 white Cat creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Cat"); power = new MageInt(2); toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/scourge/DayOfTheDragons.java b/Mage.Sets/src/mage/sets/scourge/DayOfTheDragons.java index 7595a377f1a..942deffbc79 100644 --- a/Mage.Sets/src/mage/sets/scourge/DayOfTheDragons.java +++ b/Mage.Sets/src/mage/sets/scourge/DayOfTheDragons.java @@ -170,7 +170,7 @@ class DragonToken extends Token { public DragonToken() { super("Dragon", "5/5 red Dragon creature token with flying"); cardType.add(CardType.CREATURE); - color = ObjectColor.RED; + color.setRed(true); subtype.add("Dragon"); power = new MageInt(5); toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GoblinAssault.java b/Mage.Sets/src/mage/sets/shardsofalara/GoblinAssault.java index 72123e47d49..42a5d9fe8df 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GoblinAssault.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GoblinAssault.java @@ -122,7 +122,7 @@ class GoblinAssaultToken extends Token { cardType.add(CardType.CREATURE); subtype.add("Goblin"); - color = ObjectColor.RED; + color.setRed(true); power = new MageInt(1); toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/PuppetConjurer.java b/Mage.Sets/src/mage/sets/shardsofalara/PuppetConjurer.java index 8ad17dcd300..e432836040d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/PuppetConjurer.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/PuppetConjurer.java @@ -92,7 +92,7 @@ class HomunculusToken extends Token { super("Homunculus", "0/1 blue Homunculus artifact creature token"); cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); - color = ObjectColor.BLUE; + color.setBlue(true); subtype.add("Homunculus"); power = new MageInt(0); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tempest/MongrelPack.java b/Mage.Sets/src/mage/sets/tempest/MongrelPack.java index 53b48236777..c0a243bb94e 100644 --- a/Mage.Sets/src/mage/sets/tempest/MongrelPack.java +++ b/Mage.Sets/src/mage/sets/tempest/MongrelPack.java @@ -103,7 +103,7 @@ class HoundToken extends Token { cardType.add(CardType.CREATURE); subtype.add("Hound"); - color = ObjectColor.GREEN; + color.setGreen(true); power = new MageInt(1); toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/tenth/DragonRoost.java b/Mage.Sets/src/mage/sets/tenth/DragonRoost.java index 5e38d7f261b..370c2803d54 100644 --- a/Mage.Sets/src/mage/sets/tenth/DragonRoost.java +++ b/Mage.Sets/src/mage/sets/tenth/DragonRoost.java @@ -68,7 +68,7 @@ class DragonToken2 extends Token { DragonToken2() { super("Dragon", "5/5 red Dragon creature token with flying"); cardType.add(CardType.CREATURE); - color = ObjectColor.RED; + color.setRed(true); subtype.add("Dragon"); power = new MageInt(5); toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/tenth/FaerieConclave.java b/Mage.Sets/src/mage/sets/tenth/FaerieConclave.java index 715cdeb525b..116fffdf3f0 100644 --- a/Mage.Sets/src/mage/sets/tenth/FaerieConclave.java +++ b/Mage.Sets/src/mage/sets/tenth/FaerieConclave.java @@ -73,7 +73,7 @@ class FaerieConclaveToken extends Token { super("Faerie", "a 2/1 blue Faerie creature with flying"); cardType.add(CardType.CREATURE); this.subtype.add("Faerie"); - color = ObjectColor.BLUE; + color.setBlue(true); power = new MageInt(2); toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenth/ForbiddingWatchtower.java b/Mage.Sets/src/mage/sets/tenth/ForbiddingWatchtower.java index 967d8431cb9..4c393a96d55 100644 --- a/Mage.Sets/src/mage/sets/tenth/ForbiddingWatchtower.java +++ b/Mage.Sets/src/mage/sets/tenth/ForbiddingWatchtower.java @@ -72,7 +72,8 @@ class ForbiddingWatchtowerToken extends Token { super("Soldier", "a 1/5 white Soldier creature"); cardType.add(CardType.CREATURE); this.subtype.add("Soldier"); - color = ObjectColor.WHITE; + color.setWhite(true); + power = new MageInt(1); toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/tenth/SpawningPool.java b/Mage.Sets/src/mage/sets/tenth/SpawningPool.java index c8c84151369..fd7686efe09 100644 --- a/Mage.Sets/src/mage/sets/tenth/SpawningPool.java +++ b/Mage.Sets/src/mage/sets/tenth/SpawningPool.java @@ -71,7 +71,7 @@ class SkeletonToken extends Token { super("Skeleton", "a 1/1 black Skeleton creature with \"{B}: Regenerate this creature\""); cardType.add(CardType.CREATURE); this.subtype.add("Skeleton"); - color = ObjectColor.BLACK; + color.setBlack(true); power = new MageInt(1); toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); diff --git a/Mage.Sets/src/mage/sets/tenth/TreetopVillage.java b/Mage.Sets/src/mage/sets/tenth/TreetopVillage.java index 2a1268764bc..b68e5a99e21 100644 --- a/Mage.Sets/src/mage/sets/tenth/TreetopVillage.java +++ b/Mage.Sets/src/mage/sets/tenth/TreetopVillage.java @@ -73,7 +73,7 @@ class ApeToken extends Token { super("Ape", "a 3/3 green Ape creature with trample"); cardType.add(CardType.CREATURE); this.subtype.add("Ape"); - color = ObjectColor.GREEN; + color.setGreen(true); power = new MageInt(3); toughness = new MageInt(3); this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/theros/AbhorrentOverlord.java b/Mage.Sets/src/mage/sets/theros/AbhorrentOverlord.java index a78148e6378..4c539c8579a 100644 --- a/Mage.Sets/src/mage/sets/theros/AbhorrentOverlord.java +++ b/Mage.Sets/src/mage/sets/theros/AbhorrentOverlord.java @@ -85,7 +85,7 @@ class AbhorrentOverlordHarpyToken extends Token { public AbhorrentOverlordHarpyToken() { super("Harpy", "1/1 black Harpy creature tokens with flying"); cardType.add(CardType.CREATURE); - color = ObjectColor.BLACK; + color.setBlack(true); subtype.add("Harpy"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/AkroanCrusader.java b/Mage.Sets/src/mage/sets/theros/AkroanCrusader.java index 36dacd97bee..c101e2bfd43 100644 --- a/Mage.Sets/src/mage/sets/theros/AkroanCrusader.java +++ b/Mage.Sets/src/mage/sets/theros/AkroanCrusader.java @@ -75,7 +75,7 @@ class SoldierToken extends Token { super("Soldier", "1/1 red Soldier creature token with haste"); setTokenType(3); cardType.add(CardType.CREATURE); - color = ObjectColor.RED; + color.setRed(true); subtype.add("Soldier"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/AkroanHorse.java b/Mage.Sets/src/mage/sets/theros/AkroanHorse.java index 110f5542b21..fe4c0b1f05b 100644 --- a/Mage.Sets/src/mage/sets/theros/AkroanHorse.java +++ b/Mage.Sets/src/mage/sets/theros/AkroanHorse.java @@ -186,7 +186,8 @@ class AkroanHorseSoldierToken extends Token { public AkroanHorseSoldierToken() { super("Soldier", "1/1 white Soldier creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Soldier"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/theros/EvangelOfHeliod.java b/Mage.Sets/src/mage/sets/theros/EvangelOfHeliod.java index e404fb25143..49b1d4304e8 100644 --- a/Mage.Sets/src/mage/sets/theros/EvangelOfHeliod.java +++ b/Mage.Sets/src/mage/sets/theros/EvangelOfHeliod.java @@ -74,7 +74,8 @@ class EvangelOfHeliodSoldierToken extends Token { public EvangelOfHeliodSoldierToken() { super("Soldier", "1/1 white Soldier creature tokens"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Soldier"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java b/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java index ce6f7a18679..3ae2f43f98b 100644 --- a/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java +++ b/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java @@ -92,7 +92,8 @@ class GriffinToken extends Token { public GriffinToken() { super("Griffin", "2/2 white Griffin creature token with flying"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Soldier"); power = new MageInt(2); toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinOffensive.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinOffensive.java index a6550f84fe8..d504ec30578 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GoblinOffensive.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinOffensive.java @@ -67,7 +67,7 @@ class GoblinToken extends Token { public GoblinToken() { super("Goblin", "1/1 red Goblin creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.RED; + color.setRed(true); subtype.add("Goblin"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/DragonmasterOutcast.java b/Mage.Sets/src/mage/sets/worldwake/DragonmasterOutcast.java index 695e5a2d70b..7dbac5f469c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DragonmasterOutcast.java +++ b/Mage.Sets/src/mage/sets/worldwake/DragonmasterOutcast.java @@ -87,7 +87,7 @@ class DragonToken extends Token { public DragonToken() { super("Dragon", "5/5 red Dragon creature token with flying"); cardType.add(CardType.CREATURE); - color = ObjectColor.RED; + color.setRed(true); subtype.add("Dragon"); power = new MageInt(5); toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java b/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java index d85e9eb8f3e..d2e0699346a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java @@ -147,7 +147,7 @@ class BeastGreenToken extends Token { public BeastGreenToken() { super("Beast", "4/4 green Beast creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Beast"); power = new MageInt(4); toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java b/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java index 5ee1c2e514c..ce46bc7acf1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java +++ b/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java @@ -121,7 +121,7 @@ class VampireToken extends Token { public VampireToken(int tokenPower, int tokenToughness) { super("Vampire", new StringBuilder(tokenPower).append("/").append(tokenToughness).append(" black Vampire creature token").toString()); cardType.add(CardType.CREATURE); - color = ObjectColor.BLACK; + color.setBlack(true); subtype.add("Vampire"); power = new MageInt(tokenPower); toughness = new MageInt(tokenToughness); diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForTheGravelord.java b/Mage.Sets/src/mage/sets/zendikar/QuestForTheGravelord.java index 56be84340ea..eae3a14e84c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/QuestForTheGravelord.java +++ b/Mage.Sets/src/mage/sets/zendikar/QuestForTheGravelord.java @@ -83,7 +83,7 @@ class ZombieToken extends Token { subtype.add("Zombie"); subtype.add("Giant"); - color = ObjectColor.BLACK; + color.setBlack(true); power = new MageInt(5); toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/zendikar/SummonersBane.java b/Mage.Sets/src/mage/sets/zendikar/SummonersBane.java index efbbc5670f6..91269a379ca 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SummonersBane.java +++ b/Mage.Sets/src/mage/sets/zendikar/SummonersBane.java @@ -78,7 +78,7 @@ class IllusionToken extends Token { public IllusionToken() { super("Illusion", "2/2 blue Illusion creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.BLUE; + color.setBlue(true); subtype.add("Illusion"); power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/ZektarShrineExpedition.java b/Mage.Sets/src/mage/sets/zendikar/ZektarShrineExpedition.java index 05413b7f4a0..15fce65f4be 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ZektarShrineExpedition.java +++ b/Mage.Sets/src/mage/sets/zendikar/ZektarShrineExpedition.java @@ -119,7 +119,7 @@ class ElementalToken extends Token { public ElementalToken() { super("Elemental", "7/1 red Elemental creature token with trample and haste"); cardType.add(CardType.CREATURE); - color = ObjectColor.RED; + color.setRed(true); subtype.add("Elemental"); power = new MageInt(7); toughness = new MageInt(1); diff --git a/Mage/src/mage/abilities/keyword/LivingWeaponAbility.java b/Mage/src/mage/abilities/keyword/LivingWeaponAbility.java index 3a394f9a899..19abe1db5a7 100644 --- a/Mage/src/mage/abilities/keyword/LivingWeaponAbility.java +++ b/Mage/src/mage/abilities/keyword/LivingWeaponAbility.java @@ -67,7 +67,7 @@ class GermToken extends Token { super("Germ", "a 0/0 black Germ creature token"); this.setOriginalExpansionSetCode("MBS"); cardType.add(CardType.CREATURE); - color = ObjectColor.BLACK; + color.setBlack(true); subtype.add("Germ"); power = new MageInt(0); toughness = new MageInt(0); diff --git a/Mage/src/mage/game/permanent/token/AngelToken.java b/Mage/src/mage/game/permanent/token/AngelToken.java index 410af8e085a..1649bddfd02 100644 --- a/Mage/src/mage/game/permanent/token/AngelToken.java +++ b/Mage/src/mage/game/permanent/token/AngelToken.java @@ -1,7 +1,6 @@ package mage.game.permanent.token; import mage.MageInt; -import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; @@ -15,7 +14,8 @@ public class AngelToken extends Token { super("Angel", "4/4 white Angel creature token with flying"); this.setOriginalExpansionSetCode(tokenImageSetCode); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Angel"); power = new MageInt(4); toughness = new MageInt(4); diff --git a/Mage/src/mage/game/permanent/token/BearToken.java b/Mage/src/mage/game/permanent/token/BearToken.java index e99d16dd628..3d56d60dc94 100644 --- a/Mage/src/mage/game/permanent/token/BearToken.java +++ b/Mage/src/mage/game/permanent/token/BearToken.java @@ -41,7 +41,7 @@ public class BearToken extends Token { public BearToken() { super("Beast", "2/2 green Bear creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Bear"); power = new MageInt(2); toughness = new MageInt(2); diff --git a/Mage/src/mage/game/permanent/token/BeastToken.java b/Mage/src/mage/game/permanent/token/BeastToken.java index 98225911de9..f5d9b98a546 100644 --- a/Mage/src/mage/game/permanent/token/BeastToken.java +++ b/Mage/src/mage/game/permanent/token/BeastToken.java @@ -52,7 +52,7 @@ public class BeastToken extends Token { setTokenType(tokenType); } cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Beast"); power = new MageInt(3); toughness = new MageInt(3); diff --git a/Mage/src/mage/game/permanent/token/CentaurToken.java b/Mage/src/mage/game/permanent/token/CentaurToken.java index c5318671175..bbf048b29ef 100644 --- a/Mage/src/mage/game/permanent/token/CentaurToken.java +++ b/Mage/src/mage/game/permanent/token/CentaurToken.java @@ -41,7 +41,7 @@ public class CentaurToken extends Token { public CentaurToken() { super("Centaur", "3/3 green Centaur creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Centaur"); power = new MageInt(3); toughness = new MageInt(3); diff --git a/Mage/src/mage/game/permanent/token/CitizenToken.java b/Mage/src/mage/game/permanent/token/CitizenToken.java index 9ce87de1f8d..938036389cd 100644 --- a/Mage/src/mage/game/permanent/token/CitizenToken.java +++ b/Mage/src/mage/game/permanent/token/CitizenToken.java @@ -29,7 +29,6 @@ package mage.game.permanent.token; import mage.MageInt; -import mage.ObjectColor; import mage.constants.CardType; /** @@ -41,7 +40,8 @@ public class CitizenToken extends Token { public CitizenToken() { super("Citizen", "1/1 white Citizen creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Citizen"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage/src/mage/game/permanent/token/DragonToken.java b/Mage/src/mage/game/permanent/token/DragonToken.java index a67fd512db8..4dff2872c4f 100644 --- a/Mage/src/mage/game/permanent/token/DragonToken.java +++ b/Mage/src/mage/game/permanent/token/DragonToken.java @@ -42,7 +42,7 @@ public class DragonToken extends Token { public DragonToken() { super("Dragon", "4/4 red Dragon creature token with flying"); cardType.add(CardType.CREATURE); - color = ObjectColor.RED; + color.setRed(true); subtype.add("Dragon"); power = new MageInt(4); toughness = new MageInt(4); diff --git a/Mage/src/mage/game/permanent/token/ElementalToken.java b/Mage/src/mage/game/permanent/token/ElementalToken.java index 6c37401b27f..613d3f93b93 100644 --- a/Mage/src/mage/game/permanent/token/ElementalToken.java +++ b/Mage/src/mage/game/permanent/token/ElementalToken.java @@ -41,7 +41,7 @@ public class ElementalToken extends Token { public ElementalToken() { super("Elemental", "3/1 red Elemental creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.RED; + color.setRed(true); subtype.add("Elemental"); power = new MageInt(3); toughness = new MageInt(1); diff --git a/Mage/src/mage/game/permanent/token/ElephantToken.java b/Mage/src/mage/game/permanent/token/ElephantToken.java index ed3fbc30e11..2b04118862a 100644 --- a/Mage/src/mage/game/permanent/token/ElephantToken.java +++ b/Mage/src/mage/game/permanent/token/ElephantToken.java @@ -41,7 +41,7 @@ public class ElephantToken extends Token { public ElephantToken() { super("Elephant", "3/3 green Elephant creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Elephant"); power = new MageInt(3); toughness = new MageInt(3); diff --git a/Mage/src/mage/game/permanent/token/FrogToken.java b/Mage/src/mage/game/permanent/token/FrogToken.java index 3943d6bfb9b..822d54c3f63 100644 --- a/Mage/src/mage/game/permanent/token/FrogToken.java +++ b/Mage/src/mage/game/permanent/token/FrogToken.java @@ -41,7 +41,7 @@ public class FrogToken extends Token { public FrogToken() { super("Frog", "1/1 blue Frog creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.BLUE; + color.setBlue(true); subtype.add("Frog"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage/src/mage/game/permanent/token/GoblinToken.java b/Mage/src/mage/game/permanent/token/GoblinToken.java index 31e34f55802..aeec4f0f5d2 100644 --- a/Mage/src/mage/game/permanent/token/GoblinToken.java +++ b/Mage/src/mage/game/permanent/token/GoblinToken.java @@ -46,7 +46,7 @@ public class GoblinToken extends Token { cardType.add(CardType.CREATURE); subtype.add("Goblin"); - color = ObjectColor.RED; + color.setRed(true); power = new MageInt(1); toughness = new MageInt(1); } diff --git a/Mage/src/mage/game/permanent/token/InsectInfectToken.java b/Mage/src/mage/game/permanent/token/InsectInfectToken.java index 3cbf0ba5a1d..c2721304841 100644 --- a/Mage/src/mage/game/permanent/token/InsectInfectToken.java +++ b/Mage/src/mage/game/permanent/token/InsectInfectToken.java @@ -42,7 +42,7 @@ public class InsectInfectToken extends Token { public InsectInfectToken() { super("Insect", "1/1 green Insect creature token with infect"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Insect"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage/src/mage/game/permanent/token/KnightToken.java b/Mage/src/mage/game/permanent/token/KnightToken.java index 99ee76a00c5..3ffd6de9350 100644 --- a/Mage/src/mage/game/permanent/token/KnightToken.java +++ b/Mage/src/mage/game/permanent/token/KnightToken.java @@ -2,7 +2,6 @@ package mage.game.permanent.token; import mage.constants.CardType; import mage.MageInt; -import mage.ObjectColor; import mage.abilities.keyword.VigilanceAbility; /** @@ -14,7 +13,8 @@ public class KnightToken extends Token { public KnightToken() { super("Knight", "2/2 white Knight creature token with vigilance"); cardType.add(CardType.CREATURE); - color = ObjectColor.WHITE; + color.setWhite(true); + subtype.add("Knight"); power = new MageInt(2); toughness = new MageInt(2); diff --git a/Mage/src/mage/game/permanent/token/RatToken.java b/Mage/src/mage/game/permanent/token/RatToken.java index 7aa1411d699..e6ebb2a75e1 100644 --- a/Mage/src/mage/game/permanent/token/RatToken.java +++ b/Mage/src/mage/game/permanent/token/RatToken.java @@ -46,7 +46,7 @@ public class RatToken extends Token { super("Rat", "1/1 black Rat creature token"); this.setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); - color = ObjectColor.BLACK; + color.setBlack(true); subtype.add("Rat"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage/src/mage/game/permanent/token/SaprolingToken.java b/Mage/src/mage/game/permanent/token/SaprolingToken.java index a58b4efb7f2..6c309f1cca9 100644 --- a/Mage/src/mage/game/permanent/token/SaprolingToken.java +++ b/Mage/src/mage/game/permanent/token/SaprolingToken.java @@ -42,7 +42,7 @@ public class SaprolingToken extends Token { super("Saproling", "1/1 green Saproling creature token"); this.setOriginalExpansionSetCode("MMA"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Saproling"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage/src/mage/game/permanent/token/SnakeToken.java b/Mage/src/mage/game/permanent/token/SnakeToken.java index 035bae756b3..6c19ce673c9 100644 --- a/Mage/src/mage/game/permanent/token/SnakeToken.java +++ b/Mage/src/mage/game/permanent/token/SnakeToken.java @@ -41,7 +41,7 @@ public class SnakeToken extends Token { public SnakeToken() { super("Snake", "1/1 green Snake creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Snake"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage/src/mage/game/permanent/token/SquirrelToken.java b/Mage/src/mage/game/permanent/token/SquirrelToken.java index b72897bd158..2bf239781e5 100644 --- a/Mage/src/mage/game/permanent/token/SquirrelToken.java +++ b/Mage/src/mage/game/permanent/token/SquirrelToken.java @@ -42,7 +42,7 @@ public class SquirrelToken extends Token { cardType.add(CardType.CREATURE); subtype.add("Squirrel"); - color = ObjectColor.GREEN; + color.setGreen(true); power = new MageInt(1); toughness = new MageInt(1); } diff --git a/Mage/src/mage/game/permanent/token/WolfToken.java b/Mage/src/mage/game/permanent/token/WolfToken.java index 31ad4a73879..77cf16ad898 100644 --- a/Mage/src/mage/game/permanent/token/WolfToken.java +++ b/Mage/src/mage/game/permanent/token/WolfToken.java @@ -49,7 +49,7 @@ public class WolfToken extends Token { setTokenType(Type.SECOND.code); } cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Wolf"); power = new MageInt(2); toughness = new MageInt(2); diff --git a/Mage/src/mage/game/permanent/token/WolfTokenWithDeathtouch.java b/Mage/src/mage/game/permanent/token/WolfTokenWithDeathtouch.java index 46aa8c6f8e2..d180d8f43a1 100644 --- a/Mage/src/mage/game/permanent/token/WolfTokenWithDeathtouch.java +++ b/Mage/src/mage/game/permanent/token/WolfTokenWithDeathtouch.java @@ -42,7 +42,7 @@ public class WolfTokenWithDeathtouch extends Token { public WolfTokenWithDeathtouch() { super("Wolf", "1/1 black Wolf creature token with deathtouch"); cardType.add(CardType.CREATURE); - color = ObjectColor.BLACK; + color.setBlack(true); subtype.add("Wolf"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage/src/mage/game/permanent/token/WurmToken.java b/Mage/src/mage/game/permanent/token/WurmToken.java index 429ee66b7f6..0b602c51058 100644 --- a/Mage/src/mage/game/permanent/token/WurmToken.java +++ b/Mage/src/mage/game/permanent/token/WurmToken.java @@ -39,7 +39,7 @@ public class WurmToken extends Token { public WurmToken() { super("Wurm", "a 6/6 green Wurm creature token"); cardType.add(CardType.CREATURE); - color = ObjectColor.GREEN; + color.setGreen(true); subtype.add("Wurm"); power = new MageInt(6); toughness = new MageInt(6); diff --git a/Mage/src/mage/game/permanent/token/ZombieToken.java b/Mage/src/mage/game/permanent/token/ZombieToken.java index 029881cb76d..6cd4982809e 100644 --- a/Mage/src/mage/game/permanent/token/ZombieToken.java +++ b/Mage/src/mage/game/permanent/token/ZombieToken.java @@ -50,7 +50,7 @@ public class ZombieToken extends Token { this.setTokenType(new Random().nextInt(3) + 1); } cardType.add(CardType.CREATURE); - color = ObjectColor.BLACK; + color.setBlack(true); subtype.add("Zombie"); power = new MageInt(2); toughness = new MageInt(2);