diff --git a/Mage.Sets/src/mage/sets/antiquities/SageOfLatNam.java b/Mage.Sets/src/mage/sets/antiquities/SageOfLatNam.java index 3f3213712fe..e77f8d73394 100644 --- a/Mage.Sets/src/mage/sets/antiquities/SageOfLatNam.java +++ b/Mage.Sets/src/mage/sets/antiquities/SageOfLatNam.java @@ -28,9 +28,6 @@ package mage.sets.antiquities; import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +35,8 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -62,7 +61,6 @@ public class SageOfLatNam extends CardImpl { this.subtype.add("Human"); this.subtype.add("Artificer"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/apocalypse/DeathGrasp.java b/Mage.Sets/src/mage/sets/apocalypse/DeathGrasp.java index 5f1b57c319f..df0ab0e8129 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/DeathGrasp.java +++ b/Mage.Sets/src/mage/sets/apocalypse/DeathGrasp.java @@ -46,7 +46,7 @@ public class DeathGrasp extends CardImpl { public DeathGrasp (UUID ownerId) { super(ownerId, 95, "Death Grasp", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{W}{B}"); this.expansionSetCode = "APC"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addEffect(new GainLifeEffect(new ManacostVariableValue())); diff --git a/Mage.Sets/src/mage/sets/apocalypse/EbonyTreefolk.java b/Mage.Sets/src/mage/sets/apocalypse/EbonyTreefolk.java index f95875ee501..78bb88d7cbb 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/EbonyTreefolk.java +++ b/Mage.Sets/src/mage/sets/apocalypse/EbonyTreefolk.java @@ -49,7 +49,7 @@ public class EbonyTreefolk extends CardImpl { super(ownerId, 97, "Ebony Treefolk", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{B}{G}"); this.expansionSetCode = "APC"; this.subtype.add("Treefolk"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/apocalypse/FlowstoneCharger.java b/Mage.Sets/src/mage/sets/apocalypse/FlowstoneCharger.java index b8ccc6bf184..00521545703 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/FlowstoneCharger.java +++ b/Mage.Sets/src/mage/sets/apocalypse/FlowstoneCharger.java @@ -47,7 +47,7 @@ public class FlowstoneCharger extends CardImpl { super(ownerId, 99, "Flowstone Charger", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}{W}"); this.expansionSetCode = "APC"; this.subtype.add("Beast"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/apocalypse/GoblinLegionnaire.java b/Mage.Sets/src/mage/sets/apocalypse/GoblinLegionnaire.java index fd3d21ed447..a5566030fc5 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/GoblinLegionnaire.java +++ b/Mage.Sets/src/mage/sets/apocalypse/GoblinLegionnaire.java @@ -51,7 +51,7 @@ public class GoblinLegionnaire extends CardImpl { this.expansionSetCode = "APC"; this.subtype.add("Goblin"); this.subtype.add("Soldier"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java b/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java index 02a8f5cf4cb..5abac37d0cf 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java +++ b/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java @@ -54,7 +54,7 @@ public class GoblinTrenches extends CardImpl { public GoblinTrenches(UUID ownerId) { super(ownerId, 104, "Goblin Trenches", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{W}"); this.expansionSetCode = "APC"; - this.color.setRed(true); + // {2}, Sacrifice a land: Put two 1/1 red and white Goblin Soldier creature tokens onto the battlefield. diff --git a/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java b/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java index 930a400e282..36e608be588 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java +++ b/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java @@ -47,7 +47,7 @@ public class JungleBarrier extends CardImpl { this.expansionSetCode = "APC"; this.subtype.add("Plant"); this.subtype.add("Wall"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/apocalypse/LlanowarDead.java b/Mage.Sets/src/mage/sets/apocalypse/LlanowarDead.java index 331cd0c731f..474dcd23267 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LlanowarDead.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LlanowarDead.java @@ -45,7 +45,7 @@ public class LlanowarDead extends CardImpl { this.expansionSetCode = "APC"; this.subtype.add("Zombie"); this.subtype.add("Elf"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java b/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java index a46751aa6e3..e6b4a0eb5ca 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java +++ b/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java @@ -49,7 +49,7 @@ public class MartyrsTomb extends CardImpl { public MartyrsTomb(UUID ownerId) { super(ownerId, 110, "Martyrs' Tomb", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{B}"); this.expansionSetCode = "APC"; - this.color.setBlack(true); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new PayLifeCost(2)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/apocalypse/MysticSnake.java b/Mage.Sets/src/mage/sets/apocalypse/MysticSnake.java index 7ee51198697..e686f5297b3 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/MysticSnake.java +++ b/Mage.Sets/src/mage/sets/apocalypse/MysticSnake.java @@ -48,7 +48,7 @@ public class MysticSnake extends CardImpl { super(ownerId, 112, "Mystic Snake", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}{U}{U}"); this.expansionSetCode = "APC"; this.subtype.add("Snake"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java b/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java index 4c963c9228d..014037e0e65 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java +++ b/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java @@ -49,8 +49,8 @@ public class OvergrownEstate extends CardImpl { public OvergrownEstate(UUID ownerId) { super(ownerId, 113, "Overgrown Estate", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}{G}{W}"); this.expansionSetCode = "APC"; - this.color.setGreen(true); - this.color.setBlack(true); + + // Sacrifice a land: You gain 3 life. diff --git a/Mage.Sets/src/mage/sets/apocalypse/RazorfinHunter.java b/Mage.Sets/src/mage/sets/apocalypse/RazorfinHunter.java index 7f8b01d4751..46165a469d9 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/RazorfinHunter.java +++ b/Mage.Sets/src/mage/sets/apocalypse/RazorfinHunter.java @@ -51,7 +51,7 @@ public class RazorfinHunter extends CardImpl { this.expansionSetCode = "APC"; this.subtype.add("Merfolk"); 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/apocalypse/TemporalSpring.java b/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java index 9cada98f203..5fc73d2e772 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java +++ b/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java @@ -43,7 +43,7 @@ public class TemporalSpring extends CardImpl { public TemporalSpring(UUID ownerId) { super(ownerId, 125, "Temporal Spring", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}{U}"); this.expansionSetCode = "APC"; - this.color.setBlue(true); + // Put target permanent on top of its owner's library. diff --git a/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java b/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java index 643b2ac67b4..c88ad87bfca 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java @@ -44,7 +44,7 @@ public class Vindicate extends CardImpl { public Vindicate (UUID ownerId) { super(ownerId, 126, "Vindicate", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{W}{B}"); this.expansionSetCode = "APC"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DeadeyeNavigator.java b/Mage.Sets/src/mage/sets/avacynrestored/DeadeyeNavigator.java index 4a5660fb5d8..88addcc3e72 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DeadeyeNavigator.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DeadeyeNavigator.java @@ -27,8 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,10 +38,10 @@ import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlSourceEf import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * @author noxx */ @@ -55,7 +54,6 @@ public class DeadeyeNavigator extends CardImpl { this.expansionSetCode = "AVR"; this.subtype.add("Spirit"); - this.color.setBlue(true); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DiregrafEscort.java b/Mage.Sets/src/mage/sets/avacynrestored/DiregrafEscort.java index 90b23f819ef..8f3f2a08be5 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DiregrafEscort.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DiregrafEscort.java @@ -27,21 +27,20 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import java.util.UUID; - /** * @author noxx */ @@ -61,7 +60,6 @@ public class DiregrafEscort extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DruidsFamiliar.java b/Mage.Sets/src/mage/sets/avacynrestored/DruidsFamiliar.java index 76919ba38a2..026de8d4fbc 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DruidsFamiliar.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DruidsFamiliar.java @@ -27,17 +27,16 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * * @author noxx @@ -52,7 +51,6 @@ public class DruidsFamiliar extends CardImpl { this.expansionSetCode = "AVR"; 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/avacynrestored/ElgaudShieldmate.java b/Mage.Sets/src/mage/sets/avacynrestored/ElgaudShieldmate.java index 036f7fafa27..65af29ca5c7 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ElgaudShieldmate.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ElgaudShieldmate.java @@ -27,18 +27,17 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.HexproofAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * @author noxx */ @@ -52,7 +51,6 @@ public class ElgaudShieldmate extends CardImpl { this.subtype.add("Human"); 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/avacynrestored/GalvanicAlchemist.java b/Mage.Sets/src/mage/sets/avacynrestored/GalvanicAlchemist.java index 58b10a93f40..d29e9b8226d 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GalvanicAlchemist.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GalvanicAlchemist.java @@ -27,8 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,10 +37,10 @@ import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * @author noxx */ @@ -55,7 +54,6 @@ public class GalvanicAlchemist extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GeistTrappers.java b/Mage.Sets/src/mage/sets/avacynrestored/GeistTrappers.java index 1590ef5a80f..b9548a39b42 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GeistTrappers.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GeistTrappers.java @@ -27,18 +27,17 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.ReachAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * @author noxx */ @@ -52,7 +51,6 @@ public class GeistTrappers extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HanweirLancer.java b/Mage.Sets/src/mage/sets/avacynrestored/HanweirLancer.java index c4b2174096f..6afd6a9aba1 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HanweirLancer.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HanweirLancer.java @@ -27,18 +27,17 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * @author noxx */ @@ -52,7 +51,6 @@ public class HanweirLancer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/LightningMauler.java b/Mage.Sets/src/mage/sets/avacynrestored/LightningMauler.java index aa49a9ae37e..4cd01414af0 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/LightningMauler.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/LightningMauler.java @@ -27,18 +27,17 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * * @author noxx @@ -54,7 +53,6 @@ public class LightningMauler 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/avacynrestored/NearheathPilgrim.java b/Mage.Sets/src/mage/sets/avacynrestored/NearheathPilgrim.java index 9c8e581856e..05f5c75bd02 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/NearheathPilgrim.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/NearheathPilgrim.java @@ -27,18 +27,17 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * @author noxx */ @@ -52,7 +51,6 @@ public class NearheathPilgrim extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/NightshadePeddler.java b/Mage.Sets/src/mage/sets/avacynrestored/NightshadePeddler.java index d3dac32ecfd..92b146acf25 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/NightshadePeddler.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/NightshadePeddler.java @@ -27,18 +27,17 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * @author noxx */ @@ -52,7 +51,6 @@ public class NightshadePeddler 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/avacynrestored/PathbreakerWurm.java b/Mage.Sets/src/mage/sets/avacynrestored/PathbreakerWurm.java index 807887ad81b..9efa9431ae5 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/PathbreakerWurm.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/PathbreakerWurm.java @@ -27,18 +27,17 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * @author noxx */ @@ -51,7 +50,6 @@ public class PathbreakerWurm extends CardImpl { this.expansionSetCode = "AVR"; this.subtype.add("Wurm"); - this.color.setGreen(true); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SilverbladePaladin.java b/Mage.Sets/src/mage/sets/avacynrestored/SilverbladePaladin.java index 1fbdc58e1f1..e37cfe7e501 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SilverbladePaladin.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SilverbladePaladin.java @@ -27,18 +27,17 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * @author noxx */ @@ -52,7 +51,6 @@ public class SilverbladePaladin 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/avacynrestored/SpectralGateguards.java b/Mage.Sets/src/mage/sets/avacynrestored/SpectralGateguards.java index 30491287086..77efc0a7e49 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SpectralGateguards.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SpectralGateguards.java @@ -27,18 +27,17 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * @author noxx */ @@ -52,7 +51,6 @@ public class SpectralGateguards extends CardImpl { this.subtype.add("Spirit"); 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/avacynrestored/SternMentor.java b/Mage.Sets/src/mage/sets/avacynrestored/SternMentor.java index aa8734ef3e1..23757600e70 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SternMentor.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SternMentor.java @@ -27,8 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +37,11 @@ import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; import mage.target.TargetPlayer; -import java.util.UUID; - /** * @author noxx */ @@ -56,7 +55,6 @@ public class SternMentor 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/avacynrestored/Stonewright.java b/Mage.Sets/src/mage/sets/avacynrestored/Stonewright.java index 4917bd49b5c..cfb262d43fc 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Stonewright.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Stonewright.java @@ -27,8 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +37,11 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * @author noxx */ @@ -56,7 +55,6 @@ public class Stonewright 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/avacynrestored/TandemLookout.java b/Mage.Sets/src/mage/sets/avacynrestored/TandemLookout.java index 5870ccee8fa..255339d3844 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TandemLookout.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TandemLookout.java @@ -27,8 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -37,10 +36,10 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * @author noxx */ @@ -54,7 +53,6 @@ public class TandemLookout extends CardImpl { this.subtype.add("Human"); 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/avacynrestored/TrustedForcemage.java b/Mage.Sets/src/mage/sets/avacynrestored/TrustedForcemage.java index 8d77fd6d63a..d7f87bea1bd 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TrustedForcemage.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TrustedForcemage.java @@ -27,17 +27,16 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * @author noxx */ @@ -51,7 +50,6 @@ public class TrustedForcemage 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/avacynrestored/Wingcrafter.java b/Mage.Sets/src/mage/sets/avacynrestored/Wingcrafter.java index 41e8a379047..35cba6a297b 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Wingcrafter.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Wingcrafter.java @@ -27,18 +27,17 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * * @author noxx @@ -54,7 +53,6 @@ public class Wingcrafter 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/avacynrestored/WolfirSilverheart.java b/Mage.Sets/src/mage/sets/avacynrestored/WolfirSilverheart.java index 35efb1db4d7..76e751edc66 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/WolfirSilverheart.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/WolfirSilverheart.java @@ -27,17 +27,16 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; -import java.util.UUID; - /** * @author noxx */ @@ -51,7 +50,6 @@ public class WolfirSilverheart extends CardImpl { this.subtype.add("Wolf"); this.subtype.add("Warrior"); - this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiBlizzardHerder.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiBlizzardHerder.java index 3487b7ce38c..4489705454d 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiBlizzardHerder.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiBlizzardHerder.java @@ -50,7 +50,7 @@ public class AkkiBlizzardHerder extends CardImpl { this.expansionSetCode = "BOK"; this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiRaider.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiRaider.java index 9da4917591c..cce0d058e31 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiRaider.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiRaider.java @@ -49,7 +49,7 @@ public class AkkiRaider extends CardImpl { this.expansionSetCode = "BOK"; 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/betrayersofkamigawa/AshenMonstrosity.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/AshenMonstrosity.java index f514920546b..f52adfa5b77 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/AshenMonstrosity.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/AshenMonstrosity.java @@ -45,7 +45,7 @@ public class AshenMonstrosity extends CardImpl { super(ownerId, 93, "Ashen Monstrosity", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{5}{R}{R}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setRed(true); + this.power = new MageInt(7); this.toughness = new MageInt(4); this.addAbility(HasteAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/AuraBarbs.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/AuraBarbs.java index 0078099c733..28c64bf0008 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/AuraBarbs.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/AuraBarbs.java @@ -52,7 +52,7 @@ public class AuraBarbs extends CardImpl { super(ownerId, 94, "Aura Barbs", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setRed(true); + // Each enchantment deals 2 damage to its controller, then each Aura attached to a creature deals 2 damage to the creature it's attached to. this.getSpellAbility().addEffect(new AuraBarbsEffect()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BileUrchin.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BileUrchin.java index 94bf4c2b982..4c27476f8ad 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BileUrchin.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BileUrchin.java @@ -50,7 +50,7 @@ public class BileUrchin extends CardImpl { super(ownerId, 61, "Bile Urchin", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); // Sacrifice Bile Urchin: Target player loses 1 life. diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java index f49936d4b34..8bee2d9cd9d 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java @@ -61,7 +61,7 @@ public class BlademaneBaku extends CardImpl { super(ownerId, 95, "Blademane Baku", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlazingShoal.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlazingShoal.java index 709c852dfd6..7c58c824871 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlazingShoal.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlazingShoal.java @@ -55,7 +55,7 @@ public class BlazingShoal extends CardImpl { super(ownerId, 96, "Blazing Shoal", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{R}{R}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setRed(true); + // You may exile a red card with converted mana cost X from your hand rather than pay Blazing Shoal's mana cost. FilterOwnedCard filter = new FilterOwnedCard("a red card with converted mana cost X from your hand"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlessingOfLeeches.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlessingOfLeeches.java index bc43544b76a..90183b5489b 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlessingOfLeeches.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlessingOfLeeches.java @@ -53,7 +53,7 @@ public class BlessingOfLeeches extends CardImpl { public BlessingOfLeeches(UUID ownerId) { super(ownerId, 62, "Blessing of Leeches", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "BOK"; - this.color.setBlack(true); + this.subtype.add("Aura"); this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChildOfThorns.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChildOfThorns.java index 979787a1ce3..184fac8c8bd 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChildOfThorns.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChildOfThorns.java @@ -51,7 +51,7 @@ public class ChildOfThorns extends CardImpl { super(ownerId, 123, "Child of Thorns", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); // Sacrifice Child of Thorns: Target creature gets +1/+1 until end of turn. diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ClashOfRealities.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ClashOfRealities.java index 35b25b70397..d526ad3866c 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ClashOfRealities.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ClashOfRealities.java @@ -62,7 +62,7 @@ public class ClashOfRealities extends CardImpl { public ClashOfRealities(UUID ownerId) { super(ownerId, 97, "Clash of Realities", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); this.expansionSetCode = "BOK"; - this.color.setRed(true); + // All Spirits have "When this permanent enters the battlefield, you may have it deal 3 damage to target non-Spirit creature." Ability ability1 = new ClashOfRealitiesTriggeredAbility(new DamageTargetEffect(3), "When this permanent enters the battlefield, "); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/CrackTheEarth.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/CrackTheEarth.java index 2866f3c5eec..16c60df020f 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/CrackTheEarth.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/CrackTheEarth.java @@ -44,7 +44,7 @@ public class CrackTheEarth extends CardImpl { super(ownerId, 98, "Crack the Earth", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setRed(true); + // Each player sacrifices a permanent. this.getSpellAbility().addEffect(new SacrificeAllEffect(1, new FilterControlledPermanent("permanent"))); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/DayOfDestiny.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/DayOfDestiny.java index bb938e69a0a..5aac0771c23 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/DayOfDestiny.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/DayOfDestiny.java @@ -55,7 +55,7 @@ public class DayOfDestiny extends CardImpl { super(ownerId, 1, "Day of Destiny", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "BOK"; this.supertype.add("Legendary"); - this.color.setWhite(true); + // Legendary creatures you control get +2/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/DisruptingShoal.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/DisruptingShoal.java index 571ed3d8697..4266767d1c1 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/DisruptingShoal.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/DisruptingShoal.java @@ -59,7 +59,7 @@ public class DisruptingShoal extends CardImpl { super(ownerId, 33, "Disrupting Shoal", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{U}{U}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setBlue(true); + // You may exile a blue card with converted mana cost X from your hand rather than pay Disrupting Shoal's mana cost. FilterOwnedCard filter = new FilterOwnedCard("a blue card with converted mana cost X from your hand"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java index 09df36179a9..d9502221675 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java @@ -66,7 +66,7 @@ public class FaithfulSquire extends CardImpl { this.expansionSetCode = "BOK"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.flipCard = true; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FinalJudgment.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FinalJudgment.java index 6b3ec1a6f88..4089078c877 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FinalJudgment.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FinalJudgment.java @@ -49,7 +49,7 @@ public class FinalJudgment extends CardImpl { public FinalJudgment(UUID ownerId) { super(ownerId, 4, "Final Judgment", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{W}{W}"); this.expansionSetCode = "BOK"; - this.color.setWhite(true); + // Exile all creatures. this.getSpellAbility().addEffect(new FinalJudgmentEffect()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FirstVolley.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FirstVolley.java index 55633da1561..8f20e822b03 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FirstVolley.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FirstVolley.java @@ -49,7 +49,7 @@ public class FirstVolley extends CardImpl { super(ownerId, 100, "First Volley", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setRed(true); + // First Volley deals 1 damage to target creature and 1 damage to that creature's controller. this.getSpellAbility().addEffect(new FirstVolleyEffect()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Floodbringer.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Floodbringer.java index b44f256c987..99e07d67245 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Floodbringer.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Floodbringer.java @@ -57,7 +57,7 @@ public class Floodbringer extends CardImpl { this.expansionSetCode = "BOK"; this.subtype.add("Moonfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Frostling.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Frostling.java index 2808f7b26fa..fb140368020 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Frostling.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Frostling.java @@ -50,7 +50,7 @@ public class Frostling extends CardImpl { super(ownerId, 103, "Frostling", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{R}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); // Sacrifice Frostling: Frostling deals 1 damage to target creature. diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java index 63d3492bb1c..c917b353506 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java @@ -51,7 +51,7 @@ public class HerosDemise extends CardImpl { public HerosDemise(UUID ownerId) { super(ownerId, 68, "Hero's Demise", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "BOK"; - this.color.setBlack(true); + // Destroy target legendary creature. this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HigureTheStillWind.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HigureTheStillWind.java index 3f7ba9b874c..b0a00ff9e49 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HigureTheStillWind.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HigureTheStillWind.java @@ -67,7 +67,7 @@ public class HigureTheStillWind extends CardImpl { this.subtype.add("Human"); this.subtype.add("Ninja"); this.supertype.add("Legendary"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HokoriDustDrinker.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HokoriDustDrinker.java index 3b9bb36581f..62bb2f97366 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HokoriDustDrinker.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HokoriDustDrinker.java @@ -60,7 +60,7 @@ public class HokoriDustDrinker extends CardImpl { this.expansionSetCode = "BOK"; this.supertype.add("Legendary"); 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/betrayersofkamigawa/InkEyesServantOfOni.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/InkEyesServantOfOni.java index a36068a4196..2aaa9d8c3cb 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/InkEyesServantOfOni.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/InkEyesServantOfOni.java @@ -62,7 +62,7 @@ public class InkEyesServantOfOni extends CardImpl { this.subtype.add("Rat"); this.subtype.add("Ninja"); this.supertype.add("Legendary"); - this.color.setBlack(true); + this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IreOfKaminari.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IreOfKaminari.java index 77b9f72eae1..b924371aa97 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IreOfKaminari.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IreOfKaminari.java @@ -53,7 +53,7 @@ public class IreOfKaminari extends CardImpl { super(ownerId, 109, "Ire of Kaminari", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{R}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setRed(true); + // Ire of Kaminari deals damage to target creature or player equal to the number of Arcane cards in your graveyard. this.getSpellAbility().addEffect(new DamageTargetEffect(new CardsInControllerGraveyardCount(filter))); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java index bbc46096561..22603c502cf 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java @@ -62,7 +62,7 @@ public class IsaoEnlightenedBushi extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/JettingGlasskite.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/JettingGlasskite.java index 64030bfd8c7..7c265a37cec 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/JettingGlasskite.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/JettingGlasskite.java @@ -51,7 +51,7 @@ public class JettingGlasskite extends CardImpl { super(ownerId, 38, "Jetting Glasskite", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setBlue(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KaijinOfTheVanishingTouch.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KaijinOfTheVanishingTouch.java index f52364f0fab..75adb142f3e 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KaijinOfTheVanishingTouch.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KaijinOfTheVanishingTouch.java @@ -53,7 +53,7 @@ public class KaijinOfTheVanishingTouch extends CardImpl { super(ownerId, 39, "Kaijin of the Vanishing Touch", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setBlue(true); + this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java index fd76fa71097..f9690561058 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java @@ -51,7 +51,7 @@ public class KamiOfTatteredShoji extends CardImpl { super(ownerId, 11, "Kami of Tattered Shoji", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(5); // Whenever you cast a Spirit or Arcane spell, Kami of Tattered Shoji gains flying until end of turn. diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTheHonoredDead.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTheHonoredDead.java index bcb5f4ae077..21a31b702d6 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTheHonoredDead.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTheHonoredDead.java @@ -54,7 +54,7 @@ public class KamiOfTheHonoredDead extends CardImpl { super(ownerId, 12, "Kami of the Honored Dead", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{5}{W}{W}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KentaroTheSmilingCat.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KentaroTheSmilingCat.java index a136d898ad8..5582a7e9b06 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KentaroTheSmilingCat.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KentaroTheSmilingCat.java @@ -63,7 +63,7 @@ public class KentaroTheSmilingCat extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java index 9b1a41d8fe8..4fb87fe03d0 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java @@ -58,7 +58,7 @@ public class KiraGreatGlassSpinner extends CardImpl { this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); this.supertype.add("Legendary"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java index f88f6e1b748..e9f48265a8a 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java @@ -62,7 +62,7 @@ public class MarkOfTheOni extends CardImpl { public MarkOfTheOni(UUID ownerId) { super(ownerId, 73, "Mark of the Oni", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "BOK"; - this.color.setBlack(true); + this.subtype.add("Aura"); // Enchant creature diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MendingHands.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MendingHands.java index 06cad04a43c..1f4e5a19a71 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MendingHands.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MendingHands.java @@ -45,7 +45,7 @@ public class MendingHands extends CardImpl { public MendingHands(UUID ownerId) { super(ownerId, 15, "Mending Hands", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "BOK"; - this.color.setWhite(true); + // Prevent the next 4 damage that would be dealt to target creature or player this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 4)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java index b9f63990724..10062690021 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java @@ -60,7 +60,7 @@ public class MinamoSightbender extends CardImpl { this.expansionSetCode = "BOK"; 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/betrayersofkamigawa/MistbladeShinobi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MistbladeShinobi.java index 37421d0a938..27ae8a62520 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MistbladeShinobi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MistbladeShinobi.java @@ -56,7 +56,7 @@ public class MistbladeShinobi extends CardImpl { this.expansionSetCode = "BOK"; this.subtype.add("Human"); this.subtype.add("Ninja"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MoonlitStrider.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MoonlitStrider.java index 1c4be56da1b..41c8e68f4d1 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MoonlitStrider.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MoonlitStrider.java @@ -51,7 +51,7 @@ public class MoonlitStrider extends CardImpl { super(ownerId, 16, "Moonlit Strider", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "BOK"; 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/betrayersofkamigawa/NezumiShadowWatcher.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java index b49c3e92acb..4bc7376baed 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java @@ -59,7 +59,7 @@ public class NezumiShadowWatcher extends CardImpl { this.expansionSetCode = "BOK"; this.subtype.add("Rat"); this.subtype.add("Warrior"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); // Sacrifice Nezumi Shadow-Watcher: Destroy target Ninja. diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NinjaOfTheDeepHours.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NinjaOfTheDeepHours.java index 94e3de55dd8..3d59b24040f 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NinjaOfTheDeepHours.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NinjaOfTheDeepHours.java @@ -48,7 +48,7 @@ public class NinjaOfTheDeepHours extends CardImpl { this.expansionSetCode = "BOK"; this.subtype.add("Human"); this.subtype.add("Ninja"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NourishingShoal.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NourishingShoal.java index ecba9b6217c..9b9f98d49d8 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NourishingShoal.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NourishingShoal.java @@ -52,7 +52,7 @@ public class NourishingShoal extends CardImpl { super(ownerId, 137, "Nourishing Shoal", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{G}{G}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setGreen(true); + // You may exile a green card with converted mana cost X from your hand rather than pay Nourishing Shoal's mana cost. FilterOwnedCard filter = new FilterOwnedCard("a green card with converted mana cost X from your hand"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OkibaGangShinobi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OkibaGangShinobi.java index fd1d95fdf33..bbc1d7c2911 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OkibaGangShinobi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OkibaGangShinobi.java @@ -48,7 +48,7 @@ public class OkibaGangShinobi extends CardImpl { this.expansionSetCode = "BOK"; this.subtype.add("Rat"); this.subtype.add("Ninja"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OpalEyeKondasYojimbo.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OpalEyeKondasYojimbo.java index b045c84b846..6c4f04570e0 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OpalEyeKondasYojimbo.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OpalEyeKondasYojimbo.java @@ -63,7 +63,7 @@ public class OpalEyeKondasYojimbo extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Fox"); this.subtype.add("Samurai"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OyobiWhoSplitTheHeavens.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OyobiWhoSplitTheHeavens.java index 3732d751357..8f7c9e710d9 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OyobiWhoSplitTheHeavens.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OyobiWhoSplitTheHeavens.java @@ -51,7 +51,7 @@ public class OyobiWhoSplitTheHeavens extends CardImpl { this.expansionSetCode = "BOK"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(6); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheAkki.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheAkki.java index 5cc84a1445d..5a0ba4f0e84 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheAkki.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheAkki.java @@ -50,7 +50,7 @@ public class PatronOfTheAkki extends CardImpl { this.expansionSetCode = "BOK"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setRed(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheKitsune.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheKitsune.java index 8143036d998..26eba02c042 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheKitsune.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheKitsune.java @@ -46,7 +46,7 @@ public class PatronOfTheKitsune extends CardImpl { this.expansionSetCode = "BOK"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheMoon.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheMoon.java index b5311c4ae3b..6dcb76e201c 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheMoon.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheMoon.java @@ -58,7 +58,7 @@ public class PatronOfTheMoon extends CardImpl { this.expansionSetCode = "BOK"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setBlue(true); + this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheNezumi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheNezumi.java index 4a8702e8c42..12998823283 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheNezumi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheNezumi.java @@ -55,7 +55,7 @@ public class PatronOfTheNezumi extends CardImpl { this.expansionSetCode = "BOK"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheOrochi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheOrochi.java index 3195f145121..a87902d0152 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheOrochi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheOrochi.java @@ -61,7 +61,7 @@ public class PatronOfTheOrochi extends CardImpl { this.expansionSetCode = "BOK"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java index b58ee477a4d..4de0d0d8933 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java @@ -59,7 +59,7 @@ public class PetalmaneBaku extends CardImpl { super(ownerId, 139, "Petalmane Baku", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java index aef4d1e0f30..7177f50e07a 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java @@ -63,7 +63,7 @@ public class PusKami extends CardImpl { super(ownerId, 79, "Pus Kami", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{5}{B}{B}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); // {B}, Sacrifice Pus Kami: Destroy target nonblack creature. diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java index ca0127b3cc3..e8b0b354db3 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java @@ -66,7 +66,7 @@ public class QuillmaneBaku extends CardImpl { super(ownerId, 48, "Quillmane Baku", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); this.expansionSetCode = "BOK"; 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/betrayersofkamigawa/RibbonsOfTheReikai.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/RibbonsOfTheReikai.java index a1861f5da52..ea5c8da2818 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/RibbonsOfTheReikai.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/RibbonsOfTheReikai.java @@ -52,7 +52,7 @@ public class RibbonsOfTheReikai extends CardImpl { super(ownerId, 50, "Ribbons of the Reikai", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{U}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setBlue(true); + // Draw a card for each Spirit you control. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter))); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java index 8d3715bbcd4..bb458059731 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java @@ -50,7 +50,7 @@ public class ScaledHulk extends CardImpl { super(ownerId, 143, "Scaled Hulk", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{G}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); // Whenever you cast a Spirit or Arcane spell, Scaled Hulk gets +2/+2 until end of turn. diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShimmeringGlasskite.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShimmeringGlasskite.java index 00adda2979e..4f22ae29dad 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShimmeringGlasskite.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShimmeringGlasskite.java @@ -51,7 +51,7 @@ public class ShimmeringGlasskite extends CardImpl { super(ownerId, 51, "Shimmering Glasskite", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShiningShoal.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShiningShoal.java index 1ec9d5c6a08..49691c16633 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShiningShoal.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShiningShoal.java @@ -62,7 +62,7 @@ public class ShiningShoal extends CardImpl { super(ownerId, 21, "Shining Shoal", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{W}{W}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setWhite(true); + // You may exile a white card with converted mana cost X from your hand rather than pay Shining Shoal's mana cost FilterOwnedCard filter = new FilterOwnedCard("a white card with converted mana cost X from your hand"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SickeningShoal.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SickeningShoal.java index 0d6780a9049..5fa2d069623 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SickeningShoal.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SickeningShoal.java @@ -56,7 +56,7 @@ public class SickeningShoal extends CardImpl { super(ownerId, 82, "Sickening Shoal", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{B}{B}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setBlack(true); + // You may exile a black card with converted mana cost X from your hand rather than pay Sickening Shoal's mana cost. FilterOwnedCard filter = new FilterOwnedCard("a black card with converted mana cost X from your hand"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java index 8b6f6c1d390..dbe4574bc60 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java @@ -65,7 +65,7 @@ public class SkullmaneBaku extends CardImpl { super(ownerId, 83, "Skullmane Baku", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}{B}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Skullsnatcher.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Skullsnatcher.java index afecc1ee78c..9cec6dbae47 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Skullsnatcher.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Skullsnatcher.java @@ -65,7 +65,7 @@ public class Skullsnatcher extends CardImpl { this.expansionSetCode = "BOK"; this.subtype.add("Rat"); this.subtype.add("Ninja"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java index 6364f7c7cac..cd61b92334a 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java @@ -57,7 +57,7 @@ public class SoratamiMindsweeper extends CardImpl { this.expansionSetCode = "BOK"; this.subtype.add("Moonfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(4); // Flying diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SplitTailMiko.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SplitTailMiko.java index 701c9f2e692..de206ebac58 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SplitTailMiko.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SplitTailMiko.java @@ -50,7 +50,7 @@ public class SplitTailMiko extends CardImpl { this.expansionSetCode = "BOK"; this.subtype.add("Fox"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); // {W}, {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java index b4a50d748bc..f4b77fc4c3d 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java @@ -53,7 +53,7 @@ public class StreamOfConsciousness extends CardImpl { super(ownerId, 53, "Stream of Consciousness", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setBlue(true); + // Target player shuffles up to four target cards from his or her graveyard into his or her library. this.getSpellAbility().addEffect(new StreamOfConsciousnessEffect()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SwayOfTheStars.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SwayOfTheStars.java index a1a4f97491d..5641bb5968e 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SwayOfTheStars.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SwayOfTheStars.java @@ -49,7 +49,7 @@ public class SwayOfTheStars extends CardImpl { public SwayOfTheStars(UUID ownerId) { super(ownerId, 54, "Sway of the Stars", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{8}{U}{U}"); this.expansionSetCode = "BOK"; - this.color.setBlue(true); + // Each player shuffles his or her hand, graveyard, and permanents he or she owns into his or her library, then draws seven cards. Each player's life total becomes 7. this.getSpellAbility().addEffect(new SwayOfTheStarsEffect()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TakenosCavalry.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TakenosCavalry.java index 98c511782f1..e4ead18469a 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TakenosCavalry.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TakenosCavalry.java @@ -61,7 +61,7 @@ public class TakenosCavalry extends CardImpl { this.subtype.add("Human"); this.subtype.add("Samurai"); this.subtype.add("Archer"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new BushidoAbility(1)); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Tallowisp.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Tallowisp.java index 244c2f33a91..341c7431d59 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Tallowisp.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Tallowisp.java @@ -66,7 +66,7 @@ public class Tallowisp extends CardImpl { super(ownerId, 25, "Tallowisp", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TeardropKami.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TeardropKami.java index 40558e9d0ce..4c44772811f 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TeardropKami.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TeardropKami.java @@ -50,7 +50,7 @@ public class TeardropKami extends CardImpl { super(ownerId, 55, "Teardrop Kami", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}"); this.expansionSetCode = "BOK"; 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/betrayersofkamigawa/TerashisGrasp.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java index b512534441b..355f5ce0c63 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java @@ -62,7 +62,7 @@ public class TerashisGrasp extends CardImpl { super(ownerId, 26, "Terashi's Grasp", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{W}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setWhite(true); + // Destroy target artifact or enchantment. this.getSpellAbility().addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java index a33f0b8c474..2a4b09814eb 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java @@ -53,7 +53,7 @@ public class TerashisVerdict extends CardImpl { super(ownerId, 27, "Terashi's Verdict", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setWhite(true); + // Destroy target attacking creature with power 3 or less. this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetAttackingCreature(1, 1, filter, false)); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java index ddbf176c654..4290e041e64 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java @@ -60,7 +60,7 @@ public class ThreadsOfDisloyalty extends CardImpl { public ThreadsOfDisloyalty(UUID ownerId) { super(ownerId, 56, "Threads of Disloyalty", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}{U}"); this.expansionSetCode = "BOK"; - this.color.setBlue(true); + this.subtype.add("Aura"); // Enchant creature with converted mana cost 2 or less diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java index 796bdb38ca6..ce379ac53cc 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java @@ -44,7 +44,7 @@ public class ThreeTragedies extends CardImpl { super(ownerId, 87, "Three Tragedies", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setBlack(true); + // Target player discards three cards. this.getSpellAbility().addEffect(new DiscardTargetEffect(3)); this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java index 68a1e0c9b66..96855f251f4 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java @@ -58,7 +58,7 @@ public class ThroatSlitter extends CardImpl { this.expansionSetCode = "BOK"; this.subtype.add("Rat"); this.subtype.add("Ninja"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ToilsOfNightAndDay.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ToilsOfNightAndDay.java index 5b4c54f3d36..57e893e3b37 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ToilsOfNightAndDay.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ToilsOfNightAndDay.java @@ -51,7 +51,7 @@ public class ToilsOfNightAndDay extends CardImpl { super(ownerId, 57, "Toils of Night and Day", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setBlue(true); + // You may tap or untap target permanent, then you may tap or untap another target permanent. this.getSpellAbility().addEffect(new ToilsOfNightAndDayEffect()); this.getSpellAbility().addTarget(new TargetPermanent(0, 2, new FilterPermanent(), false)); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TraprootKami.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TraprootKami.java index 9c2a58f9df9..ae508a42657 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TraprootKami.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TraprootKami.java @@ -59,7 +59,7 @@ public class TraprootKami extends CardImpl { super(ownerId, 147, "Traproot Kami", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "BOK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(0); this.toughness = new MageInt(0); // Defender; reach diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/UncheckedGrowth.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/UncheckedGrowth.java index bb01e5be4c7..82ec17eac9c 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/UncheckedGrowth.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/UncheckedGrowth.java @@ -54,7 +54,7 @@ public class UncheckedGrowth extends CardImpl { super(ownerId, 148, "Unchecked Growth", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - 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/betrayersofkamigawa/Uproot.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Uproot.java index 35afc530586..664dac2fbee 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Uproot.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Uproot.java @@ -44,7 +44,7 @@ public class Uproot extends CardImpl { super(ownerId, 149, "Uproot", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "BOK"; this.subtype.add("Arcane"); - this.color.setGreen(true); + // Put target land on top of its owner's library. this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); this.getSpellAbility().addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/WalkerOfSecretWays.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/WalkerOfSecretWays.java index 18eb6ed2998..1878e165f7b 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/WalkerOfSecretWays.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/WalkerOfSecretWays.java @@ -65,7 +65,7 @@ public class WalkerOfSecretWays extends CardImpl { this.expansionSetCode = "BOK"; this.subtype.add("Human"); this.subtype.add("Ninja"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java index e493a66c43e..85315278d56 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java @@ -64,7 +64,7 @@ public class WaxmaneBaku extends CardImpl { super(ownerId, 29, "Waxmane Baku", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.expansionSetCode = "BOK"; 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/championsofkamigawa/AkkiAvalanchers.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiAvalanchers.java index 9c8419b2c0c..c6f15603024 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiAvalanchers.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiAvalanchers.java @@ -54,7 +54,7 @@ public class AkkiAvalanchers extends CardImpl { this.expansionSetCode = "CHK"; 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/championsofkamigawa/AkkiCoalflinger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiCoalflinger.java index f98e815a41f..a32bcfe74fd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiCoalflinger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiCoalflinger.java @@ -53,7 +53,7 @@ public class AkkiCoalflinger extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FirstStrikeAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java index 3fe72213a48..de318507a64 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java @@ -31,7 +31,7 @@ public class AkkiLavarunner extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.flipCard = true; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java index 9375911804f..43b28458e80 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java @@ -56,7 +56,7 @@ public class AkkiUnderminer extends CardImpl { this.subtype.add("Goblin"); this.subtype.add("Rogue"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new AkkiUnderminerAbility()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java index 007987b6a2a..0b066f72582 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java @@ -49,7 +49,7 @@ public class AshenSkinZubera extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Zubera"); this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); Ability ability = new DiesTriggeredAbility(new DiscardTargetEffect(new ZuberasDiedDynamicValue())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java index d2e5a5ff8df..599ee192ff0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java @@ -65,7 +65,7 @@ public class AuraOfDominion extends CardImpl { super(ownerId, 51, "Aura of Dominion", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{U}{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Aura"); - this.color.setBlue(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Untap)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls.java index 10d1de302a7..773f809f68c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls.java @@ -62,7 +62,7 @@ public class AzamiLadyOfScrolls extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking.java index c178eadebbb..cc05b3fe665 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking.java @@ -51,7 +51,7 @@ public class AzusaLostButSeeking extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsControllerEffect(2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BattleMadRonin.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BattleMadRonin.java index d296307ba11..198c99246b4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BattleMadRonin.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BattleMadRonin.java @@ -47,7 +47,7 @@ public class BattleMadRonin extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new BushidoAbility(2)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java index cb2366c77e7..2e1eac5fcc5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java @@ -60,7 +60,7 @@ public class Befoul extends CardImpl { public Befoul (UUID ownerId) { super(ownerId, 102, "Befoul", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}{B}"); this.expansionSetCode = "CHK"; - this.color.setBlack(true); + // Destroy target land or nonblack creature. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); this.getSpellAbility().addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BenBenAkkiHermit.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BenBenAkkiHermit.java index 2b0b19fa4c0..338f95f1dfc 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BenBenAkkiHermit.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BenBenAkkiHermit.java @@ -65,7 +65,7 @@ public class BenBenAkkiHermit extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter), true), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java index 6e2c55512af..b0d10a61ab3 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java @@ -59,7 +59,7 @@ public class BlindWithAnger extends CardImpl { super(ownerId, 158, "Blind with Anger", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setRed(true); + this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BloodRites.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BloodRites.java index a98fbe8a001..119b0190552 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BloodRites.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BloodRites.java @@ -49,7 +49,7 @@ public class BloodRites extends CardImpl { public BloodRites(UUID ownerId) { super(ownerId, 159, "Blood Rites", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}{R}"); this.expansionSetCode = "CHK"; - this.color.setRed(true); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BloodSpeaker.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BloodSpeaker.java index 11df405ea13..47d155f69e4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BloodSpeaker.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BloodSpeaker.java @@ -65,7 +65,7 @@ public class BloodSpeaker extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Ogre"); this.subtype.add("Shaman"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java index e9ceef30c4c..992fcc36238 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java @@ -63,7 +63,7 @@ public class BudokaGardener extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.flipCard = true; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BushiTenderfoot.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BushiTenderfoot.java index 604e0302983..b0817a180f7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BushiTenderfoot.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BushiTenderfoot.java @@ -60,7 +60,7 @@ public class BushiTenderfoot extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.flipCard = true; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands.java index c986f5b2e26..bd9004fae46 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands.java @@ -55,7 +55,7 @@ public class CageOfHands extends CardImpl { super(ownerId, 3, "Cage of Hands", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Aura"); - this.color.setWhite(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory.java index dc24dbe98f7..b3f9c00b62f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory.java @@ -59,7 +59,7 @@ private static final FilterCreaturePermanent filter = new FilterCreaturePermanen public CallToGlory(UUID ownerId) { super(ownerId, 4, "Call to Glory", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "CHK"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new CalltoGloryFirstEffect()); this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn, filter, false)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Cleanfall.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Cleanfall.java index 5721aa8dc85..72ff614088a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Cleanfall.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Cleanfall.java @@ -52,7 +52,7 @@ public class Cleanfall extends CardImpl { super(ownerId, 6, "Cleanfall", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setWhite(true); + this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CommuneWithNature.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CommuneWithNature.java index f87711aeff9..844c5aa20c3 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CommuneWithNature.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CommuneWithNature.java @@ -52,7 +52,7 @@ public class CommuneWithNature extends CardImpl { public CommuneWithNature (UUID ownerId) { super(ownerId, 204, "Commune with Nature", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{G}"); this.expansionSetCode = "CHK"; - this.color.setGreen(true); + // Look at the top five cards of your library. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in any order. this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect(new StaticValue(5), false, new StaticValue(1), filter, false)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CounselOfTheSoratami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CounselOfTheSoratami.java index 4b9674ba264..f0999507637 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CounselOfTheSoratami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CounselOfTheSoratami.java @@ -43,7 +43,7 @@ public class CounselOfTheSoratami extends CardImpl { public CounselOfTheSoratami (UUID ownerId) { super(ownerId, 55, "Counsel of the Soratami", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "CHK"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CranialExtraction.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CranialExtraction.java index 631678c7a12..e9fa3622af6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CranialExtraction.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CranialExtraction.java @@ -55,7 +55,7 @@ public class CranialExtraction extends CardImpl { super(ownerId, 105, "Cranial Extraction", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setBlack(true); + /* Name a nonland card. Search target player's graveyard, hand, and library for * all cards with that name and exile them. Then that player shuffles his or her library. */ diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java index 3fba0664ee4..048fa176252 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java @@ -54,7 +54,7 @@ public class CrushingPain extends CardImpl { public CrushingPain (UUID ownerId) { super(ownerId, 162, "Crushing Pain", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "CHK"; - this.color.setRed(true); + // Crushing Pain deals 6 damage to target creature that was dealt damage this turn. this.getSpellAbility().addEffect(new DamageTargetEffect(6)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CursedRonin.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CursedRonin.java index 449dcf279d7..14df99ec3f4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CursedRonin.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CursedRonin.java @@ -49,7 +49,7 @@ public class CursedRonin extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new BushidoAbility(1)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows.java index 0c55841a1dc..ef67806f27b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows.java @@ -52,7 +52,7 @@ public class DanceOfShadows extends CardImpl { super(ownerId, 108, "Dance of Shadows", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setBlack(true); + // Creatures you control get +1/+0 and gain fear until end of turn. (They can't be blocked except by artifact creatures and/or black creatures.) Effect effect = new BoostControlledEffect(1, 0, Duration.EndOfTurn, filter); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DeathcurseOgre.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DeathcurseOgre.java index 723ef64258f..79108a83dbb 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DeathcurseOgre.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DeathcurseOgre.java @@ -48,7 +48,7 @@ public class DeathcurseOgre extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Ogre"); this.subtype.add("Warrior"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new DiesTriggeredAbility(new LoseLifeAllPlayersEffect(3))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DevotedRetainer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DevotedRetainer.java index bb1ea91c6a0..eb1b163887e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DevotedRetainer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DevotedRetainer.java @@ -46,7 +46,7 @@ public class DevotedRetainer extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new BushidoAbility(1)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringGreed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringGreed.java index 257ea91b8d8..18eebfdff24 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringGreed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringGreed.java @@ -59,7 +59,7 @@ public class DevouringGreed extends CardImpl { super(ownerId, 110, "Devouring Greed", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setBlack(true); + // As an additional cost to cast Devouring Greed, you may sacrifice any number of Spirits. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(0, Integer.MAX_VALUE, filter, true))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringRage.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringRage.java index 47497158624..d26fb0c6618 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringRage.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringRage.java @@ -64,7 +64,7 @@ public class DevouringRage extends CardImpl { super(ownerId, 164, "Devouring Rage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setRed(true); + // As an additional cost to cast Devouring Rage, you may sacrifice any number of Spirits. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(0, Integer.MAX_VALUE, filter, true))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java index bb22a0a3ff2..645e94f7c51 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java @@ -48,7 +48,7 @@ public class DrippingTongueZubera extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Zubera"); this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SpiritToken(), new ZuberasDiedDynamicValue()), false), new ZuberasDiedWatcher()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java index 3cdb833ffad..b590d8596e2 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java @@ -59,7 +59,7 @@ public class Earthshaker extends CardImpl { super(ownerId, 165, "Earthshaker", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{R}{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(5); // Whenever you cast a Spirit or Arcane spell, Earthshaker deals 2 damage to each creature without flying. diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EerieProcession.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EerieProcession.java index 9bf52a8ae5a..60b8f66c3ca 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EerieProcession.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EerieProcession.java @@ -53,7 +53,7 @@ public class EerieProcession extends CardImpl { super(ownerId, 58, "Eerie Procession", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setBlue(true); + // Search your library for an Arcane card, reveal that card, and put it into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java index 7478c844f2f..6d9b1592654 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java @@ -50,7 +50,7 @@ public class EmberFistZubera extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Zubera"); this.subtype.add("Spirit"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(new ZuberasDiedDynamicValue())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EtherealHaze.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EtherealHaze.java index 5f9eb2c7fcb..8c6eb77fe52 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EtherealHaze.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EtherealHaze.java @@ -45,7 +45,7 @@ public class EtherealHaze extends CardImpl { public EtherealHaze (UUID ownerId) { super(ownerId, 9, "Ethereal Haze", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "CHK"; - this.color.setWhite(true); + // Prevent all damage that would be dealt by creatures this turn. this.getSpellAbility().addEffect(new PreventAllDamageByAllEffect(new FilterCreaturePermanent("creatures"), Duration.EndOfTurn, false)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FeastOfWorms.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FeastOfWorms.java index 112c298cc8f..c950c151bdd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/FeastOfWorms.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FeastOfWorms.java @@ -55,7 +55,7 @@ public class FeastOfWorms extends CardImpl { super(ownerId, 207, "Feast of Worms", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setGreen(true); + // Destroy target land. If that land was legendary, its controller sacrifices another land. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java index 2f3f415147c..a7bfc05a864 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java @@ -61,7 +61,7 @@ public class FieldOfReality extends CardImpl { super(ownerId, 60, "Field of Reality", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Aura"); - this.color.setBlue(true); + // Enchanted creature can't be blocked by Spirits. TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java index d5df6a4a5bf..37b726e4745 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java @@ -57,7 +57,7 @@ public class FloatingDreamZubera extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Zubera"); this.subtype.add("Spirit"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(new ZuberasDiedDynamicValue())), new ZuberasDiedWatcher()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Frostwielder.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Frostwielder.java index bc3c33da535..a547e37e179 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Frostwielder.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Frostwielder.java @@ -54,7 +54,7 @@ public class Frostwielder extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GaleForce.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GaleForce.java index 7171dad033d..567ac080130 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GaleForce.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GaleForce.java @@ -52,7 +52,7 @@ public class GaleForce extends CardImpl { public GaleForce(UUID ownerId) { super(ownerId, 209, "Gale Force", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{G}"); this.expansionSetCode = "CHK"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new DamageAllEffect(5, filter)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GhostlyPrison.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GhostlyPrison.java index 33e3749890f..72b4101982b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GhostlyPrison.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GhostlyPrison.java @@ -49,7 +49,7 @@ public class GhostlyPrison extends CardImpl { public GhostlyPrison (UUID ownerId) { super(ownerId, 10, "Ghostly Prison", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "CHK"; - this.color.setWhite(true); + // Creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GhostlyPrisonReplacementEffect())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GibberingKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GibberingKami.java index de586ea7ccb..44d34d0d367 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GibberingKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GibberingKami.java @@ -46,7 +46,7 @@ public class GibberingKami extends CardImpl { super(ownerId, 112, "Gibbering Kami", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GlimpseOfNature.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GlimpseOfNature.java index 14a167f20e8..932d3982658 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GlimpseOfNature.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GlimpseOfNature.java @@ -47,7 +47,7 @@ public class GlimpseOfNature extends CardImpl { public GlimpseOfNature (UUID ownerId) { super(ownerId, 210, "Glimpse of Nature", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{G}"); this.expansionSetCode = "CHK"; - this.color.setGreen(true); + // Whenever you cast a creature spell this turn, draw a card. this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new GlimpseOfNatureTriggeredAbility())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java index 0b6646fbdd5..9855fc85eac 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java @@ -53,7 +53,7 @@ public class GuardianOfSolitude extends CardImpl { super(ownerId, 64, "Guardian of Solitude", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); Ability ability = new SpellCastControllerTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), filter, false); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HanaKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HanaKami.java index d9067e80983..3240589144f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HanaKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HanaKami.java @@ -59,7 +59,7 @@ public class HanaKami extends CardImpl { super(ownerId, 211, "Hana Kami", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{1}{G}")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java index ccb65b89216..e22f57b418b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java @@ -47,7 +47,7 @@ public class HanabiBlast extends CardImpl { public HanabiBlast (UUID ownerId) { super(ownerId, 170, "Hanabi Blast", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}{R}"); this.expansionSetCode = "CHK"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(ReturnToHandSpellEffect.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java index 5bf054c734d..f87ae485a25 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java @@ -68,7 +68,7 @@ public class HeWhoHungers extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java index 2ae3081eefe..c65eb6ed0e5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java @@ -45,7 +45,7 @@ public class HeartbeatOfSpring extends CardImpl { public HeartbeatOfSpring(UUID ownerId) { super(ownerId, 212, "Heartbeat of Spring", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "CHK"; - this.color.setGreen(true); + // Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced. this.addAbility(new TapForManaAllTriggeredManaAbility( diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java index 1ee9ba14813..1b9764a3912 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java @@ -55,7 +55,7 @@ public class HearthKami extends CardImpl { super(ownerId, 171, "Hearth Kami", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java index b4015f04766..e848c437702 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java @@ -59,7 +59,7 @@ public class HikariTwilightGuardian extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); // Flying diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HisokaMinamoSensei.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HisokaMinamoSensei.java index 6157900979c..9871ad87fea 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HisokaMinamoSensei.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HisokaMinamoSensei.java @@ -61,7 +61,7 @@ public class HisokaMinamoSensei extends CardImpl { this.supertype.add("Legendary"); 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/championsofkamigawa/HisokasDefiance.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasDefiance.java index 864698b39ec..3a1eb259198 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasDefiance.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasDefiance.java @@ -53,7 +53,7 @@ public class HisokasDefiance extends CardImpl { public HisokasDefiance(UUID ownerId) { super(ownerId, 67, "Hisoka's Defiance", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "CHK"; - this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetSpell(filter)); this.getSpellAbility().addEffect(new CounterTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HoldTheLine.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HoldTheLine.java index a1e3ba3bfe1..95f5deee3ef 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HoldTheLine.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HoldTheLine.java @@ -46,7 +46,7 @@ public class HoldTheLine extends CardImpl { public HoldTheLine(UUID ownerId) { super(ownerId, 13, "Hold the Line", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{W}{W}"); this.expansionSetCode = "CHK"; - this.color.setWhite(true); + // Blocking creatures get +7/+7 until end of turn. this.getSpellAbility().addEffect(new BoostAllEffect(7, 7, Duration.EndOfTurn, filter, false)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire.java index ec3bb37653a..ab7815f3f2d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire.java @@ -56,7 +56,7 @@ public class HondenOfCleansingFire extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.subtype.add("Shrine"); - this.color.setWhite(true); + // At the beginning of your upkeep, you gain 2 life for each Shrine you control. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter, 2)), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage.java index a0813a936c5..dca9718bd33 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage.java @@ -59,7 +59,7 @@ public class HondenOfInfiniteRage extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.subtype.add("Shrine"); - this.color.setRed(true); + // At the beginning of your upkeep, Honden of Infinite Rage deals damage to target creature or player equal to the number of Shrines you control. Ability ability = new BeginningOfUpkeepTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb.java index e2cc6b4d2b7..6258b419c21 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb.java @@ -57,7 +57,7 @@ public class HondenOfLifesWeb extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.subtype.add("Shrine"); - this.color.setGreen(true); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SpiritToken(), new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java index 77f2a0064b3..df0872e8ea8 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java @@ -58,7 +58,7 @@ public class HondenOfNightsReach extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.subtype.add("Shrine"); - this.color.setBlack(true); + // At the beginning of your upkeep, target opponent discards a card for each Shrine you control. Ability ability = new BeginningOfUpkeepTriggeredAbility(new DiscardTargetEffect(new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds.java index 22aa0d49674..1c6fe66572f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds.java @@ -56,7 +56,7 @@ public class HondenOfSeeingWinds extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.subtype.add("Shrine"); - this.color.setBlue(true); + // At the beginning of your upkeep, draw a card for each Shrine you control. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java index fa6f89073de..6ecea987d1e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java @@ -51,7 +51,7 @@ public class HorizonSeed extends CardImpl { super(ownerId, 15, "Horizon Seed", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SpellCastControllerTriggeredAbility(new RegenerateTargetEffect(), filter, false); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HumbleBudoka.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HumbleBudoka.java index e286b95e561..d50bf8d3eba 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HumbleBudoka.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HumbleBudoka.java @@ -46,7 +46,7 @@ public class HumbleBudoka extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(ShroudAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HundredTalonKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HundredTalonKami.java index a5a8a181166..2ff6f1c8acd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HundredTalonKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HundredTalonKami.java @@ -46,7 +46,7 @@ public class HundredTalonKami extends CardImpl { super(ownerId, 16, "Hundred-Talon Kami", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java index 7fd33583e18..5500eadf0b0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java @@ -56,7 +56,7 @@ public class InameDeathAspect extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(new EntersBattlefieldTriggeredAbility(new InameDeathAspectEffect(), true)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InameLifeAspect.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InameLifeAspect.java index 036318169bc..1d26ed807d8 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/InameLifeAspect.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InameLifeAspect.java @@ -65,7 +65,7 @@ public class InameLifeAspect extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/IndomitableWill.java b/Mage.Sets/src/mage/sets/championsofkamigawa/IndomitableWill.java index 5aba33eb7fc..3509fa64b3b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/IndomitableWill.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/IndomitableWill.java @@ -51,7 +51,7 @@ public class IndomitableWill extends CardImpl { super(ownerId, 17, "Indomitable Will", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Aura"); - this.color.setWhite(true); + this.addAbility(FlashAbility.getInstance()); TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java index 18effc5a9d4..080b956932a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java @@ -63,7 +63,7 @@ public class InitiateOfBlood extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Ogre"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.flipCard = true; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java index 54f75a581db..a7be42b45c0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java @@ -57,7 +57,7 @@ public class InnocenceKami extends CardImpl { super(ownerId, 18, "Innocence Kami", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/IsamaruHoundofKonda.java b/Mage.Sets/src/mage/sets/championsofkamigawa/IsamaruHoundofKonda.java index fc04dd2f571..4327f667cad 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/IsamaruHoundofKonda.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/IsamaruHoundofKonda.java @@ -45,7 +45,7 @@ public class IsamaruHoundofKonda extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); 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/championsofkamigawa/JoyousRespite.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JoyousRespite.java index 2832b4e2a2b..af3e3501011 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JoyousRespite.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JoyousRespite.java @@ -49,7 +49,7 @@ public class JoyousRespite extends CardImpl { super(ownerId, 216, "Joyous Respite", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setGreen(true); + // You gain 1 life for each land you control. this.getSpellAbility().addEffect(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/JuganTheRisingStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JuganTheRisingStar.java index 01412176049..39ab666cef4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JuganTheRisingStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JuganTheRisingStar.java @@ -55,7 +55,7 @@ public class JuganTheRisingStar extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Dragon"); this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/JukaiMessenger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JukaiMessenger.java index 4ab3e8084d8..552b2ab8364 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JukaiMessenger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JukaiMessenger.java @@ -46,7 +46,7 @@ public class JukaiMessenger extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new ForestwalkAbility()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KabutoMoth.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KabutoMoth.java index fd726841237..d1f57794909 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KabutoMoth.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KabutoMoth.java @@ -52,7 +52,7 @@ public class KabutoMoth extends CardImpl { super(ownerId, 20, "Kabuto Moth", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java index d05e8f994f4..06d1f0ceb34 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java @@ -58,7 +58,7 @@ public class KamiOfAncientLaw extends CardImpl { super(ownerId, 21, "Kami of Ancient Law", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java index 350063a86b4..a5ba32f5786 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java @@ -52,7 +52,7 @@ public class KamiOfFiresRoar extends CardImpl { super(ownerId, 174, "Kami of Fire's Roar", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "CHK"; 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/championsofkamigawa/KamiOfLunacy.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfLunacy.java index e3d5bfc9212..6dcfe4497f9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfLunacy.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfLunacy.java @@ -46,7 +46,7 @@ public class KamiOfLunacy extends CardImpl { super(ownerId, 119, "Kami of Lunacy", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{B}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone.java index a376de8bb8a..81d2be1453c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone.java @@ -44,7 +44,7 @@ public class KamiOfOldStone extends CardImpl { super(ownerId, 22, "Kami of Old Stone", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(7); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java index 06529284160..45df1643fd7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java @@ -50,7 +50,7 @@ public class KamiOfTheHunt extends CardImpl { super(ownerId, 219, "Kami of the Hunt", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SpellCastControllerTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), filter, false)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields.java index 8f8e97c26ff..177ac7264f7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields.java @@ -47,7 +47,7 @@ public class KamiOfThePalaceFields extends CardImpl { super(ownerId, 24, "Kami of the Palace Fields", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{5}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java index d78f9f50a12..c595b3a12dd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java @@ -54,7 +54,7 @@ public class KamiOfTheWaningMoon extends CardImpl { super(ownerId, 120, "Kami of the Waning Moon", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java index 2589d10d3f7..dd4f83eecee 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java @@ -50,7 +50,7 @@ public class KamiOfTwistedReflection extends CardImpl { super(ownerId, 71, "Kami of Twisted Reflection", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java index e0b14955c41..ad40686c344 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java @@ -52,7 +52,7 @@ public class KeigaTheTideStar extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Dragon"); this.subtype.add("Spirit"); - this.color.setBlue(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KikuNightsFlower.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KikuNightsFlower.java index d3fc992d828..ee41278f906 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KikuNightsFlower.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KikuNightsFlower.java @@ -57,7 +57,7 @@ public class KikuNightsFlower extends CardImpl { this.supertype.add("Legendary"); 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/championsofkamigawa/KitsuneBlademaster.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneBlademaster.java index 0b2d3bee56c..0f4610308c6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneBlademaster.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneBlademaster.java @@ -47,7 +47,7 @@ public class KitsuneBlademaster extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Fox"); this.subtype.add("Samurai"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FirstStrikeAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java index f7a78ca3428..fadb78b987b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java @@ -60,7 +60,7 @@ public class KitsuneDiviner extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Fox"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(0); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java index b9210ba0098..3e78523ad71 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java @@ -64,7 +64,7 @@ public class KitsuneHealer extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Fox"); 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/championsofkamigawa/KitsuneRiftwalker.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneRiftwalker.java index 21dcacc02b0..d51b8c34a3c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneRiftwalker.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneRiftwalker.java @@ -54,7 +54,7 @@ public class KitsuneRiftwalker extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Fox"); 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/championsofkamigawa/KodamaOfTheNorthTree.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheNorthTree.java index 77cc486d17b..a7c7f5233af 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheNorthTree.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheNorthTree.java @@ -47,7 +47,7 @@ public class KodamaOfTheNorthTree extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(6); this.toughness = new MageInt(4); this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java index 2c3ecbb6d17..59dc6c7c6c6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java @@ -55,7 +55,7 @@ public class KodamaOfTheSouthTree extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); Ability ability = new SpellCastControllerTriggeredAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn, new FilterCreaturePermanent(), true), filter, false); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar.java index 5ba35ae2278..554c43bebf9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar.java @@ -52,7 +52,7 @@ public class KokushoTheEveningStar extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Dragon"); this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo.java index c16064931f4..f699d3dc298 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo.java @@ -48,7 +48,7 @@ public class KondaLordOfEiganjo extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(VigilanceAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KondasHatamoto.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KondasHatamoto.java index d9545e68a0b..de77eae1651 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KondasHatamoto.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KondasHatamoto.java @@ -28,10 +28,6 @@ package mage.sets.championsofkamigawa; import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -41,6 +37,9 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.BushidoAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -66,7 +65,6 @@ public class KondasHatamoto extends CardImpl{ this.expansionSetCode = "CHK"; this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KumanoMasterYamabushi.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KumanoMasterYamabushi.java index 1a79d2e802a..bf8f2663954 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KumanoMasterYamabushi.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KumanoMasterYamabushi.java @@ -57,7 +57,7 @@ public class KumanoMasterYamabushi extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KumanosPupils.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KumanosPupils.java index 33bd9a6e64c..88eba79b43a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KumanosPupils.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KumanosPupils.java @@ -49,7 +49,7 @@ public class KumanosPupils extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Human"); 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/championsofkamigawa/KuroPitlord.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KuroPitlord.java index 66d0fe4b8d3..abc19badcf4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KuroPitlord.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KuroPitlord.java @@ -53,7 +53,7 @@ public class KuroPitlord extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Demon"); this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(9); this.toughness = new MageInt(9); // At the beginning of your upkeep, sacrifice Kuro, Pitlord unless you pay {B}{B}{B}{B}. diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/LanternKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/LanternKami.java index b01f45ad3b0..1c2561228d0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/LanternKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/LanternKami.java @@ -45,7 +45,7 @@ public class LanternKami extends CardImpl { super(ownerId, 32, "Lantern Kami", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/LavaSpike.java b/Mage.Sets/src/mage/sets/championsofkamigawa/LavaSpike.java index bbcadb20d17..1fd71d93f01 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/LavaSpike.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/LavaSpike.java @@ -45,7 +45,7 @@ public class LavaSpike extends CardImpl { super(ownerId, 178, "Lava Spike", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setRed(true); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Lure.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Lure.java index 99c4f8e4010..d2488f43a5c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Lure.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Lure.java @@ -53,7 +53,7 @@ public class Lure extends CardImpl { super(ownerId, 226, "Lure", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Aura"); - this.color.setGreen(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MarrowGnawer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MarrowGnawer.java index e35b366eaaa..ad1c48cef98 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MarrowGnawer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MarrowGnawer.java @@ -74,7 +74,7 @@ public class MarrowGnawer extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Rat"); 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/championsofkamigawa/MelokuTheCloudedMirror.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java index 001fda11111..3faf6dc0145 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java @@ -58,7 +58,7 @@ public class MelokuTheCloudedMirror extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Moonfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(4); // Flying diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MidnightCovenant.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MidnightCovenant.java index 4391914207c..fc0489f4419 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MidnightCovenant.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MidnightCovenant.java @@ -52,7 +52,7 @@ public class MidnightCovenant extends CardImpl { super(ownerId, 125, "Midnight Covenant", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Aura"); - this.color.setBlack(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java index 49d58c0f058..0c0943c2575 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java @@ -58,7 +58,7 @@ public class Mindblaze extends CardImpl { public Mindblaze (UUID ownerId) { super(ownerId, 180, "Mindblaze", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{R}"); this.expansionSetCode = "CHK"; - this.color.setRed(true); + // Name a nonland card and choose a number greater than 0. Target player reveals his or her library. // If that library contains exactly the chosen number of the named card, diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MossKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MossKami.java index c3d8265ebbb..a5b35facfbc 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MossKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MossKami.java @@ -45,7 +45,7 @@ public class MossKami extends CardImpl { super(ownerId, 228, "Moss Kami", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MothriderSamurai.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MothriderSamurai.java index 39339e3c7d3..07314632791 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MothriderSamurai.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MothriderSamurai.java @@ -47,7 +47,7 @@ public class MothriderSamurai extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NagaoBoundByHonor.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NagaoBoundByHonor.java index 13b0a42b009..c426df48851 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NagaoBoundByHonor.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NagaoBoundByHonor.java @@ -58,7 +58,7 @@ public class NagaoBoundByHonor extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new BushidoAbility(1)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java index 761cd309666..d9ab86374c6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java @@ -53,7 +53,7 @@ public class NezumiBoneReader extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Rat"); this.subtype.add("Shaman"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); // {B}, Sacrifice a creature: Target player discards a card. Activate this ability only any time you could cast a sorcery. diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiCutthroat.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiCutthroat.java index 463bdab6a15..fa9a47425bc 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiCutthroat.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiCutthroat.java @@ -47,7 +47,7 @@ public class NezumiCutthroat extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Rat"); this.subtype.add("Warrior"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(FearAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiGraverobber.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiGraverobber.java index 175e21f8724..bc5eae21af6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiGraverobber.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiGraverobber.java @@ -61,7 +61,7 @@ public class NezumiGraverobber extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Rat"); this.subtype.add("Rogue"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.flipCard = true; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiRonin.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiRonin.java index 7560bf647c5..9361ba444de 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiRonin.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiRonin.java @@ -46,7 +46,7 @@ public class NezumiRonin extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Rat"); this.subtype.add("Samurai"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(1); this.addAbility(new BushidoAbility(1)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal.java index 49ddb155ada..c0e2d04bbe9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal.java @@ -50,7 +50,7 @@ public class NightOfSoulsBetrayal extends CardImpl { super(ownerId, 133, "Night of Souls' Betrayal", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); - this.color.setBlack(true); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NumaiOutcast.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NumaiOutcast.java index 6582a2d42f2..bc53290ded7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NumaiOutcast.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NumaiOutcast.java @@ -54,7 +54,7 @@ public class NumaiOutcast extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new BushidoAbility(2)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java index b5fb394ae2a..6adb90b04fd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java @@ -52,7 +52,7 @@ public class OrbweaverKumo extends CardImpl { super(ownerId, 231, "Orbweaver Kumo", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(ReachAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrderOfTheSacredBell.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrderOfTheSacredBell.java index b340ec8e347..0e9bc63d6ec 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrderOfTheSacredBell.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrderOfTheSacredBell.java @@ -45,7 +45,7 @@ public class OrderOfTheSacredBell extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java index 538213882c2..023dc0e6a52 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java @@ -51,7 +51,7 @@ public class OreGorger extends CardImpl { super(ownerId, 182, "Ore Gorger", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(1); Ability ability = new SpellCastControllerTriggeredAbility(new DestroyTargetEffect(), filter, true); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiEggwatcher.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiEggwatcher.java index 301da59c30c..8e127e6ba1c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiEggwatcher.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiEggwatcher.java @@ -64,7 +64,7 @@ public class OrochiEggwatcher extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Snake"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.flipCard = true; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiLeafcaller.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiLeafcaller.java index be506e03e12..a983dda4c75 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiLeafcaller.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiLeafcaller.java @@ -49,7 +49,7 @@ public class OrochiLeafcaller extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Snake"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new AnyColorManaAbility(new ColoredManaCost(ColoredManaSymbol.G))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiSustainer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiSustainer.java index 30a792bdaf7..14fc71973b3 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiSustainer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiSustainer.java @@ -46,7 +46,7 @@ public class OrochiSustainer extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Snake"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(new GreenManaAbility()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PainKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PainKami.java index d64593d77c9..999a1652add 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PainKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PainKami.java @@ -52,7 +52,7 @@ public class PainKami extends CardImpl { super(ownerId, 183, "Pain Kami", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}{R}")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java index 452aeb97280..e3636632b06 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java @@ -54,7 +54,7 @@ public class PainwrackerOni extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Demon"); this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PeerThroughDepths.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PeerThroughDepths.java index 61abf98ec13..2b0e70ac4c6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PeerThroughDepths.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PeerThroughDepths.java @@ -56,7 +56,7 @@ public class PeerThroughDepths extends CardImpl { super(ownerId, 78, "Peer Through Depths", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setBlue(true); + // Look at the top five cards of your library. You may reveal an instant or sorcery card from among them and put it into your hand. // Put the rest on the bottom of your library in any order. diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PullUnder.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PullUnder.java index 42a2e2d1caf..3db6bf13c06 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PullUnder.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PullUnder.java @@ -47,7 +47,7 @@ public class PullUnder extends CardImpl { super(ownerId, 137, "Pull Under", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{5}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setBlack(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(-5, -5, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java b/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java index 3c4e48a4f30..e39f8665b22 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java @@ -53,7 +53,7 @@ public class QuietPurity extends CardImpl { super(ownerId, 39, "Quiet Purity", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setWhite(true); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RagDealer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RagDealer.java index eb40ac750cd..edf95da6756 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RagDealer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RagDealer.java @@ -58,7 +58,7 @@ public class RagDealer extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Human"); 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/championsofkamigawa/RaggedVeins.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java index 8a614931bc0..a95b255300b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java @@ -59,7 +59,7 @@ public class RaggedVeins extends CardImpl { super(ownerId, 139, "Ragged Veins", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Aura"); - this.color.setBlack(true); + // Flash this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ReachThroughMists.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ReachThroughMists.java index dfb61f1f099..53bb4eef86c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ReachThroughMists.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ReachThroughMists.java @@ -45,7 +45,7 @@ public class ReachThroughMists extends CardImpl { super(ownerId, 81, "Reach Through Mists", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setBlue(true); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Reciprocate.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Reciprocate.java index 5c1986cbcf4..65eac2b615a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Reciprocate.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Reciprocate.java @@ -51,7 +51,7 @@ public class Reciprocate extends CardImpl { public Reciprocate(UUID ownerId) { super(ownerId, 40, "Reciprocate", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "CHK"; - this.color.setWhite(true); + // Exile target creature that dealt damage to you this turn. this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new ReciprocateTarget()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java index b9abf9240c3..3ff77eee859 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java @@ -55,7 +55,7 @@ public class RendFlesh extends CardImpl { super(ownerId, 140, "Rend Flesh", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setBlack(true); + Target target = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java index b85cdce4269..2556ce40cb2 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java @@ -52,7 +52,7 @@ public class RendSpirit extends CardImpl { public RendSpirit(UUID ownerId) { super(ownerId, 141, "Rend Spirit", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "CHK"; - this.color.setBlack(true); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RiverKaijin.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RiverKaijin.java index 1ce652ed72f..ecc99ea384d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RiverKaijin.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RiverKaijin.java @@ -44,7 +44,7 @@ public class RiverKaijin extends CardImpl { super(ownerId, 83, "River Kaijin", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RoninHoundmaster.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RoninHoundmaster.java index eef57e4736e..b3023108d15 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RoninHoundmaster.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RoninHoundmaster.java @@ -47,7 +47,7 @@ public class RoninHoundmaster extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(HasteAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Rootrunner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Rootrunner.java index db8352bbf76..be2b9e716d5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Rootrunner.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Rootrunner.java @@ -52,7 +52,7 @@ public class Rootrunner extends CardImpl { super(ownerId, 237, "Rootrunner", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java index 9e0d9e0c0a5..22072830492 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java @@ -58,7 +58,7 @@ public class RyuseiTheFallingStar extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Dragon"); this.subtype.add("Spirit"); - this.color.setRed(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java index c982a5310a7..0788505122c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java @@ -65,7 +65,7 @@ public class SachiDaughterOfSeshiro extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Snake"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SakuraTribeElder.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SakuraTribeElder.java index 05a5f3db3f6..c451db4bd5a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SakuraTribeElder.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SakuraTribeElder.java @@ -54,7 +54,7 @@ public class SakuraTribeElder extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Snake"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); TargetCardInLibrary target = new TargetCardInLibrary(filterLands); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiEnforcers.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiEnforcers.java index 55590e4e6b3..b41c7d05229 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiEnforcers.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiEnforcers.java @@ -46,7 +46,7 @@ public class SamuraiEnforcers extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setWhite(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(new BushidoAbility(2)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiOfThePaleCurtain.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiOfThePaleCurtain.java index d0902ec46a5..5a340f6d805 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiOfThePaleCurtain.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiOfThePaleCurtain.java @@ -57,7 +57,7 @@ public class SamuraiOfThePaleCurtain extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Fox"); this.subtype.add("Samurai"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ScuttlingDeath.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ScuttlingDeath.java index 69e98664ab8..bf0249fb8c0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ScuttlingDeath.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ScuttlingDeath.java @@ -52,7 +52,7 @@ public class ScuttlingDeath extends CardImpl { super(ownerId, 142, "Scuttling Death", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth.java index 061c69e4fd4..e450ca66d14 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth.java @@ -53,7 +53,7 @@ public class SeizanPerverterOfTruth extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Demon"); this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java index ddabec577e9..c3ac5d0e381 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java @@ -59,7 +59,7 @@ public class SenseiGoldenTail extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Fox"); this.subtype.add("Samurai"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SerpentSkin.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SerpentSkin.java index 75016d932f2..b391691b99d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SerpentSkin.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SerpentSkin.java @@ -54,7 +54,7 @@ public class SerpentSkin extends CardImpl { super(ownerId, 240, "Serpent Skin", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Aura"); - this.color.setGreen(true); + this.addAbility(FlashAbility.getInstance()); TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java index acac2d72cdc..3ed8eadffa1 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java @@ -64,7 +64,7 @@ public class SeshiroTheAnointed extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Snake"); this.subtype.add("Monk"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java index ef1d951c6cf..7df0f8b9a1a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java @@ -52,7 +52,7 @@ public class SilentChantZubera extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Zubera"); this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); Ability ability = new DiesTriggeredAbility(new GainLifeEffect(new SilentChantZuberaDynamicValue())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java index f616be06942..e35376666d1 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java @@ -50,8 +50,8 @@ public class SireOfTheStorm extends CardImpl { super(ownerId, 85, "Sire of the Storm", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setBlue(true); - this.color.setBlue(true); + + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java index 4a8190d3c23..02da1498c58 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java @@ -53,7 +53,7 @@ public class Soilshaper extends CardImpl { super(ownerId, 243, "Soilshaper", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SokenzanBruiser.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SokenzanBruiser.java index 12b2b84025f..d3778ca8996 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SokenzanBruiser.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SokenzanBruiser.java @@ -46,7 +46,7 @@ public class SokenzanBruiser extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Ogre"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new MountainwalkAbility()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiCloudskater.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiCloudskater.java index 6646ed37dd1..d05d161317d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiCloudskater.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiCloudskater.java @@ -56,7 +56,7 @@ public class SoratamiCloudskater extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Moonfolk"); 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/championsofkamigawa/SoratamiMirrorGuard.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorGuard.java index 7f3a9ed4efe..0013d4d4661 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorGuard.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorGuard.java @@ -65,7 +65,7 @@ public class SoratamiMirrorGuard extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Moonfolk"); 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/championsofkamigawa/SoratamiMirrorMage.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java index 35c7d6c79d8..6afc5fbe5cd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java @@ -57,7 +57,7 @@ public class SoratamiMirrorMage extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Moonfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java index b9c1aeeb220..4dc868df4e6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java @@ -60,7 +60,7 @@ public class SoratamiRainshaper extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Moonfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSavant.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSavant.java index 0117b29d491..ecb4bb7eb82 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSavant.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSavant.java @@ -58,7 +58,7 @@ public class SoratamiSavant extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Moonfolk"); 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/championsofkamigawa/SoratamiSeer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSeer.java index 601bd556463..6667c9d647a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSeer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSeer.java @@ -61,7 +61,7 @@ public class SoratamiSeer extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Moonfolk"); 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/championsofkamigawa/SoulOfMagma.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java index 440f8c99880..3b364354181 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java @@ -51,7 +51,7 @@ public class SoulOfMagma extends CardImpl { super(ownerId, 189, "Soul of Magma", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SpellCastControllerTriggeredAbility(new DamageTargetEffect(1), filter, false); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java b/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java index 901864ddee4..57e55a2ffc6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java @@ -51,7 +51,7 @@ public class StrengthOfCedars extends CardImpl { super(ownerId, 245, "Strength of Cedars", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setGreen(true); + // Target creature gets +X/+X until end of turn, where X is the number of lands you control. DynamicValue controlledLands = new PermanentsOnBattlefieldCount(filter, null); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SwallowingPlague.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SwallowingPlague.java index aaca337f442..0564cf2df23 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SwallowingPlague.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SwallowingPlague.java @@ -47,7 +47,7 @@ public class SwallowingPlague extends CardImpl { super(ownerId, 146, "Swallowing Plague", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{B}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addEffect(new GainLifeEffect(new ManacostVariableValue())); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TakenoSamuraiGeneral.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TakenoSamuraiGeneral.java index 4fb1ae7f11a..0a467fd6f0c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TakenoSamuraiGeneral.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TakenoSamuraiGeneral.java @@ -55,7 +55,7 @@ public class TakenoSamuraiGeneral extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new BushidoAbility(2)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java index 00e1cf380af..3d6d9cac9d7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java @@ -56,7 +56,7 @@ public class TellerOfTales extends CardImpl { super(ownerId, 95, "Teller of Tales", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); // Flying diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TerashisCry.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TerashisCry.java index 2d3ca69406f..199fb87d338 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TerashisCry.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TerashisCry.java @@ -48,7 +48,7 @@ public class TerashisCry extends CardImpl { super(ownerId, 47, "Terashi's Cry", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setWhite(true); + // Tap up to three target creatures. Target target = new TargetCreaturePermanent(0,3); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TheUnspeakable.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TheUnspeakable.java index d25ef611509..185fbbf2eed 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TheUnspeakable.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TheUnspeakable.java @@ -58,7 +58,7 @@ public class TheUnspeakable extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setBlue(true); + this.power = new MageInt(6); this.toughness = new MageInt(7); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java index 77c217ea326..46e4adfab9c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java @@ -53,7 +53,7 @@ public class ThiefOfHope extends CardImpl { super(ownerId, 147, "Thief of Hope", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SpellCastControllerTriggeredAbility(new LoseLifeTargetEffect(1), filter, false); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Thoughtbind.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Thoughtbind.java index cf15254c731..1236a586f18 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Thoughtbind.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Thoughtbind.java @@ -53,7 +53,7 @@ public class Thoughtbind extends CardImpl { public Thoughtbind(UUID ownerId) { super(ownerId, 96, "Thoughtbind", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "CHK"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetSpell(filter)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ThousandleggedKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ThousandleggedKami.java index 2c1b70915c6..349c33a5fcd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ThousandleggedKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ThousandleggedKami.java @@ -45,7 +45,7 @@ public class ThousandleggedKami extends CardImpl { super(ownerId, 246, "Thousand-legged Kami", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{6}{G}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(6); this.toughness = new MageInt(6); this.addAbility(new SoulshiftAbility(7)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed.java index 06d9d47cb71..d82bd5e3cbb 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed.java @@ -54,7 +54,7 @@ public class TimeOfNeed extends CardImpl { public TimeOfNeed(UUID ownerId) { super(ownerId, 247, "Time of Need", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "CHK"; - this.color.setGreen(true); + // Search your library for a legendary creature card, reveal it, and put it into your hand. Then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(filter); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/UncontrollableAnger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/UncontrollableAnger.java index f5900d516d1..5da913217d7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/UncontrollableAnger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/UncontrollableAnger.java @@ -53,7 +53,7 @@ public class UncontrollableAnger extends CardImpl { super(ownerId, 195, "Uncontrollable Anger", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Aura"); - this.color.setRed(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/UnearthlyBlizzard.java b/Mage.Sets/src/mage/sets/championsofkamigawa/UnearthlyBlizzard.java index bd38a62fd7f..242df18ed16 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/UnearthlyBlizzard.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/UnearthlyBlizzard.java @@ -46,7 +46,7 @@ public class UnearthlyBlizzard extends CardImpl { super(ownerId, 196, "Unearthly Blizzard", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - 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/championsofkamigawa/UnnaturalSpeed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/UnnaturalSpeed.java index f8e618fdcb8..bae6069d35d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/UnnaturalSpeed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/UnnaturalSpeed.java @@ -48,7 +48,7 @@ public class UnnaturalSpeed extends CardImpl { super(ownerId, 197, "Unnatural Speed", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setRed(true); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/VenerableKumo.java b/Mage.Sets/src/mage/sets/championsofkamigawa/VenerableKumo.java index 21e8a49ddc5..b3343b7a588 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/VenerableKumo.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/VenerableKumo.java @@ -46,7 +46,7 @@ public class VenerableKumo extends CardImpl { super(ownerId, 248, "Venerable Kumo", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); this.addAbility(ReachAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Vigilance.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Vigilance.java index fb45b88b866..7ad32a6cfa3 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Vigilance.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Vigilance.java @@ -49,7 +49,7 @@ public class Vigilance extends CardImpl { super(ownerId, 49, "Vigilance", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Aura"); - this.color.setWhite(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/VillainousOgre.java b/Mage.Sets/src/mage/sets/championsofkamigawa/VillainousOgre.java index 469f36767b7..5d0978c3049 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/VillainousOgre.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/VillainousOgre.java @@ -28,17 +28,16 @@ package mage.sets.championsofkamigawa; import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.common.CantBlockAbility; +import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.decorator.ConditionalGainActivatedAbility; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.Rarity; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -61,7 +60,6 @@ public class VillainousOgre extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Warrior"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java b/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java index d0945f24310..af904d3e08b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java @@ -45,7 +45,7 @@ public class WakingNightmare extends CardImpl { super(ownerId, 149, "Waking Nightmare", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DiscardTargetEffect(2)); this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/WanderingOnes.java b/Mage.Sets/src/mage/sets/championsofkamigawa/WanderingOnes.java index 1e45c345520..6fa08a2563b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/WanderingOnes.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/WanderingOnes.java @@ -44,7 +44,7 @@ public class WanderingOnes extends CardImpl { super(ownerId, 100, "Wandering Ones", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}"); this.expansionSetCode = "CHK"; 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/championsofkamigawa/YamabushisFlame.java b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisFlame.java index 800169ca290..41ddd23b085 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisFlame.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisFlame.java @@ -48,7 +48,7 @@ public class YamabushisFlame extends CardImpl { public YamabushisFlame(UUID ownerId) { super(ownerId, 198, "Yamabushi's Flame", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "CHK"; - this.color.setRed(true); + // Yamabushi's Flame deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java index d7bc5475aa6..42195113735 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java @@ -57,7 +57,7 @@ public class YamabushisStorm extends CardImpl { public YamabushisStorm(UUID ownerId) { super(ownerId, 199, "Yamabushi's Storm", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "CHK"; - this.color.setRed(true); + // Yamabushi's Storm deals 1 damage to each creature. this.getSpellAbility().addEffect(new DamageAllEffect(1, new FilterCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java index db2b2bac7fb..ded774d255a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java @@ -61,7 +61,7 @@ public class YoseiTheMorningStar extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Dragon"); this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java index bbec2a178f8..723286834da 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java @@ -63,7 +63,7 @@ public class ZoZuThePunisher extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); // Whenever a land enters the battlefield, Zo-Zu the Punisher deals 2 damage to that land's controller. diff --git a/Mage.Sets/src/mage/sets/commander/DuergarHedgeMage.java b/Mage.Sets/src/mage/sets/commander/DuergarHedgeMage.java index 18745746c5d..c8aca6974f8 100644 --- a/Mage.Sets/src/mage/sets/commander/DuergarHedgeMage.java +++ b/Mage.Sets/src/mage/sets/commander/DuergarHedgeMage.java @@ -69,8 +69,6 @@ public class DuergarHedgeMage extends CardImpl { this.subtype.add("Dwarf"); this.subtype.add("Shaman"); - 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/commander/GhaveGuruOfSpores.java b/Mage.Sets/src/mage/sets/commander/GhaveGuruOfSpores.java index d00a61da142..cf0b1169a94 100644 --- a/Mage.Sets/src/mage/sets/commander/GhaveGuruOfSpores.java +++ b/Mage.Sets/src/mage/sets/commander/GhaveGuruOfSpores.java @@ -70,9 +70,8 @@ public class GhaveGuruOfSpores extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Fungus"); this.subtype.add("Shaman"); - this.color.setBlack(true); - this.color.setGreen(true); - this.color.setWhite(true); + + this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/commander/GwyllionHedgeMage.java b/Mage.Sets/src/mage/sets/commander/GwyllionHedgeMage.java index bf359f45427..8e1840aac88 100644 --- a/Mage.Sets/src/mage/sets/commander/GwyllionHedgeMage.java +++ b/Mage.Sets/src/mage/sets/commander/GwyllionHedgeMage.java @@ -71,8 +71,6 @@ public class GwyllionHedgeMage extends CardImpl { this.subtype.add("Hag"); this.subtype.add("Wizard"); - 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/commander2013/Skyscribing.java b/Mage.Sets/src/mage/sets/commander2013/Skyscribing.java index af1aea5c65c..466c3c69e77 100644 --- a/Mage.Sets/src/mage/sets/commander2013/Skyscribing.java +++ b/Mage.Sets/src/mage/sets/commander2013/Skyscribing.java @@ -45,7 +45,7 @@ public class Skyscribing extends CardImpl { public Skyscribing(UUID ownerId) { super(ownerId, 57, "Skyscribing", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{U}{U}"); this.expansionSetCode = "C13"; - this.color.setBlue(true); + // Each player draws X cards. this.getSpellAbility().addEffect(new DrawCardAllEffect(new ManacostVariableValue())); // Forecast - {2}{U}, Reveal Skyscribing from your hand: Each player draws a card. diff --git a/Mage.Sets/src/mage/sets/conflux/AbsorbVis.java b/Mage.Sets/src/mage/sets/conflux/AbsorbVis.java index 51c6dfb78a2..e61c747d0be 100644 --- a/Mage.Sets/src/mage/sets/conflux/AbsorbVis.java +++ b/Mage.Sets/src/mage/sets/conflux/AbsorbVis.java @@ -47,7 +47,7 @@ public class AbsorbVis extends CardImpl { public AbsorbVis (UUID ownerId) { super(ownerId, 40, "Absorb Vis", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{6}{B}"); this.expansionSetCode = "CON"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new LoseLifeTargetEffect(4)); this.getSpellAbility().addEffect(new GainLifeEffect(4)); this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/conflux/AerieMystics.java b/Mage.Sets/src/mage/sets/conflux/AerieMystics.java index 40397dfaf4a..1a75a1ede72 100644 --- a/Mage.Sets/src/mage/sets/conflux/AerieMystics.java +++ b/Mage.Sets/src/mage/sets/conflux/AerieMystics.java @@ -52,7 +52,7 @@ public class AerieMystics extends CardImpl { public AerieMystics(UUID ownerId) { super(ownerId, 1, "Aerie Mystics", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "CON"; - this.color.setWhite(true); + this.subtype.add("Bird"); this.subtype.add("Wizard"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/conflux/AshasFavor.java b/Mage.Sets/src/mage/sets/conflux/AshasFavor.java index 3d7d898c53a..7d00197b741 100644 --- a/Mage.Sets/src/mage/sets/conflux/AshasFavor.java +++ b/Mage.Sets/src/mage/sets/conflux/AshasFavor.java @@ -53,7 +53,7 @@ public class AshasFavor extends CardImpl { super(ownerId, 2, "Asha's Favor", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "CON"; this.subtype.add("Aura"); - this.color.setWhite(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/conflux/AvenSquire.java b/Mage.Sets/src/mage/sets/conflux/AvenSquire.java index cccf4798a00..25845276675 100644 --- a/Mage.Sets/src/mage/sets/conflux/AvenSquire.java +++ b/Mage.Sets/src/mage/sets/conflux/AvenSquire.java @@ -45,7 +45,7 @@ public class AvenSquire extends CardImpl { public AvenSquire(UUID ownerId) { super(ownerId, 3, "Aven Squire", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "CON"; - this.color.setWhite(true); + this.subtype.add("Bird"); this.subtype.add("Soldier"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java b/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java index 722e6ebc4db..a769a143c07 100644 --- a/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java +++ b/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java @@ -61,7 +61,7 @@ public class BeaconBehemoth extends CardImpl { super(ownerId, 78, "Beacon Behemoth", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "CON"; 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/conflux/BloodhallOoze.java b/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java index d3f48892cdd..484a1864a58 100644 --- a/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java +++ b/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java @@ -55,7 +55,7 @@ public class BloodhallOoze extends CardImpl { public BloodhallOoze(UUID ownerId) { super(ownerId, 59, "Bloodhall Ooze", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{R}"); this.expansionSetCode = "CON"; - this.color.setRed(true); + this.subtype.add("Ooze"); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java b/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java index a11a244a510..1ac7fd78ec1 100644 --- a/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java +++ b/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java @@ -44,7 +44,7 @@ public class CanyonMinotaur extends CardImpl { public CanyonMinotaur(UUID ownerId) { super(ownerId, 60, "Canyon Minotaur", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "CON"; - this.color.setRed(true); + this.subtype.add("Minotaur"); this.subtype.add("Warrior"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java b/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java index 039bafee37e..cb2aeb00788 100644 --- a/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java +++ b/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java @@ -56,7 +56,7 @@ public class CelestialPurge extends CardImpl { public CelestialPurge(UUID ownerId) { super(ownerId, 5, "Celestial Purge", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "CON"; - this.color.setWhite(true); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new ExileTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java b/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java index 5a201823137..7f7039b5032 100644 --- a/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java +++ b/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java @@ -47,7 +47,7 @@ public class ConstrictingTendrils extends CardImpl { public ConstrictingTendrils(UUID ownerId) { super(ownerId, 22, "Constricting Tendrils", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "CON"; - this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(-3, 0, Duration.EndOfTurn)); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); diff --git a/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java b/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java index 02901b73ff6..26b2005aa86 100644 --- a/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java +++ b/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java @@ -49,7 +49,7 @@ public class DarklitGargoyle extends CardImpl { public DarklitGargoyle(UUID ownerId) { super(ownerId, 7, "Darklit Gargoyle", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "CON"; - this.color.setWhite(true); + this.subtype.add("Gargoyle"); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/conflux/Dreadwing.java b/Mage.Sets/src/mage/sets/conflux/Dreadwing.java index 726d88d4b0d..bb6ceb0e65d 100644 --- a/Mage.Sets/src/mage/sets/conflux/Dreadwing.java +++ b/Mage.Sets/src/mage/sets/conflux/Dreadwing.java @@ -51,7 +51,7 @@ public class Dreadwing extends CardImpl { super(ownerId, 43, "Dreadwing", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{B}"); this.expansionSetCode = "CON"; this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl(("{1}{U}{B}"))); diff --git a/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java b/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java index 8ed434ef070..ff17d913795 100644 --- a/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java +++ b/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java @@ -45,8 +45,8 @@ public class EsperCormorants extends CardImpl { super(ownerId, 105, "Esper Cormorants", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}{W}{U}"); this.expansionSetCode = "CON"; this.subtype.add("Bird"); - this.color.setWhite(true); - this.color.setBlue(true); + + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/conflux/Esperzoa.java b/Mage.Sets/src/mage/sets/conflux/Esperzoa.java index 73407d6168e..6f7a519c0c3 100644 --- a/Mage.Sets/src/mage/sets/conflux/Esperzoa.java +++ b/Mage.Sets/src/mage/sets/conflux/Esperzoa.java @@ -50,7 +50,7 @@ public class Esperzoa extends CardImpl { super(ownerId, 25, "Esperzoa", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "CON"; this.subtype.add("Jellyfish"); - this.color.setBlue(true); + this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/conflux/FaerieMechanist.java b/Mage.Sets/src/mage/sets/conflux/FaerieMechanist.java index 213d5561f8c..f282d58e7a2 100644 --- a/Mage.Sets/src/mage/sets/conflux/FaerieMechanist.java +++ b/Mage.Sets/src/mage/sets/conflux/FaerieMechanist.java @@ -54,7 +54,7 @@ public class FaerieMechanist extends CardImpl { public FaerieMechanist(UUID ownerId) { super(ownerId, 27, "Faerie Mechanist", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "CON"; - this.color.setBlue(true); + this.subtype.add("Faerie"); this.subtype.add("Artificer"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/conflux/FieryFall.java b/Mage.Sets/src/mage/sets/conflux/FieryFall.java index ef30a2c88fd..ae0f6aff1da 100644 --- a/Mage.Sets/src/mage/sets/conflux/FieryFall.java +++ b/Mage.Sets/src/mage/sets/conflux/FieryFall.java @@ -46,7 +46,7 @@ public class FieryFall extends CardImpl { public FieryFall (UUID ownerId) { super(ownerId, 63, "Fiery Fall", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{5}{R}"); this.expansionSetCode = "CON"; - this.color.setRed(true); + // Fiery Fall deals 5 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(5)); diff --git a/Mage.Sets/src/mage/sets/conflux/FrontlineSage.java b/Mage.Sets/src/mage/sets/conflux/FrontlineSage.java index fefd33decc4..77160aeb2d9 100644 --- a/Mage.Sets/src/mage/sets/conflux/FrontlineSage.java +++ b/Mage.Sets/src/mage/sets/conflux/FrontlineSage.java @@ -53,7 +53,7 @@ public class FrontlineSage extends CardImpl { this.expansionSetCode = "CON"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(0); this.toughness = new MageInt(1); this.addAbility(new ExaltedAbility()); diff --git a/Mage.Sets/src/mage/sets/conflux/FusionElemental.java b/Mage.Sets/src/mage/sets/conflux/FusionElemental.java index 0e2527b13c8..233e577a9ff 100644 --- a/Mage.Sets/src/mage/sets/conflux/FusionElemental.java +++ b/Mage.Sets/src/mage/sets/conflux/FusionElemental.java @@ -29,10 +29,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; /** * @@ -44,11 +44,8 @@ public class FusionElemental extends CardImpl { super(ownerId, 107, "Fusion Elemental", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}{U}{B}{R}{G}"); this.expansionSetCode = "CON"; this.subtype.add("Elemental"); - this.color.setBlack(true); - this.color.setBlue(true); - this.color.setGreen(true); - this.color.setRed(true); - this.color.setWhite(true); + + this.power = new MageInt(8); this.toughness = new MageInt(8); } diff --git a/Mage.Sets/src/mage/sets/conflux/GluttonousSlime.java b/Mage.Sets/src/mage/sets/conflux/GluttonousSlime.java index d577fb5cab0..0f3e5b66ad9 100644 --- a/Mage.Sets/src/mage/sets/conflux/GluttonousSlime.java +++ b/Mage.Sets/src/mage/sets/conflux/GluttonousSlime.java @@ -46,7 +46,7 @@ public class GluttonousSlime extends CardImpl { super(ownerId, 83, "Gluttonous Slime", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "CON"; this.subtype.add("Ooze"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/conflux/GoblinOutlander.java b/Mage.Sets/src/mage/sets/conflux/GoblinOutlander.java index b5d2ffa20a9..f7dfbfbbad3 100644 --- a/Mage.Sets/src/mage/sets/conflux/GoblinOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/GoblinOutlander.java @@ -52,8 +52,8 @@ public class GoblinOutlander extends CardImpl { public GoblinOutlander(UUID ownerId) { super(ownerId, 109, "Goblin Outlander", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}{R}"); this.expansionSetCode = "CON"; - this.color.setBlack(true); - this.color.setRed(true); + + this.subtype.add("Goblin"); this.subtype.add("Scout"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/conflux/GoblinRazerunners.java b/Mage.Sets/src/mage/sets/conflux/GoblinRazerunners.java index 354862ac0ca..7c68f3b80ad 100644 --- a/Mage.Sets/src/mage/sets/conflux/GoblinRazerunners.java +++ b/Mage.Sets/src/mage/sets/conflux/GoblinRazerunners.java @@ -61,7 +61,7 @@ public class GoblinRazerunners extends CardImpl { this.expansionSetCode = "CON"; this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/conflux/GrixisSlavedriver.java b/Mage.Sets/src/mage/sets/conflux/GrixisSlavedriver.java index f946bb10d1e..3710c6ace36 100644 --- a/Mage.Sets/src/mage/sets/conflux/GrixisSlavedriver.java +++ b/Mage.Sets/src/mage/sets/conflux/GrixisSlavedriver.java @@ -48,7 +48,7 @@ public class GrixisSlavedriver extends CardImpl { public GrixisSlavedriver(UUID ownerId) { super(ownerId, 46, "Grixis Slavedriver", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{5}{B}"); this.expansionSetCode = "CON"; - this.color.setBlack(true); + this.subtype.add("Zombie"); this.subtype.add("Giant"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java b/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java index 99a89754471..b4d33ca0521 100644 --- a/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java +++ b/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java @@ -52,7 +52,7 @@ public class HellsparkElemental extends CardImpl { super(ownerId, 65, "Hellspark Elemental", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.expansionSetCode = "CON"; this.subtype.add("Elemental"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/conflux/InfectiousHorror.java b/Mage.Sets/src/mage/sets/conflux/InfectiousHorror.java index eef86f5eeb3..ba0b3ee8593 100644 --- a/Mage.Sets/src/mage/sets/conflux/InfectiousHorror.java +++ b/Mage.Sets/src/mage/sets/conflux/InfectiousHorror.java @@ -52,7 +52,7 @@ public class InfectiousHorror extends CardImpl { this.expansionSetCode = "CON"; this.subtype.add("Zombie"); this.subtype.add("Horror"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new AttacksTriggeredAbility(new InfectiousHorrorEffect(), false)); diff --git a/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java b/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java index d3971d03a97..effa781ac5b 100644 --- a/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java +++ b/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java @@ -47,7 +47,7 @@ public class InkwellLeviathan extends CardImpl { super(ownerId, 30, "Inkwell Leviathan", Rarity.RARE, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{7}{U}{U}" ); this.expansionSetCode = "CON"; this.subtype.add("Leviathan"); - this.color.setBlue(true); + this.power = new MageInt(7); this.toughness = new MageInt(11); diff --git a/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java b/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java index 746b36ae2d3..608418d7828 100644 --- a/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java +++ b/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java @@ -29,8 +29,6 @@ package mage.sets.conflux; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -38,6 +36,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; /** * @@ -48,9 +48,8 @@ public class KnotvineMystic extends CardImpl{ public KnotvineMystic(UUID ownerId) { super(ownerId, 114, "Knotvine Mystic", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}{R}{G}"); this.expansionSetCode = "CON"; - this.color.setRed(true); - this.color.setGreen(true); - this.color.setWhite(true); + + this.subtype.add("Elf"); this.subtype.add("Druid"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/conflux/Kranioceros.java b/Mage.Sets/src/mage/sets/conflux/Kranioceros.java index b02cdda928a..aa0754f3d1c 100644 --- a/Mage.Sets/src/mage/sets/conflux/Kranioceros.java +++ b/Mage.Sets/src/mage/sets/conflux/Kranioceros.java @@ -49,7 +49,7 @@ public class Kranioceros extends CardImpl { super(ownerId, 67, "Kranioceros", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{R}"); this.expansionSetCode = "CON"; this.subtype.add("Beast"); - this.color.setRed(true); + this.power = new MageInt(5); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/conflux/MartialCoup.java b/Mage.Sets/src/mage/sets/conflux/MartialCoup.java index 6aea8deaa23..3344214c170 100644 --- a/Mage.Sets/src/mage/sets/conflux/MartialCoup.java +++ b/Mage.Sets/src/mage/sets/conflux/MartialCoup.java @@ -50,7 +50,7 @@ public class MartialCoup extends CardImpl { public MartialCoup(UUID ownerId) { super(ownerId, 11, "Martial Coup", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{W}{W}"); this.expansionSetCode = "CON"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new MartialCoupEffect()); } diff --git a/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java b/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java index 064eab53e37..61478fcf5aa 100644 --- a/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java +++ b/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java @@ -54,7 +54,7 @@ public class MoltenFrame extends CardImpl { public MoltenFrame(UUID ownerId) { super(ownerId, 69, "Molten Frame", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "CON"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); diff --git a/Mage.Sets/src/mage/sets/conflux/NacatlOutlander.java b/Mage.Sets/src/mage/sets/conflux/NacatlOutlander.java index 680c40d27a8..ba5b9501a83 100644 --- a/Mage.Sets/src/mage/sets/conflux/NacatlOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/NacatlOutlander.java @@ -52,8 +52,8 @@ public class NacatlOutlander extends CardImpl { public NacatlOutlander(UUID ownerId) { super(ownerId, 119, "Nacatl Outlander", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{R}{G}"); this.expansionSetCode = "CON"; - this.color.setRed(true); - this.color.setGreen(true); + + this.subtype.add("Cat"); this.subtype.add("Scout"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java b/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java index 39152435de9..d7e54b1d4d4 100644 --- a/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java +++ b/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java @@ -48,7 +48,7 @@ public class NobleHierarch extends CardImpl { public NobleHierarch(UUID ownerId) { super(ownerId, 87, "Noble Hierarch", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "CON"; - this.color.setGreen(true); + this.subtype.add("Human"); this.subtype.add("Druid"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java b/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java index 73d57324d7e..a3f0102ee92 100644 --- a/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java +++ b/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java @@ -53,7 +53,7 @@ public class PestilentKathari extends CardImpl { this.expansionSetCode = "CON"; this.subtype.add("Bird"); this.subtype.add("Warrior"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/conflux/RakkaMar.java b/Mage.Sets/src/mage/sets/conflux/RakkaMar.java index 56672857e83..7b3c09ea7c0 100644 --- a/Mage.Sets/src/mage/sets/conflux/RakkaMar.java +++ b/Mage.Sets/src/mage/sets/conflux/RakkaMar.java @@ -56,7 +56,7 @@ public class RakkaMar extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(HasteAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java b/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java index 4abe718dc0a..9060f2e7712 100644 --- a/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java +++ b/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java @@ -46,8 +46,8 @@ public class RhoxBodyguard extends CardImpl { public RhoxBodyguard(UUID ownerId) { super(ownerId, 122, "Rhox Bodyguard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{W}"); this.expansionSetCode = "CON"; - this.color.setGreen(true); - this.color.setWhite(true); + + this.subtype.add("Rhino"); this.subtype.add("Monk"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/sets/conflux/RhoxMeditant.java b/Mage.Sets/src/mage/sets/conflux/RhoxMeditant.java index 6f88dc56ac6..f181e13bd48 100644 --- a/Mage.Sets/src/mage/sets/conflux/RhoxMeditant.java +++ b/Mage.Sets/src/mage/sets/conflux/RhoxMeditant.java @@ -61,7 +61,6 @@ public class RhoxMeditant extends CardImpl { this.subtype.add("Rhino"); this.subtype.add("Monk"); - this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java b/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java index a105b58888f..958ba5434ee 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java +++ b/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java @@ -28,9 +28,7 @@ package mage.sets.conflux; -import mage.constants.CardType; -import mage.constants.Rarity; -import mage.constants.Zone; +import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +36,12 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetControlledCreaturePermanent; -import java.util.UUID; - /** * * @author Loki @@ -52,9 +51,8 @@ public class ScarlandThrinax extends CardImpl { public ScarlandThrinax(UUID ownerId) { super(ownerId, 123, "Scarland Thrinax", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{B}{R}{G}"); this.expansionSetCode = "CON"; - this.color.setBlack(true); - this.color.setRed(true); - this.color.setGreen(true); + + this.subtype.add("Lizard"); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java b/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java index 8a69bcfb655..f33f0b2ff95 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java +++ b/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java @@ -48,7 +48,7 @@ public class ScepterOfDominance extends CardImpl { public ScepterOfDominance(UUID ownerId) { super(ownerId, 17, "Scepter of Dominance", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{1}{W}{W}"); this.expansionSetCode = "CON"; - this.color.setWhite(true); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java b/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java index 12af2cf8ac2..9b02e364b20 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java +++ b/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java @@ -47,7 +47,7 @@ public class ScepterOfInsight extends CardImpl { public ScepterOfInsight(UUID ownerId) { super(ownerId, 33, "Scepter of Insight", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{1}{U}{U}"); this.expansionSetCode = "CON"; - this.color.setBlue(true); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{3}{U}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/conflux/SedraxisAlchemist.java b/Mage.Sets/src/mage/sets/conflux/SedraxisAlchemist.java index aa99ca8316a..d00f7817bf3 100644 --- a/Mage.Sets/src/mage/sets/conflux/SedraxisAlchemist.java +++ b/Mage.Sets/src/mage/sets/conflux/SedraxisAlchemist.java @@ -62,7 +62,6 @@ public class SedraxisAlchemist extends CardImpl { this.subtype.add("Zombie"); 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/conflux/SigilOfTheEmptyThrone.java b/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java index 3674390f4b6..a64d635c7e1 100644 --- a/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java +++ b/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java @@ -53,7 +53,7 @@ public class SigilOfTheEmptyThrone extends CardImpl { public SigilOfTheEmptyThrone(UUID ownerId) { super(ownerId, 18, "Sigil of the Empty Throne", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}{W}"); this.expansionSetCode = "CON"; - this.color.setWhite(true); + this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new AngelToken()), filter, false)); } diff --git a/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java b/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java index c4b249b0489..9726bdfd035 100644 --- a/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java +++ b/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java @@ -49,7 +49,7 @@ public class SoulsMajesty extends CardImpl { public SoulsMajesty(UUID ownerId) { super(ownerId, 92, "Soul's Majesty", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{G}"); this.expansionSetCode = "CON"; - this.color.setGreen(true); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addEffect(new SoulsMajestyEffect()); } diff --git a/Mage.Sets/src/mage/sets/conflux/Thornling.java b/Mage.Sets/src/mage/sets/conflux/Thornling.java index ac260ccdc02..9c44b7f14ef 100644 --- a/Mage.Sets/src/mage/sets/conflux/Thornling.java +++ b/Mage.Sets/src/mage/sets/conflux/Thornling.java @@ -53,7 +53,7 @@ public class Thornling extends CardImpl { public Thornling(UUID ownerId) { super(ownerId, 95, "Thornling", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "CON"; - this.color.setGreen(true); + this.subtype.add("Elemental"); this.subtype.add("Shapeshifter"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java b/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java index f575898ccb7..deb96b72e2c 100644 --- a/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java +++ b/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java @@ -46,7 +46,7 @@ public class TukatongueThallid extends CardImpl { public TukatongueThallid(UUID ownerId) { super(ownerId, 96, "Tukatongue Thallid", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "CON"; - this.color.setGreen(true); + this.subtype.add("Fungus"); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java b/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java index 1dddf35083b..798b627731c 100644 --- a/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java @@ -52,8 +52,8 @@ public class ValeronOutlander extends CardImpl { public ValeronOutlander(UUID ownerId) { super(ownerId, 130, "Valeron Outlander", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}{W}"); this.expansionSetCode = "CON"; - this.color.setGreen(true); - this.color.setWhite(true); + + this.subtype.add("Human"); this.subtype.add("Scout"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java b/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java index 12cd0dd5c4a..5c870cf5805 100644 --- a/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java +++ b/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java @@ -43,7 +43,7 @@ public class ValiantGuard extends CardImpl { public ValiantGuard(UUID ownerId) { super(ownerId, 19, "Valiant Guard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); this.expansionSetCode = "CON"; - this.color.setWhite(true); + this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/conflux/VectisAgents.java b/Mage.Sets/src/mage/sets/conflux/VectisAgents.java index 9ed49185776..8f72c2c44aa 100644 --- a/Mage.Sets/src/mage/sets/conflux/VectisAgents.java +++ b/Mage.Sets/src/mage/sets/conflux/VectisAgents.java @@ -50,8 +50,8 @@ public class VectisAgents extends CardImpl { public VectisAgents(UUID ownerId) { super(ownerId, 131, "Vectis Agents", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}{U}{B}"); this.expansionSetCode = "CON"; - this.color.setBlue(true); - this.color.setBlack(true); + + this.subtype.add("Human"); this.subtype.add("Rogue"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java b/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java index 38f4d0531fd..f6113344b36 100644 --- a/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java @@ -52,8 +52,8 @@ public class VedalkenOutlander extends CardImpl { public VedalkenOutlander(UUID ownerId) { super(ownerId, 132, "Vedalken Outlander", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{W}{U}"); this.expansionSetCode = "CON"; - this.color.setWhite(true); - this.color.setBlue(true); + + this.subtype.add("Vedalken"); this.subtype.add("Scout"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/conflux/WallOfReverence.java b/Mage.Sets/src/mage/sets/conflux/WallOfReverence.java index d74cae22cb0..85f4643e9e1 100644 --- a/Mage.Sets/src/mage/sets/conflux/WallOfReverence.java +++ b/Mage.Sets/src/mage/sets/conflux/WallOfReverence.java @@ -56,7 +56,7 @@ public class WallOfReverence extends CardImpl { this.expansionSetCode = "CON"; this.subtype.add("Spirit"); this.subtype.add("Wall"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(6); this.addAbility(DefenderAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java b/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java index c59f7a9caa8..b924d2832f0 100644 --- a/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java @@ -52,8 +52,8 @@ public class ZombieOutlander extends CardImpl { public ZombieOutlander(UUID ownerId) { super(ownerId, 133, "Zombie Outlander", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}{B}"); this.expansionSetCode = "CON"; - this.color.setBlack(true); - this.color.setBlue(true); + + this.subtype.add("Zombie"); this.subtype.add("Scout"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/conspiracy/AcademyElite.java b/Mage.Sets/src/mage/sets/conspiracy/AcademyElite.java index 26d579bb9ef..4889f2165e9 100644 --- a/Mage.Sets/src/mage/sets/conspiracy/AcademyElite.java +++ b/Mage.Sets/src/mage/sets/conspiracy/AcademyElite.java @@ -62,7 +62,7 @@ public class AcademyElite extends CardImpl { this.expansionSetCode = "CNS"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/darkascension/ArchdemonOfGreed.java b/Mage.Sets/src/mage/sets/darkascension/ArchdemonOfGreed.java index 10245e13be7..42fc893a116 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ArchdemonOfGreed.java +++ b/Mage.Sets/src/mage/sets/darkascension/ArchdemonOfGreed.java @@ -28,9 +28,6 @@ package mage.sets.darkascension; import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; @@ -38,7 +35,9 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.Rarity; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -66,7 +65,6 @@ public class ArchdemonOfGreed extends CardImpl { super(ownerId, 71, "Archdemon of Greed", Rarity.RARE, new CardType[]{CardType.CREATURE}, ""); this.expansionSetCode = "DKA"; this.subtype.add("Demon"); - this.color.setBlack(true); this.nightCard = true; this.canTransform = true; diff --git a/Mage.Sets/src/mage/sets/darksteel/AuriokGlaivemaster.java b/Mage.Sets/src/mage/sets/darksteel/AuriokGlaivemaster.java index 7990186a525..0ffacee69d4 100644 --- a/Mage.Sets/src/mage/sets/darksteel/AuriokGlaivemaster.java +++ b/Mage.Sets/src/mage/sets/darksteel/AuriokGlaivemaster.java @@ -28,10 +28,6 @@ package mage.sets.darksteel; import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Rarity; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedCondition; @@ -40,7 +36,10 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; /** * @@ -56,7 +55,6 @@ public class AuriokGlaivemaster 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/darksteel/CrazedGoblin.java b/Mage.Sets/src/mage/sets/darksteel/CrazedGoblin.java index 367d728b33d..15cbe956741 100644 --- a/Mage.Sets/src/mage/sets/darksteel/CrazedGoblin.java +++ b/Mage.Sets/src/mage/sets/darksteel/CrazedGoblin.java @@ -46,7 +46,7 @@ public class CrazedGoblin extends CardImpl { this.expansionSetCode = "DST"; this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new AttacksEachTurnStaticAbility()); diff --git a/Mage.Sets/src/mage/sets/darksteel/EssenceDrain.java b/Mage.Sets/src/mage/sets/darksteel/EssenceDrain.java index f1d8421a6f1..8c26eb1c6e8 100644 --- a/Mage.Sets/src/mage/sets/darksteel/EssenceDrain.java +++ b/Mage.Sets/src/mage/sets/darksteel/EssenceDrain.java @@ -45,7 +45,7 @@ public class EssenceDrain extends CardImpl { public EssenceDrain (UUID ownerId) { super(ownerId, 43, "Essence Drain", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{B}"); this.expansionSetCode = "DST"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new GainLifeEffect(3)); diff --git a/Mage.Sets/src/mage/sets/darksteel/GrimclawBats.java b/Mage.Sets/src/mage/sets/darksteel/GrimclawBats.java index f171c72aa26..3f7b0c0cf17 100644 --- a/Mage.Sets/src/mage/sets/darksteel/GrimclawBats.java +++ b/Mage.Sets/src/mage/sets/darksteel/GrimclawBats.java @@ -49,7 +49,7 @@ public class GrimclawBats extends CardImpl { super(ownerId, 45, "Grimclaw Bats", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.expansionSetCode = "DST"; this.subtype.add("Bat"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java b/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java index 4f4588d1424..f4cc4c92e8a 100644 --- a/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java +++ b/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java @@ -52,7 +52,7 @@ public class KrarkClanStoker extends CardImpl { this.expansionSetCode = "DST"; 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/darksteel/LastWord.java b/Mage.Sets/src/mage/sets/darksteel/LastWord.java index 57a10603b11..05751ab5743 100644 --- a/Mage.Sets/src/mage/sets/darksteel/LastWord.java +++ b/Mage.Sets/src/mage/sets/darksteel/LastWord.java @@ -45,7 +45,7 @@ public class LastWord extends CardImpl { public LastWord (UUID ownerId) { super(ownerId, 23, "Last Word", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); this.expansionSetCode = "DST"; - this.color.setBlue(true); + this.addAbility(new CantBeCounteredAbility()); this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/darksteel/LoxodonMystic.java b/Mage.Sets/src/mage/sets/darksteel/LoxodonMystic.java index cdcc5270a5a..c4fb8f5ec8b 100644 --- a/Mage.Sets/src/mage/sets/darksteel/LoxodonMystic.java +++ b/Mage.Sets/src/mage/sets/darksteel/LoxodonMystic.java @@ -53,7 +53,7 @@ public class LoxodonMystic extends CardImpl { this.expansionSetCode = "DST"; this.subtype.add("Elephant"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); diff --git a/Mage.Sets/src/mage/sets/darksteel/MagneticFlux.java b/Mage.Sets/src/mage/sets/darksteel/MagneticFlux.java index e5097a199f7..6f2bc6a6dbb 100644 --- a/Mage.Sets/src/mage/sets/darksteel/MagneticFlux.java +++ b/Mage.Sets/src/mage/sets/darksteel/MagneticFlux.java @@ -54,7 +54,7 @@ public class MagneticFlux extends CardImpl { public MagneticFlux(UUID ownerId) { super(ownerId, 25, "Magnetic Flux", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "DST"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.EndOfTurn, filter, false)); } diff --git a/Mage.Sets/src/mage/sets/darksteel/NeurokProdigy.java b/Mage.Sets/src/mage/sets/darksteel/NeurokProdigy.java index 66bb74fe3ff..fe75b36e2fa 100644 --- a/Mage.Sets/src/mage/sets/darksteel/NeurokProdigy.java +++ b/Mage.Sets/src/mage/sets/darksteel/NeurokProdigy.java @@ -59,7 +59,7 @@ public class NeurokProdigy extends CardImpl { this.expansionSetCode = "DST"; 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/darksteel/Nourish.java b/Mage.Sets/src/mage/sets/darksteel/Nourish.java index d3068abc3be..fb91dbe40a3 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Nourish.java +++ b/Mage.Sets/src/mage/sets/darksteel/Nourish.java @@ -43,7 +43,7 @@ public class Nourish extends CardImpl { public Nourish (UUID ownerId) { super(ownerId, 78, "Nourish", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}{G}"); this.expansionSetCode = "DST"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new GainLifeEffect(6)); } diff --git a/Mage.Sets/src/mage/sets/darksteel/Oxidize.java b/Mage.Sets/src/mage/sets/darksteel/Oxidize.java index b42c5842709..a0d075f0923 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Oxidize.java +++ b/Mage.Sets/src/mage/sets/darksteel/Oxidize.java @@ -52,7 +52,7 @@ public class Oxidize extends CardImpl { public Oxidize(UUID ownerId) { super(ownerId, 79, "Oxidize", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "DST"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java b/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java index 4e237278601..20bd14ac3da 100644 --- a/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java +++ b/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java @@ -59,7 +59,7 @@ public class PteronGhost extends CardImpl { super(ownerId, 10, "Pteron Ghost", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "DST"; this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/darksteel/ScavengingScarab.java b/Mage.Sets/src/mage/sets/darksteel/ScavengingScarab.java index cdf6648acf9..6624e6c3ef5 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ScavengingScarab.java +++ b/Mage.Sets/src/mage/sets/darksteel/ScavengingScarab.java @@ -45,7 +45,7 @@ public class ScavengingScarab extends CardImpl { super(ownerId, 51, "Scavenging Scarab", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "DST"; this.subtype.add("Insect"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new CantBlockAbility()); diff --git a/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java b/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java index 40c2282c9d9..b2a4cb87888 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java +++ b/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java @@ -67,7 +67,7 @@ public class SlobadGoblinTinkerer extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Goblin"); this.subtype.add("Artificer"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/darksteel/Soulscour.java b/Mage.Sets/src/mage/sets/darksteel/Soulscour.java index d1220d07b55..96d96766237 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Soulscour.java +++ b/Mage.Sets/src/mage/sets/darksteel/Soulscour.java @@ -52,7 +52,7 @@ public class Soulscour extends CardImpl { public Soulscour (UUID ownerId) { super(ownerId, 14, "Soulscour", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{7}{W}{W}{W}"); this.expansionSetCode = "DST"; - this.color.setWhite(true); + // Destroy all nonartifact permanents. this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/darksteel/SteelshaperApprentice.java b/Mage.Sets/src/mage/sets/darksteel/SteelshaperApprentice.java index eeddb75a41a..f45923cdddb 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SteelshaperApprentice.java +++ b/Mage.Sets/src/mage/sets/darksteel/SteelshaperApprentice.java @@ -64,7 +64,7 @@ public class SteelshaperApprentice extends CardImpl { this.expansionSetCode = "DST"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/darksteel/TangleSpider.java b/Mage.Sets/src/mage/sets/darksteel/TangleSpider.java index 8f73b615db1..681bbbd01ec 100644 --- a/Mage.Sets/src/mage/sets/darksteel/TangleSpider.java +++ b/Mage.Sets/src/mage/sets/darksteel/TangleSpider.java @@ -46,7 +46,7 @@ public class TangleSpider extends CardImpl { super(ownerId, 85, "Tangle Spider", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); this.expansionSetCode = "DST"; this.subtype.add("Spider"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/darksteel/ViridianAcolyte.java b/Mage.Sets/src/mage/sets/darksteel/ViridianAcolyte.java index 7cc6536403f..728cd5157fe 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ViridianAcolyte.java +++ b/Mage.Sets/src/mage/sets/darksteel/ViridianAcolyte.java @@ -49,7 +49,7 @@ public class ViridianAcolyte extends CardImpl { this.expansionSetCode = "DST"; this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new AnyColorManaAbility(new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java b/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java index 731850a4c8d..ba3372745f9 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java +++ b/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java @@ -63,7 +63,7 @@ public class ViridianZealot extends CardImpl { this.expansionSetCode = "DST"; this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{G}")); diff --git a/Mage.Sets/src/mage/sets/dissension/BeaconHawk.java b/Mage.Sets/src/mage/sets/dissension/BeaconHawk.java index 9a0d2e5fcb9..f41071f5fbf 100644 --- a/Mage.Sets/src/mage/sets/dissension/BeaconHawk.java +++ b/Mage.Sets/src/mage/sets/dissension/BeaconHawk.java @@ -51,7 +51,7 @@ public class BeaconHawk extends CardImpl { super(ownerId, 3, "Beacon Hawk", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "DIS"; this.subtype.add("Bird"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/dissension/CacklingFlames.java b/Mage.Sets/src/mage/sets/dissension/CacklingFlames.java index 7d1c101b929..072406c62cc 100644 --- a/Mage.Sets/src/mage/sets/dissension/CacklingFlames.java +++ b/Mage.Sets/src/mage/sets/dissension/CacklingFlames.java @@ -47,7 +47,7 @@ public class CacklingFlames extends CardImpl { super(ownerId, 59, "Cackling Flames", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{R}"); this.expansionSetCode = "DIS"; - this.color.setRed(true); + // Cackling Flames deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( diff --git a/Mage.Sets/src/mage/sets/dissension/CelestialAncient.java b/Mage.Sets/src/mage/sets/dissension/CelestialAncient.java index aa7f06b4352..f56249a4dfb 100644 --- a/Mage.Sets/src/mage/sets/dissension/CelestialAncient.java +++ b/Mage.Sets/src/mage/sets/dissension/CelestialAncient.java @@ -54,7 +54,7 @@ public class CelestialAncient extends CardImpl { super(ownerId, 7, "Celestial Ancient", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); this.expansionSetCode = "DIS"; 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/dissension/Demonfire.java b/Mage.Sets/src/mage/sets/dissension/Demonfire.java index 55e91901dfb..02484480095 100644 --- a/Mage.Sets/src/mage/sets/dissension/Demonfire.java +++ b/Mage.Sets/src/mage/sets/dissension/Demonfire.java @@ -55,7 +55,7 @@ public class Demonfire extends CardImpl { super(ownerId, 60, "Demonfire", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{R}"); this.expansionSetCode = "DIS"; - this.color.setRed(true); + // Demonfire deals X damage to target creature or player. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( diff --git a/Mage.Sets/src/mage/sets/dissension/FlaringFlameKin.java b/Mage.Sets/src/mage/sets/dissension/FlaringFlameKin.java index 02bc3913601..c8b77cfc298 100644 --- a/Mage.Sets/src/mage/sets/dissension/FlaringFlameKin.java +++ b/Mage.Sets/src/mage/sets/dissension/FlaringFlameKin.java @@ -28,10 +28,6 @@ package mage.sets.dissension; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Rarity; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +39,10 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; /** * @@ -60,7 +60,6 @@ public class FlaringFlameKin extends CardImpl { this.subtype.add("Elemental"); 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/dissension/HaazdaExonerator.java b/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java index 0b3b806fab6..8bbfb184cb9 100644 --- a/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java +++ b/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java @@ -60,7 +60,7 @@ public class HaazdaExonerator extends CardImpl { this.expansionSetCode = "DIS"; this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java b/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java index 43e963a19b8..ab3cfcce029 100644 --- a/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java +++ b/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java @@ -58,7 +58,7 @@ public class IndrikStomphowler extends CardImpl { super(ownerId, 86, "Indrik Stomphowler", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "DIS"; this.subtype.add("Beast"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); diff --git a/Mage.Sets/src/mage/sets/dissension/MinisterOfImpediments.java b/Mage.Sets/src/mage/sets/dissension/MinisterOfImpediments.java index 2ec6770bf09..b0f01673240 100644 --- a/Mage.Sets/src/mage/sets/dissension/MinisterOfImpediments.java +++ b/Mage.Sets/src/mage/sets/dissension/MinisterOfImpediments.java @@ -51,8 +51,8 @@ public class MinisterOfImpediments extends CardImpl { this.expansionSetCode = "DIS"; this.subtype.add("Human"); this.subtype.add("Advisor"); - this.color.setBlue(true); - this.color.setWhite(true); + + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/dissension/ProclamationOfRebirth.java b/Mage.Sets/src/mage/sets/dissension/ProclamationOfRebirth.java index ac245708ce3..5a1cf3711a1 100644 --- a/Mage.Sets/src/mage/sets/dissension/ProclamationOfRebirth.java +++ b/Mage.Sets/src/mage/sets/dissension/ProclamationOfRebirth.java @@ -55,8 +55,6 @@ public class ProclamationOfRebirth extends CardImpl { super(ownerId, 15, "Proclamation of Rebirth", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{W}"); this.expansionSetCode = "DIS"; - this.color.setWhite(true); - // Return up to three target creature cards with converted mana cost 1 or less from your graveyard to the battlefield. this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(0,3,filter3)); this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/dissension/RakdosPitDragon.java b/Mage.Sets/src/mage/sets/dissension/RakdosPitDragon.java index d49cda917c2..d1a801beb65 100644 --- a/Mage.Sets/src/mage/sets/dissension/RakdosPitDragon.java +++ b/Mage.Sets/src/mage/sets/dissension/RakdosPitDragon.java @@ -55,7 +55,7 @@ public class RakdosPitDragon extends CardImpl { super(ownerId, 69, "Rakdos Pit Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); this.expansionSetCode = "DIS"; this.subtype.add("Dragon"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); // {R}{R}: Rakdos Pit Dragon gains flying until end of turn. diff --git a/Mage.Sets/src/mage/sets/dissension/RiotSpikes.java b/Mage.Sets/src/mage/sets/dissension/RiotSpikes.java index 6b2ed2ae039..7fd5deb71b7 100644 --- a/Mage.Sets/src/mage/sets/dissension/RiotSpikes.java +++ b/Mage.Sets/src/mage/sets/dissension/RiotSpikes.java @@ -49,8 +49,8 @@ public class RiotSpikes extends CardImpl { super(ownerId, 146, "Riot Spikes", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{B/R}"); this.expansionSetCode = "DIS"; this.subtype.add("Aura"); - this.color.setRed(true); - this.color.setBlack(true); + + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java b/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java index ccc025dfe80..38c2ed89396 100644 --- a/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java +++ b/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java @@ -57,7 +57,7 @@ public class SealOfDoom extends CardImpl { public SealOfDoom(UUID ownerId) { super(ownerId, 53, "Seal of Doom", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "DIS"; - this.color.setBlack(true); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/AEtherling.java b/Mage.Sets/src/mage/sets/dragonsmaze/AEtherling.java index 9fa3b9f5a36..e0f87fb4b96 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/AEtherling.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/AEtherling.java @@ -60,7 +60,7 @@ public class AEtherling extends CardImpl { super(ownerId, 11, "AEtherling", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); this.expansionSetCode = "DGM"; this.subtype.add("Shapeshifter"); - this.color.setBlue(true); + this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ArmoredWolfRider.java b/Mage.Sets/src/mage/sets/dragonsmaze/ArmoredWolfRider.java index 96026ad9597..d841a1e9a96 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ArmoredWolfRider.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ArmoredWolfRider.java @@ -47,8 +47,8 @@ public class ArmoredWolfRider extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Elf"); this.subtype.add("Knight"); - this.color.setGreen(true); - this.color.setWhite(true); + + this.power = new MageInt(4); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/AscendedLawmage.java b/Mage.Sets/src/mage/sets/dragonsmaze/AscendedLawmage.java index 88fc5b3bb8c..56047f7af49 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/AscendedLawmage.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/AscendedLawmage.java @@ -49,8 +49,8 @@ public class AscendedLawmage extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Vedalken"); this.subtype.add("Wizard"); - this.color.setWhite(true); - this.color.setBlue(true); + + this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/AweForTheGuilds.java b/Mage.Sets/src/mage/sets/dragonsmaze/AweForTheGuilds.java index 3be9677781c..bbe6c0fc447 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/AweForTheGuilds.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/AweForTheGuilds.java @@ -54,7 +54,7 @@ public class AweForTheGuilds extends CardImpl { public AweForTheGuilds(UUID ownerId) { super(ownerId, 31, "Awe for the Guilds", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "DGM"; - this.color.setRed(true); + // Monocolored creatures can't block this turn. this.getSpellAbility().addEffect(new CantBlockAllEffect(filter, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BaneAlleyBlackguard.java b/Mage.Sets/src/mage/sets/dragonsmaze/BaneAlleyBlackguard.java index de96c47b569..a50e0e7438e 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BaneAlleyBlackguard.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BaneAlleyBlackguard.java @@ -47,7 +47,7 @@ public class BaneAlleyBlackguard extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BatteringKrasis.java b/Mage.Sets/src/mage/sets/dragonsmaze/BatteringKrasis.java index d450fd37e38..083e7392e09 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BatteringKrasis.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BatteringKrasis.java @@ -49,7 +49,7 @@ public class BatteringKrasis extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Fish"); this.subtype.add("Beast"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BeetleformMage.java b/Mage.Sets/src/mage/sets/dragonsmaze/BeetleformMage.java index fdc98dadfd8..e9e7084d0b6 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BeetleformMage.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BeetleformMage.java @@ -56,8 +56,8 @@ public class BeetleformMage extends CardImpl { this.subtype.add("Human"); this.subtype.add("Insect"); 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/dragonsmaze/BlazeCommando.java b/Mage.Sets/src/mage/sets/dragonsmaze/BlazeCommando.java index f728094c195..cc64ee14378 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BlazeCommando.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BlazeCommando.java @@ -62,8 +62,8 @@ public class BlazeCommando extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Minotaur"); this.subtype.add("Soldier"); - this.color.setRed(true); - this.color.setWhite(true); + + this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BloodBaronOfVizkopa.java b/Mage.Sets/src/mage/sets/dragonsmaze/BloodBaronOfVizkopa.java index 794af59b736..24af9bc9355 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BloodBaronOfVizkopa.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BloodBaronOfVizkopa.java @@ -71,8 +71,8 @@ public class BloodBaronOfVizkopa extends CardImpl { super(ownerId, 57, "Blood Baron of Vizkopa", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{3}{W}{B}"); this.expansionSetCode = "DGM"; this.subtype.add("Vampire"); - 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/dragonsmaze/BloodScrivener.java b/Mage.Sets/src/mage/sets/dragonsmaze/BloodScrivener.java index c59127171dc..80f7f046dc6 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BloodScrivener.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BloodScrivener.java @@ -57,7 +57,7 @@ public class BloodScrivener extends CardImpl { this.expansionSetCode = "DGM"; 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/dragonsmaze/BorosBattleshaper.java b/Mage.Sets/src/mage/sets/dragonsmaze/BorosBattleshaper.java index ac20d90b731..37493cfd35c 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BorosBattleshaper.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BorosBattleshaper.java @@ -68,8 +68,8 @@ public class BorosBattleshaper extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Minotaur"); this.subtype.add("Soldier"); - this.color.setRed(true); - this.color.setWhite(true); + + this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BorosMastiff.java b/Mage.Sets/src/mage/sets/dragonsmaze/BorosMastiff.java index b168cf8caf9..b6f98b1b0a8 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BorosMastiff.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BorosMastiff.java @@ -50,7 +50,7 @@ public class BorosMastiff extends CardImpl { super(ownerId, 1, "Boros Mastiff", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "DGM"; 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/dragonsmaze/ClearAPath.java b/Mage.Sets/src/mage/sets/dragonsmaze/ClearAPath.java index c703226db2e..ab155f4418e 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ClearAPath.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ClearAPath.java @@ -55,7 +55,7 @@ public class ClearAPath extends CardImpl { public ClearAPath(UUID ownerId) { super(ownerId, 32, "Clear a Path", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "DGM"; - this.color.setRed(true); + // Destroy target creature with defender. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java b/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java index bd694552eaf..7d49f8ada0d 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java @@ -65,8 +65,8 @@ public class CouncilOfTheAbsolute extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Human"); this.subtype.add("Advisor"); - this.color.setWhite(true); - this.color.setBlue(true); + + this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/CryptIncursion.java b/Mage.Sets/src/mage/sets/dragonsmaze/CryptIncursion.java index 045bd40b579..a83ca2aec54 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/CryptIncursion.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/CryptIncursion.java @@ -52,7 +52,7 @@ public class CryptIncursion extends CardImpl { public CryptIncursion(UUID ownerId) { super(ownerId, 23, "Crypt Incursion", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "DGM"; - this.color.setBlack(true); + // Exile all creature cards from target player's graveyard. You gain 3 life for each card exiled this way. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/FatalFumes.java b/Mage.Sets/src/mage/sets/dragonsmaze/FatalFumes.java index e3f2ef3f3de..3254148f1ef 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/FatalFumes.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/FatalFumes.java @@ -47,7 +47,7 @@ public class FatalFumes extends CardImpl { public FatalFumes(UUID ownerId) { super(ownerId, 24, "Fatal Fumes", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{B}"); this.expansionSetCode = "DGM"; - this.color.setBlack(true); + // Target creature gets -4/-2 until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java b/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java index d4e1fa33fb5..e85fcdbd4e8 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java @@ -63,7 +63,7 @@ public class HaazdaSnareSquad extends CardImpl { this.expansionSetCode = "DGM"; 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/dragonsmaze/HiddenStrings.java b/Mage.Sets/src/mage/sets/dragonsmaze/HiddenStrings.java index 6c4e107f9ea..f10ce2e4e7c 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/HiddenStrings.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/HiddenStrings.java @@ -54,7 +54,7 @@ public class HiddenStrings extends CardImpl { public HiddenStrings(UUID ownerId) { super(ownerId, 12, "Hidden Strings", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{U}"); this.expansionSetCode = "DGM"; - this.color.setBlue(true); + // You may tap or untap target permanent, then you may tap or untap another target permanent this.getSpellAbility().addEffect(new HiddenStringsEffect()); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/HiredTorturer.java b/Mage.Sets/src/mage/sets/dragonsmaze/HiredTorturer.java index 58682b3992e..d20b586b75b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/HiredTorturer.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/HiredTorturer.java @@ -61,7 +61,7 @@ public class HiredTorturer extends CardImpl { this.expansionSetCode = "DGM"; 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/dragonsmaze/KraulWarrior.java b/Mage.Sets/src/mage/sets/dragonsmaze/KraulWarrior.java index 77e85b1bf27..1e39ce2fcf1 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/KraulWarrior.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/KraulWarrior.java @@ -52,7 +52,7 @@ public class KraulWarrior extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Insect"); 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/dragonsmaze/LaviniaOfTheTenth.java b/Mage.Sets/src/mage/sets/dragonsmaze/LaviniaOfTheTenth.java index eabbd56770d..6bb3bac497a 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/LaviniaOfTheTenth.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/LaviniaOfTheTenth.java @@ -71,8 +71,8 @@ public class LaviniaOfTheTenth extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); this.supertype.add("Legendary"); - 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/dragonsmaze/LyevDecree.java b/Mage.Sets/src/mage/sets/dragonsmaze/LyevDecree.java index 53474c93255..b0b914be2fa 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/LyevDecree.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/LyevDecree.java @@ -56,7 +56,7 @@ public class LyevDecree extends CardImpl { public LyevDecree(UUID ownerId) { super(ownerId, 3, "Lyev Decree", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{W}"); this.expansionSetCode = "DGM"; - this.color.setWhite(true); + // Detain up to two target creatures your opponent controls. this.getSpellAbility().addEffect(new DetainTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MazeAbomination.java b/Mage.Sets/src/mage/sets/dragonsmaze/MazeAbomination.java index 2ed3378d469..482f48d4cd7 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MazeAbomination.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MazeAbomination.java @@ -58,7 +58,7 @@ public class MazeAbomination extends CardImpl { super(ownerId, 26, "Maze Abomination", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{B}"); this.expansionSetCode = "DGM"; this.subtype.add("Elemental"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MazeBehemoth.java b/Mage.Sets/src/mage/sets/dragonsmaze/MazeBehemoth.java index fa9ae5540d1..6437afb1391 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MazeBehemoth.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MazeBehemoth.java @@ -58,7 +58,7 @@ public class MazeBehemoth extends CardImpl { super(ownerId, 43, "Maze Behemoth", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{G}"); this.expansionSetCode = "DGM"; this.subtype.add("Elemental"); - this.color.setGreen(true); + this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MazeGlider.java b/Mage.Sets/src/mage/sets/dragonsmaze/MazeGlider.java index 07e33f54a25..12312b40100 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MazeGlider.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MazeGlider.java @@ -58,7 +58,7 @@ public class MazeGlider extends CardImpl { super(ownerId, 13, "Maze Glider", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{U}"); this.expansionSetCode = "DGM"; this.subtype.add("Elemental"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MazeRusher.java b/Mage.Sets/src/mage/sets/dragonsmaze/MazeRusher.java index ae3bac7e622..46a03dc7b07 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MazeRusher.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MazeRusher.java @@ -58,7 +58,7 @@ public class MazeRusher extends CardImpl { super(ownerId, 33, "Maze Rusher", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{R}"); this.expansionSetCode = "DGM"; this.subtype.add("Elemental"); - this.color.setRed(true); + this.power = new MageInt(6); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MazeSentinel.java b/Mage.Sets/src/mage/sets/dragonsmaze/MazeSentinel.java index 89ac2e2f940..02bb4c3a00e 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MazeSentinel.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MazeSentinel.java @@ -58,7 +58,7 @@ public class MazeSentinel extends CardImpl { super(ownerId, 4, "Maze Sentinel", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{W}"); this.expansionSetCode = "DGM"; this.subtype.add("Elemental"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MendingTouch.java b/Mage.Sets/src/mage/sets/dragonsmaze/MendingTouch.java index c66526bad73..4c776401cb8 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MendingTouch.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MendingTouch.java @@ -46,7 +46,7 @@ public class MendingTouch extends CardImpl { public MendingTouch(UUID ownerId) { super(ownerId, 44, "Mending Touch", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "DGM"; - this.color.setGreen(true); + // Regenerate target creature. this.getSpellAbility().addEffect(new RegenerateTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/Mindstatic.java b/Mage.Sets/src/mage/sets/dragonsmaze/Mindstatic.java index 0e7d30d4555..8ad525ba735 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/Mindstatic.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/Mindstatic.java @@ -47,7 +47,7 @@ public class Mindstatic extends CardImpl { public Mindstatic(UUID ownerId) { super(ownerId, 14, "Mindstatic", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "DGM"; - this.color.setBlue(true); + // Counter target spell unless it's controller pays {6}. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MirkoVoskMindDrinker.java b/Mage.Sets/src/mage/sets/dragonsmaze/MirkoVoskMindDrinker.java index 9168862caaa..b599da5ac5b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MirkoVoskMindDrinker.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MirkoVoskMindDrinker.java @@ -58,8 +58,8 @@ public class MirkoVoskMindDrinker extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Vampire"); this.supertype.add("Legendary"); - this.color.setBlue(true); - this.color.setBlack(true); + + this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MurmuringPhantasm.java b/Mage.Sets/src/mage/sets/dragonsmaze/MurmuringPhantasm.java index 81cbd31da2f..0446cc5a4b7 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MurmuringPhantasm.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MurmuringPhantasm.java @@ -47,7 +47,7 @@ public class MurmuringPhantasm extends CardImpl { super(ownerId, 15, "Murmuring Phantasm", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "DGM"; this.subtype.add("Spirit"); - this.color.setBlue(true); + this.power = new MageInt(0); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MutantsPrey.java b/Mage.Sets/src/mage/sets/dragonsmaze/MutantsPrey.java index 36fc7354732..9a9bc3ac10f 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MutantsPrey.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MutantsPrey.java @@ -60,7 +60,7 @@ public class MutantsPrey extends CardImpl { public MutantsPrey(UUID ownerId) { super(ownerId, 45, "Mutant's Prey", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "DGM"; - this.color.setGreen(true); + // Target creature you control with a +1/+1 counter on it fights target creature an opponent controls. this.getSpellAbility().addEffect(new FightTargetsEffect()); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/OpalLakeGatekeepers.java b/Mage.Sets/src/mage/sets/dragonsmaze/OpalLakeGatekeepers.java index 8b2a73f4daf..cdac5d35357 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/OpalLakeGatekeepers.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/OpalLakeGatekeepers.java @@ -58,7 +58,7 @@ public class OpalLakeGatekeepers extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Vedalken"); 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/dragonsmaze/Phytoburst.java b/Mage.Sets/src/mage/sets/dragonsmaze/Phytoburst.java index 81f6aeee9fd..4a3adaed9bb 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/Phytoburst.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/Phytoburst.java @@ -48,7 +48,7 @@ public class Phytoburst extends CardImpl { public Phytoburst(UUID ownerId) { super(ownerId, 46, "Phytoburst", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "DGM"; - this.color.setGreen(true); + // Target creature gets +5/+5 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(5,5, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PontiffOfBlight.java b/Mage.Sets/src/mage/sets/dragonsmaze/PontiffOfBlight.java index 109d45c320f..d21b018c512 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/PontiffOfBlight.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/PontiffOfBlight.java @@ -63,7 +63,7 @@ public class PontiffOfBlight extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Zombie"); this.subtype.add("Cleric"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PunishTheEnemy.java b/Mage.Sets/src/mage/sets/dragonsmaze/PunishTheEnemy.java index cfba22d8f62..1d8c8ea7fab 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/PunishTheEnemy.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/PunishTheEnemy.java @@ -48,7 +48,7 @@ public class PunishTheEnemy extends CardImpl { public PunishTheEnemy(UUID ownerId) { super(ownerId, 35, "Punish the Enemy", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{4}{R}"); this.expansionSetCode = "DGM"; - this.color.setRed(true); + // Punish the Enemy deals 3 damage to target player and 3 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(3, true, "target player and 3 damage to target creature")); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PyrewildShaman.java b/Mage.Sets/src/mage/sets/dragonsmaze/PyrewildShaman.java index 08cd0ab14f1..a03b595e714 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/PyrewildShaman.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/PyrewildShaman.java @@ -62,7 +62,7 @@ public class PyrewildShaman extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Goblin"); 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/dragonsmaze/RakdosDrake.java b/Mage.Sets/src/mage/sets/dragonsmaze/RakdosDrake.java index 7b5515628ee..1462be5be5f 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RakdosDrake.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RakdosDrake.java @@ -59,7 +59,7 @@ public class RakdosDrake extends CardImpl { super(ownerId, 28, "Rakdos Drake", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "DGM"; this.subtype.add("Drake"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RenegadeKrasis.java b/Mage.Sets/src/mage/sets/dragonsmaze/RenegadeKrasis.java index efe0b4bead7..efafb1dac5b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RenegadeKrasis.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RenegadeKrasis.java @@ -58,7 +58,7 @@ public class RenegadeKrasis extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Beast"); 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/dragonsmaze/RiotControl.java b/Mage.Sets/src/mage/sets/dragonsmaze/RiotControl.java index 6b752befb35..327841ecaec 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RiotControl.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RiotControl.java @@ -57,7 +57,7 @@ public class RiotControl extends CardImpl { public RiotControl(UUID ownerId) { super(ownerId, 6, "Riot Control", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "DGM"; - this.color.setWhite(true); + // Gain 1 life for each creature your opponents control. Prevent all damage that would be dealt to you this turn. this.getSpellAbility().addEffect(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter))); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RiotPiker.java b/Mage.Sets/src/mage/sets/dragonsmaze/RiotPiker.java index 3a42713b0a9..b7debd74a83 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RiotPiker.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RiotPiker.java @@ -49,7 +49,7 @@ public class RiotPiker extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Goblin"); 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/dragonsmaze/RubblebeltMaaka.java b/Mage.Sets/src/mage/sets/dragonsmaze/RubblebeltMaaka.java index 7678fc89d87..766102d81a5 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RubblebeltMaaka.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RubblebeltMaaka.java @@ -50,7 +50,7 @@ public class RubblebeltMaaka extends CardImpl { super(ownerId, 38, "Rubblebelt Maaka", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "DGM"; this.subtype.add("Cat"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java b/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java index 717273891bc..8ab97d42be9 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java @@ -65,7 +65,7 @@ public class RunnersBane extends CardImpl { super(ownerId, 17, "Runner's Bane", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "DGM"; this.subtype.add("Aura"); - this.color.setBlue(true); + // Enchant creature with power 3 or less TargetPermanent auraTarget = new TargetCreaturePermanent(filter); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SaruliGatekeepers.java b/Mage.Sets/src/mage/sets/dragonsmaze/SaruliGatekeepers.java index 03f0c6cf691..839e8e558b5 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SaruliGatekeepers.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SaruliGatekeepers.java @@ -58,7 +58,7 @@ public class SaruliGatekeepers extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Elf"); 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/dragonsmaze/ScionOfVituGhazi.java b/Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java index 6020c6b811d..1bc24f70cd2 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java @@ -55,7 +55,7 @@ public class ScionOfVituGhazi extends CardImpl { super(ownerId, 7, "Scion of Vitu-Ghazi", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); this.expansionSetCode = "DGM"; this.subtype.add("Elemental"); - this.color.setWhite(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/Showstopper.java b/Mage.Sets/src/mage/sets/dragonsmaze/Showstopper.java index 31a8e55a0a8..162d2757d85 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/Showstopper.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/Showstopper.java @@ -61,8 +61,8 @@ public class Showstopper extends CardImpl { public Showstopper (UUID ownerId) { super(ownerId, 102, "Showstopper", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{B}{R}"); this.expansionSetCode = "DGM"; - this.color.setBlack(true); - this.color.setRed(true); + + // Until end of turn, creatures you control gain "When this creature dies, it deals 2 damage to target creature an opponent controls." TriggeredAbility ability = new DiesTriggeredAbility(new DamageTargetEffect(2), false); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SinisterPossession.java b/Mage.Sets/src/mage/sets/dragonsmaze/SinisterPossession.java index 0ae5badf510..a06d7f1042b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SinisterPossession.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SinisterPossession.java @@ -59,7 +59,7 @@ public class SinisterPossession extends CardImpl { super(ownerId, 29, "Sinister Possession", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.subtype.add("Aura"); this.expansionSetCode = "DGM"; - this.color.setBlack(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SireOfInsanity.java b/Mage.Sets/src/mage/sets/dragonsmaze/SireOfInsanity.java index da132bfae4a..93599c4e256 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SireOfInsanity.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SireOfInsanity.java @@ -54,8 +54,8 @@ public class SireOfInsanity extends CardImpl { super(ownerId, 104, "Sire of Insanity", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{B}{R}"); this.expansionSetCode = "DGM"; this.subtype.add("Demon"); - this.color.setBlack(true); - this.color.setRed(true); + + this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/Skylasher.java b/Mage.Sets/src/mage/sets/dragonsmaze/Skylasher.java index c3a772fd3c6..494b502e990 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/Skylasher.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/Skylasher.java @@ -58,7 +58,7 @@ public class Skylasher extends CardImpl { super(ownerId, 49, "Skylasher", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "DGM"; this.subtype.add("Insect"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SmeltWardGatekeepers.java b/Mage.Sets/src/mage/sets/dragonsmaze/SmeltWardGatekeepers.java index fc460116146..95f3582d94d 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SmeltWardGatekeepers.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SmeltWardGatekeepers.java @@ -71,7 +71,7 @@ public class SmeltWardGatekeepers extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SteepleRoc.java b/Mage.Sets/src/mage/sets/dragonsmaze/SteepleRoc.java index 013de6c05f7..987fb8590bd 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SteepleRoc.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SteepleRoc.java @@ -48,7 +48,7 @@ public class SteepleRoc extends CardImpl { super(ownerId, 8, "Steeple Roc", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "DGM"; this.subtype.add("Bird"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SunspireGatekeepers.java b/Mage.Sets/src/mage/sets/dragonsmaze/SunspireGatekeepers.java index 177715be74a..d875881a8eb 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SunspireGatekeepers.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SunspireGatekeepers.java @@ -59,7 +59,7 @@ public class SunspireGatekeepers extends CardImpl { this.expansionSetCode = "DGM"; 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/dragonsmaze/ThrashingMossdog.java b/Mage.Sets/src/mage/sets/dragonsmaze/ThrashingMossdog.java index 90b9c0dc958..c9ef42e2e03 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ThrashingMossdog.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ThrashingMossdog.java @@ -50,7 +50,7 @@ public class ThrashingMossdog extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Plant"); this.subtype.add("Hound"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/UbulSarGatekeepers.java b/Mage.Sets/src/mage/sets/dragonsmaze/UbulSarGatekeepers.java index 30bfb8151cc..16ff85ae354 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/UbulSarGatekeepers.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/UbulSarGatekeepers.java @@ -67,7 +67,7 @@ public class UbulSarGatekeepers extends CardImpl { this.expansionSetCode = "DGM"; this.subtype.add("Zombie"); this.subtype.add("Soldier"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/WeaponSurge.java b/Mage.Sets/src/mage/sets/dragonsmaze/WeaponSurge.java index 14135de37c8..78b3ab99879 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/WeaponSurge.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/WeaponSurge.java @@ -63,7 +63,7 @@ public class WeaponSurge extends CardImpl { public WeaponSurge(UUID ownerId) { super(ownerId, 40, "Weapon Surge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "DGM"; - this.color.setRed(true); + // Target creature you control gets +1/+0 and gains first strike until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(1,0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/BurrentonBombardier.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/BurrentonBombardier.java index f500f99a9d7..9bae2e8d2ea 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/BurrentonBombardier.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/BurrentonBombardier.java @@ -48,7 +48,7 @@ public class BurrentonBombardier extends CardImpl { this.expansionSetCode = "DDF"; this.subtype.add("Kithkin"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); // Flying diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/GoldmeadowHarrier.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/GoldmeadowHarrier.java index 821a502d0b8..70a0b368e5b 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/GoldmeadowHarrier.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/GoldmeadowHarrier.java @@ -53,7 +53,7 @@ public class GoldmeadowHarrier extends CardImpl { this.expansionSetCode = "DDF"; this.subtype.add("Kithkin"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}")); diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/MosquitoGuard.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/MosquitoGuard.java index 4fb439a4446..4df23632fc1 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/MosquitoGuard.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/MosquitoGuard.java @@ -48,7 +48,7 @@ public class MosquitoGuard extends CardImpl { this.expansionSetCode = "DDF"; this.subtype.add("Kithkin"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FirstStrikeAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/TempleAcolyte.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/TempleAcolyte.java index f05dccb664e..d284255a97f 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/TempleAcolyte.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/TempleAcolyte.java @@ -47,7 +47,7 @@ public class TempleAcolyte extends CardImpl { this.expansionSetCode = "DDF"; this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(3))); diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/SkirkDrillSergeant.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/SkirkDrillSergeant.java index 3215431858c..0963ac0f95e 100644 --- a/Mage.Sets/src/mage/sets/elvesvsgoblins/SkirkDrillSergeant.java +++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/SkirkDrillSergeant.java @@ -66,7 +66,6 @@ public class SkirkDrillSergeant extends CardImpl { this.expansionSetCode = "EVG"; 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/eventide/AshlingTheExtinguisher.java b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java index 67825bacac7..dea771ba4ba 100644 --- a/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java +++ b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java @@ -57,7 +57,7 @@ public class AshlingTheExtinguisher extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Elemental"); this.subtype.add("Shaman"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(new AshlingTheExtinguisherTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java b/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java index ae30a7c18f7..a923020c3a5 100644 --- a/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java +++ b/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java @@ -69,8 +69,8 @@ public class BalefireLiege extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Spirit"); this.subtype.add("Horror"); - this.color.setRed(true); - this.color.setWhite(true); + + this.power = new MageInt(2); this.toughness = new MageInt(4); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRedCreature, true))); diff --git a/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java b/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java index ed8553b58ee..4d6f4b77c3f 100644 --- a/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java +++ b/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java @@ -61,7 +61,7 @@ public class BallynockTrapper extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Kithkin"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java b/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java index c1c936c18ae..87254f4df64 100644 --- a/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java +++ b/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java @@ -55,7 +55,7 @@ public class BanishingKnack extends CardImpl { public BanishingKnack(UUID ownerId) { super(ownerId, 17, "Banishing Knack", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "EVE"; - this.color.setBlue(true); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); gainedAbility.addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/eventide/BattlegateMimic.java b/Mage.Sets/src/mage/sets/eventide/BattlegateMimic.java index 83bc1d8f391..f109141e065 100644 --- a/Mage.Sets/src/mage/sets/eventide/BattlegateMimic.java +++ b/Mage.Sets/src/mage/sets/eventide/BattlegateMimic.java @@ -62,8 +62,6 @@ public class BattlegateMimic extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Shapeshifter"); - 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/BeckonApparition.java b/Mage.Sets/src/mage/sets/eventide/BeckonApparition.java index 77d1de8ed33..16c5761bfac 100644 --- a/Mage.Sets/src/mage/sets/eventide/BeckonApparition.java +++ b/Mage.Sets/src/mage/sets/eventide/BeckonApparition.java @@ -47,8 +47,8 @@ public class BeckonApparition extends CardImpl { public BeckonApparition(UUID ownerId) { super(ownerId, 82, "Beckon Apparition", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W/B}"); this.expansionSetCode = "EVE"; - this.color.setBlack(true); - this.color.setWhite(true); + + this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetCardInGraveyard()); this.getSpellAbility().addEffect(new CreateTokenEffect(new BeckonApparitionToken(), 1)); diff --git a/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java b/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java index 62e951baa64..76d50ae5ac8 100644 --- a/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java @@ -59,8 +59,8 @@ public class BelligerentHatchling extends CardImpl { super(ownerId, 134, "Belligerent Hatchling", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R/W}"); this.expansionSetCode = "EVE"; this.subtype.add("Elemental"); - this.color.setRed(true); - this.color.setWhite(true); + + this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/eventide/BloodiedGhost.java b/Mage.Sets/src/mage/sets/eventide/BloodiedGhost.java index 51e42c8d500..2d046b50dfa 100644 --- a/Mage.Sets/src/mage/sets/eventide/BloodiedGhost.java +++ b/Mage.Sets/src/mage/sets/eventide/BloodiedGhost.java @@ -48,8 +48,8 @@ public class BloodiedGhost extends CardImpl { super(ownerId, 83, "Bloodied Ghost", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{W/B}{W/B}"); this.expansionSetCode = "EVE"; this.subtype.add("Spirit"); - this.color.setBlack(true); - this.color.setWhite(true); + + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/eventide/CacheRaiders.java b/Mage.Sets/src/mage/sets/eventide/CacheRaiders.java index b7add6cbf1f..8bab659290f 100644 --- a/Mage.Sets/src/mage/sets/eventide/CacheRaiders.java +++ b/Mage.Sets/src/mage/sets/eventide/CacheRaiders.java @@ -48,7 +48,7 @@ public class CacheRaiders extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Merfolk"); this.subtype.add("Rogue"); - this.color.setBlue(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java b/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java index 34481b5a082..d32b78aac10 100644 --- a/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java +++ b/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java @@ -62,7 +62,7 @@ public class CinderPyromancer extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Elemental"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(0); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/eventide/CreakwoodGhoul.java b/Mage.Sets/src/mage/sets/eventide/CreakwoodGhoul.java index 3b1d2ad9951..61db838c1df 100644 --- a/Mage.Sets/src/mage/sets/eventide/CreakwoodGhoul.java +++ b/Mage.Sets/src/mage/sets/eventide/CreakwoodGhoul.java @@ -53,7 +53,7 @@ public class CreakwoodGhoul extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Plant"); this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{B/G}{B/G}")) ; diff --git a/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java b/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java index ced848f7737..310429e2403 100644 --- a/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java +++ b/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java @@ -63,8 +63,8 @@ public class CreakwoodLiege extends CardImpl { super(ownerId, 117, "Creakwood Liege", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{B/G}{B/G}{B/G}"); this.expansionSetCode = "EVE"; this.subtype.add("Horror"); - 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/DeathbringerLiege.java b/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java index 9407375c340..9fc6b2664b9 100644 --- a/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java +++ b/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java @@ -68,8 +68,8 @@ public class DeathbringerLiege extends CardImpl { super(ownerId, 85, "Deathbringer Liege", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{W/B}{W/B}{W/B}"); this.expansionSetCode = "EVE"; this.subtype.add("Horror"); - this.color.setBlack(true); - this.color.setWhite(true); + + this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); diff --git a/Mage.Sets/src/mage/sets/eventide/DeityOfScars.java b/Mage.Sets/src/mage/sets/eventide/DeityOfScars.java index 0252e5b6e52..5aa361c3c49 100644 --- a/Mage.Sets/src/mage/sets/eventide/DeityOfScars.java +++ b/Mage.Sets/src/mage/sets/eventide/DeityOfScars.java @@ -53,8 +53,8 @@ public class DeityOfScars extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Spirit"); this.subtype.add("Avatar"); - this.color.setGreen(true); - this.color.setBlack(true); + + this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/eventide/DivinityOfPride.java b/Mage.Sets/src/mage/sets/eventide/DivinityOfPride.java index b072571f793..19558dcc7f7 100644 --- a/Mage.Sets/src/mage/sets/eventide/DivinityOfPride.java +++ b/Mage.Sets/src/mage/sets/eventide/DivinityOfPride.java @@ -56,8 +56,8 @@ public class DivinityOfPride extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Spirit"); this.subtype.add("Avatar"); - this.color.setBlack(true); - this.color.setWhite(true); + + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/eventide/DominusOfFealty.java b/Mage.Sets/src/mage/sets/eventide/DominusOfFealty.java index 9f6170f3853..325fcd2c3e2 100644 --- a/Mage.Sets/src/mage/sets/eventide/DominusOfFealty.java +++ b/Mage.Sets/src/mage/sets/eventide/DominusOfFealty.java @@ -55,8 +55,8 @@ public class DominusOfFealty extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Spirit"); this.subtype.add("Avatar"); - this.color.setRed(true); - this.color.setBlue(true); + + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/eventide/DoubleCleave.java b/Mage.Sets/src/mage/sets/eventide/DoubleCleave.java index aa22d01a7c6..37d06cca0f6 100644 --- a/Mage.Sets/src/mage/sets/eventide/DoubleCleave.java +++ b/Mage.Sets/src/mage/sets/eventide/DoubleCleave.java @@ -46,8 +46,8 @@ public class DoubleCleave extends CardImpl { public DoubleCleave(UUID ownerId) { super(ownerId, 135, "Double Cleave", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R/W}"); this.expansionSetCode = "EVE"; - this.color.setRed(true); - this.color.setWhite(true); + + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/eventide/DrainTheWell.java b/Mage.Sets/src/mage/sets/eventide/DrainTheWell.java index 84f0a72b562..328b253cc25 100644 --- a/Mage.Sets/src/mage/sets/eventide/DrainTheWell.java +++ b/Mage.Sets/src/mage/sets/eventide/DrainTheWell.java @@ -44,8 +44,8 @@ public class DrainTheWell extends CardImpl { public DrainTheWell(UUID ownerId) { super(ownerId, 121, "Drain the Well", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B/G}{B/G}"); this.expansionSetCode = "EVE"; - this.color.setGreen(true); - this.color.setBlack(true); + + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new GainLifeEffect(2)); this.getSpellAbility().addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/sets/eventide/DuergarCaveGuard.java b/Mage.Sets/src/mage/sets/eventide/DuergarCaveGuard.java index 0e4bb2e0d97..7f224b5b810 100644 --- a/Mage.Sets/src/mage/sets/eventide/DuergarCaveGuard.java +++ b/Mage.Sets/src/mage/sets/eventide/DuergarCaveGuard.java @@ -51,7 +51,7 @@ public class DuergarCaveGuard extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Dwarf"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); this.addAbility(WitherAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java b/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java index 29b2c332a5b..4b1e04bd143 100644 --- a/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java +++ b/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java @@ -57,8 +57,8 @@ public class FableOfWolfAndOwl extends CardImpl { public FableOfWolfAndOwl(UUID ownerId) { super(ownerId, 150, "Fable of Wolf and Owl", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{G/U}{G/U}{G/U}"); this.expansionSetCode = "EVE"; - this.color.setBlue(true); - this.color.setGreen(true); + + this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new WolfToken(), 1), filterGreenSpell, true)); this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new OwlToken(), 1), filterBlueSpell, true)); } diff --git a/Mage.Sets/src/mage/sets/eventide/GroundlingPouncer.java b/Mage.Sets/src/mage/sets/eventide/GroundlingPouncer.java index 388ec03536a..1d7e0ead21c 100644 --- a/Mage.Sets/src/mage/sets/eventide/GroundlingPouncer.java +++ b/Mage.Sets/src/mage/sets/eventide/GroundlingPouncer.java @@ -68,8 +68,6 @@ public class GroundlingPouncer extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Faerie"); - 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/eventide/HagHedgeMage.java b/Mage.Sets/src/mage/sets/eventide/HagHedgeMage.java index 2a1fd1bad6b..05effd0fbab 100644 --- a/Mage.Sets/src/mage/sets/eventide/HagHedgeMage.java +++ b/Mage.Sets/src/mage/sets/eventide/HagHedgeMage.java @@ -34,8 +34,8 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition.CountType; import mage.abilities.decorator.ConditionalTriggeredAbility; -import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; @@ -68,8 +68,6 @@ public class HagHedgeMage extends CardImpl { this.subtype.add("Hag"); this.subtype.add("Shaman"); - 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/MerrowLevitator.java b/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java index 775ef7f6d48..92a20dcc829 100644 --- a/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java +++ b/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java @@ -65,7 +65,7 @@ public class MerrowLevitator extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/eventide/NoggleBridgebreaker.java b/Mage.Sets/src/mage/sets/eventide/NoggleBridgebreaker.java index 6c005f6ed5b..62fd61fa409 100644 --- a/Mage.Sets/src/mage/sets/eventide/NoggleBridgebreaker.java +++ b/Mage.Sets/src/mage/sets/eventide/NoggleBridgebreaker.java @@ -49,8 +49,8 @@ public class NoggleBridgebreaker extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Noggle"); this.subtype.add("Rogue"); - this.color.setRed(true); - this.color.setBlue(true); + + this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/eventide/NoggleHedgeMage.java b/Mage.Sets/src/mage/sets/eventide/NoggleHedgeMage.java index fa635a9577a..855a008226f 100644 --- a/Mage.Sets/src/mage/sets/eventide/NoggleHedgeMage.java +++ b/Mage.Sets/src/mage/sets/eventide/NoggleHedgeMage.java @@ -69,8 +69,6 @@ public class NoggleHedgeMage extends CardImpl { this.subtype.add("Noggle"); 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/eventide/NoxiousHatchling.java b/Mage.Sets/src/mage/sets/eventide/NoxiousHatchling.java index 3e303e8c38a..30103cff039 100644 --- a/Mage.Sets/src/mage/sets/eventide/NoxiousHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/NoxiousHatchling.java @@ -60,8 +60,8 @@ public class NoxiousHatchling extends CardImpl { super(ownerId, 124, "Noxious Hatchling", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{B/G}"); this.expansionSetCode = "EVE"; this.subtype.add("Elemental"); - 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/OdiousTrow.java b/Mage.Sets/src/mage/sets/eventide/OdiousTrow.java index bcd0af3c406..3b489f0d38c 100644 --- a/Mage.Sets/src/mage/sets/eventide/OdiousTrow.java +++ b/Mage.Sets/src/mage/sets/eventide/OdiousTrow.java @@ -48,8 +48,8 @@ public class OdiousTrow extends CardImpl { super(ownerId, 125, "Odious Trow", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B/G}"); this.expansionSetCode = "EVE"; this.subtype.add("Troll"); - this.color.setGreen(true); - this.color.setBlack(true); + + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B/G}"))); diff --git a/Mage.Sets/src/mage/sets/eventide/PunctureBlast.java b/Mage.Sets/src/mage/sets/eventide/PunctureBlast.java index b5ffa2a97d1..2b3b4a9a75a 100644 --- a/Mage.Sets/src/mage/sets/eventide/PunctureBlast.java +++ b/Mage.Sets/src/mage/sets/eventide/PunctureBlast.java @@ -44,7 +44,7 @@ public class PunctureBlast extends CardImpl { public PunctureBlast(UUID ownerId) { super(ownerId, 60, "Puncture Blast", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "EVE"; - this.color.setRed(true); + this.addAbility(WitherAbility.getInstance()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java b/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java index d5a6dd2e2b4..c66e16243f4 100644 --- a/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java +++ b/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java @@ -53,7 +53,7 @@ public class RecumbentBliss extends CardImpl { super(ownerId, 13, "Recumbent Bliss", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "EVE"; this.subtype.add("Aura"); - this.color.setWhite(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); diff --git a/Mage.Sets/src/mage/sets/eventide/SmolderingButcher.java b/Mage.Sets/src/mage/sets/eventide/SmolderingButcher.java index 042114254fc..7ab7475d490 100644 --- a/Mage.Sets/src/mage/sets/eventide/SmolderingButcher.java +++ b/Mage.Sets/src/mage/sets/eventide/SmolderingButcher.java @@ -46,7 +46,7 @@ public class SmolderingButcher extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Elemental"); this.subtype.add("Warrior"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(2); this.addAbility(WitherAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/eventide/SoulSnuffers.java b/Mage.Sets/src/mage/sets/eventide/SoulSnuffers.java index 6a48067b0ab..5f6694d29fa 100644 --- a/Mage.Sets/src/mage/sets/eventide/SoulSnuffers.java +++ b/Mage.Sets/src/mage/sets/eventide/SoulSnuffers.java @@ -49,7 +49,7 @@ public class SoulSnuffers extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Elemental"); this.subtype.add("Shaman"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersAllEffect(CounterType.M1M1.createInstance(), new FilterCreaturePermanent()))); diff --git a/Mage.Sets/src/mage/sets/eventide/StigmaLasher.java b/Mage.Sets/src/mage/sets/eventide/StigmaLasher.java index 6961dfb6c75..9cfd99ac682 100644 --- a/Mage.Sets/src/mage/sets/eventide/StigmaLasher.java +++ b/Mage.Sets/src/mage/sets/eventide/StigmaLasher.java @@ -55,7 +55,7 @@ public class StigmaLasher 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/eventide/StreamHopper.java b/Mage.Sets/src/mage/sets/eventide/StreamHopper.java index 173d0a7d675..b0279d98d0a 100644 --- a/Mage.Sets/src/mage/sets/eventide/StreamHopper.java +++ b/Mage.Sets/src/mage/sets/eventide/StreamHopper.java @@ -50,8 +50,8 @@ public class StreamHopper extends CardImpl { super(ownerId, 113, "Stream Hopper", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U/R}"); this.expansionSetCode = "EVE"; this.subtype.add("Goblin"); - this.color.setRed(true); - this.color.setBlue(true); + + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{U/R}"))); diff --git a/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java b/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java index 5abdd304049..990847fccde 100644 --- a/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java @@ -64,8 +64,8 @@ public class SturdyHatchling extends CardImpl { super(ownerId, 163, "Sturdy Hatchling", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G/U}"); this.expansionSetCode = "EVE"; this.subtype.add("Elemental"); - 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/eventide/SutureSpirit.java b/Mage.Sets/src/mage/sets/eventide/SutureSpirit.java index a214c2b2e45..f758c3def45 100644 --- a/Mage.Sets/src/mage/sets/eventide/SutureSpirit.java +++ b/Mage.Sets/src/mage/sets/eventide/SutureSpirit.java @@ -51,7 +51,7 @@ public class SutureSpirit extends CardImpl { super(ownerId, 16, "Suture Spirit", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "EVE"; this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/eventide/Talonrend.java b/Mage.Sets/src/mage/sets/eventide/Talonrend.java index c8c972aeee0..d292f121088 100644 --- a/Mage.Sets/src/mage/sets/eventide/Talonrend.java +++ b/Mage.Sets/src/mage/sets/eventide/Talonrend.java @@ -50,7 +50,7 @@ public class Talonrend extends CardImpl { super(ownerId, 30, "Talonrend", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); this.expansionSetCode = "EVE"; this.subtype.add("Elemental"); - this.color.setBlue(true); + this.power = new MageInt(0); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/eventide/TwinbladeSlasher.java b/Mage.Sets/src/mage/sets/eventide/TwinbladeSlasher.java index d38e24b5402..32234cf73a7 100644 --- a/Mage.Sets/src/mage/sets/eventide/TwinbladeSlasher.java +++ b/Mage.Sets/src/mage/sets/eventide/TwinbladeSlasher.java @@ -51,7 +51,7 @@ public class TwinbladeSlasher extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(WitherAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/eventide/Unmake.java b/Mage.Sets/src/mage/sets/eventide/Unmake.java index 8405dd280b1..cd002e9e447 100644 --- a/Mage.Sets/src/mage/sets/eventide/Unmake.java +++ b/Mage.Sets/src/mage/sets/eventide/Unmake.java @@ -29,10 +29,10 @@ package mage.sets.eventide; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.target.common.TargetCreaturePermanent; /** @@ -44,8 +44,6 @@ public class Unmake extends CardImpl { public Unmake (UUID ownerId) { super(ownerId, 96, "Unmake", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W/B}{W/B}{W/B}"); this.expansionSetCode = "EVE"; - this.getColor().setBlack(true); - this.getColor().setWhite(true); this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java b/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java index 3226adcf71b..b4151fb820d 100644 --- a/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java @@ -59,8 +59,8 @@ public class VoraciousHatchling extends CardImpl { super(ownerId, 97, "Voracious Hatchling", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W/B}"); this.expansionSetCode = "EVE"; this.subtype.add("Elemental"); - this.color.setBlack(true); - this.color.setWhite(true); + + this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java b/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java index 675120735d5..5472d60912b 100644 --- a/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java +++ b/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java @@ -65,7 +65,7 @@ public class WickerboughElder extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Treefolk"); 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/eventide/WildernessHypnotist.java b/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java index 7afd0d41a60..6c22a8e15b2 100644 --- a/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java +++ b/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java @@ -63,7 +63,7 @@ public class WildernessHypnotist extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/eventide/WistfulSelkie.java b/Mage.Sets/src/mage/sets/eventide/WistfulSelkie.java index 5d87790f939..63c51a8f35c 100644 --- a/Mage.Sets/src/mage/sets/eventide/WistfulSelkie.java +++ b/Mage.Sets/src/mage/sets/eventide/WistfulSelkie.java @@ -47,8 +47,8 @@ public class WistfulSelkie extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setGreen(true); - this.color.setBlue(true); + + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); diff --git a/Mage.Sets/src/mage/sets/futuresight/KavuPrimarch.java b/Mage.Sets/src/mage/sets/futuresight/KavuPrimarch.java index e11bef1b2fe..deca054ff68 100644 --- a/Mage.Sets/src/mage/sets/futuresight/KavuPrimarch.java +++ b/Mage.Sets/src/mage/sets/futuresight/KavuPrimarch.java @@ -49,7 +49,7 @@ public class KavuPrimarch extends CardImpl { super(ownerId, 128, "Kavu Primarch", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "FUT"; this.subtype.add("Kavu"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java b/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java index 155560952df..a9f8ea334a1 100644 --- a/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java +++ b/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java @@ -56,7 +56,7 @@ public class WitchsMist extends CardImpl { public WitchsMist(UUID ownerId) { super(ownerId, 92, "Witch's Mist", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "FUT"; - this.color.setBlack(true); + // {2}{B}, {T}: Destroy target creature that was dealt damage this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(),new ManaCostsImpl("{2}{B}")); diff --git a/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java b/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java index fd4dfae093e..2a83f0ab877 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java @@ -60,8 +60,8 @@ public class AureliaTheWarleader extends CardImpl { public AureliaTheWarleader(UUID ownerId) { super(ownerId, 143, "Aurelia, the Warleader", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{2}{R}{R}{W}{W}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); - this.color.setWhite(true); + + this.supertype.add("Legendary"); this.subtype.add("Angel"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java b/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java index 673dcad729c..0ec1e13590c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java @@ -70,8 +70,8 @@ public class DomriRade extends CardImpl { super(ownerId, 156, "Domri Rade", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{1}{R}{G}"); this.expansionSetCode = "GTC"; this.subtype.add("Domri"); - this.color.setGreen(true); - this.color.setRed(true); + + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), false)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/FiremaneAvenger.java b/Mage.Sets/src/mage/sets/gatecrash/FiremaneAvenger.java index 8088d7ba08d..c5f5b3f9328 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FiremaneAvenger.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FiremaneAvenger.java @@ -49,8 +49,8 @@ public class FiremaneAvenger extends CardImpl { super(ownerId, 163, "Firemane Avenger", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}{W}"); this.expansionSetCode = "GTC"; this.subtype.add("Angel"); - 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/FiveAlarmFire.java b/Mage.Sets/src/mage/sets/gatecrash/FiveAlarmFire.java index b6a7f8b5b61..1d18de1d7df 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FiveAlarmFire.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FiveAlarmFire.java @@ -58,7 +58,7 @@ public class FiveAlarmFire extends CardImpl { super(ownerId, 91, "Five-Alarm Fire", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{R}"); this.expansionSetCode = "GTC"; - this.color.setRed(true); + //Whenever a creature you control deals combat damage, put a blaze counter on Five-Alarm Fire. this.addAbility(new FiveAlarmFireTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GatewayShade.java b/Mage.Sets/src/mage/sets/gatecrash/GatewayShade.java index 0b5b9b957b3..adce1b5fdd5 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GatewayShade.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GatewayShade.java @@ -60,7 +60,7 @@ public class GatewayShade extends CardImpl { super(ownerId, 65, "Gateway Shade", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "GTC"; 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/gatecrash/GiantAdephage.java b/Mage.Sets/src/mage/sets/gatecrash/GiantAdephage.java index 4c4d9e7fa01..67b1fd6ab7c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GiantAdephage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GiantAdephage.java @@ -55,7 +55,7 @@ public class GiantAdephage extends CardImpl { super(ownerId, 121, "Giant Adephage", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{5}{G}{G}"); this.expansionSetCode = "GTC"; this.subtype.add("Insect"); - this.color.setGreen(true); + this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java b/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java index ce93c289e2f..78e4322ff31 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java @@ -63,7 +63,7 @@ public class GideonChampionOfJustice extends CardImpl { super(ownerId, 13, "Gideon, Champion of Justice", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{W}{W}"); this.expansionSetCode = "GTC"; this.subtype.add("Gideon"); - this.color.setWhite(true); + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false)); // +1: Put a loyalty counter on Gideon, Champion of Justice for each creature target opponent controls. diff --git a/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java b/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java index 6a456cd32e7..70352646018 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java @@ -68,7 +68,7 @@ public class OgreSlumlord extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Rogue"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/gatecrash/TinStreetMarket.java b/Mage.Sets/src/mage/sets/gatecrash/TinStreetMarket.java index caa06726664..9101f22cc0b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/TinStreetMarket.java +++ b/Mage.Sets/src/mage/sets/gatecrash/TinStreetMarket.java @@ -54,7 +54,7 @@ public class TinStreetMarket extends CardImpl { this.expansionSetCode = "GTC"; this.subtype.add("Aura"); - this.color.setRed(true); + // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/VizkopaConfessor.java b/Mage.Sets/src/mage/sets/gatecrash/VizkopaConfessor.java index d16c7aa8515..43d5a214440 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/VizkopaConfessor.java +++ b/Mage.Sets/src/mage/sets/gatecrash/VizkopaConfessor.java @@ -59,8 +59,8 @@ public class VizkopaConfessor extends CardImpl { this.expansionSetCode = "GTC"; 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(3); diff --git a/Mage.Sets/src/mage/sets/guildpact/AgentOfMasks.java b/Mage.Sets/src/mage/sets/guildpact/AgentOfMasks.java index 545c8599a9b..b0aea3e017a 100644 --- a/Mage.Sets/src/mage/sets/guildpact/AgentOfMasks.java +++ b/Mage.Sets/src/mage/sets/guildpact/AgentOfMasks.java @@ -51,8 +51,8 @@ public class AgentOfMasks extends CardImpl { this.expansionSetCode = "GPT"; 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(3); this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AgentOfMasksEffect(), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair.java b/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair.java index a3653d86276..03f510f244f 100644 --- a/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair.java +++ b/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair.java @@ -49,8 +49,8 @@ public class AngelOfDespair extends CardImpl { super(ownerId, 101, "Angel of Despair", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}{W}{B}{B}"); this.expansionSetCode = "GPT"; this.subtype.add("Angel"); - this.color.setWhite(true); - this.color.setBlack(true); + + this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java b/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java index 9460451c3c4..6147d04f377 100644 --- a/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java +++ b/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java @@ -54,8 +54,8 @@ public class BurningTreeShaman extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Centaur"); this.subtype.add("Shaman"); - this.color.setRed(true); - this.color.setGreen(true); + + this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(new BurningTreeShamanTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/guildpact/CausticRain.java b/Mage.Sets/src/mage/sets/guildpact/CausticRain.java index e2033582ad5..b599b1a4579 100644 --- a/Mage.Sets/src/mage/sets/guildpact/CausticRain.java +++ b/Mage.Sets/src/mage/sets/guildpact/CausticRain.java @@ -43,7 +43,7 @@ public class CausticRain extends CardImpl { public CausticRain(UUID ownerId) { super(ownerId, 44, "Caustic Rain", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{B}{B}"); this.expansionSetCode = "GPT"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetLandPermanent()); } diff --git a/Mage.Sets/src/mage/sets/guildpact/Cremate.java b/Mage.Sets/src/mage/sets/guildpact/Cremate.java index b8cd2dd788d..e06fdb92fc5 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Cremate.java +++ b/Mage.Sets/src/mage/sets/guildpact/Cremate.java @@ -44,7 +44,7 @@ public class Cremate extends CardImpl { public Cremate(UUID ownerId) { super(ownerId, 45, "Cremate", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "GPT"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetCardInGraveyard()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/guildpact/CrystalSeer.java b/Mage.Sets/src/mage/sets/guildpact/CrystalSeer.java index 6de1cd94638..8a30c8e1aae 100644 --- a/Mage.Sets/src/mage/sets/guildpact/CrystalSeer.java +++ b/Mage.Sets/src/mage/sets/guildpact/CrystalSeer.java @@ -52,7 +52,7 @@ public class CrystalSeer extends CardImpl { this.expansionSetCode = "GPT"; 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/guildpact/DaggerclawImp.java b/Mage.Sets/src/mage/sets/guildpact/DaggerclawImp.java index 4fc4ae4c400..436250dd818 100644 --- a/Mage.Sets/src/mage/sets/guildpact/DaggerclawImp.java +++ b/Mage.Sets/src/mage/sets/guildpact/DaggerclawImp.java @@ -46,7 +46,7 @@ public class DaggerclawImp extends CardImpl { super(ownerId, 48, "Daggerclaw Imp", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "GPT"; this.subtype.add("Imp"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/guildpact/DouseInGloom.java b/Mage.Sets/src/mage/sets/guildpact/DouseInGloom.java index 60148914eba..1f516e012b7 100644 --- a/Mage.Sets/src/mage/sets/guildpact/DouseInGloom.java +++ b/Mage.Sets/src/mage/sets/guildpact/DouseInGloom.java @@ -44,7 +44,7 @@ public class DouseInGloom extends CardImpl { public DouseInGloom(UUID ownerId) { super(ownerId, 49, "Douse in Gloom", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "GPT"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GainLifeEffect(2)); diff --git a/Mage.Sets/src/mage/sets/guildpact/DuneBroodNephilim.java b/Mage.Sets/src/mage/sets/guildpact/DuneBroodNephilim.java index 3e483371877..b5539b653e0 100644 --- a/Mage.Sets/src/mage/sets/guildpact/DuneBroodNephilim.java +++ b/Mage.Sets/src/mage/sets/guildpact/DuneBroodNephilim.java @@ -28,13 +28,13 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.game.permanent.token.Token; @@ -50,10 +50,8 @@ public class DuneBroodNephilim extends CardImpl { super(ownerId, 110, "Dune-Brood Nephilim", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{B}{R}{G}{W}"); this.expansionSetCode = "GPT"; this.subtype.add("Nephilim"); - this.color.setRed(true); - this.color.setGreen(true); - this.color.setBlack(true); - this.color.setWhite(true); + + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/guildpact/Frazzle.java b/Mage.Sets/src/mage/sets/guildpact/Frazzle.java index c7d4aa30938..90cf67aa37c 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Frazzle.java +++ b/Mage.Sets/src/mage/sets/guildpact/Frazzle.java @@ -52,7 +52,7 @@ public class Frazzle extends CardImpl { public Frazzle(UUID ownerId) { super(ownerId, 25, "Frazzle", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "GPT"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java b/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java index 84f527b23d7..1c9843a3b55 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java +++ b/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java @@ -63,8 +63,8 @@ public class Gelectrode extends CardImpl { super(ownerId, 113, "Gelectrode", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{R}"); this.expansionSetCode = "GPT"; this.subtype.add("Weird"); - this.color.setRed(true); - this.color.setBlue(true); + + this.power = new MageInt(0); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/guildpact/GhorClanBloodscale.java b/Mage.Sets/src/mage/sets/guildpact/GhorClanBloodscale.java index 0a32019ad29..90e9c8a35aa 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GhorClanBloodscale.java +++ b/Mage.Sets/src/mage/sets/guildpact/GhorClanBloodscale.java @@ -51,7 +51,7 @@ public class GhorClanBloodscale extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Viashino"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(FirstStrikeAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java b/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java index 2873bcd3850..0682a27f865 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java +++ b/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java @@ -60,8 +60,8 @@ public class GhostCouncilOfOrzhova extends CardImpl { this.expansionSetCode = "GPT"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); - 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/guildpact/GiantSolifuge.java b/Mage.Sets/src/mage/sets/guildpact/GiantSolifuge.java index f8f0dafc4d4..e907b6386de 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GiantSolifuge.java +++ b/Mage.Sets/src/mage/sets/guildpact/GiantSolifuge.java @@ -46,8 +46,8 @@ public class GiantSolifuge extends CardImpl { super(ownerId, 143, "Giant Solifuge", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R/G}{R/G}"); this.expansionSetCode = "GPT"; this.subtype.add("Insect"); - this.color.setRed(true); - this.color.setGreen(true); + + this.power = new MageInt(4); this.toughness = new MageInt(1); this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java b/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java index c524f2fa0ac..7c742393b66 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java +++ b/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java @@ -59,8 +59,8 @@ public class GruulGuildmage extends CardImpl { this.expansionSetCode = "GPT"; 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/guildpact/GruulNodorog.java b/Mage.Sets/src/mage/sets/guildpact/GruulNodorog.java index 251dc9f0052..27a18d8bd20 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GruulNodorog.java +++ b/Mage.Sets/src/mage/sets/guildpact/GruulNodorog.java @@ -49,7 +49,7 @@ public class GruulNodorog extends CardImpl { super(ownerId, 88, "Gruul Nodorog", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); this.expansionSetCode = "GPT"; 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/guildpact/HarrierGriffin.java b/Mage.Sets/src/mage/sets/guildpact/HarrierGriffin.java index 8473c0bfc5d..5625b3bbafe 100644 --- a/Mage.Sets/src/mage/sets/guildpact/HarrierGriffin.java +++ b/Mage.Sets/src/mage/sets/guildpact/HarrierGriffin.java @@ -50,7 +50,7 @@ public class HarrierGriffin extends CardImpl { super(ownerId, 9, "Harrier Griffin", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{5}{W}"); this.expansionSetCode = "GPT"; this.subtype.add("Griffin"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java b/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java index 4e313b1a21c..df8211b7013 100644 --- a/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java +++ b/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java @@ -44,7 +44,7 @@ public class HatchingPlans extends CardImpl { public HatchingPlans (UUID ownerId) { super(ownerId, 27, "Hatching Plans", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "GPT"; - this.color.setBlue(true); + this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new DrawCardSourceControllerEffect(3))); } diff --git a/Mage.Sets/src/mage/sets/guildpact/HypervoltGrasp.java b/Mage.Sets/src/mage/sets/guildpact/HypervoltGrasp.java index 85eb3065ffe..34c19b4ee6c 100644 --- a/Mage.Sets/src/mage/sets/guildpact/HypervoltGrasp.java +++ b/Mage.Sets/src/mage/sets/guildpact/HypervoltGrasp.java @@ -55,7 +55,7 @@ public class HypervoltGrasp extends CardImpl { super(ownerId, 67, "Hypervolt Grasp", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "GPT"; this.subtype.add("Aura"); - this.color.setRed(true); + // Enchant creature diff --git a/Mage.Sets/src/mage/sets/guildpact/IzzetChronarch.java b/Mage.Sets/src/mage/sets/guildpact/IzzetChronarch.java index 89cdecc2156..5ee4fda8212 100644 --- a/Mage.Sets/src/mage/sets/guildpact/IzzetChronarch.java +++ b/Mage.Sets/src/mage/sets/guildpact/IzzetChronarch.java @@ -59,8 +59,8 @@ public class IzzetChronarch extends CardImpl { this.expansionSetCode = "GPT"; 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); Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), false); diff --git a/Mage.Sets/src/mage/sets/guildpact/LionheartMaverick.java b/Mage.Sets/src/mage/sets/guildpact/LionheartMaverick.java index 7af79a4b09f..e92a5c5c1e3 100644 --- a/Mage.Sets/src/mage/sets/guildpact/LionheartMaverick.java +++ b/Mage.Sets/src/mage/sets/guildpact/LionheartMaverick.java @@ -51,7 +51,7 @@ public class LionheartMaverick extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(VigilanceAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/guildpact/Mortify.java b/Mage.Sets/src/mage/sets/guildpact/Mortify.java index fe1a72d7ee7..e77fa33d1d5 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Mortify.java +++ b/Mage.Sets/src/mage/sets/guildpact/Mortify.java @@ -53,8 +53,8 @@ public class Mortify extends CardImpl { public Mortify(UUID ownerId) { super(ownerId, 122, "Mortify", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}{B}"); this.expansionSetCode = "GPT"; - this.color.setBlack(true); - this.color.setWhite(true); + + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/guildpact/NivMizzetTheFiremind.java b/Mage.Sets/src/mage/sets/guildpact/NivMizzetTheFiremind.java index 2882eaac41e..eda90671d55 100644 --- a/Mage.Sets/src/mage/sets/guildpact/NivMizzetTheFiremind.java +++ b/Mage.Sets/src/mage/sets/guildpact/NivMizzetTheFiremind.java @@ -55,8 +55,8 @@ public class NivMizzetTheFiremind extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Dragon"); this.subtype.add("Wizard"); - this.color.setRed(true); - this.color.setBlue(true); + + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/guildpact/OstiaryThrull.java b/Mage.Sets/src/mage/sets/guildpact/OstiaryThrull.java index 1c79543004d..7562add2b73 100644 --- a/Mage.Sets/src/mage/sets/guildpact/OstiaryThrull.java +++ b/Mage.Sets/src/mage/sets/guildpact/OstiaryThrull.java @@ -52,7 +52,7 @@ public class OstiaryThrull extends CardImpl { super(ownerId, 55, "Ostiary Thrull", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "GPT"; this.subtype.add("Thrull"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); diff --git a/Mage.Sets/src/mage/sets/guildpact/PlaguedRusalka.java b/Mage.Sets/src/mage/sets/guildpact/PlaguedRusalka.java index 252bee722b8..8740ae47604 100644 --- a/Mage.Sets/src/mage/sets/guildpact/PlaguedRusalka.java +++ b/Mage.Sets/src/mage/sets/guildpact/PlaguedRusalka.java @@ -50,7 +50,7 @@ public class PlaguedRusalka extends CardImpl { super(ownerId, 56, "Plagued Rusalka", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{B}"); this.expansionSetCode = "GPT"; this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); diff --git a/Mage.Sets/src/mage/sets/guildpact/RestlessBones.java b/Mage.Sets/src/mage/sets/guildpact/RestlessBones.java index d431e1be517..4020b8db1fd 100644 --- a/Mage.Sets/src/mage/sets/guildpact/RestlessBones.java +++ b/Mage.Sets/src/mage/sets/guildpact/RestlessBones.java @@ -54,7 +54,7 @@ public class RestlessBones extends CardImpl { super(ownerId, 58, "Restless Bones", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "GPT"; this.subtype.add("Skeleton"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl("{3}{B}")); diff --git a/Mage.Sets/src/mage/sets/guildpact/Runeboggle.java b/Mage.Sets/src/mage/sets/guildpact/Runeboggle.java index 6680e21c7ac..b7e75fd0f59 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Runeboggle.java +++ b/Mage.Sets/src/mage/sets/guildpact/Runeboggle.java @@ -45,7 +45,7 @@ public class Runeboggle extends CardImpl { public Runeboggle(UUID ownerId) { super(ownerId, 33, "Runeboggle", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "GPT"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new GenericManaCost(1))); this.getSpellAbility().addTarget(new TargetSpell()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/guildpact/ScabClanMauler.java b/Mage.Sets/src/mage/sets/guildpact/ScabClanMauler.java index dad9331a609..ceb57bc0ae6 100644 --- a/Mage.Sets/src/mage/sets/guildpact/ScabClanMauler.java +++ b/Mage.Sets/src/mage/sets/guildpact/ScabClanMauler.java @@ -46,8 +46,8 @@ public class ScabClanMauler extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Human"); this.subtype.add("Berserker"); - this.color.setRed(true); - this.color.setGreen(true); + + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new BloodthirstAbility(2)); diff --git a/Mage.Sets/src/mage/sets/guildpact/ScorchedRusalka.java b/Mage.Sets/src/mage/sets/guildpact/ScorchedRusalka.java index 63d5435624f..2284c34481b 100644 --- a/Mage.Sets/src/mage/sets/guildpact/ScorchedRusalka.java +++ b/Mage.Sets/src/mage/sets/guildpact/ScorchedRusalka.java @@ -53,7 +53,7 @@ public class ScorchedRusalka extends CardImpl { super(ownerId, 74, "Scorched Rusalka", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{R}"); this.expansionSetCode = "GPT"; this.subtype.add("Spirit"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.R)); diff --git a/Mage.Sets/src/mage/sets/guildpact/SilhanaLedgewalker.java b/Mage.Sets/src/mage/sets/guildpact/SilhanaLedgewalker.java index 444fc6d0fe7..3f882705119 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SilhanaLedgewalker.java +++ b/Mage.Sets/src/mage/sets/guildpact/SilhanaLedgewalker.java @@ -55,7 +55,7 @@ public class SilhanaLedgewalker extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Elf"); this.subtype.add("Rogue"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java b/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java index a1fe862e629..66437c854b2 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java +++ b/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java @@ -65,7 +65,7 @@ public class SkeletalVampire extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Vampire"); this.subtype.add("Skeleton"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/guildpact/SmogsteedRider.java b/Mage.Sets/src/mage/sets/guildpact/SmogsteedRider.java index 832d628459a..28f4a09912e 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SmogsteedRider.java +++ b/Mage.Sets/src/mage/sets/guildpact/SmogsteedRider.java @@ -50,7 +50,7 @@ public class SmogsteedRider extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new AttacksTriggeredAbility(new GainAbilityControlledEffect(FearAbility.getInstance(), Duration.EndOfTurn, new FilterAttackingCreature(), true), false)); diff --git a/Mage.Sets/src/mage/sets/guildpact/StarvedRusalka.java b/Mage.Sets/src/mage/sets/guildpact/StarvedRusalka.java index d6373eb8d37..7c8eac801b8 100644 --- a/Mage.Sets/src/mage/sets/guildpact/StarvedRusalka.java +++ b/Mage.Sets/src/mage/sets/guildpact/StarvedRusalka.java @@ -52,7 +52,7 @@ public class StarvedRusalka extends CardImpl { super(ownerId, 97, "Starved Rusalka", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "GPT"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ColoredManaCost(ColoredManaSymbol.G)); diff --git a/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java b/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java index af70c20166d..f7728db529b 100644 --- a/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java +++ b/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java @@ -69,8 +69,8 @@ public class TiborAndLumia extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setRed(true); - this.color.setBlue(true); + + this.power = new MageInt(3); this.toughness = new MageInt(3); Ability firstAbility = new SpellCastControllerTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), filterBlue, false); diff --git a/Mage.Sets/src/mage/sets/guildpact/TorchDrake.java b/Mage.Sets/src/mage/sets/guildpact/TorchDrake.java index 5b23eb4a890..337b5787f9f 100644 --- a/Mage.Sets/src/mage/sets/guildpact/TorchDrake.java +++ b/Mage.Sets/src/mage/sets/guildpact/TorchDrake.java @@ -52,7 +52,7 @@ public class TorchDrake extends CardImpl { super(ownerId, 38, "Torch Drake", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "GPT"; this.subtype.add("Drake"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java b/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java index e4ddbec8351..aad302a5d1c 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java +++ b/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java @@ -59,8 +59,8 @@ public class WeeDragonauts extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Faerie"); this.subtype.add("Wizard"); - this.color.setRed(true); - this.color.setBlue(true); + + this.power = new MageInt(1); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/guildpact/WildCantor.java b/Mage.Sets/src/mage/sets/guildpact/WildCantor.java index baaee55d02d..f8856b8ca44 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WildCantor.java +++ b/Mage.Sets/src/mage/sets/guildpact/WildCantor.java @@ -46,8 +46,8 @@ public class WildCantor extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setRed(true); - this.color.setGreen(true); + + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new AnyColorManaAbility(new SacrificeSourceCost())); diff --git a/Mage.Sets/src/mage/sets/guildpact/Withstand.java b/Mage.Sets/src/mage/sets/guildpact/Withstand.java index 2fb1749d40c..7dfbba2f92d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Withstand.java +++ b/Mage.Sets/src/mage/sets/guildpact/Withstand.java @@ -46,7 +46,7 @@ public class Withstand extends CardImpl { public Withstand(UUID ownerId) { super(ownerId, 21, "Withstand", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "GPT"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java b/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java index 8cb7dd07c21..e9cb58657a8 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java +++ b/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java @@ -55,8 +55,8 @@ public class WreakHavoc extends CardImpl { public WreakHavoc(UUID ownerId) { super(ownerId, 139, "Wreak Havoc", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}{G}"); this.expansionSetCode = "GPT"; - this.color.setRed(true); - this.color.setGreen(true); + + this.addAbility(new CantBeCounteredAbility()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java b/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java index e3c58d52afb..da5e93aa789 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java +++ b/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java @@ -64,7 +64,7 @@ public class WurmweaverCoil extends CardImpl { super(ownerId, 99, "Wurmweaver Coil", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}{G}"); this.expansionSetCode = "GPT"; this.subtype.add("Aura"); - this.color.setGreen(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); diff --git a/Mage.Sets/src/mage/sets/iceage/ImposingVisage.java b/Mage.Sets/src/mage/sets/iceage/ImposingVisage.java index 215e3eb740d..a310f641457 100644 --- a/Mage.Sets/src/mage/sets/iceage/ImposingVisage.java +++ b/Mage.Sets/src/mage/sets/iceage/ImposingVisage.java @@ -52,7 +52,7 @@ public class ImposingVisage extends CardImpl { super(ownerId, 193, "Imposing Visage", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{R}"); this.expansionSetCode = "ICE"; this.subtype.add("Aura"); - this.color.setRed(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/innistrad/AbbeyGriffin.java b/Mage.Sets/src/mage/sets/innistrad/AbbeyGriffin.java index 6e780faf189..8bf848a55bb 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AbbeyGriffin.java +++ b/Mage.Sets/src/mage/sets/innistrad/AbbeyGriffin.java @@ -46,7 +46,7 @@ public class AbbeyGriffin extends CardImpl { super(ownerId, 1, "Abbey Griffin", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "ISD"; 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/innistrad/AngelOfFlightAlabaster.java b/Mage.Sets/src/mage/sets/innistrad/AngelOfFlightAlabaster.java index 551f0fd310c..0c95d56ff26 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AngelOfFlightAlabaster.java +++ b/Mage.Sets/src/mage/sets/innistrad/AngelOfFlightAlabaster.java @@ -27,7 +27,7 @@ public class AngelOfFlightAlabaster extends CardImpl { super(ownerId, 2, "Angel of Flight Alabaster", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "ISD"; 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/innistrad/AvacynsPilgrim.java b/Mage.Sets/src/mage/sets/innistrad/AvacynsPilgrim.java index 179f4815a56..4f7d6169db3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AvacynsPilgrim.java +++ b/Mage.Sets/src/mage/sets/innistrad/AvacynsPilgrim.java @@ -46,7 +46,7 @@ public class AvacynsPilgrim extends CardImpl { this.expansionSetCode = "ISD"; this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new WhiteManaAbility()); diff --git a/Mage.Sets/src/mage/sets/innistrad/BoneyardWurm.java b/Mage.Sets/src/mage/sets/innistrad/BoneyardWurm.java index e8bca229221..1ba617a7486 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BoneyardWurm.java +++ b/Mage.Sets/src/mage/sets/innistrad/BoneyardWurm.java @@ -49,7 +49,7 @@ public class BoneyardWurm extends CardImpl { super(ownerId, 171, "Boneyard Wurm", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "ISD"; this.subtype.add("Wurm"); - this.color.setGreen(true); + // Boneyard Wurm's power and toughness are each equal to the number of creature cards in your graveyard. DynamicValue value = new CardsInControllerGraveyardCount(new FilterCreatureCard()); diff --git a/Mage.Sets/src/mage/sets/innistrad/MentorOfTheMeek.java b/Mage.Sets/src/mage/sets/innistrad/MentorOfTheMeek.java index 219adbc1d22..b1ae0dfe392 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MentorOfTheMeek.java +++ b/Mage.Sets/src/mage/sets/innistrad/MentorOfTheMeek.java @@ -60,7 +60,7 @@ public class MentorOfTheMeek extends CardImpl { this.expansionSetCode = "ISD"; 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/Nevermore.java b/Mage.Sets/src/mage/sets/innistrad/Nevermore.java index 7cd1f805f58..c5a02b4cbd0 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Nevermore.java +++ b/Mage.Sets/src/mage/sets/innistrad/Nevermore.java @@ -59,7 +59,7 @@ public class Nevermore extends CardImpl { public Nevermore(UUID ownerId) { super(ownerId, 25, "Nevermore", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}{W}"); this.expansionSetCode = "ISD"; - this.color.setWhite(true); + //As Nevermore enters the battlefield, name a nonland card. this.addAbility(new AsEntersBattlefieldAbility(new NevermoreEffect1())); diff --git a/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java b/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java index 4dd89f5cf7a..fccc03b9e34 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java +++ b/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java @@ -63,7 +63,7 @@ public class ReaperFromTheAbyss extends CardImpl { super(ownerId, 112, "Reaper from the Abyss", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{3}{B}{B}{B}"); this.expansionSetCode = "ISD"; this.subtype.add("Demon"); - this.color.setBlack(true); + this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/innistrad/SpideryGrasp.java b/Mage.Sets/src/mage/sets/innistrad/SpideryGrasp.java index 0347b594609..c6c75ab6c01 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SpideryGrasp.java +++ b/Mage.Sets/src/mage/sets/innistrad/SpideryGrasp.java @@ -47,7 +47,7 @@ public class SpideryGrasp extends CardImpl { public SpideryGrasp(UUID ownerId) { super(ownerId, 204, "Spidery Grasp", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "ISD"; - this.color.setGreen(true); + // Untap target creature. It gets +2/+4 and gains reach until end of turn. this.getSpellAbility().addEffect(new UntapTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/innistrad/WreathofGeists.java b/Mage.Sets/src/mage/sets/innistrad/WreathofGeists.java index 4ec12911c5b..5e5b547a3c8 100644 --- a/Mage.Sets/src/mage/sets/innistrad/WreathofGeists.java +++ b/Mage.Sets/src/mage/sets/innistrad/WreathofGeists.java @@ -55,7 +55,7 @@ public class WreathofGeists extends CardImpl { super(ownerId, 211, "Wreath of Geists", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "ISD"; this.subtype.add("Aura"); - this.color.setGreen(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SarkhanTheDragonspeaker.java b/Mage.Sets/src/mage/sets/khansoftarkir/SarkhanTheDragonspeaker.java index 85ce4a6d2ba..f8aea6b73bc 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SarkhanTheDragonspeaker.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SarkhanTheDragonspeaker.java @@ -70,7 +70,7 @@ public class SarkhanTheDragonspeaker extends CardImpl { super(ownerId, 119, "Sarkhan, the Dragonspeaker", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{R}{R}"); this.expansionSetCode = "KTK"; this.subtype.add("Sarkhan"); - this.color.setRed(true); + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false)); // +1: Until end of turn, Sarkhan, the Dragonspeaker becomes a legendary 4/4 red Dragon creature with flying, indestructible, and haste. diff --git a/Mage.Sets/src/mage/sets/legends/CrimsonKobolds.java b/Mage.Sets/src/mage/sets/legends/CrimsonKobolds.java index d192e67180d..cc3ede5bd5c 100644 --- a/Mage.Sets/src/mage/sets/legends/CrimsonKobolds.java +++ b/Mage.Sets/src/mage/sets/legends/CrimsonKobolds.java @@ -28,10 +28,10 @@ package mage.sets.legends; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/legends/CrookshankKobolds.java b/Mage.Sets/src/mage/sets/legends/CrookshankKobolds.java index adf2160891f..a458a92b4c6 100644 --- a/Mage.Sets/src/mage/sets/legends/CrookshankKobolds.java +++ b/Mage.Sets/src/mage/sets/legends/CrookshankKobolds.java @@ -28,10 +28,10 @@ package mage.sets.legends; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/legends/KoboldsOfKherKeep.java b/Mage.Sets/src/mage/sets/legends/KoboldsOfKherKeep.java index e465d24c661..274dd0de879 100644 --- a/Mage.Sets/src/mage/sets/legends/KoboldsOfKherKeep.java +++ b/Mage.Sets/src/mage/sets/legends/KoboldsOfKherKeep.java @@ -28,10 +28,10 @@ package mage.sets.legends; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/legions/GoblinTurncoat.java b/Mage.Sets/src/mage/sets/legions/GoblinTurncoat.java index cdbe89651c0..6364de5fdbc 100644 --- a/Mage.Sets/src/mage/sets/legions/GoblinTurncoat.java +++ b/Mage.Sets/src/mage/sets/legions/GoblinTurncoat.java @@ -59,7 +59,7 @@ public class GoblinTurncoat extends CardImpl { this.expansionSetCode = "LGN"; this.subtype.add("Goblin"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/lorwyn/AvianChangeling.java b/Mage.Sets/src/mage/sets/lorwyn/AvianChangeling.java index cbdf100e931..70ccba8cbf6 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/AvianChangeling.java +++ b/Mage.Sets/src/mage/sets/lorwyn/AvianChangeling.java @@ -46,7 +46,7 @@ public class AvianChangeling extends CardImpl { super(ownerId, 4, "Avian Changeling", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.expansionSetCode = "LRW"; this.subtype.add("Shapeshifter"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(ChangelingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java b/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java index 72b62f7019f..818ffbbfff9 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java @@ -50,7 +50,7 @@ public class BattleMastery extends CardImpl { super(ownerId, 5, "Battle Mastery", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "LRW"; this.subtype.add("Aura"); - this.color.setWhite(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); diff --git a/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java b/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java index 057d0fb2143..2f1de4dda32 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java @@ -67,7 +67,7 @@ public class Benthicore extends CardImpl { super(ownerId, 53, "Benthicore", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{6}{U}"); this.expansionSetCode = "LRW"; this.subtype.add("Elemental"); - this.color.setBlue(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new MerfolkToken(), 2), false)); diff --git a/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java b/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java index dc7770624b0..b9efe89768a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java @@ -59,7 +59,7 @@ public class BlackPoplarShaman extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Treefolk"); this.subtype.add("Shaman"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{2}{B}")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java b/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java index 85c0b2a053e..ab9facc966e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java @@ -53,7 +53,7 @@ public class BoggartBirthRite extends CardImpl { super(ownerId, 101, "Boggart Birth Rite", Rarity.COMMON, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{B}"); this.expansionSetCode = "LRW"; this.subtype.add("Goblin"); - this.color.setBlack(true); + this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter)); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/CaterwaulingBoggart.java b/Mage.Sets/src/mage/sets/lorwyn/CaterwaulingBoggart.java index a854c730823..aac9e3e926a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/CaterwaulingBoggart.java +++ b/Mage.Sets/src/mage/sets/lorwyn/CaterwaulingBoggart.java @@ -61,7 +61,7 @@ public class CaterwaulingBoggart extends CardImpl { this.expansionSetCode = "LRW"; 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/lorwyn/CloudgoatRanger.java b/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java index d84646f1ff1..a33dbc35d97 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java +++ b/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java @@ -68,7 +68,7 @@ public class CloudgoatRanger extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KithkinToken(), 3), false)); diff --git a/Mage.Sets/src/mage/sets/lorwyn/DeeptreadMerrow.java b/Mage.Sets/src/mage/sets/lorwyn/DeeptreadMerrow.java index abdd997fd4a..28a7bcf0c0b 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/DeeptreadMerrow.java +++ b/Mage.Sets/src/mage/sets/lorwyn/DeeptreadMerrow.java @@ -48,7 +48,7 @@ public class DeeptreadMerrow extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Merfolk"); this.subtype.add("Rogue"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new IslandwalkAbility(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java b/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java index 4bc1345eb25..3352d6be2e3 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java @@ -58,7 +58,7 @@ public class ElvishEulogist extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(new CardsInControllerGraveyardCount(filter, 1)), new SacrificeSourceCost())); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java b/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java index 9805a1b1504..9570c122c8d 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java @@ -55,7 +55,7 @@ public class ElvishHandservant extends CardImpl { this.expansionSetCode = "LRW"; 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/ElvishPromenade.java b/Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java index cb8ec781508..f828e4e7da3 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java @@ -54,7 +54,7 @@ public class ElvishPromenade extends CardImpl { super(ownerId, 208, "Elvish Promenade", Rarity.UNCOMMON, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "LRW"; this.subtype.add("Elf"); - this.color.setGreen(true); + this.getSpellAbility().addEffect(new CreateTokenEffect(new ElfToken(), new PermanentsOnBattlefieldCount(filter))); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java b/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java index ddb970f1c7c..1b0233ff13e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java +++ b/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java @@ -52,7 +52,7 @@ public class EpicProportions extends CardImpl { super(ownerId, 209, "Epic Proportions", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}{G}"); this.expansionSetCode = "LRW"; this.subtype.add("Aura"); - this.color.setGreen(true); + this.addAbility(FlashAbility.getInstance()); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java b/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java index 008a995d22b..66464fb29fa 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java +++ b/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java @@ -54,7 +54,7 @@ public class EyeblightsEnding extends CardImpl { super(ownerId, 110, "Eyeblight's Ending", Rarity.COMMON, new CardType[]{CardType.TRIBAL, CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "LRW"; this.subtype.add("Elf"); - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java b/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java index 7bcdd930996..582d9210792 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java @@ -58,7 +58,7 @@ public class Facevaulter extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); diff --git a/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java b/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java index d3095d9e258..2ad26791828 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java @@ -47,7 +47,7 @@ public class FamiliarsRuse extends CardImpl { public FamiliarsRuse(UUID ownerId) { super(ownerId, 64, "Familiar's Ruse", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}{U}"); this.expansionSetCode = "LRW"; - this.color.setBlue(true); + this.getSpellAbility().addCost(new ReturnToHandTargetCost(new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent("creature"),false))); this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/FinalRevels.java b/Mage.Sets/src/mage/sets/lorwyn/FinalRevels.java index 5a3e6e9b688..9855dba01a3 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FinalRevels.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FinalRevels.java @@ -46,7 +46,7 @@ public class FinalRevels extends CardImpl { public FinalRevels(UUID ownerId) { super(ownerId, 113, "Final Revels", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{B}"); this.expansionSetCode = "LRW"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new BoostAllEffect(2, 0, Duration.EndOfTurn, new FilterCreaturePermanent(), false)); Mode mode = new Mode(); mode.getEffects().add(new BoostAllEffect(0, -2, Duration.EndOfTurn, new FilterCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/sets/lorwyn/FlamekinBrawler.java b/Mage.Sets/src/mage/sets/lorwyn/FlamekinBrawler.java index f96d7b50c90..3fd7b7df9ed 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FlamekinBrawler.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FlamekinBrawler.java @@ -47,7 +47,7 @@ public class FlamekinBrawler extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Elemental"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(0); this.toughness = new MageInt(2); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); diff --git a/Mage.Sets/src/mage/sets/lorwyn/FlamekinSpitfire.java b/Mage.Sets/src/mage/sets/lorwyn/FlamekinSpitfire.java index 7fd7268819d..63aff65531e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FlamekinSpitfire.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FlamekinSpitfire.java @@ -51,7 +51,7 @@ public class FlamekinSpitfire extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Elemental"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{3}{R}")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/GhostlyChangeling.java b/Mage.Sets/src/mage/sets/lorwyn/GhostlyChangeling.java index bae49365989..32f2e13e6a9 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GhostlyChangeling.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GhostlyChangeling.java @@ -50,7 +50,7 @@ public class GhostlyChangeling extends CardImpl { super(ownerId, 116, "Ghostly Changeling", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "LRW"; this.subtype.add("Shapeshifter"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(ChangelingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java b/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java index 993dd737d4d..29d0b9cf90a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java @@ -61,7 +61,7 @@ public class Goatnapper extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Goblin"); this.subtype.add("Rogue"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new UntapTargetEffect(), false); diff --git a/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java b/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java index d838c1670f4..d28fd2e0d1c 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java @@ -64,7 +64,7 @@ public class GuardianOfCloverdell extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Treefolk"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(5); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KithkinToken(), 3), false)); diff --git a/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java b/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java index d376a1e956e..07651653e77 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java @@ -62,7 +62,7 @@ public class HarpoonSniper extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Merfolk"); this.subtype.add("Archer"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ColoredManaCost(ColoredManaSymbol.W)); diff --git a/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java b/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java index d60723b4177..7b5ecee990c 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java @@ -67,7 +67,7 @@ public class HearthcageGiant extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new RedElementalToken(), 2), false)); diff --git a/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java b/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java index d1b18b65e78..4782e11826f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java @@ -56,7 +56,7 @@ public class HoofprintsOfTheStag extends CardImpl { super(ownerId, 21, "Hoofprints of the Stag", Rarity.RARE, new CardType[]{CardType.TRIBAL, CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "LRW"; this.subtype.add("Elemental"); - this.color.setWhite(true); + this.addAbility(new DrawCardControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.HOOFPRINT.createInstance(1)), true)); Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WhiteElementalToken(), 1), new ManaCostsImpl("{2}{W}"), MyTurnCondition.getInstance()); ability.addCost(new RemoveCountersSourceCost(CounterType.HOOFPRINT.createInstance(4))); diff --git a/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java b/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java index 38a016ef46e..0f6634b0639 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java @@ -50,7 +50,7 @@ public class HornetHarasser extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), false); diff --git a/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java b/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java index a0620467327..0e78b09e2bd 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java @@ -56,7 +56,7 @@ public class HurlyBurly extends CardImpl { public HurlyBurly(UUID ownerId) { super(ownerId, 177, "Hurly-Burly", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "LRW"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DamageAllEffect(1, filterWithFlying)); Mode mode = new Mode(); mode.getEffects().add(new DamageAllEffect(1, filterWithoutFlying)); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java b/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java index 3a40bc42585..347506ab60b 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java @@ -60,7 +60,7 @@ public class ImperiousPerfect extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); diff --git a/Mage.Sets/src/mage/sets/lorwyn/InkfathomDivers.java b/Mage.Sets/src/mage/sets/lorwyn/InkfathomDivers.java index b4450858e81..56e1a70180a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/InkfathomDivers.java +++ b/Mage.Sets/src/mage/sets/lorwyn/InkfathomDivers.java @@ -48,7 +48,7 @@ public class InkfathomDivers extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Merfolk"); this.subtype.add("Soldier"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java index 83b0e8692ad..7ee6239ee38 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java +++ b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java @@ -51,7 +51,7 @@ public class KinsbaileBalloonist extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Kithkin"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java index 9280695226a..1887ecea869 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java +++ b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java @@ -50,7 +50,7 @@ public class KinsbaileSkirmisher extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Kithkin"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), false); diff --git a/Mage.Sets/src/mage/sets/lorwyn/KithkinDaggerdare.java b/Mage.Sets/src/mage/sets/lorwyn/KithkinDaggerdare.java index 2c46cb3dfc3..cd5195e5be9 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/KithkinDaggerdare.java +++ b/Mage.Sets/src/mage/sets/lorwyn/KithkinDaggerdare.java @@ -50,7 +50,7 @@ public class KithkinDaggerdare extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Kithkin"); this.subtype.add("Soldier"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); diff --git a/Mage.Sets/src/mage/sets/lorwyn/KithkinHealer.java b/Mage.Sets/src/mage/sets/lorwyn/KithkinHealer.java index bac1057cf6c..33c1a3fa658 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/KithkinHealer.java +++ b/Mage.Sets/src/mage/sets/lorwyn/KithkinHealer.java @@ -52,7 +52,7 @@ public class KithkinHealer extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Kithkin"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java b/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java index e2d1674431f..dbf8e077584 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java +++ b/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java @@ -47,7 +47,7 @@ public class LaceWithMoonglove extends CardImpl { public LaceWithMoonglove(UUID ownerId) { super(ownerId, 225, "Lace with Moonglove", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "LRW"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/lorwyn/LeafGilder.java b/Mage.Sets/src/mage/sets/lorwyn/LeafGilder.java index 9b3f2cb91af..96fd76007de 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/LeafGilder.java +++ b/Mage.Sets/src/mage/sets/lorwyn/LeafGilder.java @@ -46,7 +46,7 @@ public class LeafGilder extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new GreenManaAbility()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java b/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java index ccf73d3adf8..9fcbfc72b7f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java +++ b/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java @@ -55,7 +55,7 @@ public class LysAlanaHuntmaster extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new ElfToken()), filter, true)); diff --git a/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java b/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java index a7315cae582..565c2c103b4 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java @@ -66,7 +66,7 @@ public class MadAuntie extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/lorwyn/MudbuttonTorchrunner.java b/Mage.Sets/src/mage/sets/lorwyn/MudbuttonTorchrunner.java index f45f754daab..cbf51c38a29 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MudbuttonTorchrunner.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MudbuttonTorchrunner.java @@ -49,7 +49,7 @@ public class MudbuttonTorchrunner extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); // When Mudbutton Torchrunner dies, it deals 3 damage to target creature or player. diff --git a/Mage.Sets/src/mage/sets/lorwyn/NeckSnap.java b/Mage.Sets/src/mage/sets/lorwyn/NeckSnap.java index 954221cf634..a52c303c7f1 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/NeckSnap.java +++ b/Mage.Sets/src/mage/sets/lorwyn/NeckSnap.java @@ -44,7 +44,7 @@ public class NeckSnap extends CardImpl { public NeckSnap(UUID ownerId) { super(ownerId, 32, "Neck Snap", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "LRW"; - this.color.setWhite(true); + // Destroy target attacking or blocking creature. this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetAttackingOrBlockingCreature()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java b/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java index 0ec67ad7955..29d821d1a15 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java +++ b/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java @@ -61,7 +61,7 @@ public class NectarFaerie extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Faerie"); this.subtype.add("Wizard"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/NightshadeStinger.java b/Mage.Sets/src/mage/sets/lorwyn/NightshadeStinger.java index 75862881605..db4b68ef246 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/NightshadeStinger.java +++ b/Mage.Sets/src/mage/sets/lorwyn/NightshadeStinger.java @@ -47,7 +47,7 @@ public class NightshadeStinger extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Faerie"); this.subtype.add("Rogue"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java b/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java index 65abb711fbc..e92e63093d9 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java @@ -53,7 +53,7 @@ public class ProtectiveBubble extends CardImpl { super(ownerId, 80, "Protective Bubble", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); this.expansionSetCode = "LRW"; this.subtype.add("Aura"); - this.color.setBlue(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java b/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java index 711f0894b7a..c3f6f9f0abb 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java @@ -67,7 +67,7 @@ public class ScionOfOona extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Faerie"); 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/lorwyn/SeedguideAsh.java b/Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java index d32baff4350..271f95edfcf 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java @@ -57,7 +57,7 @@ public class SeedguideAsh extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Treefolk"); this.subtype.add("Druid"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); // When Seedguide Ash dies, you may search your library for up to three Forest cards and put them onto the battlefield tapped. If you do, shuffle your library. diff --git a/Mage.Sets/src/mage/sets/lorwyn/SkeletalChangeling.java b/Mage.Sets/src/mage/sets/lorwyn/SkeletalChangeling.java index a71fccb91d8..d85cdd437c2 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SkeletalChangeling.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SkeletalChangeling.java @@ -49,7 +49,7 @@ public class SkeletalChangeling extends CardImpl { super(ownerId, 140, "Skeletal Changeling", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.expansionSetCode = "LRW"; this.subtype.add("Shapeshifter"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); // Changeling diff --git a/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java b/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java index 3d0c8cf3b34..713c3525d61 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java @@ -51,7 +51,7 @@ public class SpiderwigBoggart extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); // When Spiderwig Boggart enters the battlefield, target creature gains fear until end of turn. diff --git a/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java b/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java index 03fb73aa119..f69a60c2ca2 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java @@ -61,7 +61,7 @@ public class SummonTheSchool extends CardImpl { super(ownerId, 42, "Summon the School", Rarity.UNCOMMON, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{3}{W}"); this.expansionSetCode = "LRW"; this.subtype.add("Merfolk"); - this.color.setWhite(true); + // Put two 1/1 blue Merfolk Wizard creature tokens onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new MerfolkToken(), 2)); // Tap four untapped Merfolk you control: Return Summon the School from your graveyard to your hand. diff --git a/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java b/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java index f142d1be1ec..3a61315d398 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java @@ -59,7 +59,7 @@ public class SunriseSovereign extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Giant"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); // Other Giant creatures you control get +2/+2 and have trample. diff --git a/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java b/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java index 353283f5670..f04ff4b4a8d 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java +++ b/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java @@ -61,7 +61,7 @@ public class TarPitcher extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); // {tap}, Sacrifice a Goblin: Tar Pitcher deals 2 damage to target creature or player. diff --git a/Mage.Sets/src/mage/sets/lorwyn/Tarfire.java b/Mage.Sets/src/mage/sets/lorwyn/Tarfire.java index da454f22acd..91cee2cf458 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Tarfire.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Tarfire.java @@ -45,7 +45,7 @@ public class Tarfire extends CardImpl { super(ownerId, 194, "Tarfire", Rarity.COMMON, new CardType[]{CardType.TRIBAL, CardType.INSTANT}, "{R}"); this.expansionSetCode = "LRW"; this.subtype.add("Goblin"); - this.color.setRed(true); + // Tarfire deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java b/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java index 03e07e4b380..14e1d3425f3 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java @@ -58,7 +58,7 @@ public class ThorntoothWitch extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Treefolk"); this.subtype.add("Shaman"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); // Whenever you cast a Treefolk spell, you may have target creature get +3/-3 until end of turn. diff --git a/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java b/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java index f73fc223ed9..2a07e94a909 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java +++ b/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java @@ -67,7 +67,7 @@ public class TimberProtector extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Treefolk"); this.subtype.add("Warrior"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java b/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java index 322cca287ea..9b8bcfdb183 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java @@ -57,7 +57,7 @@ public class WizenedCenn extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Kithkin"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); // Other Kithkin creatures you control get +1/+1. diff --git a/Mage.Sets/src/mage/sets/lorwyn/WoodlandChangeling.java b/Mage.Sets/src/mage/sets/lorwyn/WoodlandChangeling.java index e85b0094e59..518be0933c3 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WoodlandChangeling.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WoodlandChangeling.java @@ -45,7 +45,7 @@ public class WoodlandChangeling extends CardImpl { super(ownerId, 242, "Woodland Changeling", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "LRW"; this.subtype.add("Shapeshifter"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); // Changeling diff --git a/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java b/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java index e102914c228..2d319bc0743 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java @@ -60,8 +60,8 @@ public class WortBoggartAuntie extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); - this.color.setBlack(true); + + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FearAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/WydwenTheBitingGale.java b/Mage.Sets/src/mage/sets/lorwyn/WydwenTheBitingGale.java index cb9ff33c0d0..b22828d84b4 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WydwenTheBitingGale.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WydwenTheBitingGale.java @@ -54,8 +54,8 @@ public class WydwenTheBitingGale extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Faerie"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setBlack(true); + + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java b/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java index 6ff9005e48c..de95c9add85 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java @@ -51,7 +51,7 @@ public class ZephyrNet extends CardImpl { super(ownerId, 98, "Zephyr Net", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "LRW"; this.subtype.add("Aura"); - this.color.setBlue(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java b/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java index ded0d59c1c7..785dc518a43 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java +++ b/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java @@ -62,7 +62,7 @@ public class AcidicSlime extends CardImpl { super(ownerId, 165, "Acidic Slime", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "M10"; this.subtype.add("Ooze"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java b/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java index 4e2b15ed440..523030be09e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java +++ b/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java @@ -52,7 +52,7 @@ public class AcolyteOfXathrid extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setBlack(true); + this.power = new MageInt(0); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{1}{B}")); diff --git a/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java b/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java index 48607d59227..7d0e91753fb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java +++ b/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java @@ -48,7 +48,7 @@ public class ActOfTreason extends CardImpl { public ActOfTreason(UUID ownerId) { super(ownerId, 124, "Act of Treason", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "M10"; - this.color.setRed(true); + // Gain control of target creature until end of turn. Untap that creature. // It gains haste until end of turn. (It can attack and {T} this turn.) diff --git a/Mage.Sets/src/mage/sets/magic2010/AirElemental.java b/Mage.Sets/src/mage/sets/magic2010/AirElemental.java index 74cb7d107bb..2da6413dd0f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AirElemental.java +++ b/Mage.Sets/src/mage/sets/magic2010/AirElemental.java @@ -44,7 +44,7 @@ public class AirElemental extends CardImpl { public AirElemental(UUID ownerId) { super(ownerId, 42, "Air Elemental", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{U}{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); + this.subtype.add("Elemental"); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java b/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java index 79b7c79153e..f53660bf0f0 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java +++ b/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java @@ -67,7 +67,7 @@ public class AjaniGoldmane extends CardImpl { super(ownerId, 1, "Ajani Goldmane", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{W}{W}"); this.expansionSetCode = "M10"; this.subtype.add("Ajani"); - this.color.setWhite(true); + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false)); // +1: You gain 2 life. diff --git a/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java b/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java index d94f407b6e4..25a4441f584 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java +++ b/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java @@ -59,7 +59,7 @@ public class AlluringSiren extends CardImpl { public AlluringSiren(UUID ownerId) { super(ownerId, 43, "Alluring Siren", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); + this.subtype.add("Siren"); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java b/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java index c35f3ba9298..81a32f75803 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java +++ b/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java @@ -43,7 +43,7 @@ public class AngelsMercy extends CardImpl { public AngelsMercy(UUID ownerId) { super(ownerId, 2, "Angel's Mercy", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}{W}"); this.expansionSetCode = "M10"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new GainLifeEffect(7)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/AntQueen.java b/Mage.Sets/src/mage/sets/magic2010/AntQueen.java index 8a100a1b80f..b8f41effc05 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AntQueen.java +++ b/Mage.Sets/src/mage/sets/magic2010/AntQueen.java @@ -51,7 +51,7 @@ public class AntQueen extends CardImpl { super(ownerId, 166, "Ant Queen", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "M10"; this.subtype.add("Insect"); - this.color.setGreen(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java b/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java index 307af8dd779..460d36f8de8 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java +++ b/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java @@ -65,7 +65,7 @@ public class ArmoredAscension extends CardImpl { public ArmoredAscension(UUID ownerId) { super(ownerId, 3, "Armored Ascension", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "M10"; - this.color.setWhite(true); + this.subtype.add("Aura"); TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java b/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java index b5455d98792..9ca0b162e31 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java +++ b/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java @@ -62,7 +62,7 @@ public class AwakenerDruid extends CardImpl { public AwakenerDruid(UUID ownerId) { super(ownerId, 167, "Awakener Druid", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "M10"; - this.color.setGreen(true); + this.subtype.add("Human"); this.subtype.add("Druid"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2010/BallLightning.java b/Mage.Sets/src/mage/sets/magic2010/BallLightning.java index 2b26d4bd870..7e8689f8863 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BallLightning.java +++ b/Mage.Sets/src/mage/sets/magic2010/BallLightning.java @@ -49,7 +49,7 @@ public class BallLightning extends CardImpl { super(ownerId, 125, "Ball Lightning", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{R}{R}{R}"); this.expansionSetCode = "M10"; this.subtype.add("Elemental"); - this.color.setRed(true); + this.power = new MageInt(6); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java b/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java index 6f527109a38..a75f4ba92a3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java +++ b/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java @@ -58,7 +58,7 @@ public class BaneslayerAngel extends CardImpl { super(ownerId, 4, "Baneslayer Angel", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); this.expansionSetCode = "M10"; this.subtype.add("Angel"); - this.color.setWhite(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java b/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java index 9bfb1134785..8aa734ac2a3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java +++ b/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java @@ -44,7 +44,7 @@ public class BerserkersOfBloodRidge extends CardImpl { public BerserkersOfBloodRidge(UUID ownerId) { super(ownerId, 126, "Berserkers of Blood Ridge", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{R}"); this.expansionSetCode = "M10"; - this.color.setRed(true); + this.subtype.add("Human"); this.subtype.add("Berserker"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java b/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java index 19dcdc84d64..65cd78b155b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java +++ b/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java @@ -56,7 +56,7 @@ public class BlackKnight extends CardImpl { this.expansionSetCode = "M10"; 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/magic2010/BlindingMage.java b/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java index bbe4c9f6520..3452c4befdc 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java +++ b/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java @@ -52,7 +52,7 @@ public class BlindingMage extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}")); diff --git a/Mage.Sets/src/mage/sets/magic2010/BogWraith.java b/Mage.Sets/src/mage/sets/magic2010/BogWraith.java index 447c8c6ddbb..191356d0909 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BogWraith.java +++ b/Mage.Sets/src/mage/sets/magic2010/BogWraith.java @@ -44,7 +44,7 @@ public class BogWraith extends CardImpl { public BogWraith(UUID ownerId) { super(ownerId, 86, "Bog Wraith", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "M10"; - this.color.setBlack(true); + this.subtype.add("Wraith"); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java b/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java index 44d5c4d42c5..5c144d82acf 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java +++ b/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java @@ -50,7 +50,7 @@ public class BogardanHellkite extends CardImpl { super(ownerId, 127, "Bogardan Hellkite", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{6}{R}{R}"); this.expansionSetCode = "M10"; 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/magic2010/BorderlandRanger.java b/Mage.Sets/src/mage/sets/magic2010/BorderlandRanger.java index e1b81893e89..a437a43f001 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BorderlandRanger.java +++ b/Mage.Sets/src/mage/sets/magic2010/BorderlandRanger.java @@ -50,7 +50,7 @@ public class BorderlandRanger extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Human"); this.subtype.add("Scout"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2010/BrambleCreeper.java b/Mage.Sets/src/mage/sets/magic2010/BrambleCreeper.java index bbaa9ee2f6f..6fd056a47a8 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BrambleCreeper.java +++ b/Mage.Sets/src/mage/sets/magic2010/BrambleCreeper.java @@ -47,7 +47,7 @@ public class BrambleCreeper extends CardImpl { super(ownerId, 171, "Bramble Creeper", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "M10"; this.subtype.add("Elemental"); - this.color.setGreen(true); + this.power = new MageInt(0); this.toughness = new MageInt(3); this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(5, 0, Duration.EndOfTurn), false)); diff --git a/Mage.Sets/src/mage/sets/magic2010/BurstOfSpeed.java b/Mage.Sets/src/mage/sets/magic2010/BurstOfSpeed.java index 9e6746da2c8..8347d16e85d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BurstOfSpeed.java +++ b/Mage.Sets/src/mage/sets/magic2010/BurstOfSpeed.java @@ -46,7 +46,7 @@ public class BurstOfSpeed extends CardImpl { public BurstOfSpeed(UUID ownerId) { super(ownerId, 129, "Burst of Speed", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "M10"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent(), false)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/CaptainOfTheWatch.java b/Mage.Sets/src/mage/sets/magic2010/CaptainOfTheWatch.java index 3c282359a02..4a56df9ab50 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CaptainOfTheWatch.java +++ b/Mage.Sets/src/mage/sets/magic2010/CaptainOfTheWatch.java @@ -62,7 +62,7 @@ public class CaptainOfTheWatch extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(VigilanceAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java b/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java index f642dadc566..e795ef55dc2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java +++ b/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java @@ -60,7 +60,7 @@ public class ChandraNalaar extends CardImpl { super(ownerId, 132, "Chandra Nalaar", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{R}{R}"); this.expansionSetCode = "M10"; this.subtype.add("Chandra"); - this.color.setRed(true); + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(6)), false)); diff --git a/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java b/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java index 1437c3b1ebe..cc179a8b8a4 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java +++ b/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java @@ -44,7 +44,7 @@ public class ChildOfNight extends CardImpl { public ChildOfNight(UUID ownerId) { super(ownerId, 88, "Child of Night", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.expansionSetCode = "M10"; - this.color.setBlack(true); + this.subtype.add("Vampire"); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java b/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java index 79651109431..dab2269517e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java +++ b/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java @@ -43,7 +43,7 @@ public class CoralMerfolk extends CardImpl { public CoralMerfolk(UUID ownerId) { super(ownerId, 47, "Coral Merfolk", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); + this.subtype.add("Merfolk"); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java b/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java index b8f40adfec7..1b165d8317c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java +++ b/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java @@ -47,7 +47,7 @@ public class CudgelTroll extends CardImpl { public CudgelTroll(UUID ownerId) { super(ownerId, 174, "Cudgel Troll", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.expansionSetCode = "M10"; - this.color.setGreen(true); + this.subtype.add("Troll"); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2010/DeadlyRecluse.java b/Mage.Sets/src/mage/sets/magic2010/DeadlyRecluse.java index 69635706772..bd0545120a1 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DeadlyRecluse.java +++ b/Mage.Sets/src/mage/sets/magic2010/DeadlyRecluse.java @@ -45,7 +45,7 @@ public class DeadlyRecluse extends CardImpl { public DeadlyRecluse(UUID ownerId) { super(ownerId, 175, "Deadly Recluse", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "M10"; - this.color.setGreen(true); + this.subtype.add("Spider"); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2010/Disentomb.java b/Mage.Sets/src/mage/sets/magic2010/Disentomb.java index 9a8c79907e2..c84c6879598 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Disentomb.java +++ b/Mage.Sets/src/mage/sets/magic2010/Disentomb.java @@ -47,7 +47,7 @@ public class Disentomb extends CardImpl { public Disentomb(UUID ownerId) { super(ownerId, 92, "Disentomb", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "M10"; - this.color.setBlack(true); + this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter)); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Disorient.java b/Mage.Sets/src/mage/sets/magic2010/Disorient.java index 769b4a644e6..019702fa586 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Disorient.java +++ b/Mage.Sets/src/mage/sets/magic2010/Disorient.java @@ -45,7 +45,7 @@ public class Disorient extends CardImpl { public Disorient(UUID ownerId) { super(ownerId, 48, "Disorient", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(-7, 0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java b/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java index aaf05abbadd..b5d3b340438 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java +++ b/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java @@ -54,7 +54,7 @@ public class DoomBlade extends CardImpl { public DoomBlade(UUID ownerId){ super(ownerId, 93, "Doom Blade", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "M10"; - this.color.setBlack(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java index 489c6e28b81..193d5f4fb86 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java +++ b/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java @@ -48,7 +48,7 @@ public class DrudgeSkeletons extends CardImpl{ super(ownerId, 95, "Drudge Skeletons", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.expansionSetCode = "M10"; this.subtype.add("Skeleton"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); diff --git a/Mage.Sets/src/mage/sets/magic2010/Duress.java b/Mage.Sets/src/mage/sets/magic2010/Duress.java index aea882b8e65..7ecb43ea62d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Duress.java +++ b/Mage.Sets/src/mage/sets/magic2010/Duress.java @@ -53,7 +53,7 @@ public class Duress extends CardImpl { public Duress(UUID ownerId){ super(ownerId, 96, "Duress", Rarity.COMMON, new CardType[]{CardType.SORCERY},"{B}"); this.expansionSetCode = "M10"; - this.color.setBlack(true); + // Target opponent reveals his or her hand. You choose a noncreature, nonland card from it. That player discards that card. this.getSpellAbility().addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/sets/magic2010/Earthquake.java b/Mage.Sets/src/mage/sets/magic2010/Earthquake.java index 89a206ffb44..b49cd07434b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Earthquake.java +++ b/Mage.Sets/src/mage/sets/magic2010/Earthquake.java @@ -52,7 +52,7 @@ public class Earthquake extends CardImpl { public Earthquake(UUID ownerId) { super(ownerId, 134, "Earthquake", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{R}"); this.expansionSetCode = "M10"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new EarthquakeEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java b/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java index f65488f4ad2..00887c6de98 100644 --- a/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java +++ b/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java @@ -43,7 +43,7 @@ public class EliteVanguard extends CardImpl { public EliteVanguard(UUID ownerId) { super(ownerId, 9, "Elite Vanguard", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}"); this.expansionSetCode = "M10"; - this.color.setWhite(true); + this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java b/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java index c2139be5b65..5224b598da7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java +++ b/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java @@ -63,7 +63,7 @@ public class ElvishArchdruid extends CardImpl { this.expansionSetCode = "M10"; 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/magic2010/EmeraldOryx.java b/Mage.Sets/src/mage/sets/magic2010/EmeraldOryx.java index 853f95c7a36..53772143850 100644 --- a/Mage.Sets/src/mage/sets/magic2010/EmeraldOryx.java +++ b/Mage.Sets/src/mage/sets/magic2010/EmeraldOryx.java @@ -44,7 +44,7 @@ public class EmeraldOryx extends CardImpl { public EmeraldOryx(UUID ownerId) { super(ownerId, 179, "Emerald Oryx", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "M10"; - this.color.setGreen(true); + this.subtype.add("Antelope"); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2010/Fabricate.java b/Mage.Sets/src/mage/sets/magic2010/Fabricate.java index 6ccffc85ad2..fb4347dffd5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Fabricate.java +++ b/Mage.Sets/src/mage/sets/magic2010/Fabricate.java @@ -51,7 +51,7 @@ public class Fabricate extends CardImpl { public Fabricate(UUID ownerId) { super(ownerId, 52, "Fabricate", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); + // Search your library for an artifact card, reveal it, and put it into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, filter), true)); diff --git a/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java b/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java index 458fd3030b3..9d8b62667da 100644 --- a/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java +++ b/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java @@ -50,7 +50,7 @@ public class FieryHellhound extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Elemental"); 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/Fireball.java b/Mage.Sets/src/mage/sets/magic2010/Fireball.java index f8a232897f4..b4a3a67ae3b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Fireball.java +++ b/Mage.Sets/src/mage/sets/magic2010/Fireball.java @@ -54,7 +54,7 @@ public class Fireball extends CardImpl { public Fireball(UUID ownerId) { super(ownerId, 136, "Fireball", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{R}"); this.expansionSetCode = "M10"; - this.color.setRed(true); + this.getSpellAbility().addTarget(new FireballTargetCreatureOrPlayer(0, Integer.MAX_VALUE)); this.getSpellAbility().addEffect(new FireballEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Fog.java b/Mage.Sets/src/mage/sets/magic2010/Fog.java index 4b71a3bb9a7..dd4c19ce478 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Fog.java +++ b/Mage.Sets/src/mage/sets/magic2010/Fog.java @@ -44,7 +44,7 @@ public class Fog extends CardImpl { public Fog(UUID ownerId) { super(ownerId, 182, "Fog", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "M10"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new PreventAllDamageByAllEffect(Duration.EndOfTurn, true)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java b/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java index ead33c3a7b3..7c35ee12a38 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java +++ b/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java @@ -60,7 +60,7 @@ public class GarrukWildspeaker extends CardImpl { super(ownerId, 183, "Garruk Wildspeaker", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{G}{G}"); this.expansionSetCode = "M10"; this.subtype.add("Garruk"); - this.color.setGreen(true); + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), false)); diff --git a/Mage.Sets/src/mage/sets/magic2010/GloriousCharge.java b/Mage.Sets/src/mage/sets/magic2010/GloriousCharge.java index 068a90fd330..efb547081bf 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GloriousCharge.java +++ b/Mage.Sets/src/mage/sets/magic2010/GloriousCharge.java @@ -45,7 +45,7 @@ public class GloriousCharge extends CardImpl { public GloriousCharge(UUID ownerId) { super(ownerId, 11, "Glorious Charge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "M10"; - this.color.setWhite(true); + // Creatures you control get +1/+1 until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn, new FilterCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/sets/magic2010/GoblinArtillery.java b/Mage.Sets/src/mage/sets/magic2010/GoblinArtillery.java index b8e736832d4..bb39eb96ac7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GoblinArtillery.java +++ b/Mage.Sets/src/mage/sets/magic2010/GoblinArtillery.java @@ -52,7 +52,7 @@ public class GoblinArtillery extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java b/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java index 1ff6f9b2d4b..12581f8da94 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java +++ b/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java @@ -58,7 +58,7 @@ public class GoblinChieftain extends CardImpl { super(ownerId, 139, "Goblin Chieftain", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); this.expansionSetCode = "M10"; 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/magic2010/GreatSableStag.java b/Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java index a7952ffcae3..f4fd1b206cc 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java +++ b/Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java @@ -58,7 +58,7 @@ public class GreatSableStag extends CardImpl { super(ownerId, 186, "Great Sable Stag", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}{G}"); this.expansionSetCode = "M10"; this.subtype.add("Elk"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java b/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java index 65ce5791701..235259d1d17 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java +++ b/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java @@ -46,7 +46,7 @@ public class GriffinSentinel extends CardImpl { super(ownerId, 12, "Griffin Sentinel", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.expansionSetCode = "M10"; this.subtype.add("Griffin"); - this.color.setWhite(true); + this.addAbility(FlyingAbility.getInstance()); this.addAbility(VigilanceAbility.getInstance()); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java b/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java index b289de1411b..56cd51479ab 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java +++ b/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java @@ -55,7 +55,7 @@ public class HauntingEchoes extends CardImpl { public HauntingEchoes(UUID ownerId) { super(ownerId, 98, "Haunting Echoes", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "M10"; - this.color.setBlack(true); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new HauntingEchoesEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java b/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java index b89cd1cabc4..84dc01e137b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java +++ b/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java @@ -55,7 +55,7 @@ public class HonorOfThePure extends CardImpl { public HonorOfThePure(UUID ownerId) { super(ownerId, 16, "Honor of the Pure", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "M10"; - this.color.setWhite(true); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/sets/magic2010/HornedTurtle.java b/Mage.Sets/src/mage/sets/magic2010/HornedTurtle.java index 3d4708be139..3d742eb5820 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HornedTurtle.java +++ b/Mage.Sets/src/mage/sets/magic2010/HornedTurtle.java @@ -43,7 +43,7 @@ public class HornedTurtle extends CardImpl { public HornedTurtle(UUID ownerId) { super(ownerId, 55, "Horned Turtle", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); + this.subtype.add("Turtle"); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2010/HowlOfTheNightPack.java b/Mage.Sets/src/mage/sets/magic2010/HowlOfTheNightPack.java index 58fdcbaaa21..08d64a0369e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HowlOfTheNightPack.java +++ b/Mage.Sets/src/mage/sets/magic2010/HowlOfTheNightPack.java @@ -52,7 +52,7 @@ public class HowlOfTheNightPack extends CardImpl { public HowlOfTheNightPack(UUID ownerId) { super(ownerId, 187, "Howl of the Night Pack", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{6}{G}"); this.expansionSetCode = "M10"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new CreateTokenEffect(new WolfToken(), new PermanentsOnBattlefieldCount(filter))); } diff --git a/Mage.Sets/src/mage/sets/magic2010/HowlingBanshee.java b/Mage.Sets/src/mage/sets/magic2010/HowlingBanshee.java index c34383c6208..94665cc8a70 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HowlingBanshee.java +++ b/Mage.Sets/src/mage/sets/magic2010/HowlingBanshee.java @@ -47,7 +47,7 @@ public class HowlingBanshee extends CardImpl { super(ownerId, 99, "Howling Banshee", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); this.expansionSetCode = "M10"; this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2010/IceCage.java b/Mage.Sets/src/mage/sets/magic2010/IceCage.java index 20c10392edf..1a0b9bc894d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/IceCage.java +++ b/Mage.Sets/src/mage/sets/magic2010/IceCage.java @@ -57,7 +57,7 @@ public class IceCage extends CardImpl { public IceCage(UUID ownerId) { super(ownerId, 56, "Ice Cage", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); + this.subtype.add("Aura"); // Enchant creature diff --git a/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java b/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java index 4baf258182c..fcd4938b0e1 100644 --- a/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java +++ b/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java @@ -51,7 +51,7 @@ public class JaceBeleren extends CardImpl { super(ownerId, 58, "Jace Beleren", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{1}{U}{U}"); this.expansionSetCode = "M10"; this.subtype.add("Jace"); - this.color.setBlue(true); + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), false)); // +2: Each player draws a card. diff --git a/Mage.Sets/src/mage/sets/magic2010/Jump.java b/Mage.Sets/src/mage/sets/magic2010/Jump.java index 0761964d6b7..431920f71ad 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Jump.java +++ b/Mage.Sets/src/mage/sets/magic2010/Jump.java @@ -46,7 +46,7 @@ public class Jump extends CardImpl { public Jump(UUID ownerId) { super(ownerId, 59, "Jump", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java b/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java index eb4ad9beadc..222964973f9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java +++ b/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java @@ -45,7 +45,7 @@ public class KelinoreBat extends CardImpl { super(ownerId, 101, "Kelinore Bat", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "M10"; this.subtype.add("Bat"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2010/KindledFury.java b/Mage.Sets/src/mage/sets/magic2010/KindledFury.java index 37f0a935116..e405e9e87ce 100644 --- a/Mage.Sets/src/mage/sets/magic2010/KindledFury.java +++ b/Mage.Sets/src/mage/sets/magic2010/KindledFury.java @@ -47,7 +47,7 @@ public class KindledFury extends CardImpl { public KindledFury(UUID ownerId) { super(ownerId, 144, "Kindled Fury", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "M10"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java b/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java index 6d8b0c93ab5..80c5fd54a2d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java +++ b/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java @@ -44,7 +44,7 @@ public class LightningBolt extends CardImpl { public LightningBolt(UUID ownerId) { super(ownerId, 146, "Lightning Bolt", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "M10"; - this.color.setRed(true); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java b/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java index cb8f8a217fe..d03f79e665a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java +++ b/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java @@ -58,7 +58,7 @@ public class LilianaVess extends CardImpl { super(ownerId, 102, "Liliana Vess", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{B}{B}"); this.expansionSetCode = "M10"; this.subtype.add("Liliana"); - this.color.setBlack(true); + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(5)), false)); // +1: Target player discards a card. LoyaltyAbility ability1 = new LoyaltyAbility(new DiscardTargetEffect(1), 1); diff --git a/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java b/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java index 2098c926458..69f47251006 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java +++ b/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java @@ -49,7 +49,7 @@ public class LoomingShade extends CardImpl { super(ownerId, 103, "Looming Shade", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "M10"; this.subtype.add("Shade"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{B}"))); diff --git a/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java b/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java index b5baa763d88..7cf6344b07f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java +++ b/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java @@ -51,7 +51,7 @@ public class MagmaPhoenix extends CardImpl { super(ownerId, 148, "Magma Phoenix", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); this.expansionSetCode = "M10"; 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/magic2010/MasterOfTheWildHunt.java b/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java index 28968767c5f..3d0c31b8d20 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java +++ b/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java @@ -68,7 +68,7 @@ public class MasterOfTheWildHunt extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Human"); 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/magic2010/MerfolkSovereign.java b/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java index 86d4b5e84f4..533f6c3765f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java +++ b/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java @@ -63,7 +63,7 @@ public class MerfolkSovereign extends CardImpl { super(ownerId, 62, "Merfolk Sovereign", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); this.expansionSetCode = "M10"; 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/magic2010/MightOfOaks.java b/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java index 1fd3ec0ab14..b38690467ee 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java +++ b/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java @@ -45,7 +45,7 @@ public class MightOfOaks extends CardImpl { public MightOfOaks(UUID ownerId){ super(ownerId, 192, "Might of Oaks", Rarity.RARE, new CardType[]{CardType.INSTANT},"{3}{G}"); this.expansionSetCode = "M10"; - this.color.setGreen(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(7, 7, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/MindControl.java b/Mage.Sets/src/mage/sets/magic2010/MindControl.java index ab58bc3fc97..b3e030da380 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MindControl.java +++ b/Mage.Sets/src/mage/sets/magic2010/MindControl.java @@ -51,7 +51,7 @@ public class MindControl extends CardImpl { public MindControl(UUID ownerId) { super(ownerId, 63, "Mind Control", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); + this.subtype.add("Aura"); TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2010/MindSpring.java b/Mage.Sets/src/mage/sets/magic2010/MindSpring.java index 0b10c802cea..72955a428fb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MindSpring.java +++ b/Mage.Sets/src/mage/sets/magic2010/MindSpring.java @@ -47,7 +47,7 @@ public class MindSpring extends CardImpl { public MindSpring(UUID ownerId) { super(ownerId, 64, "Mind Spring", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{U}{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new MindSpringEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/MistLeopard.java b/Mage.Sets/src/mage/sets/magic2010/MistLeopard.java index 9487c777114..61faa149c85 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MistLeopard.java +++ b/Mage.Sets/src/mage/sets/magic2010/MistLeopard.java @@ -44,7 +44,7 @@ public class MistLeopard extends CardImpl { public MistLeopard(UUID ownerId) { super(ownerId, 193, "Mist Leopard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "M10"; - this.color.setGreen(true); + this.subtype.add("Cat"); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java b/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java index ce3d49786c3..30d544425d4 100644 --- a/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java +++ b/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java @@ -45,7 +45,7 @@ public class NaturesSpiral extends CardImpl { public NaturesSpiral(UUID ownerId) { super(ownerId, 196, "Nature's Spiral", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "M10"; - this.color.setGreen(true); + this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterPermanentCard("permanent card from your graveyard"))); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Negate.java b/Mage.Sets/src/mage/sets/magic2010/Negate.java index 3075f248e6f..b06c4d9fc80 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Negate.java +++ b/Mage.Sets/src/mage/sets/magic2010/Negate.java @@ -53,7 +53,7 @@ public class Negate extends CardImpl { public Negate(UUID ownerId) { super(ownerId, 65, "Negate", 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/Oakenform.java b/Mage.Sets/src/mage/sets/magic2010/Oakenform.java index da66ea3bcea..ebfff007131 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Oakenform.java +++ b/Mage.Sets/src/mage/sets/magic2010/Oakenform.java @@ -56,7 +56,7 @@ public class Oakenform extends CardImpl { public Oakenform(UUID ownerId) { super(ownerId, 197, "Oakenform", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "M10"; - this.color.setGreen(true); + this.subtype.add("Aura"); TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2010/Overrun.java b/Mage.Sets/src/mage/sets/magic2010/Overrun.java index 2e7763f2740..708a27bb8bd 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Overrun.java +++ b/Mage.Sets/src/mage/sets/magic2010/Overrun.java @@ -48,7 +48,7 @@ public class Overrun extends CardImpl { public Overrun(UUID ownerId) { super(ownerId, 198, "Overrun", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY},"{2}{G}{G}{G}"); this.expansionSetCode = "M10"; - this.color.setGreen(true); + // Creatures you control get +3/+3 and gain trample until end of turn. Effect effect = new BoostControlledEffect(3, 3, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java b/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java index 41f99426d77..c3055d75246 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java +++ b/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java @@ -48,7 +48,7 @@ public class PalaceGuard extends CardImpl { this.expansionSetCode = "M10"; 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/magic2010/PhantomWarrior.java b/Mage.Sets/src/mage/sets/magic2010/PhantomWarrior.java index 999274326e1..483de2048c9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PhantomWarrior.java +++ b/Mage.Sets/src/mage/sets/magic2010/PhantomWarrior.java @@ -45,7 +45,7 @@ public class PhantomWarrior extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Illusion"); this.subtype.add("Warrior"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new CantBeBlockedSourceAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2010/PlanarCleansing.java b/Mage.Sets/src/mage/sets/magic2010/PlanarCleansing.java index 921e4b9048b..2649c3517e1 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PlanarCleansing.java +++ b/Mage.Sets/src/mage/sets/magic2010/PlanarCleansing.java @@ -49,7 +49,7 @@ public class PlanarCleansing extends CardImpl { public PlanarCleansing(UUID ownerId) { super(ownerId, 24, "Planar Cleansing", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{W}{W}{W}"); this.expansionSetCode = "M10"; - this.color.setWhite(true); + // Destroy all nonland permanents. this.getSpellAbility().addEffect(new PlanarCleansingEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java b/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java index 569a1d9630c..601440c21c0 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java +++ b/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java @@ -47,7 +47,7 @@ public class PrizedUnicorn extends CardImpl { super(ownerId, 199, "Prized Unicorn", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "M10"; this.subtype.add("Unicorn"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java b/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java index 9c6eba26107..feb2ccc3206 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java +++ b/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java @@ -60,7 +60,7 @@ public class ProteanHydra extends CardImpl { super(ownerId, 200, "Protean Hydra", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{X}{G}"); this.expansionSetCode = "M10"; 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/magic2010/RampantGrowth.java b/Mage.Sets/src/mage/sets/magic2010/RampantGrowth.java index 82bc1fd341e..dabb3dc9168 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RampantGrowth.java +++ b/Mage.Sets/src/mage/sets/magic2010/RampantGrowth.java @@ -45,7 +45,7 @@ public class RampantGrowth extends CardImpl { public RampantGrowth(UUID ownerId){ super(ownerId, 201, "Rampant Growth", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "M10"; - this.color.setGreen(true); + TargetCardInLibrary target = new TargetCardInLibrary(new FilterBasicLandCard()); this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(target, true)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Regenerate.java b/Mage.Sets/src/mage/sets/magic2010/Regenerate.java index 813c9af6349..34094a1f67f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Regenerate.java +++ b/Mage.Sets/src/mage/sets/magic2010/Regenerate.java @@ -43,7 +43,7 @@ public class Regenerate extends CardImpl { public Regenerate(UUID ownerId) { super(ownerId, 202, "Regenerate", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "M10"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new RegenerateTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java b/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java index 78b126ad328..ac13e9ca382 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java +++ b/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java @@ -56,7 +56,7 @@ public class RhoxPikemaster extends CardImpl { public RhoxPikemaster(UUID ownerId) { super(ownerId, 26, "Rhox Pikemaster", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); this.expansionSetCode = "M10"; - this.color.setWhite(true); + this.subtype.add("Rhino"); this.subtype.add("Soldier"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java b/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java index 2e1fa62b73d..5596fd7914c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java +++ b/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java @@ -52,7 +52,7 @@ public class RiseFromTheGrave extends CardImpl { public RiseFromTheGrave(UUID ownerId) { super(ownerId, 109, "Rise from the Grave", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{B}"); this.expansionSetCode = "M10"; - this.color.setBlack(true); + // Put target creature card from a graveyard onto the battlefield under your control. That creature is a black Zombie in addition to its other colors and types. this.getSpellAbility().addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard"))); diff --git a/Mage.Sets/src/mage/sets/magic2010/RuneclawBear.java b/Mage.Sets/src/mage/sets/magic2010/RuneclawBear.java index edcd55a63a2..f384e8ebd1d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RuneclawBear.java +++ b/Mage.Sets/src/mage/sets/magic2010/RuneclawBear.java @@ -44,7 +44,7 @@ public class RuneclawBear extends CardImpl { super(ownerId, 203, "Runeclaw Bear", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "M10"; 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/magic2010/SafePassage.java b/Mage.Sets/src/mage/sets/magic2010/SafePassage.java index 62e5f0df88a..2fa048898de 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SafePassage.java +++ b/Mage.Sets/src/mage/sets/magic2010/SafePassage.java @@ -55,7 +55,7 @@ public class SafePassage extends CardImpl { public SafePassage(UUID ownerId) { super(ownerId, 28, "Safe Passage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "M10"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new PreventAllDamageToAllEffect(Duration.EndOfTurn, filter)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java b/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java index c0860f5c63d..32d958ea6dc 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java +++ b/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java @@ -52,7 +52,7 @@ public class SeismicStrike extends CardImpl { public SeismicStrike(UUID ownerId) { super(ownerId, 154, "Seismic Strike", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "M10"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/SiegeGangCommander.java b/Mage.Sets/src/mage/sets/magic2010/SiegeGangCommander.java index 1af66951dc2..b2621b66a03 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SiegeGangCommander.java +++ b/Mage.Sets/src/mage/sets/magic2010/SiegeGangCommander.java @@ -63,7 +63,7 @@ public class SiegeGangCommander extends CardImpl { super(ownerId, 157, "Siege-Gang Commander", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); this.expansionSetCode = "M10"; this.subtype.add("Goblin"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GoblinToken(), 3), false)); diff --git a/Mage.Sets/src/mage/sets/magic2010/SiegeMastodon.java b/Mage.Sets/src/mage/sets/magic2010/SiegeMastodon.java index e2f046a4722..7aeee4d0a7b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SiegeMastodon.java +++ b/Mage.Sets/src/mage/sets/magic2010/SiegeMastodon.java @@ -44,7 +44,7 @@ public class SiegeMastodon extends CardImpl { super(ownerId, 30, "Siege Mastodon", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "M10"; this.subtype.add("Elephant"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java b/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java index cd80dc1d28f..d42cae9a7cb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java +++ b/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java @@ -46,7 +46,7 @@ public class SignInBlood extends CardImpl { public SignInBlood(UUID ownerId) { super(ownerId, 112, "Sign in Blood", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}{B}"); this.expansionSetCode = "M10"; - this.color.setBlack(true); + // Target player draws two cards and loses 2 life. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/magic2010/Silence.java b/Mage.Sets/src/mage/sets/magic2010/Silence.java index 3ca7999e3e2..4e406fbe936 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Silence.java +++ b/Mage.Sets/src/mage/sets/magic2010/Silence.java @@ -50,7 +50,7 @@ public class Silence extends CardImpl { public Silence(UUID ownerId) { super(ownerId, 31, "Silence", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "M10"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new SilenceEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/SilvercoatLion.java b/Mage.Sets/src/mage/sets/magic2010/SilvercoatLion.java index 0f3c857647e..f558135034e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SilvercoatLion.java +++ b/Mage.Sets/src/mage/sets/magic2010/SilvercoatLion.java @@ -44,7 +44,7 @@ public class SilvercoatLion extends CardImpl { super(ownerId, 32, "Silvercoat Lion", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "M10"; this.subtype.add("Cat"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2010/Sleep.java b/Mage.Sets/src/mage/sets/magic2010/Sleep.java index 5866580a73d..9b74bff5919 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Sleep.java +++ b/Mage.Sets/src/mage/sets/magic2010/Sleep.java @@ -53,7 +53,7 @@ public class Sleep extends CardImpl { public Sleep(UUID ownerId) { super(ownerId, 71, "Sleep", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new SleepEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java b/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java index 5b8457413c8..e2f48200eae 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java +++ b/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java @@ -44,7 +44,7 @@ public class SnappingDrake extends CardImpl{ public SnappingDrake(UUID ownerId) { super(ownerId, 72, "Snapping Drake", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); + this.subtype.add("Drake"); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java b/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java index c0cc2fdc5f8..f3d3f8deb3b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java +++ b/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java @@ -56,7 +56,7 @@ public class SolemnOffering extends CardImpl { public SolemnOffering(UUID ownerId) { super(ownerId, 33, "Solemn Offering", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{W}"); this.expansionSetCode = "M10"; - this.color.setWhite(true); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new GainLifeEffect(4)); diff --git a/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java b/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java index 37c64ea4e7a..5310991e3c3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java +++ b/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java @@ -56,7 +56,7 @@ public class SoulWarden extends CardImpl { this.expansionSetCode = "M10"; 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/magic2010/SparkmageApprentice.java b/Mage.Sets/src/mage/sets/magic2010/SparkmageApprentice.java index 3377ff1d797..6bc9466a1fa 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SparkmageApprentice.java +++ b/Mage.Sets/src/mage/sets/magic2010/SparkmageApprentice.java @@ -48,7 +48,7 @@ public class SparkmageApprentice extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(1), false); diff --git a/Mage.Sets/src/mage/sets/magic2010/StormfrontPegasus.java b/Mage.Sets/src/mage/sets/magic2010/StormfrontPegasus.java index f57a88f5a6b..786477e5131 100644 --- a/Mage.Sets/src/mage/sets/magic2010/StormfrontPegasus.java +++ b/Mage.Sets/src/mage/sets/magic2010/StormfrontPegasus.java @@ -45,7 +45,7 @@ public class StormfrontPegasus extends CardImpl { super(ownerId, 35, "Stormfront Pegasus", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "M10"; this.subtype.add("Pegasus"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2010/TempestOfLight.java b/Mage.Sets/src/mage/sets/magic2010/TempestOfLight.java index dcaa8137dad..113e3730fad 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TempestOfLight.java +++ b/Mage.Sets/src/mage/sets/magic2010/TempestOfLight.java @@ -49,7 +49,7 @@ public class TempestOfLight extends CardImpl { public TempestOfLight(UUID ownerId) { super(ownerId, 36, "Tempest of Light", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "M10"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new TempestOfLightEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java b/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java index 578faaaf3d3..94895951c58 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java +++ b/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java @@ -53,7 +53,7 @@ public class TendrilsOfCorruption extends CardImpl { public TendrilsOfCorruption(UUID ownerId) { super(ownerId, 114, "Tendrils of Corruption", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{B}"); this.expansionSetCode = "M10"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter))); diff --git a/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java b/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java index 7e4af9ee057..4284550916c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java +++ b/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java @@ -48,7 +48,7 @@ public class TimeWarp extends CardImpl { public TimeWarp(UUID ownerId) { super(ownerId, 75, "Time Warp", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{3}{U}{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new TimeWarpEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/TomeScour.java b/Mage.Sets/src/mage/sets/magic2010/TomeScour.java index c9fd377a7c0..eb802f29eaa 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TomeScour.java +++ b/Mage.Sets/src/mage/sets/magic2010/TomeScour.java @@ -44,7 +44,7 @@ public class TomeScour extends CardImpl { public TomeScour(UUID ownerId) { super(ownerId, 76, "Tome Scour", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(5)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Twincast.java b/Mage.Sets/src/mage/sets/magic2010/Twincast.java index 7389b67aec7..01f5944b21f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Twincast.java +++ b/Mage.Sets/src/mage/sets/magic2010/Twincast.java @@ -54,7 +54,7 @@ public class Twincast extends CardImpl { public Twincast(UUID ownerId) { super(ownerId, 78, "Twincast", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{U}{U}"); this.expansionSetCode = "M10"; - this.color.setBlue(true); + // Copy target instant or sorcery spell. You may choose new targets for the copy. this.getSpellAbility().addEffect(new CopyTargetSpellEffect()); this.getSpellAbility().addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java b/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java index 1d0fbb1184b..8094930479a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java +++ b/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java @@ -65,7 +65,7 @@ public class UndeadSlayer extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); diff --git a/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java b/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java index 6c3c6f7ba76..20f3e00c0fd 100644 --- a/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java +++ b/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java @@ -53,7 +53,7 @@ public class VampireAristocrat extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Vampire"); this.subtype.add("Rogue"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("")); diff --git a/Mage.Sets/src/mage/sets/magic2010/VeteranArmorsmith.java b/Mage.Sets/src/mage/sets/magic2010/VeteranArmorsmith.java index 3259ddf78c1..1f5b81222bf 100644 --- a/Mage.Sets/src/mage/sets/magic2010/VeteranArmorsmith.java +++ b/Mage.Sets/src/mage/sets/magic2010/VeteranArmorsmith.java @@ -57,7 +57,7 @@ public class VeteranArmorsmith extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); diff --git a/Mage.Sets/src/mage/sets/magic2010/VeteranSwordsmith.java b/Mage.Sets/src/mage/sets/magic2010/VeteranSwordsmith.java index 7392365c6a6..b6c0e3c3012 100644 --- a/Mage.Sets/src/mage/sets/magic2010/VeteranSwordsmith.java +++ b/Mage.Sets/src/mage/sets/magic2010/VeteranSwordsmith.java @@ -56,7 +56,7 @@ public class VeteranSwordsmith extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); diff --git a/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java b/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java index 95a897bef64..ce274f412fe 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java +++ b/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java @@ -50,7 +50,7 @@ public class WallOfBone extends CardImpl { this.expansionSetCode = "M10"; this.subtype.add("Skeleton"); this.subtype.add("Wall"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(4); this.addAbility(DefenderAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java b/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java index 70cc7356b93..24f33384e3a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java +++ b/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java @@ -49,7 +49,7 @@ public class WallOfFaith extends CardImpl { public WallOfFaith(UUID ownerId) { super(ownerId, 40, "Wall of Faith", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "M10"; - this.color.setWhite(true); + this.subtype.add("Wall"); this.power = new MageInt(0); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java b/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java index fb85edfe72b..e10a9c323cd 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java +++ b/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java @@ -45,7 +45,7 @@ public class WallOfFrost extends CardImpl { super(ownerId, 80, "Wall of Frost", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); this.expansionSetCode = "M10"; 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/magic2010/WarpathGhoul.java b/Mage.Sets/src/mage/sets/magic2010/WarpathGhoul.java index 66e87cf0772..3e0671c1466 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WarpathGhoul.java +++ b/Mage.Sets/src/mage/sets/magic2010/WarpathGhoul.java @@ -44,7 +44,7 @@ public class WarpathGhoul extends CardImpl { super(ownerId, 120, "Warpath Ghoul", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "M10"; 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/magic2010/Weakness.java b/Mage.Sets/src/mage/sets/magic2010/Weakness.java index b24191eed80..2047968193f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Weakness.java +++ b/Mage.Sets/src/mage/sets/magic2010/Weakness.java @@ -56,7 +56,7 @@ public class Weakness extends CardImpl { public Weakness(UUID ownerId) { super(ownerId, 121, "Weakness", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "M10"; - this.color.setBlack(true); + this.subtype.add("Aura"); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java b/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java index d9410b57cab..6cba6afce88 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java +++ b/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java @@ -56,7 +56,7 @@ public class WhiteKnight extends CardImpl { this.expansionSetCode = "M10"; 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/magic2010/WindDrake.java b/Mage.Sets/src/mage/sets/magic2010/WindDrake.java index 457af23f32f..642ad70f2d5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WindDrake.java +++ b/Mage.Sets/src/mage/sets/magic2010/WindDrake.java @@ -45,7 +45,7 @@ public class WindDrake extends CardImpl { super(ownerId, 81, "Wind Drake", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "M10"; this.subtype.add("Drake"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java b/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java index d7a766dda30..15dfa09d8e8 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java +++ b/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java @@ -45,7 +45,7 @@ public class ZephyrSprite extends CardImpl { super(ownerId, 82, "Zephyr Sprite", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}"); this.expansionSetCode = "M10"; this.subtype.add("Faerie"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2011/AirServant.java b/Mage.Sets/src/mage/sets/magic2011/AirServant.java index b5c91b91158..c07fc8b205c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AirServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/AirServant.java @@ -58,7 +58,7 @@ public class AirServant extends CardImpl { public AirServant(UUID ownerId) { super(ownerId, 42, "Air Servant", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); this.expansionSetCode = "M11"; - this.color.setBlue(true); + this.subtype.add("Elemental"); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java b/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java index 2d6970cb015..d6bb8ef6bc3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java +++ b/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java @@ -29,11 +29,11 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.game.events.GameEvent.EventType; /** @@ -45,7 +45,6 @@ public class AjanisMantra extends CardImpl { public AjanisMantra(UUID ownerId) { super(ownerId, 2, "Ajani's Mantra", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "M11"; - this.getColor().setWhite(true); this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new GainLifeEffect(1), true)); } diff --git a/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java b/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java index 99b2b222bb7..0818fa5dd96 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java +++ b/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java @@ -52,7 +52,7 @@ public class AjanisPridemate extends CardImpl { this.expansionSetCode = "M11"; this.subtype.add("Cat"); 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/magic2011/AncientHellkite.java b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java index 0c9e057f0a0..0d85a1a63c5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java +++ b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java @@ -57,7 +57,7 @@ public class AncientHellkite extends CardImpl { super(ownerId, 122, "Ancient Hellkite", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{R}{R}{R}"); this.expansionSetCode = "M11"; 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/magic2011/AngelicArbiter.java b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java index 5900b41088b..d71cf015bca 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java +++ b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java @@ -61,7 +61,7 @@ public class AngelicArbiter extends CardImpl { super(ownerId, 4, "Angelic Arbiter", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{W}{W}"); this.expansionSetCode = "M11"; this.subtype.add("Angel"); - this.color.setWhite(true); + this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java b/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java index 877e8c3939f..d146e85dba2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java +++ b/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java @@ -49,7 +49,7 @@ public class ArcRunner extends CardImpl { this.expansionSetCode = "M11"; this.subtype.add("Elemental"); this.subtype.add("Ox"); - this.color.setRed(true); + this.power = new MageInt(5); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java b/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java index fcc7b19582d..20ab7fb4bf8 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java +++ b/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java @@ -43,7 +43,7 @@ public class ArmoredCancrix extends CardImpl { public ArmoredCancrix(UUID ownerId) { super(ownerId, 44, "Armored Cancrix", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); this.expansionSetCode = "M11"; - this.color.setBlue(true); + this.subtype.add("Crab"); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java b/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java index 14336be1424..a6de45d6499 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java +++ b/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java @@ -44,7 +44,7 @@ public class AssaultGriffin extends CardImpl { public AssaultGriffin(UUID ownerId) { super(ownerId, 6, "Assault Griffin", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "M11"; - this.color.setWhite(true); + this.subtype.add("Griffin"); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java b/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java index e4372b4d70a..56ede7b04cd 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java +++ b/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java @@ -47,7 +47,7 @@ public class AuguryOwl extends CardImpl { super(ownerId, 45, "Augury Owl", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "M11"; 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/magic2011/AzureDrake.java b/Mage.Sets/src/mage/sets/magic2011/AzureDrake.java index d934dc362bf..ce429451048 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AzureDrake.java +++ b/Mage.Sets/src/mage/sets/magic2011/AzureDrake.java @@ -44,7 +44,7 @@ public class AzureDrake extends CardImpl { public AzureDrake(UUID ownerId) { super(ownerId, 46, "Azure Drake", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "M11"; - this.color.setBlue(true); + this.subtype.add("Drake"); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2011/BackToNature.java b/Mage.Sets/src/mage/sets/magic2011/BackToNature.java index 014ff203b11..f83bf201657 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BackToNature.java +++ b/Mage.Sets/src/mage/sets/magic2011/BackToNature.java @@ -51,7 +51,7 @@ public class BackToNature extends CardImpl { public BackToNature(UUID ownerId) { super(ownerId, 164, "Back to Nature", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "M11"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); } diff --git a/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java b/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java index fa5e10b963c..91565652f9f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java +++ b/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java @@ -43,7 +43,7 @@ public class BaronyVampire extends CardImpl { public BaronyVampire(UUID ownerId) { super(ownerId, 82, "Barony Vampire", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "M11"; - this.color.setBlack(true); + this.subtype.add("Vampire"); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java b/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java index 861ea098a28..ed7d0a447c7 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java +++ b/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java @@ -29,12 +29,12 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.game.Game; /** @@ -46,7 +46,6 @@ public class BloodTithe extends CardImpl { public BloodTithe(UUID ownerId) { super(ownerId, 84, "Blood Tithe", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "M11"; - this.getColor().setBlack(true); this.getSpellAbility().addEffect(new BloodTitheEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java b/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java index 16ea96e4935..49e0a3c967a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java +++ b/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java @@ -54,7 +54,7 @@ public class BloodcrazedGoblin extends CardImpl { this.expansionSetCode = "M11"; 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/magic2011/BogRaiders.java b/Mage.Sets/src/mage/sets/magic2011/BogRaiders.java index 0ec8c3e5c30..d49abd6f5a7 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BogRaiders.java +++ b/Mage.Sets/src/mage/sets/magic2011/BogRaiders.java @@ -44,7 +44,7 @@ public class BogRaiders extends CardImpl { public BogRaiders(UUID ownerId) { super(ownerId, 86, "Bog Raiders", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "M11"; - this.color.setBlack(true); + this.subtype.add("Zombie"); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java b/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java index b73734ee4dc..0e72ef01248 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java +++ b/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java @@ -47,7 +47,7 @@ public class BrindleBoar extends CardImpl { public BrindleBoar(UUID ownerId) { super(ownerId, 166, "Brindle Boar", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "M11"; - this.color.setGreen(true); + this.subtype.add("Boar"); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java b/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java index 9564f3eb62e..ca43463c03d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java +++ b/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java @@ -72,7 +72,7 @@ public class CaptivatingVampire extends CardImpl { public CaptivatingVampire(UUID ownerId) { super(ownerId, 87, "Captivating Vampire", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); this.expansionSetCode = "M11"; - this.color.setBlack(true); + this.subtype.add("Vampire"); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java b/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java index 090c1eaa928..a5ee07e9ce7 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java +++ b/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java @@ -49,7 +49,7 @@ public class ChandrasOutrage extends CardImpl { public ChandrasOutrage(UUID ownerId) { super(ownerId, 128, "Chandra's Outrage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}{R}"); this.expansionSetCode = "M11"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new ChandrasOutrageEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java b/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java index 64faddd0b07..1154a69bd6b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java +++ b/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java @@ -52,7 +52,7 @@ public class ChandrasSpitfire extends CardImpl { super(ownerId, 129, "Chandra's Spitfire", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.expansionSetCode = "M11"; this.subtype.add("Elemental"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java b/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java index ba45ef01efb..3234fd81238 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java +++ b/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java @@ -47,7 +47,7 @@ public class CloudCrusader extends CardImpl { this.expansionSetCode = "M11"; this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java b/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java index 17727ef55eb..b8143876eb4 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java +++ b/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java @@ -58,7 +58,7 @@ public class ConundrumSphinx extends CardImpl { super(ownerId, 51, "Conundrum Sphinx", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); this.expansionSetCode = "M11"; this.subtype.add("Sphinx"); - this.color.setBlue(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2011/Corrupt.java b/Mage.Sets/src/mage/sets/magic2011/Corrupt.java index 33053739ea2..a4195a17f84 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Corrupt.java +++ b/Mage.Sets/src/mage/sets/magic2011/Corrupt.java @@ -53,7 +53,7 @@ public class Corrupt extends CardImpl { public Corrupt(UUID ownerId) { super(ownerId, 89, "Corrupt", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{5}{B}"); this.expansionSetCode = "M11"; - this.color.setBlack(true); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new CorruptEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java index c1ba9c23ed2..531ae538879 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java +++ b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java @@ -55,7 +55,7 @@ public class CyclopsGladiator extends CardImpl { this.expansionSetCode = "M11"; this.subtype.add("Cyclops"); 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/magic2011/DarkTutelage.java b/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java index f707e8d9fcd..fc7d6d61bdb 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java +++ b/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java @@ -29,10 +29,6 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Rarity; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -40,6 +36,10 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent.EventType; import mage.players.Player; @@ -53,7 +53,6 @@ public class DarkTutelage extends CardImpl { public DarkTutelage(UUID ownerId) { super(ownerId, 90, "Dark Tutelage", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "M11"; - this.getColor().setBlack(true); this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new DarkTutelageEffect(), false)); } diff --git a/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java b/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java index 4bed267001d..500756c505e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java +++ b/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java @@ -59,7 +59,7 @@ public class DemonOfDeathsGate extends CardImpl { super(ownerId, 92, "Demon of Death's Gate", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{6}{B}{B}{B}"); this.expansionSetCode = "M11"; this.subtype.add("Demon"); - this.color.setBlack(true); + this.power = new MageInt(9); this.toughness = new MageInt(9); diff --git a/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java b/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java index 2d292915958..dcec0e210b9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java +++ b/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java @@ -52,7 +52,7 @@ public class DestructiveForce extends CardImpl { public DestructiveForce(UUID ownerId) { super(ownerId, 133, "Destructive Force", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{R}{R}"); this.expansionSetCode = "M11"; - this.color.setRed(true); + // Each player sacrifices five lands. this.getSpellAbility().addEffect(new SacrificeAllEffect(5, filterLand)); diff --git a/Mage.Sets/src/mage/sets/magic2011/Diminish.java b/Mage.Sets/src/mage/sets/magic2011/Diminish.java index 6143de5f7c7..e2896aaf45e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Diminish.java +++ b/Mage.Sets/src/mage/sets/magic2011/Diminish.java @@ -45,7 +45,7 @@ public class Diminish extends CardImpl { public Diminish(UUID ownerId) { super(ownerId, 52, "Diminish", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "M11"; - this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new SetPowerToughnessTargetEffect(1, 1, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java b/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java index 0d762f19dbf..16c2bdbc36d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java +++ b/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java @@ -45,7 +45,7 @@ public class DuskdaleWurm extends CardImpl { super(ownerId, 170, "Duskdale Wurm", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{5}{G}{G}"); this.expansionSetCode = "M11"; 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/magic2011/EmberHauler.java b/Mage.Sets/src/mage/sets/magic2011/EmberHauler.java index 1d9a5bb8b68..a2928cdc805 100644 --- a/Mage.Sets/src/mage/sets/magic2011/EmberHauler.java +++ b/Mage.Sets/src/mage/sets/magic2011/EmberHauler.java @@ -51,7 +51,7 @@ public class EmberHauler extends CardImpl { super(ownerId, 135, "Ember Hauler", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{R}{R}"); this.expansionSetCode = "M11"; 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/magic2011/FaunaShaman.java b/Mage.Sets/src/mage/sets/magic2011/FaunaShaman.java index 7d6e7194f5e..4adc55305af 100644 --- a/Mage.Sets/src/mage/sets/magic2011/FaunaShaman.java +++ b/Mage.Sets/src/mage/sets/magic2011/FaunaShaman.java @@ -56,7 +56,7 @@ public class FaunaShaman extends CardImpl { this.expansionSetCode = "M11"; 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/magic2011/Fling.java b/Mage.Sets/src/mage/sets/magic2011/Fling.java index 37e092ca509..c9bde41d57a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Fling.java +++ b/Mage.Sets/src/mage/sets/magic2011/Fling.java @@ -52,7 +52,7 @@ public class Fling extends CardImpl { public Fling(UUID ownerId) { super(ownerId, 139, "Fling", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "M11"; - this.color.setRed(true); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new FlingEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2011/Foresee.java b/Mage.Sets/src/mage/sets/magic2011/Foresee.java index b137184d579..c6ef0baf46c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Foresee.java +++ b/Mage.Sets/src/mage/sets/magic2011/Foresee.java @@ -44,7 +44,7 @@ public class Foresee extends CardImpl { public Foresee(UUID ownerId) { super(ownerId, 54, "Foresee", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "M11"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new ScryEffect(4)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java b/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java index 73adc0a825e..d09fae31897 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java +++ b/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java @@ -60,7 +60,7 @@ public class GaeasRevenge extends CardImpl { super(ownerId, 174, "Gaea's Revenge", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{5}{G}{G}"); this.expansionSetCode = "M11"; this.subtype.add("Elemental"); - this.color.setGreen(true); + this.power = new MageInt(8); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java b/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java index fc1ae5c1b0f..23d02d5f082 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java +++ b/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java @@ -45,7 +45,7 @@ public class GarruksCompanion extends CardImpl { super(ownerId, 176, "Garruk's Companion", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}{G}"); this.expansionSetCode = "M11"; 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/magic2011/GarruksPackleader.java b/Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java index cd1362e1e84..c1188477157 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java +++ b/Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java @@ -58,7 +58,7 @@ public class GarruksPackleader extends CardImpl { super(ownerId, 177, "Garruk's Packleader", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "M11"; 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/magic2011/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java index e5514d93cad..08567b94009 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java +++ b/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java @@ -51,7 +51,7 @@ public class GoblinBalloonBrigade extends CardImpl { this.expansionSetCode = "M11"; 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/magic2011/GraveTitan.java b/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java index de1c1111b34..4282f7e051a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java @@ -52,7 +52,7 @@ public class GraveTitan extends CardImpl { super(ownerId, 97, "Grave Titan", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{B}{B}"); this.expansionSetCode = "M11"; this.subtype.add("Giant"); - this.color.setBlack(true); + this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java b/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java index d67a346b90a..b9ad814831b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java +++ b/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java @@ -45,7 +45,7 @@ public class GreaterBasilisk extends CardImpl { super(ownerId, 180, "Greater Basilisk", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "M11"; this.subtype.add("Basilisk"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java b/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java index be89e04dfdc..cbef2790095 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java +++ b/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java @@ -54,7 +54,7 @@ public class HarborSerpent extends CardImpl { super(ownerId, 56, "Harbor Serpent", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); this.expansionSetCode = "M11"; 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/magic2011/HoardingDragon.java b/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java index 1f1221c5897..6d5920967db 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java +++ b/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java @@ -59,7 +59,7 @@ public class HoardingDragon extends CardImpl { super(ownerId, 144, "Hoarding Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); this.expansionSetCode = "M11"; this.subtype.add("Dragon"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2011/HornetSting.java b/Mage.Sets/src/mage/sets/magic2011/HornetSting.java index 1427928e0e7..87150a27d7d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HornetSting.java +++ b/Mage.Sets/src/mage/sets/magic2011/HornetSting.java @@ -44,7 +44,7 @@ public class HornetSting extends CardImpl { public HornetSting(UUID ownerId) { super(ownerId, 181, "Hornet Sting", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "M11"; - this.color.setGreen(true); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new DamageTargetEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java b/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java index 6a8ec18bca2..997604a013f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java +++ b/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java @@ -44,7 +44,7 @@ public class HuntersFeast extends CardImpl { public HuntersFeast(UUID ownerId) { super(ownerId, 182, "Hunters' Feast", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "M11"; - this.color.setGreen(true); + this.getSpellAbility().addTarget(new TargetPlayer(0, Integer.MAX_VALUE, false)); this.getSpellAbility().addEffect(new GainLifeTargetEffect(6)); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Incite.java b/Mage.Sets/src/mage/sets/magic2011/Incite.java index 4c88570a75b..bd5b23f850f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Incite.java +++ b/Mage.Sets/src/mage/sets/magic2011/Incite.java @@ -48,7 +48,7 @@ public class Incite extends CardImpl { public Incite(UUID ownerId) { super(ownerId, 145, "Incite", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "M11"; - this.color.setRed(true); + // Target creature becomes red until end of turn and attacks this turn if able. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java b/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java index 176d7e689d0..785f504b033 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java +++ b/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java @@ -52,7 +52,7 @@ public class InfantryVeteran extends CardImpl { this.expansionSetCode = "M11"; 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/magic2011/InfernoTitan.java b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java index d33089c1ed7..083d75001fa 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java @@ -55,7 +55,7 @@ public class InfernoTitan extends CardImpl { super(ownerId, 146, "Inferno Titan", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{R}{R}"); this.expansionSetCode = "M11"; this.subtype.add("Giant"); - this.color.setRed(true); + this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java b/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java index d3bd7d76438..da4ed0018ec 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java +++ b/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java @@ -44,7 +44,7 @@ public class InspiredCharge extends CardImpl { public InspiredCharge(UUID ownerId) { super(ownerId, 19, "Inspired Charge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}{W}"); this.expansionSetCode = "M11"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new BoostControlledEffect(2, 1, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java b/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java index 7b125394bb5..cec48b9407d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java +++ b/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java @@ -45,7 +45,7 @@ public class JacesErasure extends CardImpl { public JacesErasure(UUID ownerId) { super(ownerId, 59, "Jace's Erasure", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "M11"; - this.color.setBlue(true); + DrawCardControllerTriggeredAbility ability = new DrawCardControllerTriggeredAbility(new PutLibraryIntoGraveTargetEffect(1), true); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java b/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java index a46761427a4..dd40bc5152f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java +++ b/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java @@ -43,7 +43,7 @@ public class JacesIngenuity extends CardImpl { public JacesIngenuity(UUID ownerId) { super(ownerId, 60, "Jace's Ingenuity", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); this.expansionSetCode = "M11"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); } diff --git a/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java b/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java index f8ba0508002..302f040ee30 100644 --- a/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java +++ b/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java @@ -64,7 +64,7 @@ public class KnightExemplar extends CardImpl { this.expansionSetCode = "M11"; 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/magic2011/LeylineOfAnticipation.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfAnticipation.java index 6c57098a05e..6b35417a83e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfAnticipation.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfAnticipation.java @@ -57,7 +57,7 @@ public class LeylineOfAnticipation extends CardImpl { super(ownerId, 61, "Leyline of Anticipation", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}"); this.expansionSetCode = "M11"; - this.color.setBlue(true); + // If Leyline of Anticipation 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/magic2011/LeylineOfPunishment.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java index fd7b586de2f..31e242ba383 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java @@ -57,7 +57,7 @@ public class LeylineOfPunishment extends CardImpl { public LeylineOfPunishment(UUID ownerId) { super(ownerId, 148, "Leyline of Punishment", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{R}"); this.expansionSetCode = "M11"; - this.color.setRed(true); + // If Leyline of Punishment 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/magic2011/LeylineOfSanctity.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfSanctity.java index e41694d0b22..180acde2719 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfSanctity.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfSanctity.java @@ -56,7 +56,7 @@ public class LeylineOfSanctity extends CardImpl { public LeylineOfSanctity(UUID ownerId) { super(ownerId, 21, "Leyline of Sanctity", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "M11"; - this.color.setWhite(true); + // If Leyline of Sanctity 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/magic2011/LeylineOfTheVoid.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfTheVoid.java index 80092b9e74c..a082fad325f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfTheVoid.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfTheVoid.java @@ -56,7 +56,7 @@ public class LeylineOfTheVoid extends CardImpl { public LeylineOfTheVoid(UUID ownerId) { super(ownerId, 101, "Leyline of the Void", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "M11"; - this.color.setBlack(true); + // If Leyline of the Void is in your opening hand, you may begin the game with it on the battlefield. this.addAbility(LeylineAbility.getInstance()); // If a card would be put into an opponent's graveyard from anywhere, exile it instead. diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java index 97c5d2845bd..ebd72dc8691 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java @@ -50,7 +50,7 @@ public class LeylineOfVitality extends CardImpl { public LeylineOfVitality(UUID ownerId) { super(ownerId, 183, "Leyline of Vitality", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); this.expansionSetCode = "M11"; - this.color.setGreen(true); + this.addAbility(LeylineAbility.getInstance()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); diff --git a/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java b/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java index eaa28d347be..de0eea24e4f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java +++ b/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java @@ -50,7 +50,7 @@ public class LilianasCaress extends CardImpl { public LilianasCaress(UUID ownerId) { super(ownerId, 103, "Liliana's Caress", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "M11"; - this.color.setBlack(true); + // Whenever an opponent discards a card, that player loses 2 life. this.addAbility(new LilianasCaressAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java b/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java index b6cbcfa73a1..1e2498235d5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java +++ b/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java @@ -53,7 +53,7 @@ public class LilianasSpecter extends CardImpl { super(ownerId, 104, "Liliana's Specter", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); this.expansionSetCode = "M11"; this.subtype.add("Specter"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java b/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java index 8ea896f7146..e1294820d66 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java +++ b/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java @@ -49,7 +49,7 @@ public class ManaLeak extends CardImpl { public ManaLeak(UUID ownerId) { super(ownerId, 62, "Mana Leak", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "M11"; - this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetSpell()); this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new GenericManaCost(3))); } diff --git a/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java b/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java index ca4e1eff425..b4974d67244 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java +++ b/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java @@ -58,7 +58,7 @@ public class ManicVandal extends CardImpl { this.expansionSetCode = "M11"; this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java b/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java index e19e1479249..4e57cb743c0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java +++ b/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java @@ -43,7 +43,7 @@ public class MaritimeGuard extends CardImpl { public MaritimeGuard(UUID ownerId) { super(ownerId, 63, "Maritime Guard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "M11"; - this.color.setBlue(true); + this.subtype.add("Merfolk"); this.subtype.add("Soldier"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java b/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java index c944d17b716..9e159d7af75 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java +++ b/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java @@ -55,7 +55,7 @@ public class MassPolymorph extends CardImpl { public MassPolymorph(UUID ownerId) { super(ownerId, 64, "Mass Polymorph", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{U}"); this.expansionSetCode = "M11"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new MassPolymorphEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java b/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java index 6111ee1ad04..387cf80e31f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java +++ b/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java @@ -55,7 +55,7 @@ public class MerfolkSpy extends CardImpl { this.expansionSetCode = "M11"; 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/magic2011/MitoticSlime.java b/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java index b5d3ebfb573..ee8e6f69f18 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java +++ b/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java @@ -47,7 +47,7 @@ public class MitoticSlime extends CardImpl { super(ownerId, 185, "Mitotic Slime", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "M11"; this.subtype.add("Ooze"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java b/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java index 6236fd55ed1..f297c9c118a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java +++ b/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java @@ -50,7 +50,7 @@ public class NantukoShade extends CardImpl { this.expansionSetCode = "M11"; this.subtype.add("Insect"); this.subtype.add("Shade"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java index 7d668296322..58a741397a3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java +++ b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java @@ -71,7 +71,7 @@ public class NecroticPlague extends CardImpl { public NecroticPlague(UUID ownerId) { super(ownerId, 107, "Necrotic Plague", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "M11"; - this.color.setBlack(true); + this.subtype.add("Aura"); // Enchant creature diff --git a/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java b/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java index 4b53da1df7f..1907a49dd21 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java +++ b/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java @@ -44,7 +44,7 @@ public class NetherHorror extends CardImpl { super(ownerId, 108, "Nether Horror", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "M11"; this.subtype.add("Horror"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java b/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java index d014063c0e6..6d6db49d0f5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java +++ b/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java @@ -50,7 +50,7 @@ public class NightwingShade extends CardImpl { super(ownerId, 109, "Nightwing Shade", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{B}"); this.expansionSetCode = "M11"; this.subtype.add("Shade"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java b/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java index 5894870ab7c..d2adbc1706e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java +++ b/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java @@ -59,7 +59,7 @@ public class ObstinateBaloth extends CardImpl { super(ownerId, 188, "Obstinate Baloth", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.expansionSetCode = "M11"; 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/magic2011/PhylacteryLich.java b/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java index 6c5626145c1..a42e28768db 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java +++ b/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java @@ -60,7 +60,7 @@ public class PhylacteryLich extends CardImpl { super(ownerId, 110, "Phylactery Lich", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{B}{B}{B}"); this.expansionSetCode = "M11"; this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2011/Plummet.java b/Mage.Sets/src/mage/sets/magic2011/Plummet.java index b9c51435f21..06c741c6998 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Plummet.java +++ b/Mage.Sets/src/mage/sets/magic2011/Plummet.java @@ -54,7 +54,7 @@ public class Plummet extends CardImpl { public Plummet(UUID ownerId) { super(ownerId, 190, "Plummet", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "M11"; - this.color.setGreen(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Preordain.java b/Mage.Sets/src/mage/sets/magic2011/Preordain.java index aad5a8323d3..f0b908bde7d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Preordain.java +++ b/Mage.Sets/src/mage/sets/magic2011/Preordain.java @@ -44,7 +44,7 @@ public class Preordain extends CardImpl { public Preordain(UUID ownerId) { super(ownerId, 70, "Preordain", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}"); this.expansionSetCode = "M11"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new ScryEffect(2)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java b/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java index fd5db83c102..4cf1ce21498 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java +++ b/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java @@ -56,7 +56,7 @@ public class PrimalCocoon extends CardImpl { public PrimalCocoon(UUID ownerId) { super(ownerId, 191, "Primal Cocoon", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "M11"; - this.color.setGreen(true); + this.subtype.add("Aura"); TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java b/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java index e2c3665f325..9000bb19c95 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java +++ b/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java @@ -44,7 +44,7 @@ public class PyreticRitual extends CardImpl { public PyreticRitual(UUID ownerId) { super(ownerId, 153, "Pyretic Ritual", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "M11"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new BasicManaEffect(Mana.RedMana(3))); } diff --git a/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java b/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java index 4d158ad4d84..a8bffa3e5b0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java +++ b/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java @@ -63,7 +63,7 @@ public class QuagSickness extends CardImpl { public QuagSickness(UUID ownerId) { super(ownerId, 111, "Quag Sickness", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "M11"; - this.color.setBlack(true); + this.subtype.add("Aura"); TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java b/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java index 599e0d85a2d..e0ffb0f2321 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java +++ b/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java @@ -49,7 +49,7 @@ public class ReassemblingSkeleton extends CardImpl { this.expansionSetCode = "M11"; 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/magic2011/Redirect.java b/Mage.Sets/src/mage/sets/magic2011/Redirect.java index 0f4d5e99964..27d0f0c14e3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Redirect.java +++ b/Mage.Sets/src/mage/sets/magic2011/Redirect.java @@ -44,7 +44,7 @@ public class Redirect extends CardImpl { public Redirect(UUID ownerId) { super(ownerId, 71, "Redirect", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{U}{U}"); this.expansionSetCode = "M11"; - this.color.setBlue(true); + // You may choose new targets for target spell. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/magic2011/Reverberate.java b/Mage.Sets/src/mage/sets/magic2011/Reverberate.java index f8e10dcfe40..508818922ea 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Reverberate.java +++ b/Mage.Sets/src/mage/sets/magic2011/Reverberate.java @@ -55,7 +55,7 @@ public class Reverberate extends CardImpl { public Reverberate(UUID ownerId) { super(ownerId, 155, "Reverberate", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{R}{R}"); this.expansionSetCode = "M11"; - this.color.setRed(true); + // Copy target instant or sorcery spell. You may choose new targets for the copy. this.getSpellAbility().addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/sets/magic2011/RocEgg.java b/Mage.Sets/src/mage/sets/magic2011/RocEgg.java index b668b7c94ea..47fcaf1b700 100644 --- a/Mage.Sets/src/mage/sets/magic2011/RocEgg.java +++ b/Mage.Sets/src/mage/sets/magic2011/RocEgg.java @@ -51,7 +51,7 @@ public class RocEgg extends CardImpl { super(ownerId, 25, "Roc Egg", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.expansionSetCode = "M11"; this.subtype.add("Bird"); - this.color.setWhite(true); + this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2011/RottingLegion.java b/Mage.Sets/src/mage/sets/magic2011/RottingLegion.java index d3b7bccef0b..10cc9ffe00c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/RottingLegion.java +++ b/Mage.Sets/src/mage/sets/magic2011/RottingLegion.java @@ -45,7 +45,7 @@ public class RottingLegion extends CardImpl { super(ownerId, 115, "Rotting Legion", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{B}"); this.expansionSetCode = "M11"; this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2011/SacredWolf.java b/Mage.Sets/src/mage/sets/magic2011/SacredWolf.java index 5cf80941d71..34ab45de7ce 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SacredWolf.java +++ b/Mage.Sets/src/mage/sets/magic2011/SacredWolf.java @@ -44,7 +44,7 @@ public class SacredWolf extends CardImpl { super(ownerId, 196, "Sacred Wolf", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "M11"; this.subtype.add("Wolf"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(1); this.addAbility(HexproofAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2011/ScrollThief.java b/Mage.Sets/src/mage/sets/magic2011/ScrollThief.java index cfa2f7335e0..960673771d7 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ScrollThief.java +++ b/Mage.Sets/src/mage/sets/magic2011/ScrollThief.java @@ -47,7 +47,7 @@ public class ScrollThief extends CardImpl { this.expansionSetCode = "M11"; this.subtype.add("Merfolk"); this.subtype.add("Rogue"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java b/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java index 206a3ce822a..a631cbf8395 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java +++ b/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java @@ -58,7 +58,7 @@ public class SerraAscendant extends CardImpl { this.expansionSetCode = "M11"; this.subtype.add("Human"); this.subtype.add("Monk"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/magic2011/SquadronHawk.java b/Mage.Sets/src/mage/sets/magic2011/SquadronHawk.java index 47cdc6ccbb8..0427fde951c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SquadronHawk.java +++ b/Mage.Sets/src/mage/sets/magic2011/SquadronHawk.java @@ -56,7 +56,7 @@ public class SquadronHawk extends CardImpl { super(ownerId, 33, "Squadron Hawk", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "M11"; 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/magic2011/StabbingPain.java b/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java index 48259fea129..1743f38ba1e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java +++ b/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java @@ -46,7 +46,7 @@ public class StabbingPain extends CardImpl { public StabbingPain(UUID ownerId) { super(ownerId, 118, "Stabbing Pain", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "M11"; - this.color.setBlack(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(-1, -1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new TapTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2011/StormtideLeviathan.java b/Mage.Sets/src/mage/sets/magic2011/StormtideLeviathan.java index 345074619c5..67605e8c765 100644 --- a/Mage.Sets/src/mage/sets/magic2011/StormtideLeviathan.java +++ b/Mage.Sets/src/mage/sets/magic2011/StormtideLeviathan.java @@ -71,7 +71,7 @@ public class StormtideLeviathan extends CardImpl { super(ownerId, 74, "Stormtide Leviathan", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{U}{U}{U}"); this.expansionSetCode = "M11"; this.subtype.add("Leviathan"); - this.color.setBlue(true); + this.power = new MageInt(8); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/sets/magic2011/SunTitan.java b/Mage.Sets/src/mage/sets/magic2011/SunTitan.java index 3455512c809..050b9d6ce2c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SunTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/SunTitan.java @@ -58,7 +58,7 @@ public class SunTitan extends CardImpl { super(ownerId, 35, "Sun Titan", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{W}{W}"); this.expansionSetCode = "M11"; this.subtype.add("Giant"); - this.color.setWhite(true); + this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/magic2011/SylvanRanger.java b/Mage.Sets/src/mage/sets/magic2011/SylvanRanger.java index 9c184ec5d69..e52f88c3451 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SylvanRanger.java +++ b/Mage.Sets/src/mage/sets/magic2011/SylvanRanger.java @@ -51,7 +51,7 @@ public class SylvanRanger extends CardImpl { this.expansionSetCode = "M11"; 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/magic2011/ThunderStrike.java b/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java index 31e1bfd6bd1..27398704a12 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java +++ b/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java @@ -47,7 +47,7 @@ public class ThunderStrike extends CardImpl { public ThunderStrike(UUID ownerId) { super(ownerId, 157, "Thunder Strike", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "M11"; - this.color.setRed(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java b/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java index 3a553a2ffc8..6762ceeef9a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java +++ b/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java @@ -50,7 +50,7 @@ public class TimeReversal extends CardImpl { public TimeReversal(UUID ownerId) { super(ownerId, 75, "Time Reversal", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{3}{U}{U}"); this.expansionSetCode = "M11"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new TimeReversalEffect()); this.getSpellAbility().addEffect(ExileSpellEffect.getInstance()); } diff --git a/Mage.Sets/src/mage/sets/magic2011/TirelessMissionaries.java b/Mage.Sets/src/mage/sets/magic2011/TirelessMissionaries.java index 5fc2ddc9506..d98a2e6c748 100644 --- a/Mage.Sets/src/mage/sets/magic2011/TirelessMissionaries.java +++ b/Mage.Sets/src/mage/sets/magic2011/TirelessMissionaries.java @@ -47,7 +47,7 @@ public class TirelessMissionaries extends CardImpl { this.expansionSetCode = "M11"; 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/magic2011/VengefulArchon.java b/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java index 87fcc1a9bd9..3a87d6528e1 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java +++ b/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java @@ -55,7 +55,7 @@ public class VengefulArchon extends CardImpl { super(ownerId, 37, "Vengeful Archon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{W}{W}{W}"); this.expansionSetCode = "M11"; this.subtype.add("Archon"); - this.color.setWhite(true); + this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java b/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java index 209aaf039dc..0d29a799c32 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java +++ b/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java @@ -50,7 +50,7 @@ public class VisceraSeer extends CardImpl { this.expansionSetCode = "M11"; this.subtype.add("Vampire"); 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/magic2011/VulshokBerserker.java b/Mage.Sets/src/mage/sets/magic2011/VulshokBerserker.java index 63856c6ef5e..b4d9211d72f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VulshokBerserker.java +++ b/Mage.Sets/src/mage/sets/magic2011/VulshokBerserker.java @@ -46,7 +46,7 @@ public class VulshokBerserker extends CardImpl { this.expansionSetCode = "M11"; this.subtype.add("Human"); this.subtype.add("Berserker"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2011/WallOfVines.java b/Mage.Sets/src/mage/sets/magic2011/WallOfVines.java index f76491f7f5e..5b42da6df2d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WallOfVines.java +++ b/Mage.Sets/src/mage/sets/magic2011/WallOfVines.java @@ -47,7 +47,7 @@ public class WallOfVines extends CardImpl { this.expansionSetCode = "M11"; 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/magic2011/WarPriestOfThune.java b/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java index a0bd6725f3b..0cf5fc90f0c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java +++ b/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java @@ -58,7 +58,7 @@ public class WarPriestOfThune extends CardImpl { this.expansionSetCode = "M11"; 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/magic2011/WaterServant.java b/Mage.Sets/src/mage/sets/magic2011/WaterServant.java index f346b0f4eff..765bc03d4e5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WaterServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/WaterServant.java @@ -49,7 +49,7 @@ public class WaterServant extends CardImpl { super(ownerId, 80, "Water Servant", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); this.expansionSetCode = "M11"; this.subtype.add("Elemental"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2011/WildEvocation.java b/Mage.Sets/src/mage/sets/magic2011/WildEvocation.java index dbdc6948bb1..068dc581bd4 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WildEvocation.java +++ b/Mage.Sets/src/mage/sets/magic2011/WildEvocation.java @@ -54,7 +54,7 @@ public class WildEvocation extends CardImpl { public WildEvocation(UUID ownerId) { super(ownerId, 160, "Wild Evocation", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{5}{R}"); this.expansionSetCode = "M11"; - this.color.setRed(true); + //At the beginning of each player's upkeep, that player reveals a card at random from his or her hand. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new WildEvocationEffect(), TargetController.ANY, false)); diff --git a/Mage.Sets/src/mage/sets/magic2011/YavimayaWurm.java b/Mage.Sets/src/mage/sets/magic2011/YavimayaWurm.java index 933bfd5f57f..5c19cfeb54c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/YavimayaWurm.java +++ b/Mage.Sets/src/mage/sets/magic2011/YavimayaWurm.java @@ -45,7 +45,7 @@ public class YavimayaWurm extends CardImpl { super(ownerId, 200, "Yavimaya Wurm", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); this.expansionSetCode = "M11"; this.subtype.add("Wurm"); - this.color.setGreen(true); + this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java b/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java index b39d98a553e..bea1bce1aba 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java +++ b/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java @@ -62,7 +62,7 @@ public class AegisAngel extends CardImpl { super(ownerId, 1, "Aegis Angel", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{W}{W}"); this.expansionSetCode = "M12"; this.subtype.add("Angel"); - this.color.setWhite(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/magic2012/AlabasterMage.java b/Mage.Sets/src/mage/sets/magic2012/AlabasterMage.java index 0ec834fed5f..cd08bdd8bd2 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AlabasterMage.java +++ b/Mage.Sets/src/mage/sets/magic2012/AlabasterMage.java @@ -53,7 +53,7 @@ public class AlabasterMage extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); diff --git a/Mage.Sets/src/mage/sets/magic2012/ArmoredWarhorse.java b/Mage.Sets/src/mage/sets/magic2012/ArmoredWarhorse.java index 8a974436001..12b925f57b2 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ArmoredWarhorse.java +++ b/Mage.Sets/src/mage/sets/magic2012/ArmoredWarhorse.java @@ -44,7 +44,7 @@ public class ArmoredWarhorse extends CardImpl { super(ownerId, 7, "Armored Warhorse", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}{W}"); this.expansionSetCode = "M12"; this.subtype.add("Horse"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/magic2012/Auramancer.java b/Mage.Sets/src/mage/sets/magic2012/Auramancer.java index d8218b0d8ae..77210b55aff 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Auramancer.java +++ b/Mage.Sets/src/mage/sets/magic2012/Auramancer.java @@ -57,7 +57,7 @@ public class Auramancer extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true); diff --git a/Mage.Sets/src/mage/sets/magic2012/AvenFleetwing.java b/Mage.Sets/src/mage/sets/magic2012/AvenFleetwing.java index 5ed23bd560e..e5618d64072 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AvenFleetwing.java +++ b/Mage.Sets/src/mage/sets/magic2012/AvenFleetwing.java @@ -47,7 +47,7 @@ public class AvenFleetwing extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Bird"); this.subtype.add("Soldier"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2012/AzureMage.java b/Mage.Sets/src/mage/sets/magic2012/AzureMage.java index 6d5465dca7a..1b666e2da8f 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AzureMage.java +++ b/Mage.Sets/src/mage/sets/magic2012/AzureMage.java @@ -49,7 +49,7 @@ public class AzureMage extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{3}{U}"))); diff --git a/Mage.Sets/src/mage/sets/magic2012/BenalishVeteran.java b/Mage.Sets/src/mage/sets/magic2012/BenalishVeteran.java index 426f3d71e56..91641bbb05b 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BenalishVeteran.java +++ b/Mage.Sets/src/mage/sets/magic2012/BenalishVeteran.java @@ -48,7 +48,7 @@ public class BenalishVeteran extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), false)); diff --git a/Mage.Sets/src/mage/sets/magic2012/BloodOgre.java b/Mage.Sets/src/mage/sets/magic2012/BloodOgre.java index 778c22a7c9f..241f4ad7427 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BloodOgre.java +++ b/Mage.Sets/src/mage/sets/magic2012/BloodOgre.java @@ -46,7 +46,7 @@ public class BloodOgre extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Ogre"); 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/BonebreakerGiant.java b/Mage.Sets/src/mage/sets/magic2012/BonebreakerGiant.java index f4efac2c7c2..cbd2cf5f33d 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BonebreakerGiant.java +++ b/Mage.Sets/src/mage/sets/magic2012/BonebreakerGiant.java @@ -44,7 +44,7 @@ public class BonebreakerGiant extends CardImpl { super(ownerId, 123, "Bonebreaker Giant", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{R}"); this.expansionSetCode = "M12"; 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/magic2012/BountifulHarvest.java b/Mage.Sets/src/mage/sets/magic2012/BountifulHarvest.java index a95c8a22c1b..99208e1cac6 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BountifulHarvest.java +++ b/Mage.Sets/src/mage/sets/magic2012/BountifulHarvest.java @@ -47,7 +47,7 @@ public class BountifulHarvest extends CardImpl { public BountifulHarvest(UUID ownerId) { super(ownerId, 166, "Bountiful Harvest", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{G}"); this.expansionSetCode = "M12"; - this.color.setGreen(true); + // You gain 1 life for each land you control. this.getSpellAbility().addEffect(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter))); diff --git a/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand.java b/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand.java index f6e6b67b4e6..f06f9cda101 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand.java +++ b/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand.java @@ -58,7 +58,7 @@ public class ChandraTheFirebrand extends CardImpl { super(ownerId, 124, "Chandra, the Firebrand", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{R}"); this.expansionSetCode = "M12"; this.subtype.add("Chandra"); - this.color.setRed(true); + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), false)); // +1: Chandra, the Firebrand deals 1 damage to target creature or player. diff --git a/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java b/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java index 292a5b2e4ba..c32055862e2 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java +++ b/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java @@ -50,7 +50,7 @@ public class ChasmDrake extends CardImpl { super(ownerId, 48, "Chasm Drake", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); this.expansionSetCode = "M12"; 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/magic2012/CrimsonMage.java b/Mage.Sets/src/mage/sets/magic2012/CrimsonMage.java index 2d7d6c95931..c39ca90de52 100644 --- a/Mage.Sets/src/mage/sets/magic2012/CrimsonMage.java +++ b/Mage.Sets/src/mage/sets/magic2012/CrimsonMage.java @@ -50,7 +50,7 @@ public class CrimsonMage extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); diff --git a/Mage.Sets/src/mage/sets/magic2012/DarkFavor.java b/Mage.Sets/src/mage/sets/magic2012/DarkFavor.java index 9162de071c7..100f9334404 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DarkFavor.java +++ b/Mage.Sets/src/mage/sets/magic2012/DarkFavor.java @@ -51,7 +51,7 @@ public class DarkFavor extends CardImpl { super(ownerId, 89, "Dark Favor", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "M12"; this.subtype.add("Aura"); - this.color.setBlack(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/magic2012/DevouringSwarm.java b/Mage.Sets/src/mage/sets/magic2012/DevouringSwarm.java index 496f266f258..e326141cf4f 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DevouringSwarm.java +++ b/Mage.Sets/src/mage/sets/magic2012/DevouringSwarm.java @@ -51,7 +51,7 @@ public class DevouringSwarm extends CardImpl { super(ownerId, 91, "Devouring Swarm", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); this.expansionSetCode = "M12"; this.subtype.add("Insect"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2012/Divination.java b/Mage.Sets/src/mage/sets/magic2012/Divination.java index 8f776575760..3478d0be81b 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Divination.java +++ b/Mage.Sets/src/mage/sets/magic2012/Divination.java @@ -43,7 +43,7 @@ public class Divination extends CardImpl { public Divination (UUID ownerId) { super(ownerId, 50, "Divination", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "M12"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/magic2012/DivineFavor.java b/Mage.Sets/src/mage/sets/magic2012/DivineFavor.java index 423219c97c9..6a6208e9da1 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DivineFavor.java +++ b/Mage.Sets/src/mage/sets/magic2012/DivineFavor.java @@ -51,7 +51,7 @@ public class DivineFavor extends CardImpl { super(ownerId, 14, "Divine Favor", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "M12"; this.subtype.add("Aura"); - this.color.setWhite(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/magic2012/DriftingShade.java b/Mage.Sets/src/mage/sets/magic2012/DriftingShade.java index fda347e4d9a..42d6b58ed58 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DriftingShade.java +++ b/Mage.Sets/src/mage/sets/magic2012/DriftingShade.java @@ -47,7 +47,7 @@ public class DriftingShade extends CardImpl { super(ownerId, 96, "Drifting Shade", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "M12"; this.subtype.add("Shade"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2012/Firebreathing.java b/Mage.Sets/src/mage/sets/magic2012/Firebreathing.java index 3f1842bc4bc..6cd00148230 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Firebreathing.java +++ b/Mage.Sets/src/mage/sets/magic2012/Firebreathing.java @@ -51,7 +51,7 @@ public class Firebreathing extends CardImpl { super(ownerId, 132, "Firebreathing", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{R}"); this.expansionSetCode = "M12"; this.subtype.add("Aura"); - this.color.setRed(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); diff --git a/Mage.Sets/src/mage/sets/magic2012/Flight.java b/Mage.Sets/src/mage/sets/magic2012/Flight.java index 0a6bcb1c561..198a3e6a8a5 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Flight.java +++ b/Mage.Sets/src/mage/sets/magic2012/Flight.java @@ -51,7 +51,7 @@ public class Flight extends CardImpl { super(ownerId, 53, "Flight", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{U}"); this.expansionSetCode = "M12"; this.subtype.add("Aura"); - this.color.setBlue(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); diff --git a/Mage.Sets/src/mage/sets/magic2012/GarrukPrimalHunter.java b/Mage.Sets/src/mage/sets/magic2012/GarrukPrimalHunter.java index 518447af71d..17c8316eca0 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GarrukPrimalHunter.java +++ b/Mage.Sets/src/mage/sets/magic2012/GarrukPrimalHunter.java @@ -63,7 +63,7 @@ public class GarrukPrimalHunter extends CardImpl { super(ownerId, 174, "Garruk, Primal Hunter", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{G}{G}{G}"); this.expansionSetCode = "M12"; this.subtype.add("Garruk"); - this.color.setGreen(true); + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), false)); diff --git a/Mage.Sets/src/mage/sets/magic2012/GideonsAvenger.java b/Mage.Sets/src/mage/sets/magic2012/GideonsAvenger.java index 56fd660853f..77e9c98bab9 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GideonsAvenger.java +++ b/Mage.Sets/src/mage/sets/magic2012/GideonsAvenger.java @@ -52,7 +52,7 @@ public class GideonsAvenger extends CardImpl { this.expansionSetCode = "M12"; 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/magic2012/GideonsLawkeeper.java b/Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper.java index 528a5cd84b2..eb2ea86e161 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper.java +++ b/Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper.java @@ -53,7 +53,7 @@ public class GideonsLawkeeper extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); diff --git a/Mage.Sets/src/mage/sets/magic2012/GladecoverScout.java b/Mage.Sets/src/mage/sets/magic2012/GladecoverScout.java index 2a4079e3b4b..76993180fba 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GladecoverScout.java +++ b/Mage.Sets/src/mage/sets/magic2012/GladecoverScout.java @@ -46,7 +46,7 @@ public class GladecoverScout extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Elf"); this.subtype.add("Scout"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(HexproofAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2012/GoblinFireslinger.java b/Mage.Sets/src/mage/sets/magic2012/GoblinFireslinger.java index 1194e6569f1..ca8d0ff9590 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GoblinFireslinger.java +++ b/Mage.Sets/src/mage/sets/magic2012/GoblinFireslinger.java @@ -51,7 +51,7 @@ public class GoblinFireslinger extends CardImpl { this.expansionSetCode = "M12"; 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/magic2012/GoblinGrenade.java b/Mage.Sets/src/mage/sets/magic2012/GoblinGrenade.java index 3cfeb7ffcbe..e51354d6b20 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GoblinGrenade.java +++ b/Mage.Sets/src/mage/sets/magic2012/GoblinGrenade.java @@ -54,7 +54,7 @@ public class GoblinGrenade extends CardImpl { public GoblinGrenade(UUID ownerId) { super(ownerId, 140, "Goblin Grenade", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "M12"; - this.color.setRed(true); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); this.getSpellAbility().addEffect(new DamageTargetEffect(5)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/magic2012/GuardiansPledge.java b/Mage.Sets/src/mage/sets/magic2012/GuardiansPledge.java index 474f014711b..812745932ff 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GuardiansPledge.java +++ b/Mage.Sets/src/mage/sets/magic2012/GuardiansPledge.java @@ -54,7 +54,7 @@ public class GuardiansPledge extends CardImpl { public GuardiansPledge (UUID ownerId) { super(ownerId, 22, "Guardians' Pledge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}{W}"); this.expansionSetCode = "M12"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new BoostControlledEffect(2, 2, Duration.EndOfTurn, filter, false)); } diff --git a/Mage.Sets/src/mage/sets/magic2012/JadeMage.java b/Mage.Sets/src/mage/sets/magic2012/JadeMage.java index d123b28ac11..2eb893f47a7 100644 --- a/Mage.Sets/src/mage/sets/magic2012/JadeMage.java +++ b/Mage.Sets/src/mage/sets/magic2012/JadeMage.java @@ -50,7 +50,7 @@ public class JadeMage extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{2}{G}"))); diff --git a/Mage.Sets/src/mage/sets/magic2012/Levitation.java b/Mage.Sets/src/mage/sets/magic2012/Levitation.java index 438e0b19983..da431f8ea8c 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Levitation.java +++ b/Mage.Sets/src/mage/sets/magic2012/Levitation.java @@ -56,7 +56,7 @@ public class Levitation extends CardImpl { public Levitation (UUID ownerId) { super(ownerId, 61, "Levitation", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}"); this.expansionSetCode = "M12"; - this.color.setBlue(true); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/sets/magic2012/Lifelink.java b/Mage.Sets/src/mage/sets/magic2012/Lifelink.java index c3fe0489163..056c662e2e1 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Lifelink.java +++ b/Mage.Sets/src/mage/sets/magic2012/Lifelink.java @@ -51,7 +51,7 @@ public class Lifelink extends CardImpl { super(ownerId, 24, "Lifelink", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}"); this.expansionSetCode = "M12"; this.subtype.add("Aura"); - this.color.setWhite(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); diff --git a/Mage.Sets/src/mage/sets/magic2012/LordOfTheUnreal.java b/Mage.Sets/src/mage/sets/magic2012/LordOfTheUnreal.java index 3f2b2a466e7..eee2a72fcdd 100644 --- a/Mage.Sets/src/mage/sets/magic2012/LordOfTheUnreal.java +++ b/Mage.Sets/src/mage/sets/magic2012/LordOfTheUnreal.java @@ -60,7 +60,7 @@ public class LordOfTheUnreal extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); diff --git a/Mage.Sets/src/mage/sets/magic2012/MasterThief.java b/Mage.Sets/src/mage/sets/magic2012/MasterThief.java index 2aff9932857..f1232a84479 100644 --- a/Mage.Sets/src/mage/sets/magic2012/MasterThief.java +++ b/Mage.Sets/src/mage/sets/magic2012/MasterThief.java @@ -58,7 +58,7 @@ public class MasterThief extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/magic2012/MerfolkLooter.java b/Mage.Sets/src/mage/sets/magic2012/MerfolkLooter.java index 2163552735e..d0fef30fce7 100644 --- a/Mage.Sets/src/mage/sets/magic2012/MerfolkLooter.java +++ b/Mage.Sets/src/mage/sets/magic2012/MerfolkLooter.java @@ -49,7 +49,7 @@ public class MerfolkLooter extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Merfolk"); this.subtype.add("Rogue"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost())); diff --git a/Mage.Sets/src/mage/sets/magic2012/MerfolkMesmerist.java b/Mage.Sets/src/mage/sets/magic2012/MerfolkMesmerist.java index 4d1300f2280..84650dd9c58 100644 --- a/Mage.Sets/src/mage/sets/magic2012/MerfolkMesmerist.java +++ b/Mage.Sets/src/mage/sets/magic2012/MerfolkMesmerist.java @@ -53,7 +53,7 @@ public class MerfolkMesmerist extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.U)); diff --git a/Mage.Sets/src/mage/sets/magic2012/OnyxMage.java b/Mage.Sets/src/mage/sets/magic2012/OnyxMage.java index 61a44c7134e..2e19c2730b6 100644 --- a/Mage.Sets/src/mage/sets/magic2012/OnyxMage.java +++ b/Mage.Sets/src/mage/sets/magic2012/OnyxMage.java @@ -53,7 +53,7 @@ public class OnyxMage extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{B}")); diff --git a/Mage.Sets/src/mage/sets/magic2012/PeregrineGriffin.java b/Mage.Sets/src/mage/sets/magic2012/PeregrineGriffin.java index 6cf3eee2f0b..999ed8f2aa7 100644 --- a/Mage.Sets/src/mage/sets/magic2012/PeregrineGriffin.java +++ b/Mage.Sets/src/mage/sets/magic2012/PeregrineGriffin.java @@ -46,7 +46,7 @@ public class PeregrineGriffin extends CardImpl { super(ownerId, 29, "Peregrine Griffin", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "M12"; this.subtype.add("Griffin"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2012/PrideGuardian.java b/Mage.Sets/src/mage/sets/magic2012/PrideGuardian.java index c0eaeeeb6b7..bfc93b8d645 100644 --- a/Mage.Sets/src/mage/sets/magic2012/PrideGuardian.java +++ b/Mage.Sets/src/mage/sets/magic2012/PrideGuardian.java @@ -48,7 +48,7 @@ public class PrideGuardian extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Cat"); this.subtype.add("Monk"); - this.color.setWhite(true); + this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2012/Reclaim.java b/Mage.Sets/src/mage/sets/magic2012/Reclaim.java index ec340f5eeed..3eb19a6e377 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Reclaim.java +++ b/Mage.Sets/src/mage/sets/magic2012/Reclaim.java @@ -44,7 +44,7 @@ public class Reclaim extends CardImpl { public Reclaim(UUID ownerId) { super(ownerId, 191, "Reclaim", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "M12"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard()); } diff --git a/Mage.Sets/src/mage/sets/magic2012/RuneScarredDemon.java b/Mage.Sets/src/mage/sets/magic2012/RuneScarredDemon.java index 12aa8b82689..abddd169bbd 100644 --- a/Mage.Sets/src/mage/sets/magic2012/RuneScarredDemon.java +++ b/Mage.Sets/src/mage/sets/magic2012/RuneScarredDemon.java @@ -49,8 +49,8 @@ public class RuneScarredDemon extends CardImpl { super(ownerId, 106, "Rune-Scarred Demon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{B}{B}"); this.expansionSetCode = "M12"; this.subtype.add("Demon"); - this.color.setBlack(true); - this.color.setBlack(true); + + this.power = new MageInt(6 ); this.toughness = new MageInt( 6); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2012/SorinsThirst.java b/Mage.Sets/src/mage/sets/magic2012/SorinsThirst.java index 70d605d80b0..7da94dd1ce7 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SorinsThirst.java +++ b/Mage.Sets/src/mage/sets/magic2012/SorinsThirst.java @@ -45,7 +45,7 @@ public class SorinsThirst extends CardImpl { public SorinsThirst (UUID ownerId) { super(ownerId, 110, "Sorin's Thirst", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}{B}"); this.expansionSetCode = "M12"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addEffect(new GainLifeEffect(2)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/magic2012/SorinsVengeance.java b/Mage.Sets/src/mage/sets/magic2012/SorinsVengeance.java index 8a49ad7610c..c303688b9a2 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SorinsVengeance.java +++ b/Mage.Sets/src/mage/sets/magic2012/SorinsVengeance.java @@ -45,7 +45,7 @@ public class SorinsVengeance extends CardImpl { public SorinsVengeance (UUID ownerId) { super(ownerId, 111, "Sorin's Vengeance", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{B}{B}{B}"); this.expansionSetCode = "M12"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(10)); this.getSpellAbility().addEffect(new GainLifeEffect(10)); this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/magic2012/StampedingRhino.java b/Mage.Sets/src/mage/sets/magic2012/StampedingRhino.java index fadb22f33cf..a1ef9c1cc9d 100644 --- a/Mage.Sets/src/mage/sets/magic2012/StampedingRhino.java +++ b/Mage.Sets/src/mage/sets/magic2012/StampedingRhino.java @@ -45,7 +45,7 @@ public class StampedingRhino extends CardImpl { super(ownerId, 196, "Stampeding Rhino", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "M12"; this.subtype.add("Rhino"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java b/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java index 3fe7515887f..20ed2bb9ad3 100644 --- a/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java +++ b/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java @@ -58,7 +58,7 @@ public class StingerflingSpider extends CardImpl { super(ownerId, 197, "Stingerfling Spider", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "M12"; this.subtype.add("Spider"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(5); this.addAbility(ReachAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2012/TasteOfBlood.java b/Mage.Sets/src/mage/sets/magic2012/TasteOfBlood.java index 074c40a7ff1..89c5b69c7ba 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TasteOfBlood.java +++ b/Mage.Sets/src/mage/sets/magic2012/TasteOfBlood.java @@ -45,7 +45,7 @@ public class TasteOfBlood extends CardImpl { public TasteOfBlood (UUID ownerId) { super(ownerId, 113, "Taste of Blood", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "M12"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addEffect(new GainLifeEffect(1)); this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/magic2012/TimelyReinforcements.java b/Mage.Sets/src/mage/sets/magic2012/TimelyReinforcements.java index 43a41bb3610..fa8159ea0a9 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TimelyReinforcements.java +++ b/Mage.Sets/src/mage/sets/magic2012/TimelyReinforcements.java @@ -51,7 +51,7 @@ public class TimelyReinforcements extends CardImpl { public TimelyReinforcements(UUID ownerId) { super(ownerId, 40, "Timely Reinforcements", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{W}"); this.expansionSetCode = "M12"; - this.color.setWhite(true); + // If you have less life than an opponent, you gain 6 life. If you control fewer creatures than an opponent, put three 1/1 white Soldier creature tokens onto the battlefield. this.getSpellAbility().addEffect(new TimelyReinforcementsEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2012/TitanicGrowth.java b/Mage.Sets/src/mage/sets/magic2012/TitanicGrowth.java index f3d91f3b313..dc6ffa8700e 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TitanicGrowth.java +++ b/Mage.Sets/src/mage/sets/magic2012/TitanicGrowth.java @@ -45,7 +45,7 @@ public class TitanicGrowth extends CardImpl { public TitanicGrowth(UUID ownerId) { super(ownerId, 198, "Titanic Growth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "M12"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/magic2012/TormentedSoul.java b/Mage.Sets/src/mage/sets/magic2012/TormentedSoul.java index 217f718ea9d..32d8a975d6d 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TormentedSoul.java +++ b/Mage.Sets/src/mage/sets/magic2012/TormentedSoul.java @@ -46,7 +46,7 @@ public class TormentedSoul extends CardImpl { super(ownerId, 114, "Tormented Soul", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}"); this.expansionSetCode = "M12"; this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new CantBlockAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2012/Trollhide.java b/Mage.Sets/src/mage/sets/magic2012/Trollhide.java index 43edf0fb187..47337163b65 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Trollhide.java +++ b/Mage.Sets/src/mage/sets/magic2012/Trollhide.java @@ -54,7 +54,7 @@ public class Trollhide extends CardImpl { super(ownerId, 199, "Trollhide", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "M12"; this.subtype.add("Aura"); - this.color.setGreen(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/magic2012/VolcanicDragon.java b/Mage.Sets/src/mage/sets/magic2012/VolcanicDragon.java index 94779aa990f..f6afa50905c 100644 --- a/Mage.Sets/src/mage/sets/magic2012/VolcanicDragon.java +++ b/Mage.Sets/src/mage/sets/magic2012/VolcanicDragon.java @@ -46,7 +46,7 @@ public class VolcanicDragon extends CardImpl { super(ownerId, 158, "Volcanic Dragon", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{R}{R}"); this.expansionSetCode = "M12"; this.subtype.add("Dragon"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2012/WallOfTorches.java b/Mage.Sets/src/mage/sets/magic2012/WallOfTorches.java index f9b5e7c9c03..273322e8aa1 100644 --- a/Mage.Sets/src/mage/sets/magic2012/WallOfTorches.java +++ b/Mage.Sets/src/mage/sets/magic2012/WallOfTorches.java @@ -45,7 +45,7 @@ public class WallOfTorches extends CardImpl { super(ownerId, 159, "Wall of Torches", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.expansionSetCode = "M12"; this.subtype.add("Wall"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(1); this.addAbility(DefenderAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2012/WringFlesh.java b/Mage.Sets/src/mage/sets/magic2012/WringFlesh.java index ac389bf914d..5be694702ff 100644 --- a/Mage.Sets/src/mage/sets/magic2012/WringFlesh.java +++ b/Mage.Sets/src/mage/sets/magic2012/WringFlesh.java @@ -45,7 +45,7 @@ public class WringFlesh extends CardImpl { public WringFlesh(UUID ownerId) { super(ownerId, 118, "Wring Flesh", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "M12"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -1, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/magic2012/ZombieGoliath.java b/Mage.Sets/src/mage/sets/magic2012/ZombieGoliath.java index 434eb1b2a32..176626ab645 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ZombieGoliath.java +++ b/Mage.Sets/src/mage/sets/magic2012/ZombieGoliath.java @@ -45,7 +45,7 @@ public class ZombieGoliath extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Zombie"); this.subtype.add("Giant"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/BallistaSquad.java b/Mage.Sets/src/mage/sets/mercadianmasques/BallistaSquad.java index 6bc7f530673..b17ca94b4d9 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/BallistaSquad.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/BallistaSquad.java @@ -53,7 +53,7 @@ public class BallistaSquad extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranBrute.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranBrute.java index 866872112fc..a1b8a08bff2 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CateranBrute.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CateranBrute.java @@ -63,7 +63,7 @@ public class CateranBrute extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Horror"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranEnforcer.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranEnforcer.java index 522e51a06c2..6bd10fe2ba4 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CateranEnforcer.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CateranEnforcer.java @@ -64,7 +64,7 @@ public class CateranEnforcer extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Horror"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranKidnappers.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranKidnappers.java index 59814cf035a..da9abb15495 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CateranKidnappers.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CateranKidnappers.java @@ -63,7 +63,7 @@ public class CateranKidnappers extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Human"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranOverlord.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranOverlord.java index 42cf7470ec8..e89a8b8461e 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CateranOverlord.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CateranOverlord.java @@ -67,7 +67,7 @@ public class CateranOverlord extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Horror"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(7); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranPersuader.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranPersuader.java index 1f77c4cbb39..b656b973ef4 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CateranPersuader.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CateranPersuader.java @@ -63,7 +63,7 @@ public class CateranPersuader extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Human"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranSlaver.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranSlaver.java index b868d8c9c1a..119dc3b3dea 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CateranSlaver.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CateranSlaver.java @@ -64,7 +64,7 @@ public class CateranSlaver extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Horror"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranSummons.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranSummons.java index aa74c20f7c4..4901b5a051a 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CateranSummons.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CateranSummons.java @@ -53,7 +53,7 @@ public class CateranSummons extends CardImpl { public CateranSummons(UUID ownerId) { super(ownerId, 126, "Cateran Summons", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "MMQ"; - this.color.setBlack(true); + // Search your library for a Mercenary card, reveal that card, and put it into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true)); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/MoltingHarpy.java b/Mage.Sets/src/mage/sets/mercadianmasques/MoltingHarpy.java index f8218909a9f..929918abbbf 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/MoltingHarpy.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/MoltingHarpy.java @@ -50,7 +50,7 @@ public class MoltingHarpy extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Harpy"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/NightwindGlider.java b/Mage.Sets/src/mage/sets/mercadianmasques/NightwindGlider.java index 8bf0c74fc04..f6b68fece71 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/NightwindGlider.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/NightwindGlider.java @@ -56,7 +56,7 @@ public class NightwindGlider extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/PiousWarrior.java b/Mage.Sets/src/mage/sets/mercadianmasques/PiousWarrior.java index f453b0b1329..a068a919de1 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/PiousWarrior.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/PiousWarrior.java @@ -55,7 +55,7 @@ public class PiousWarrior extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rebel"); 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/mercadianmasques/PrimevalShambler.java b/Mage.Sets/src/mage/sets/mercadianmasques/PrimevalShambler.java index a7d3ee28b7e..c1ac347b8cc 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/PrimevalShambler.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/PrimevalShambler.java @@ -50,7 +50,7 @@ public class PrimevalShambler extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Horror"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCaptain.java b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCaptain.java index bf5be6965ed..f40bb0b8c49 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCaptain.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCaptain.java @@ -65,7 +65,7 @@ public class RamosianCaptain extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCommander.java b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCommander.java index dd73216e41b..e29870e6b6b 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCommander.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCommander.java @@ -63,7 +63,7 @@ public class RamosianCommander extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianLieutenant.java b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianLieutenant.java index fbc4be0a920..0efd3821f1c 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianLieutenant.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianLieutenant.java @@ -63,7 +63,7 @@ public class RamosianLieutenant extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSergeant.java b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSergeant.java index ef909fee4dd..9185a3db9f0 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSergeant.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSergeant.java @@ -63,7 +63,7 @@ public class RamosianSergeant extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSkyMarshal.java b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSkyMarshal.java index 5d9037792d1..e7294512654 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSkyMarshal.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSkyMarshal.java @@ -64,7 +64,7 @@ public class RamosianSkyMarshal extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RampartCrawler.java b/Mage.Sets/src/mage/sets/mercadianmasques/RampartCrawler.java index 659ec1c4d38..33460f2a9e2 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/RampartCrawler.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/RampartCrawler.java @@ -55,7 +55,7 @@ public class RampartCrawler extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Lizard"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/SkulkingFugitive.java b/Mage.Sets/src/mage/sets/mercadianmasques/SkulkingFugitive.java index 7f6ce4a9b37..7c26a07d5ba 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/SkulkingFugitive.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/SkulkingFugitive.java @@ -47,7 +47,7 @@ public class SkulkingFugitive extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Horror"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/StrongarmThug.java b/Mage.Sets/src/mage/sets/mercadianmasques/StrongarmThug.java index 66ed9c45f37..cfc80b06232 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/StrongarmThug.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/StrongarmThug.java @@ -57,7 +57,7 @@ public class StrongarmThug extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Human"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/ThermalGlider.java b/Mage.Sets/src/mage/sets/mercadianmasques/ThermalGlider.java index b5d3bdf6273..a7c541729f1 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/ThermalGlider.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/ThermalGlider.java @@ -56,7 +56,7 @@ public class ThermalGlider extends CardImpl { this.expansionSetCode = "MMQ"; this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java b/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java index ec8a86843a3..4bc72f29f63 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java @@ -54,7 +54,7 @@ public class AltarsLight extends CardImpl { public AltarsLight(UUID ownerId) { super(ownerId, 1, "Altar's Light", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{W}{W}"); this.expansionSetCode = "MRD"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/Annul.java b/Mage.Sets/src/mage/sets/mirrodin/Annul.java index e3a9de4e3c6..9399d38cfeb 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Annul.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Annul.java @@ -54,7 +54,7 @@ public class Annul extends CardImpl { public Annul(UUID ownerId) { super(ownerId, 29, "Annul", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "MRD"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetSpell(filter)); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/Arrest.java b/Mage.Sets/src/mage/sets/mirrodin/Arrest.java index b36d77998af..01d4204336c 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Arrest.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Arrest.java @@ -54,7 +54,7 @@ public class Arrest extends CardImpl { super(ownerId, 2, "Arrest", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "MRD"; this.subtype.add("Aura"); - this.color.setWhite(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/mirrodin/Atog.java b/Mage.Sets/src/mage/sets/mirrodin/Atog.java index d23c6a39381..5a31d2ef6ec 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Atog.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Atog.java @@ -58,7 +58,7 @@ public class Atog extends CardImpl { super(ownerId, 86, "Atog", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.expansionSetCode = "MRD"; this.subtype.add("Atog"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); diff --git a/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java b/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java index dc348c95cd9..f2cf65be8f3 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java @@ -60,7 +60,7 @@ public class AuriokTransfixer extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Human"); this.subtype.add("Scout"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java b/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java index 9cb96788ef7..266267c2f83 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java @@ -44,7 +44,7 @@ public class Battlegrowth extends CardImpl { public Battlegrowth(UUID ownerId) { super(ownerId, 113, "Battlegrowth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "MRD"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java b/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java index f30be6e6bf0..8fc50760428 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java @@ -44,7 +44,7 @@ public class Bloodscent extends CardImpl { public Bloodscent(UUID ownerId) { super(ownerId, 114, "Bloodscent", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{G}"); this.expansionSetCode = "MRD"; - 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/mirrodin/Deconstruct.java b/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java index 14dc277f9a0..1e6eef3d172 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java @@ -53,7 +53,7 @@ public class Deconstruct extends CardImpl { public Deconstruct(UUID ownerId) { super(ownerId, 118, "Deconstruct", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "MRD"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new BasicManaEffect(new Mana(0, 3, 0, 0, 0, 0, 0))); diff --git a/Mage.Sets/src/mage/sets/mirrodin/KrarkClanGrunt.java b/Mage.Sets/src/mage/sets/mirrodin/KrarkClanGrunt.java index 140db43f162..94ffdedb221 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/KrarkClanGrunt.java +++ b/Mage.Sets/src/mage/sets/mirrodin/KrarkClanGrunt.java @@ -62,7 +62,7 @@ public class KrarkClanGrunt extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter))); diff --git a/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java b/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java index 6b4778dd383..a7c8e9e14a8 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java +++ b/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java @@ -64,7 +64,7 @@ public class KrarkClanShaman extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filterTargetedCreatures), new SacrificeTargetCost(new TargetControlledPermanent(filterSacrificed)))); diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java index e4810d3691d..e8fa6160cfa 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java @@ -54,7 +54,7 @@ public class LeoninAbunas extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Cat"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(5); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java b/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java index 033a57cffc7..3f09d0e5a51 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java @@ -56,7 +56,7 @@ public class LoomingHoverguard extends CardImpl { super(ownerId, 38, "Looming Hoverguard", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); this.expansionSetCode = "MRD"; this.subtype.add("Drone"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java b/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java index 6d2dcd65345..4bcf2cee1ec 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java @@ -60,7 +60,7 @@ public class LoxodonMender extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Elephant"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/LuminousAngel.java b/Mage.Sets/src/mage/sets/mirrodin/LuminousAngel.java index 1d6eb0875e7..7fab125c19d 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LuminousAngel.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LuminousAngel.java @@ -49,7 +49,7 @@ public class LuminousAngel extends CardImpl { super(ownerId, 15, "Luminous Angel", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{W}{W}{W}"); this.expansionSetCode = "MRD"; this.subtype.add("Angel"); - this.color.setWhite(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/MassHysteria.java b/Mage.Sets/src/mage/sets/mirrodin/MassHysteria.java index 126d0e8209f..b48267e3fba 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/MassHysteria.java +++ b/Mage.Sets/src/mage/sets/mirrodin/MassHysteria.java @@ -48,7 +48,7 @@ public class MassHysteria extends CardImpl { public MassHysteria(UUID ownerId) { super(ownerId, 99, "Mass Hysteria", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{R}"); this.expansionSetCode = "MRD"; - this.color.setRed(true); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/Megatog.java b/Mage.Sets/src/mage/sets/mirrodin/Megatog.java index 853c9700784..801acb392b7 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Megatog.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Megatog.java @@ -60,7 +60,7 @@ public class Megatog extends CardImpl { super(ownerId, 100, "Megatog", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{R}{R}"); this.expansionSetCode = "MRD"; this.subtype.add("Atog"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter))); diff --git a/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java b/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java index b50cc909430..cefc85a0183 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java +++ b/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java @@ -56,7 +56,7 @@ public class MolderSlug extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Slug"); this.subtype.add("Beast"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(6); Ability ability = new BeginningOfUpkeepTriggeredAbility(new SacrificeEffect(filter, 1, "that player"), TargetController.ANY, false); diff --git a/Mage.Sets/src/mage/sets/mirrodin/NeurokSpy.java b/Mage.Sets/src/mage/sets/mirrodin/NeurokSpy.java index 4beea189d87..3dccb51f5d5 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NeurokSpy.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NeurokSpy.java @@ -51,7 +51,7 @@ public class NeurokSpy extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java b/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java index ae140196d07..1af1ffcdb64 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java @@ -57,7 +57,7 @@ public class NimLasher extends CardImpl { super(ownerId, 71, "Nim Lasher", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "MRD"; this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new StaticValue(0), Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java b/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java index 6d6d6869097..8ed76b47f69 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java @@ -58,7 +58,7 @@ public class NimShrieker extends CardImpl { super(ownerId, 73, "Nim Shrieker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "MRD"; this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(0); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java b/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java index 1689c40c791..b4191b97b5b 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java +++ b/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java @@ -47,7 +47,7 @@ public class PredatorsStrike extends CardImpl { public PredatorsStrike(UUID ownerId) { super(ownerId, 128, "Predator's Strike", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "MRD"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java b/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java index c955df20ade..7fb6463e9bd 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java +++ b/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java @@ -46,7 +46,7 @@ public class PsychicMembrane extends CardImpl { super(ownerId, 46, "Psychic Membrane", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "MRD"; this.subtype.add("Wall"); - this.color.setBlue(true); + this.power = new MageInt(0); this.toughness = new MageInt(3); this.addAbility(DefenderAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm.java b/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm.java index 72a2131096e..a168b852539 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm.java +++ b/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm.java @@ -44,7 +44,7 @@ public class RaiseTheAlarm extends CardImpl { public RaiseTheAlarm (UUID ownerId) { super(ownerId, 16, "Raise the Alarm", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "MRD"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new CreateTokenEffect(new SoldierToken(), 2)); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/Regress.java b/Mage.Sets/src/mage/sets/mirrodin/Regress.java index 13ce1b6bb82..c54168c9910 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Regress.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Regress.java @@ -44,7 +44,7 @@ public class Regress extends CardImpl { public Regress (UUID ownerId) { super(ownerId, 48, "Regress", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "MRD"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent()); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/SeethingSong.java b/Mage.Sets/src/mage/sets/mirrodin/SeethingSong.java index 665cd503a97..118b7979eca 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SeethingSong.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SeethingSong.java @@ -43,7 +43,7 @@ public class SeethingSong extends CardImpl { public SeethingSong(UUID ownerId) { super(ownerId, 104, "Seething Song", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "MRD"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new BasicManaEffect(new Mana(5, 0, 0, 0, 0, 0, 0))); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/Shatter.java b/Mage.Sets/src/mage/sets/mirrodin/Shatter.java index 6d7f66fcf38..6ee15fcc26d 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Shatter.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Shatter.java @@ -51,7 +51,7 @@ public class Shatter extends CardImpl { public Shatter (UUID ownerId) { super(ownerId, 105, "Shatter", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "MRD"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithAscendant.java b/Mage.Sets/src/mage/sets/mirrodin/SlithAscendant.java index 630f7c251fc..931a7b32331 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SlithAscendant.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SlithAscendant.java @@ -47,7 +47,7 @@ public class SlithAscendant extends CardImpl { super(ownerId, 23, "Slith Ascendant", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{W}{W}"); this.expansionSetCode = "MRD"; this.subtype.add("Slith"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithBloodletter.java b/Mage.Sets/src/mage/sets/mirrodin/SlithBloodletter.java index a9768e16048..aa1c5d3eae2 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SlithBloodletter.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SlithBloodletter.java @@ -51,7 +51,7 @@ public class SlithBloodletter extends CardImpl { super(ownerId, 77, "Slith Bloodletter", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{B}{B}"); this.expansionSetCode = "MRD"; this.subtype.add("Slith"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), false)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithFirewalker.java b/Mage.Sets/src/mage/sets/mirrodin/SlithFirewalker.java index 6c982ed1989..e6eaf50e072 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SlithFirewalker.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SlithFirewalker.java @@ -47,7 +47,7 @@ public class SlithFirewalker extends CardImpl { super(ownerId, 107, "Slith Firewalker", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{R}{R}"); this.expansionSetCode = "MRD"; this.subtype.add("Slith"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithPredator.java b/Mage.Sets/src/mage/sets/mirrodin/SlithPredator.java index b6a3b52caf1..97f80ea6fe8 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SlithPredator.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SlithPredator.java @@ -47,7 +47,7 @@ public class SlithPredator extends CardImpl { super(ownerId, 129, "Slith Predator", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{G}{G}"); this.expansionSetCode = "MRD"; this.subtype.add("Slith"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java b/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java index 063d1ab61da..9f129c8643b 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java @@ -48,7 +48,7 @@ public class SlithStrider extends CardImpl { super(ownerId, 50, "Slith Strider", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); this.expansionSetCode = "MRD"; this.subtype.add("Slith"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new BecomesBlockedTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/TelJiladExile.java b/Mage.Sets/src/mage/sets/mirrodin/TelJiladExile.java index b93fc9ba9ff..c05e3255689 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TelJiladExile.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TelJiladExile.java @@ -49,7 +49,7 @@ public class TelJiladExile extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Troll"); this.subtype.add("Warrior"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"))); diff --git a/Mage.Sets/src/mage/sets/mirrodin/TrashForTreasure.java b/Mage.Sets/src/mage/sets/mirrodin/TrashForTreasure.java index 90965c88b26..86536946578 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TrashForTreasure.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TrashForTreasure.java @@ -56,7 +56,7 @@ public class TrashForTreasure extends CardImpl { public TrashForTreasure(UUID ownerId) { super(ownerId, 109, "Trash for Treasure", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "MRD"; - this.color.setRed(true); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledPermanent(filterPermanent))); this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filterCard)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/TrollAscetic.java b/Mage.Sets/src/mage/sets/mirrodin/TrollAscetic.java index c6cb1493893..19760f938cb 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TrollAscetic.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TrollAscetic.java @@ -50,7 +50,7 @@ public class TrollAscetic extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Troll"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); this.addAbility(HexproofAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java b/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java index 7afb8b64482..b49354cd7cc 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java @@ -60,7 +60,7 @@ public class TrollsOfTelJilad extends CardImpl { this.expansionSetCode = "MRD"; this.subtype.add("Troll"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(5); this.toughness = new MageInt(6); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}{G}")); diff --git a/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java b/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java index cc3b19889c3..06b9939603c 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java @@ -53,7 +53,7 @@ public class TurnToDust extends CardImpl { public TurnToDust(UUID ownerId) { super(ownerId, 137, "Turn to Dust", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "MRD"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new BasicManaEffect(new Mana(0, 1, 0, 0, 0, 0, 0))); diff --git a/Mage.Sets/src/mage/sets/mirrodin/WallOfBlood.java b/Mage.Sets/src/mage/sets/mirrodin/WallOfBlood.java index 8f17f491bd5..5535457b7f8 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/WallOfBlood.java +++ b/Mage.Sets/src/mage/sets/mirrodin/WallOfBlood.java @@ -50,7 +50,7 @@ public class WallOfBlood extends CardImpl { super(ownerId, 82, "Wall of Blood", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "MRD"; this.subtype.add("Wall"); - this.color.setBlack(true); + this.power = new MageInt(0); this.toughness = new MageInt(2); this.addAbility(DefenderAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/AccorderPaladin.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/AccorderPaladin.java index 5818243aa9a..a5c7ad18ad9 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/AccorderPaladin.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/AccorderPaladin.java @@ -46,7 +46,7 @@ public class AccorderPaladin extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(1); this.addAbility(new BattleCryAbility()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ArdentRecruit.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ArdentRecruit.java index 169076b5c7d..f5e3e6f1e3b 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ArdentRecruit.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ArdentRecruit.java @@ -54,7 +54,7 @@ public class ArdentRecruit extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java index 50870a6cdc5..ff56c6cc516 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java @@ -55,7 +55,7 @@ public class BanishmentDecree extends CardImpl { public BanishmentDecree (UUID ownerId) { super(ownerId, 3, "Banishment Decree", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}{W}"); this.expansionSetCode = "MBS"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlackSunsZenith.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlackSunsZenith.java index e769a14e6ae..410eaa83e94 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlackSunsZenith.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlackSunsZenith.java @@ -50,7 +50,7 @@ public class BlackSunsZenith extends CardImpl { public BlackSunsZenith (UUID ownerId) { super(ownerId, 39, "Black Sun's Zenith", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{B}{B}"); this.expansionSetCode = "MBS"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new BlackSunsZenithEffect()); this.getSpellAbility().addEffect(ShuffleSpellEffect.getInstance()); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Blightwidow.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Blightwidow.java index 46ed6f7787f..7431f92324c 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Blightwidow.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Blightwidow.java @@ -46,7 +46,7 @@ public class Blightwidow extends CardImpl { super(ownerId, 77, "Blightwidow", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "MBS"; this.subtype.add("Spider"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(4); this.addAbility(ReachAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlisterstickShaman.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlisterstickShaman.java index b9db509c225..39111eed6f5 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlisterstickShaman.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlisterstickShaman.java @@ -49,7 +49,7 @@ public class BlisterstickShaman extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlueSunsZenith.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlueSunsZenith.java index 55905c84baf..6f0f4e2ac2a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlueSunsZenith.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlueSunsZenith.java @@ -46,7 +46,7 @@ public class BlueSunsZenith extends CardImpl { public BlueSunsZenith (UUID ownerId) { super(ownerId, 20, "Blue Sun's Zenith", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{U}{U}{U}"); this.expansionSetCode = "MBS"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new DrawCardTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addEffect(ShuffleSpellEffect.getInstance()); this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java index 9ae1425e05b..b616ac0b8a7 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java @@ -49,7 +49,7 @@ public class BurntheImpure extends CardImpl { public BurntheImpure(UUID ownerId) { super(ownerId, 59, "Burn the Impure", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "MBS"; - this.color.setRed(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BurntheImpureEffect()); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/CausticHound.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/CausticHound.java index d333872e1bb..90b397c1c0f 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/CausticHound.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/CausticHound.java @@ -47,7 +47,7 @@ public class CausticHound extends CardImpl { super(ownerId, 40, "Caustic Hound", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{B}"); this.expansionSetCode = "MBS"; this.subtype.add("Hound"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(new DiesTriggeredAbility(new LoseLifeAllPlayersEffect(4))); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java index ac8b83a44ea..3b658942d11 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java @@ -51,7 +51,7 @@ public class ConsecratedSphinx extends CardImpl { super(ownerId, 21, "Consecrated Sphinx", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); this.expansionSetCode = "MBS"; this.subtype.add("Sphinx"); - this.color.setBlue(true); + this.power = new MageInt(4); this.toughness = new MageInt(6); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/CorruptedConscience.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/CorruptedConscience.java index 1feb976d547..74adb82e243 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/CorruptedConscience.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/CorruptedConscience.java @@ -52,7 +52,7 @@ public class CorruptedConscience extends CardImpl { super(ownerId, 22, "Corrupted Conscience", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}{U}"); this.expansionSetCode = "MBS"; this.subtype.add("Aura"); - this.color.setBlue(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/CreepingCorrosion.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/CreepingCorrosion.java index b41db8ab34a..b09a9395649 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/CreepingCorrosion.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/CreepingCorrosion.java @@ -44,7 +44,7 @@ public class CreepingCorrosion extends CardImpl { public CreepingCorrosion(UUID ownerId) { super(ownerId, 78, "Creeping Corrosion", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{G}{G}"); this.expansionSetCode = "MBS"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new DestroyAllEffect(new FilterArtifactPermanent())); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java index 802e5009669..64202e88ca3 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java @@ -59,7 +59,7 @@ public class Cryptoplasm extends CardImpl { super(ownerId, 23, "Cryptoplasm", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); this.expansionSetCode = "MBS"; this.subtype.add("Shapeshifter"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/DivineOffering.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/DivineOffering.java index b01ad9e54e4..1fcbb3dd8d2 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/DivineOffering.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/DivineOffering.java @@ -58,7 +58,7 @@ public class DivineOffering extends CardImpl { public DivineOffering(UUID ownerId) { super(ownerId, 5, "Divine Offering", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "MBS"; - this.color.setWhite(true); + // Destroy target artifact. You gain life equal to its converted mana cost. this.getSpellAbility().addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Flensermite.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Flensermite.java index e6c972a7c9a..3dcb48d7b37 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Flensermite.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Flensermite.java @@ -46,7 +46,7 @@ public class Flensermite extends CardImpl { super(ownerId, 41, "Flensermite", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.expansionSetCode = "MBS"; this.subtype.add("Gremlin"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(InfectAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/FleshEaterImp.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/FleshEaterImp.java index 9d84ba84121..692d2d103c0 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/FleshEaterImp.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/FleshEaterImp.java @@ -53,7 +53,7 @@ public class FleshEaterImp extends CardImpl { super(ownerId, 42, "Flesh-Eater Imp", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "MBS"; this.subtype.add("Imp"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/FuelForTheCause.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/FuelForTheCause.java index 9b552cfa2fb..2e04b12267a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/FuelForTheCause.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/FuelForTheCause.java @@ -45,7 +45,7 @@ public class FuelForTheCause extends CardImpl { public FuelForTheCause (UUID ownerId) { super(ownerId, 25, "Fuel for the Cause", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); this.expansionSetCode = "MBS"; - this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetSpell()); this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addEffect(new ProliferateEffect()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java index c2fb56a30a2..9d5026c995e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java @@ -58,8 +58,8 @@ public class GlissaTheTraitor extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Zombie"); this.subtype.add("Elf"); - this.color.setBlack(true); - this.color.setGreen(true); + + this.power = new MageInt(3); this.toughness = new MageInt(3); // First strike, diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissasCourier.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissasCourier.java index 98b0574635a..9d4365172bb 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissasCourier.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissasCourier.java @@ -45,7 +45,7 @@ public class GlissasCourier extends CardImpl { super(ownerId, 80, "Glissa's Courier", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}{G}"); this.expansionSetCode = "MBS"; this.subtype.add("Horror"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); this.addAbility(new MountainwalkAbility()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java index 9bf43fb3c32..052132577e6 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java @@ -53,7 +53,7 @@ public class GoForTheThroat extends CardImpl { public GoForTheThroat(UUID ownerId) { super(ownerId, 43, "Go for the Throat", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "MBS"; - this.color.setBlack(true); + Target target = new TargetCreaturePermanent(filter); target.setTargetName("nonartifact creature"); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoblinWardriver.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoblinWardriver.java index 7e480a11bb1..7025e17aa5f 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoblinWardriver.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoblinWardriver.java @@ -46,7 +46,7 @@ public class GoblinWardriver extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new BattleCryAbility()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/HellkiteIgniter.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/HellkiteIgniter.java index 7d834265b1f..e93952b2a3a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/HellkiteIgniter.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/HellkiteIgniter.java @@ -61,7 +61,7 @@ public class HellkiteIgniter extends CardImpl { super(ownerId, 65, "Hellkite Igniter", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{R}{R}"); this.expansionSetCode = "MBS"; 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/mirrodinbesieged/HeroOfBladehold.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold.java index 61a7f163e4b..5ac30fde023 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold.java @@ -48,7 +48,7 @@ public class HeroOfBladehold extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfOxidRidge.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfOxidRidge.java index c3029b0b00c..a05107e2675 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfOxidRidge.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfOxidRidge.java @@ -53,7 +53,7 @@ public class HeroOfOxidRidge extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java index 4839c91ac67..93e2f1b338a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java @@ -44,7 +44,7 @@ public class HorrifyingRevelation extends CardImpl { public HorrifyingRevelation(UUID ownerId) { super(ownerId, 45, "Horrifying Revelation", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "MBS"; - this.color.setBlack(true); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DiscardTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/KothsCourier.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/KothsCourier.java index ad72832f23c..5bb6375efc7 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/KothsCourier.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/KothsCourier.java @@ -46,7 +46,7 @@ public class KothsCourier extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); this.addAbility(new ForestwalkAbility()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaRingleader.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaRingleader.java index 8323657dd55..7c879296451 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaRingleader.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaRingleader.java @@ -47,7 +47,7 @@ public class KuldothaRingleader extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Giant"); this.subtype.add("Berserker"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(new BattleCryAbility()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java index 7eceb4ea4f9..d5b5a27af66 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java @@ -64,7 +64,7 @@ public class LeoninRelicWarder extends CardImpl { this.expansionSetCode = "MBS"; 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/mirrodinbesieged/LoxodonPartisan.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/LoxodonPartisan.java index 46aab60c9e5..86fc44f9a6b 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/LoxodonPartisan.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/LoxodonPartisan.java @@ -46,7 +46,7 @@ public class LoxodonPartisan extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Elephant"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(new BattleCryAbility()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java index a79faa24b79..69c80992b9a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java @@ -57,7 +57,7 @@ public class MassacreWurm extends CardImpl { super(ownerId, 46, "Massacre Wurm", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{3}{B}{B}{B}"); this.expansionSetCode = "MBS"; this.subtype.add("Wurm"); - this.color.setBlack(true); + this.power = new MageInt(6); this.toughness = new MageInt(5); this.addAbility(new EntersBattlefieldTriggeredAbility(new BoostOpponentsEffect(-2, -2, Duration.EndOfTurn))); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MastersCall.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MastersCall.java index e5efd6e2c5d..3e65306db39 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MastersCall.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MastersCall.java @@ -44,7 +44,7 @@ public class MastersCall extends CardImpl { public MastersCall (UUID ownerId) { super(ownerId, 13, "Master's Call", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "MBS"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new CreateTokenEffect(new MyrToken(), 2)); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MelirasKeepers.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MelirasKeepers.java index a7e92510fbd..81f77ae8f91 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MelirasKeepers.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MelirasKeepers.java @@ -53,7 +53,7 @@ public class MelirasKeepers extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranCrusader.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranCrusader.java index a1d98879d49..b0ac242bf22 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranCrusader.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranCrusader.java @@ -57,7 +57,7 @@ public class MirranCrusader extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(DoubleStrikeAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranMettle.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranMettle.java index c88e46e115a..5e82630d531 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranMettle.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranMettle.java @@ -49,7 +49,7 @@ public class MirranMettle extends CardImpl { public MirranMettle(UUID ownerId) { super(ownerId, 84, "Mirran Mettle", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "MBS"; - this.color.setGreen(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/NestedGhoul.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/NestedGhoul.java index d39c4c0e4d7..27eae919aae 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/NestedGhoul.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/NestedGhoul.java @@ -51,7 +51,7 @@ public class NestedGhoul extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Zombie"); this.subtype.add("Warrior"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(2); this.addAbility(new NestedGhoulTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java index c780a36f304..5b660ba10a4 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java @@ -46,7 +46,7 @@ public class Oculus extends CardImpl { super(ownerId, 29, "Oculus", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "MBS"; this.subtype.add("Homunculus"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/OgreResister.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/OgreResister.java index 9075014ab22..981d5e4aed8 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/OgreResister.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/OgreResister.java @@ -44,7 +44,7 @@ public class OgreResister extends CardImpl { super(ownerId, 72, "Ogre Resister", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); this.expansionSetCode = "MBS"; this.subtype.add("Ogre"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Phyresis.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Phyresis.java index 0aa141643a3..c9293d1ef20 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Phyresis.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Phyresis.java @@ -55,7 +55,7 @@ public class Phyresis extends CardImpl { super(ownerId, 49, "Phyresis", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "MBS"; this.subtype.add("Aura"); - this.color.setBlack(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianCrusader.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianCrusader.java index 71a0b4f9c74..73055a85cd5 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianCrusader.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianCrusader.java @@ -60,7 +60,7 @@ public class PhyrexianCrusader extends CardImpl { this.expansionSetCode = "MBS"; 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/mirrodinbesieged/PhyrexianHydra.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianHydra.java index 06e35b37acc..2db4875241d 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianHydra.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianHydra.java @@ -54,7 +54,7 @@ public class PhyrexianHydra extends CardImpl { super(ownerId, 85, "Phyrexian Hydra", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "MBS"; 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/mirrodinbesieged/PhyrexianRebirth.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRebirth.java index 3598098d1e2..2ff546ea821 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRebirth.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRebirth.java @@ -51,7 +51,7 @@ public class PhyrexianRebirth extends CardImpl { public PhyrexianRebirth (UUID ownerId) { super(ownerId, 15, "Phyrexian Rebirth", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{W}{W}"); this.expansionSetCode = "MBS"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new PhyrexianRebirthEffect()); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianVatmother.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianVatmother.java index a26f42d2245..146b2b930f0 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianVatmother.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianVatmother.java @@ -53,7 +53,7 @@ public class PhyrexianVatmother extends CardImpl { super(ownerId, 52, "Phyrexian Vatmother", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); this.expansionSetCode = "MBS"; this.subtype.add("Horror"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(5); this.addAbility(InfectAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java index 1df4d87cf4f..b9b7e8424f4 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java @@ -61,7 +61,7 @@ public class PistusStrike extends CardImpl { public PistusStrike(UUID ownerId) { super(ownerId, 86, "Pistus Strike", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "MBS"; - this.color.setGreen(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PlaguemawBeast.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PlaguemawBeast.java index ee01e81aeeb..5df9dad4cc8 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PlaguemawBeast.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PlaguemawBeast.java @@ -52,7 +52,7 @@ public class PlaguemawBeast extends CardImpl { super(ownerId, 87, "Plaguemaw Beast", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "MBS"; this.subtype.add("Beast"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PraetorsCounsel.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PraetorsCounsel.java index 40b6523eeee..2ce46bf49d7 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PraetorsCounsel.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PraetorsCounsel.java @@ -51,7 +51,7 @@ public class PraetorsCounsel extends CardImpl { public PraetorsCounsel(UUID ownerId) { super(ownerId, 88, "Praetor's Counsel", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{5}{G}{G}{G}"); this.expansionSetCode = "MBS"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new PraetorsCounselEffect()); this.getSpellAbility().addEffect(ExileSpellEffect.getInstance()); this.getSpellAbility().addEffect(new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.EndOfGame, HandSizeModification.SET)); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PriestsOfNorn.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PriestsOfNorn.java index 81618257d14..056c21db9cb 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PriestsOfNorn.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PriestsOfNorn.java @@ -46,7 +46,7 @@ public class PriestsOfNorn extends CardImpl { super(ownerId, 16, "Priests of Norn", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.expansionSetCode = "MBS"; this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(4); this.addAbility(VigilanceAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/QuilledSlagwurm.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/QuilledSlagwurm.java index a0b9c9e45ad..2431fd8c5a6 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/QuilledSlagwurm.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/QuilledSlagwurm.java @@ -44,7 +44,7 @@ public class QuilledSlagwurm extends CardImpl { super(ownerId, 89, "Quilled Slagwurm", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{G}{G}{G}"); this.expansionSetCode = "MBS"; this.subtype.add("Wurm"); - this.color.setGreen(true); + this.power = new MageInt(8); this.toughness = new MageInt(8); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/RedSunsZenith.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/RedSunsZenith.java index 8902296827a..48dec655e1c 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/RedSunsZenith.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/RedSunsZenith.java @@ -48,7 +48,7 @@ public class RedSunsZenith extends CardImpl { public RedSunsZenith(UUID ownerId) { super(ownerId, 74, "Red Sun's Zenith", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{R}"); this.expansionSetCode = "MBS"; - this.color.setRed(true); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java index 22c46953001..0f644d47dfb 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java @@ -54,7 +54,7 @@ public class Sangromancer extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Vampire"); this.subtype.add("Shaman"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ScourgeServant.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ScourgeServant.java index 1838dc9468b..c6b2b56a389 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ScourgeServant.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ScourgeServant.java @@ -45,7 +45,7 @@ public class ScourgeServant extends CardImpl { super(ownerId, 54, "Scourge Servant", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{B}"); this.expansionSetCode = "MBS"; this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(InfectAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java index bd59ad5a963..5f83c3cfdd8 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java @@ -47,7 +47,7 @@ public class SerumRaker extends CardImpl { super(ownerId, 31, "Serum Raker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); this.expansionSetCode = "MBS"; this.subtype.add("Drake"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Slagstorm.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Slagstorm.java index a0144c27c3e..7992dce2a00 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Slagstorm.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Slagstorm.java @@ -47,7 +47,7 @@ public class Slagstorm extends CardImpl { public Slagstorm (UUID ownerId) { super(ownerId, 75, "Slagstorm", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); this.expansionSetCode = "MBS"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DamageAllEffect(3, new FilterCreaturePermanent())); Mode mode = new Mode(); mode.getEffects().add(new DamagePlayersEffect(3)); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpiralingDuelist.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpiralingDuelist.java index 15aa8d8f897..6859377def1 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpiralingDuelist.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpiralingDuelist.java @@ -54,7 +54,7 @@ public class SpiralingDuelist extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Human"); this.subtype.add("Berserker"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness.java index 3ab6ece6d80..188c610d000 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness.java @@ -45,7 +45,7 @@ public class SpreadTheSickness extends CardImpl { public SpreadTheSickness (UUID ownerId) { super(ownerId, 56, "Spread the Sickness", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{B}"); this.expansionSetCode = "MBS"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new ProliferateEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TangleMantis.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TangleMantis.java index f9c936a1bb4..6e755990f40 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/TangleMantis.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TangleMantis.java @@ -45,7 +45,7 @@ public class TangleMantis extends CardImpl { super(ownerId, 91, "Tangle Mantis", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.expansionSetCode = "MBS"; this.subtype.add("Insect"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java index ba8df5c5114..df35e2d49d7 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java @@ -69,8 +69,8 @@ public class TezzeretAgentOfBolas extends CardImpl { super(ownerId, 97, "Tezzeret, Agent of Bolas", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{U}{B}"); this.expansionSetCode = "MBS"; this.subtype.add("Tezzeret"); - this.color.setBlue(true); - this.color.setBlack(true); + + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), false)); // +1: Look at the top five cards of your library. You may reveal an artifact card from among them and put it into your hand. Put the rest on the bottom of your library in any order. diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TineShrike.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TineShrike.java index b457de2caaf..0e540dc6b37 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/TineShrike.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TineShrike.java @@ -46,7 +46,7 @@ public class TineShrike extends CardImpl { super(ownerId, 17, "Tine Shrike", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "MBS"; this.subtype.add("Bird"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TreasureMage.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TreasureMage.java index d03c90b1ea0..0a0395a19fe 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/TreasureMage.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TreasureMage.java @@ -60,7 +60,7 @@ public class TreasureMage extends CardImpl { this.expansionSetCode = "MBS"; 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/mirrodinbesieged/TurnTheTide.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TurnTheTide.java index cd94da552fa..8c5d1acbaf2 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/TurnTheTide.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TurnTheTide.java @@ -45,7 +45,7 @@ public class TurnTheTide extends CardImpl { public TurnTheTide (UUID ownerId) { super(ownerId, 35, "Turn the Tide", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "MBS"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new BoostOpponentsEffect(-2, 0, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/UnnaturalPredation.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/UnnaturalPredation.java index 7836cb2cfed..19cb5941e18 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/UnnaturalPredation.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/UnnaturalPredation.java @@ -48,7 +48,7 @@ public class UnnaturalPredation extends CardImpl { public UnnaturalPredation (UUID ownerId) { super(ownerId, 93, "Unnatural Predation", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "MBS"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenInfuser.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenInfuser.java index bddb6eb3269..81c84f1fad4 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenInfuser.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenInfuser.java @@ -52,7 +52,7 @@ public class VedalkenInfuser extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Vedalken"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/VictorysHerald.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/VictorysHerald.java index 3c69e228910..8522d1dc1d7 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/VictorysHerald.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/VictorysHerald.java @@ -52,7 +52,7 @@ public class VictorysHerald extends CardImpl { super(ownerId, 18, "Victory's Herald", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}{W}{W}"); this.expansionSetCode = "MBS"; this.subtype.add("Angel"); - this.color.setWhite(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); Ability ability = new AttacksTriggeredAbility(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.EndOfTurn, new FilterAttackingCreature()), false); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java index 245b043ccd1..93d5b5a96b7 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java @@ -59,7 +59,7 @@ public class ViridianCorrupter extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(InfectAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianEmissary.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianEmissary.java index e02650525a0..5d083e9520a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianEmissary.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianEmissary.java @@ -49,7 +49,7 @@ public class ViridianEmissary extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Elf"); this.subtype.add("Scout"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new DiesTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterBasicLandCard()), true), true)); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java index 0bcb1ff9dc3..ab3bb82d9a1 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java @@ -45,7 +45,7 @@ public class Vivisection extends CardImpl { public Vivisection (UUID ownerId) { super(ownerId, 38, "Vivisection", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "MBS"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/WhiteSunsZenith.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/WhiteSunsZenith.java index 2f399da8090..ca6630a0c4d 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/WhiteSunsZenith.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/WhiteSunsZenith.java @@ -47,7 +47,7 @@ public class WhiteSunsZenith extends CardImpl { public WhiteSunsZenith (UUID ownerId) { super(ownerId, 19, "White Sun's Zenith", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{W}{W}{W}"); this.expansionSetCode = "MBS"; - this.color.setWhite(true); + // Put X 2/2 white Cat creature tokens onto the battlefield. Shuffle White Sun's Zenith into its owner's library. this.getSpellAbility().addEffect(new CreateTokenEffect(new CatToken(), new ManacostVariableValue())); this.getSpellAbility().addEffect(ShuffleSpellEffect.getInstance()); diff --git a/Mage.Sets/src/mage/sets/morningtide/AmbassadorOak.java b/Mage.Sets/src/mage/sets/morningtide/AmbassadorOak.java index 4d2230248c2..e2ad8b052ca 100644 --- a/Mage.Sets/src/mage/sets/morningtide/AmbassadorOak.java +++ b/Mage.Sets/src/mage/sets/morningtide/AmbassadorOak.java @@ -48,7 +48,7 @@ public class AmbassadorOak extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Treefolk"); this.subtype.add("Warrior"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ElfToken(), 1), false)); diff --git a/Mage.Sets/src/mage/sets/morningtide/Bitterblossom.java b/Mage.Sets/src/mage/sets/morningtide/Bitterblossom.java index 4b040fa10fa..e7a64e2a949 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Bitterblossom.java +++ b/Mage.Sets/src/mage/sets/morningtide/Bitterblossom.java @@ -50,7 +50,7 @@ public class Bitterblossom extends CardImpl { super(ownerId, 58, "Bitterblossom", Rarity.RARE, new CardType[]{CardType.TRIBAL, CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "MOR"; this.subtype.add("Faerie"); - this.color.setBlack(true); + // At the beginning of your upkeep, you lose 1 life and put a 1/1 black Faerie Rogue creature token with flying onto the battlefield. Ability ability = new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(1), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/sets/morningtide/BlightsoilDruid.java b/Mage.Sets/src/mage/sets/morningtide/BlightsoilDruid.java index 98a64f5a652..95081cf6878 100644 --- a/Mage.Sets/src/mage/sets/morningtide/BlightsoilDruid.java +++ b/Mage.Sets/src/mage/sets/morningtide/BlightsoilDruid.java @@ -48,7 +48,7 @@ public class BlightsoilDruid extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); Ability ability = new GreenManaAbility(); diff --git a/Mage.Sets/src/mage/sets/morningtide/BurrentonShieldBearers.java b/Mage.Sets/src/mage/sets/morningtide/BurrentonShieldBearers.java index d18b4630d8e..4362179e9f4 100644 --- a/Mage.Sets/src/mage/sets/morningtide/BurrentonShieldBearers.java +++ b/Mage.Sets/src/mage/sets/morningtide/BurrentonShieldBearers.java @@ -50,7 +50,7 @@ public class BurrentonShieldBearers extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Kithkin"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); Ability ability = new AttacksTriggeredAbility(new BoostTargetEffect(0, 3, Duration.EndOfTurn), false); diff --git a/Mage.Sets/src/mage/sets/morningtide/ChameleonColossus.java b/Mage.Sets/src/mage/sets/morningtide/ChameleonColossus.java index cb839d79038..56d7df6a2e4 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ChameleonColossus.java +++ b/Mage.Sets/src/mage/sets/morningtide/ChameleonColossus.java @@ -65,7 +65,7 @@ public class ChameleonColossus extends CardImpl { super(ownerId, 116, "Chameleon Colossus", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.expansionSetCode = "MOR"; this.subtype.add("Shapeshifter"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/morningtide/ChangelingSentinel.java b/Mage.Sets/src/mage/sets/morningtide/ChangelingSentinel.java index 70575372ace..7dc130b0966 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ChangelingSentinel.java +++ b/Mage.Sets/src/mage/sets/morningtide/ChangelingSentinel.java @@ -45,7 +45,7 @@ public class ChangelingSentinel extends CardImpl { super(ownerId, 6, "Changeling Sentinel", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "MOR"; this.subtype.add("Shapeshifter"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); this.addAbility(ChangelingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/morningtide/Earthbrawn.java b/Mage.Sets/src/mage/sets/morningtide/Earthbrawn.java index 4d485596cda..142d55600aa 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Earthbrawn.java +++ b/Mage.Sets/src/mage/sets/morningtide/Earthbrawn.java @@ -47,7 +47,7 @@ public class Earthbrawn extends CardImpl { public Earthbrawn(UUID ownerId) { super(ownerId, 119, "Earthbrawn", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "MOR"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.addAbility(new ReinforceAbility(1, new ManaCostsImpl("{1}{G}"))); diff --git a/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java b/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java index b25f39ca155..3d752531dec 100644 --- a/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java +++ b/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java @@ -65,7 +65,7 @@ public class EverbarkShaman extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Treefolk"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/morningtide/FendeepSummoner.java b/Mage.Sets/src/mage/sets/morningtide/FendeepSummoner.java index 93df3119c8c..8fb95c592b9 100644 --- a/Mage.Sets/src/mage/sets/morningtide/FendeepSummoner.java +++ b/Mage.Sets/src/mage/sets/morningtide/FendeepSummoner.java @@ -60,7 +60,7 @@ public class FendeepSummoner extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Treefolk"); this.subtype.add("Shaman"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/morningtide/Festercreep.java b/Mage.Sets/src/mage/sets/morningtide/Festercreep.java index 39e6b9a7203..1539c7dd4fa 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Festercreep.java +++ b/Mage.Sets/src/mage/sets/morningtide/Festercreep.java @@ -54,7 +54,7 @@ public class Festercreep extends CardImpl { super(ownerId, 62, "Festercreep", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.expansionSetCode = "MOR"; 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/morningtide/GameTrailChangeling.java b/Mage.Sets/src/mage/sets/morningtide/GameTrailChangeling.java index 1fbd2c5abcd..4b9e3ee69c4 100644 --- a/Mage.Sets/src/mage/sets/morningtide/GameTrailChangeling.java +++ b/Mage.Sets/src/mage/sets/morningtide/GameTrailChangeling.java @@ -45,7 +45,7 @@ public class GameTrailChangeling extends CardImpl { super(ownerId, 123, "Game-Trail Changeling", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "MOR"; this.subtype.add("Shapeshifter"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(ChangelingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/morningtide/HuntingTriad.java b/Mage.Sets/src/mage/sets/morningtide/HuntingTriad.java index a7d85896e67..e3a8fab41d9 100644 --- a/Mage.Sets/src/mage/sets/morningtide/HuntingTriad.java +++ b/Mage.Sets/src/mage/sets/morningtide/HuntingTriad.java @@ -46,7 +46,7 @@ public class HuntingTriad extends CardImpl { super(ownerId, 127, "Hunting Triad", Rarity.UNCOMMON, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "MOR"; this.subtype.add("Elf"); - this.color.setGreen(true); + this.getSpellAbility().addEffect(new CreateTokenEffect(new ElfToken(), 3)); this.addAbility(new ReinforceAbility(3, new ManaCostsImpl("{3}{G}"))); } diff --git a/Mage.Sets/src/mage/sets/morningtide/IdyllicTutor.java b/Mage.Sets/src/mage/sets/morningtide/IdyllicTutor.java index bdc9e1699e9..9663c6739a9 100644 --- a/Mage.Sets/src/mage/sets/morningtide/IdyllicTutor.java +++ b/Mage.Sets/src/mage/sets/morningtide/IdyllicTutor.java @@ -51,7 +51,7 @@ public class IdyllicTutor extends CardImpl { public IdyllicTutor(UUID ownerId) { super(ownerId, 12, "Idyllic Tutor", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{W}"); this.expansionSetCode = "MOR"; - this.color.setWhite(true); + // Search your library for an enchantment card, reveal it, and put it into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true)); diff --git a/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java b/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java index a35c33bfeaf..5db71050489 100644 --- a/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java +++ b/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java @@ -61,7 +61,7 @@ public class InspiredSprite extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Faerie"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/morningtide/KinsbaileCavalier.java b/Mage.Sets/src/mage/sets/morningtide/KinsbaileCavalier.java index e36bfd5b62a..c7bacdd92a1 100644 --- a/Mage.Sets/src/mage/sets/morningtide/KinsbaileCavalier.java +++ b/Mage.Sets/src/mage/sets/morningtide/KinsbaileCavalier.java @@ -58,7 +58,7 @@ public class KinsbaileCavalier extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Kithkin"); this.subtype.add("Knight"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java b/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java index a754db4f3b9..731f129ffdc 100644 --- a/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java +++ b/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java @@ -62,7 +62,7 @@ public class LysAlanaBowmaster extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Elf"); this.subtype.add("Archer"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(ReachAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/morningtide/MoongloveChangeling.java b/Mage.Sets/src/mage/sets/morningtide/MoongloveChangeling.java index 1b59bccfd59..04b9d50e2b7 100644 --- a/Mage.Sets/src/mage/sets/morningtide/MoongloveChangeling.java +++ b/Mage.Sets/src/mage/sets/morningtide/MoongloveChangeling.java @@ -48,7 +48,7 @@ public class MoongloveChangeling extends CardImpl { super(ownerId, 67, "Moonglove Changeling", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "MOR"; this.subtype.add("Shapeshifter"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(ChangelingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/morningtide/MothdustChangeling.java b/Mage.Sets/src/mage/sets/morningtide/MothdustChangeling.java index fe6da14b7bd..4177f5a13da 100644 --- a/Mage.Sets/src/mage/sets/morningtide/MothdustChangeling.java +++ b/Mage.Sets/src/mage/sets/morningtide/MothdustChangeling.java @@ -60,7 +60,7 @@ public class MothdustChangeling extends CardImpl { super(ownerId, 42, "Mothdust Changeling", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}"); this.expansionSetCode = "MOR"; this.subtype.add("Shapeshifter"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(ChangelingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/morningtide/RhysTheExiled.java b/Mage.Sets/src/mage/sets/morningtide/RhysTheExiled.java index ba76090fbf4..b0cb411a3ab 100644 --- a/Mage.Sets/src/mage/sets/morningtide/RhysTheExiled.java +++ b/Mage.Sets/src/mage/sets/morningtide/RhysTheExiled.java @@ -66,7 +66,7 @@ public class RhysTheExiled extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java b/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java index 02914a7b27b..d01985b3b37 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java +++ b/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java @@ -61,7 +61,7 @@ public class ScarbladeElite extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Elf"); this.subtype.add("Assassin"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/morningtide/SeethingPathblazer.java b/Mage.Sets/src/mage/sets/morningtide/SeethingPathblazer.java index 71cbdbdd527..28e3968107d 100644 --- a/Mage.Sets/src/mage/sets/morningtide/SeethingPathblazer.java +++ b/Mage.Sets/src/mage/sets/morningtide/SeethingPathblazer.java @@ -62,7 +62,7 @@ public class SeethingPathblazer extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Elemental"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); diff --git a/Mage.Sets/src/mage/sets/morningtide/ShardVolley.java b/Mage.Sets/src/mage/sets/morningtide/ShardVolley.java index ddb0d5f02cf..5b0ecac4dcc 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ShardVolley.java +++ b/Mage.Sets/src/mage/sets/morningtide/ShardVolley.java @@ -49,7 +49,7 @@ public class ShardVolley extends CardImpl { public ShardVolley(UUID ownerId) { super(ownerId, 103, "Shard Volley", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "MOR"; - this.color.setRed(true); + // As an additional cost to cast Shard Volley, sacrifice a land. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); diff --git a/Mage.Sets/src/mage/sets/morningtide/Shinewend.java b/Mage.Sets/src/mage/sets/morningtide/Shinewend.java index 517df9d5968..e527b641226 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Shinewend.java +++ b/Mage.Sets/src/mage/sets/morningtide/Shinewend.java @@ -63,7 +63,7 @@ public class Shinewend extends CardImpl { super(ownerId, 23, "Shinewend", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "MOR"; this.subtype.add("Elemental"); - this.color.setWhite(true); + this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/morningtide/SigilTracer.java b/Mage.Sets/src/mage/sets/morningtide/SigilTracer.java index b6a390e26a3..b5e5499dfa0 100644 --- a/Mage.Sets/src/mage/sets/morningtide/SigilTracer.java +++ b/Mage.Sets/src/mage/sets/morningtide/SigilTracer.java @@ -69,7 +69,7 @@ public class SigilTracer extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetSpellEffect(), new ManaCostsImpl("{1}{U}")); diff --git a/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java b/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java index 6ae839cca9c..ce77d4ee132 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java +++ b/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java @@ -65,7 +65,7 @@ public class Stingmoggie extends CardImpl { super(ownerId, 106, "Stingmoggie", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "MOR"; this.subtype.add("Elemental"); - this.color.setRed(true); + this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/morningtide/VioletPall.java b/Mage.Sets/src/mage/sets/morningtide/VioletPall.java index 19aff854bc9..228a57579be 100644 --- a/Mage.Sets/src/mage/sets/morningtide/VioletPall.java +++ b/Mage.Sets/src/mage/sets/morningtide/VioletPall.java @@ -55,7 +55,7 @@ public class VioletPall extends CardImpl { super(ownerId, 81, "Violet Pall", Rarity.COMMON, new CardType[]{CardType.TRIBAL, CardType.INSTANT}, "{4}{B}"); this.expansionSetCode = "MOR"; this.subtype.add("Faerie"); - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new CreateTokenEffect(new FaerieToken(), 1)); diff --git a/Mage.Sets/src/mage/sets/morningtide/WarSpikeChangeling.java b/Mage.Sets/src/mage/sets/morningtide/WarSpikeChangeling.java index c1f112f2587..2d4a8367696 100644 --- a/Mage.Sets/src/mage/sets/morningtide/WarSpikeChangeling.java +++ b/Mage.Sets/src/mage/sets/morningtide/WarSpikeChangeling.java @@ -48,7 +48,7 @@ public class WarSpikeChangeling extends CardImpl { super(ownerId, 112, "War-Spike Changeling", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "MOR"; this.subtype.add("Shapeshifter"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(ChangelingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/morningtide/WeirdingShaman.java b/Mage.Sets/src/mage/sets/morningtide/WeirdingShaman.java index 0a5159bb325..8bc8b3e8eb4 100644 --- a/Mage.Sets/src/mage/sets/morningtide/WeirdingShaman.java +++ b/Mage.Sets/src/mage/sets/morningtide/WeirdingShaman.java @@ -61,7 +61,7 @@ public class WeirdingShaman extends CardImpl { this.expansionSetCode = "MOR"; this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new goblinRogueToken(), 2), new ManaCostsImpl("{3}{B}")); diff --git a/Mage.Sets/src/mage/sets/nemesis/Moggcatcher.java b/Mage.Sets/src/mage/sets/nemesis/Moggcatcher.java index 3e89add453d..d670ab3eee9 100644 --- a/Mage.Sets/src/mage/sets/nemesis/Moggcatcher.java +++ b/Mage.Sets/src/mage/sets/nemesis/Moggcatcher.java @@ -59,7 +59,7 @@ public class Moggcatcher extends CardImpl { this.expansionSetCode = "NMS"; this.subtype.add("Human"); this.subtype.add("Mercenary"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/nemesis/PhyrexianDriver.java b/Mage.Sets/src/mage/sets/nemesis/PhyrexianDriver.java index e9274f70d08..8e20335c5f9 100644 --- a/Mage.Sets/src/mage/sets/nemesis/PhyrexianDriver.java +++ b/Mage.Sets/src/mage/sets/nemesis/PhyrexianDriver.java @@ -55,7 +55,7 @@ public class PhyrexianDriver extends CardImpl { this.expansionSetCode = "NMS"; this.subtype.add("Zombie"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/nemesis/RathiAssassin.java b/Mage.Sets/src/mage/sets/nemesis/RathiAssassin.java index 67ecc1c482c..afe62061c50 100644 --- a/Mage.Sets/src/mage/sets/nemesis/RathiAssassin.java +++ b/Mage.Sets/src/mage/sets/nemesis/RathiAssassin.java @@ -74,7 +74,7 @@ public class RathiAssassin extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Mercenary"); 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/nemesis/RathiFiend.java b/Mage.Sets/src/mage/sets/nemesis/RathiFiend.java index 98d269907d7..7e42770a5b9 100644 --- a/Mage.Sets/src/mage/sets/nemesis/RathiFiend.java +++ b/Mage.Sets/src/mage/sets/nemesis/RathiFiend.java @@ -64,7 +64,7 @@ public class RathiFiend extends CardImpl { this.expansionSetCode = "NMS"; this.subtype.add("Horror"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/nemesis/RathiIntimidator.java b/Mage.Sets/src/mage/sets/nemesis/RathiIntimidator.java index 24b3837e651..d7b51ad0eb5 100644 --- a/Mage.Sets/src/mage/sets/nemesis/RathiIntimidator.java +++ b/Mage.Sets/src/mage/sets/nemesis/RathiIntimidator.java @@ -63,7 +63,7 @@ public class RathiIntimidator extends CardImpl { this.expansionSetCode = "NMS"; this.subtype.add("Horror"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/nemesis/Seahunter.java b/Mage.Sets/src/mage/sets/nemesis/Seahunter.java index 0aa8b77a82b..b05c743cc38 100644 --- a/Mage.Sets/src/mage/sets/nemesis/Seahunter.java +++ b/Mage.Sets/src/mage/sets/nemesis/Seahunter.java @@ -59,7 +59,7 @@ public class Seahunter extends CardImpl { this.expansionSetCode = "NMS"; this.subtype.add("Human"); this.subtype.add("Mercenary"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/nemesis/StampedeDriver.java b/Mage.Sets/src/mage/sets/nemesis/StampedeDriver.java index cb0680bf1d6..3056ad72299 100644 --- a/Mage.Sets/src/mage/sets/nemesis/StampedeDriver.java +++ b/Mage.Sets/src/mage/sets/nemesis/StampedeDriver.java @@ -56,7 +56,7 @@ public class StampedeDriver extends CardImpl { this.expansionSetCode = "NMS"; this.subtype.add("Human"); this.subtype.add("Spellshaper"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ApostlesBlessing.java b/Mage.Sets/src/mage/sets/newphyrexia/ApostlesBlessing.java index 12ebb590d69..a040d8b982d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ApostlesBlessing.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ApostlesBlessing.java @@ -62,7 +62,7 @@ public class ApostlesBlessing extends CardImpl { public ApostlesBlessing(UUID ownerId) { super(ownerId, 2, "Apostle's Blessing", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{WP}"); this.expansionSetCode = "NPH"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new ApostlesBlessingEffect(Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetControlledPermanent(filter)); this.getSpellAbility().addChoice(new ChoiceColorOrArtifact()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BladeSplicer.java b/Mage.Sets/src/mage/sets/newphyrexia/BladeSplicer.java index 60cbe674cf1..d1ab3a10b54 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BladeSplicer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BladeSplicer.java @@ -63,7 +63,7 @@ public class BladeSplicer extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Human"); this.subtype.add("Artificer"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken()))); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Dismember.java b/Mage.Sets/src/mage/sets/newphyrexia/Dismember.java index 275a4638674..d7482d5ab91 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Dismember.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Dismember.java @@ -46,7 +46,7 @@ public class Dismember extends CardImpl { public Dismember (UUID ownerId) { super(ownerId, 57, "Dismember", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{BP}{BP}"); this.expansionSetCode = "NPH"; - this.color.setBlack(true); + // Target creature gets -5/-5 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-5, -5, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Dispatch.java b/Mage.Sets/src/mage/sets/newphyrexia/Dispatch.java index 2ff620c2b5a..3b8edb0faa6 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Dispatch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Dispatch.java @@ -47,7 +47,7 @@ public class Dispatch extends CardImpl { public Dispatch (UUID ownerId) { super(ownerId, 7, "Dispatch", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "NPH"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new TapTargetEffect()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new ExileTargetEffect(), MetalcraftCondition.getInstance(), "Metalcraft - If you control three or more artifacts, exile that creature")); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/EleshNornGrandCenobite.java b/Mage.Sets/src/mage/sets/newphyrexia/EleshNornGrandCenobite.java index 46b360bbc30..526d909a69c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/EleshNornGrandCenobite.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/EleshNornGrandCenobite.java @@ -51,7 +51,7 @@ public class EleshNornGrandCenobite extends CardImpl { this.expansionSetCode = "NPH"; this.supertype.add("Legendary"); this.subtype.add("Praetor"); - this.color.setWhite(true); + this.power = new MageInt(4); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Enslave.java b/Mage.Sets/src/mage/sets/newphyrexia/Enslave.java index 6b14f11ae00..d158331c83f 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Enslave.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Enslave.java @@ -55,7 +55,7 @@ public class Enslave extends CardImpl { super(ownerId, 58, "Enslave", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{B}{B}"); this.expansionSetCode = "NPH"; this.subtype.add("Aura"); - this.color.setBlack(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ForcedWorship.java b/Mage.Sets/src/mage/sets/newphyrexia/ForcedWorship.java index 29b117013a0..3ad95ac2445 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ForcedWorship.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ForcedWorship.java @@ -56,7 +56,7 @@ public class ForcedWorship extends CardImpl { super(ownerId, 11, "Forced Worship", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "NPH"; this.subtype.add("Aura"); - this.color.setWhite(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GethsVerdict.java b/Mage.Sets/src/mage/sets/newphyrexia/GethsVerdict.java index 7411a6e11a0..409b21bb0f5 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GethsVerdict.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GethsVerdict.java @@ -46,7 +46,7 @@ public class GethsVerdict extends CardImpl { public GethsVerdict (UUID ownerId) { super(ownerId, 61, "Geth's Verdict", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}{B}"); this.expansionSetCode = "NPH"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new SacrificeEffect(new FilterCreaturePermanent(), 1, "Target player")); this.getSpellAbility().addEffect(new LoseLifeTargetEffect(1)); this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java b/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java index c4f4f69d3fd..1dd4bfe1c4f 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java @@ -49,7 +49,7 @@ public class GitaxianProbe extends CardImpl { public GitaxianProbe (UUID ownerId) { super(ownerId, 35, "Gitaxian Probe", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{UP}"); this.expansionSetCode = "NPH"; - this.color.setBlue(true); + // Look at target player's hand. this.getSpellAbility().addEffect(new GitaxianProbeEffect()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java b/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java index a74ea390195..68546fe5f5a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java @@ -57,7 +57,7 @@ public class GlisteningOil extends CardImpl { super(ownerId, 62, "Glistening Oil", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}{B}"); this.expansionSetCode = "NPH"; this.subtype.add("Aura"); - this.color.setBlack(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java b/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java index f01468ef781..b207f7bddb1 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java @@ -56,7 +56,7 @@ public class GreenhiltTrainee extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(4, 4, Duration.EndOfTurn), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java index bddef69470c..450b3872387 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java @@ -49,7 +49,7 @@ public class InquisitorExarch extends CardImpl { super(ownerId, 12, "Inquisitor Exarch", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}{W}"); this.expansionSetCode = "NPH"; 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/newphyrexia/LostLeonin.java b/Mage.Sets/src/mage/sets/newphyrexia/LostLeonin.java index ae3bd8429af..4b2c58679b6 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/LostLeonin.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/LostLeonin.java @@ -46,7 +46,7 @@ public class LostLeonin extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Cat"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(InfectAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MentalMisstep.java b/Mage.Sets/src/mage/sets/newphyrexia/MentalMisstep.java index 780aebf1ad5..18825bf349e 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MentalMisstep.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MentalMisstep.java @@ -53,7 +53,7 @@ public class MentalMisstep extends CardImpl { public MentalMisstep (UUID ownerId) { super(ownerId, 38, "Mental Misstep", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{UP}"); this.expansionSetCode = "NPH"; - this.color.setBlue(true); + // Counter target spell with converted mana cost 1. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MutagenicGrowth.java b/Mage.Sets/src/mage/sets/newphyrexia/MutagenicGrowth.java index 386d8e6072a..0b3ced2b7bd 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MutagenicGrowth.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MutagenicGrowth.java @@ -45,7 +45,7 @@ public class MutagenicGrowth extends CardImpl { public MutagenicGrowth (UUID ownerId) { super(ownerId, 116, "Mutagenic Growth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{GP}"); this.expansionSetCode = "NPH"; - this.color.setGreen(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/NoxiousRevival.java b/Mage.Sets/src/mage/sets/newphyrexia/NoxiousRevival.java index c10588806a6..512f98342da 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/NoxiousRevival.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/NoxiousRevival.java @@ -44,7 +44,7 @@ public class NoxiousRevival extends CardImpl { public NoxiousRevival (UUID ownerId) { super(ownerId, 118, "Noxious Revival", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{GP}"); this.expansionSetCode = "NPH"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); this.getSpellAbility().addTarget(new TargetCardInGraveyard()); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java b/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java index 413c7307014..cd2f7f3379c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java @@ -63,7 +63,7 @@ public class PuresteelPaladin extends CardImpl { this.expansionSetCode = "NPH"; 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/newphyrexia/RuthlessInvasion.java b/Mage.Sets/src/mage/sets/newphyrexia/RuthlessInvasion.java index 4b878a76132..0f091228ab4 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/RuthlessInvasion.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/RuthlessInvasion.java @@ -48,7 +48,7 @@ public class RuthlessInvasion extends CardImpl { public RuthlessInvasion (UUID ownerId) { super(ownerId, 93, "Ruthless Invasion", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{RP}"); this.expansionSetCode = "NPH"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new RuthlessInvasionEffect()); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShatteredAngel.java b/Mage.Sets/src/mage/sets/newphyrexia/ShatteredAngel.java index 9b098762f7a..1e4f75b0f21 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShatteredAngel.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShatteredAngel.java @@ -57,7 +57,7 @@ public class ShatteredAngel extends CardImpl { super(ownerId, 23, "Shattered Angel", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); this.expansionSetCode = "NPH"; 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/newphyrexia/SheoldredWhisperingOne.java b/Mage.Sets/src/mage/sets/newphyrexia/SheoldredWhisperingOne.java index c3ac6dd5e93..cc7e64b8930 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SheoldredWhisperingOne.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SheoldredWhisperingOne.java @@ -55,7 +55,7 @@ public class SheoldredWhisperingOne extends CardImpl { this.expansionSetCode = "NPH"; this.supertype.add("Legendary"); this.subtype.add("Praetor"); - this.color.setBlack(true); + this.power = new MageInt(6); this.toughness = new MageInt(6); this.addAbility(new SwampwalkAbility()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java b/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java index f161692a226..68c43806518 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java @@ -64,7 +64,7 @@ public class SuturePriest extends CardImpl { super(ownerId, 25, "Suture Priest", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "NPH"; 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/newphyrexia/TormentorExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java index ca562e3c3a2..bd87164ac97 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java @@ -50,7 +50,7 @@ public class TormentorExarch extends CardImpl { super(ownerId, 97, "Tormentor Exarch", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "NPH"; this.subtype.add("Cleric"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java b/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java index 190bfdfae45..50aae93e6c5 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java @@ -46,7 +46,7 @@ public class VaporSnag extends CardImpl { public VaporSnag (UUID ownerId) { super(ownerId, 48, "Vapor Snag", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "NPH"; - this.color.setBlue(true); + // Return target creature to its owner's hand. Its controller loses 1 life. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/odyssey/ThoughtDevourer.java b/Mage.Sets/src/mage/sets/odyssey/ThoughtDevourer.java index 33f0ea82671..e7a9c8c64c2 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ThoughtDevourer.java +++ b/Mage.Sets/src/mage/sets/odyssey/ThoughtDevourer.java @@ -49,7 +49,7 @@ public class ThoughtDevourer extends CardImpl { super(ownerId, 105, "Thought Devourer", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); this.expansionSetCode = "ODY"; 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/odyssey/ThoughtEater.java b/Mage.Sets/src/mage/sets/odyssey/ThoughtEater.java index 38d38706379..ee3603b2ef7 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ThoughtEater.java +++ b/Mage.Sets/src/mage/sets/odyssey/ThoughtEater.java @@ -49,7 +49,7 @@ public class ThoughtEater extends CardImpl { super(ownerId, 106, "Thought Eater", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "ODY"; this.subtype.add("Beast"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/odyssey/ThoughtNibbler.java b/Mage.Sets/src/mage/sets/odyssey/ThoughtNibbler.java index 1ebb5fa4517..396489fc258 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ThoughtNibbler.java +++ b/Mage.Sets/src/mage/sets/odyssey/ThoughtNibbler.java @@ -49,7 +49,7 @@ public class ThoughtNibbler extends CardImpl { super(ownerId, 107, "Thought Nibbler", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}"); this.expansionSetCode = "ODY"; this.subtype.add("Beast"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/onslaught/WirewoodElf.java b/Mage.Sets/src/mage/sets/onslaught/WirewoodElf.java index 2bef10cad25..00096a09c35 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WirewoodElf.java +++ b/Mage.Sets/src/mage/sets/onslaught/WirewoodElf.java @@ -45,7 +45,7 @@ public class WirewoodElf extends CardImpl { this.expansionSetCode = "ONS"; this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(new GreenManaAbility()); diff --git a/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java b/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java index 638e7731864..92937122425 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java @@ -51,7 +51,7 @@ public class Saltblast extends CardImpl { public Saltblast(UUID ownerId) { super(ownerId, 15, "Saltblast", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{W}{W}"); this.expansionSetCode = "PLC"; - this.color.setWhite(true); + // Destroy target nonwhite permanent. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java b/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java index f2b0e416bb6..dbe63612558 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java @@ -53,7 +53,7 @@ public class Sunlance extends CardImpl { public Sunlance(UUID ownerId) { super(ownerId, 31, "Sunlance", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{W}"); this.expansionSetCode = "PLC"; - this.color.setWhite(true); + // Sunlance deals 3 damage to target nonwhite creature. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/planarchaos/WistfulThinking.java b/Mage.Sets/src/mage/sets/planarchaos/WistfulThinking.java index 99579a858e7..021d6e01b3a 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/WistfulThinking.java +++ b/Mage.Sets/src/mage/sets/planarchaos/WistfulThinking.java @@ -45,7 +45,7 @@ public class WistfulThinking extends CardImpl { super(ownerId, 53, "Wistful Thinking", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "PLC"; - this.color.setBlue(true); + // Target player draws two cards, then discards four cards. this.getSpellAbility().addEffect(new DrawCardTargetEffect(2)); diff --git a/Mage.Sets/src/mage/sets/planechase/AkromasVengeance.java b/Mage.Sets/src/mage/sets/planechase/AkromasVengeance.java index 435a0969a7b..fb3b07fef3d 100644 --- a/Mage.Sets/src/mage/sets/planechase/AkromasVengeance.java +++ b/Mage.Sets/src/mage/sets/planechase/AkromasVengeance.java @@ -52,7 +52,7 @@ public class AkromasVengeance extends CardImpl { public AkromasVengeance(UUID ownerId) { super(ownerId, 1, "Akroma's Vengeance", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{W}{W}"); this.expansionSetCode = "HOP"; - this.color.setWhite(true); + this.addAbility(new CyclingAbility(new ManaCostsImpl("{3}"))); this.getSpellAbility().addEffect(new AkromasVengeanceEffect()); } diff --git a/Mage.Sets/src/mage/sets/planechase/AscendantEvincar.java b/Mage.Sets/src/mage/sets/planechase/AscendantEvincar.java index 394fdc2e7fd..8ba2d349f1e 100644 --- a/Mage.Sets/src/mage/sets/planechase/AscendantEvincar.java +++ b/Mage.Sets/src/mage/sets/planechase/AscendantEvincar.java @@ -62,7 +62,7 @@ public class AscendantEvincar extends CardImpl { this.expansionSetCode = "HOP"; this.supertype.add("Legendary"); this.subtype.add("Vampire"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/planechase/BogardanFirefiend.java b/Mage.Sets/src/mage/sets/planechase/BogardanFirefiend.java index bb1b4c07bc8..0b4a65412d6 100644 --- a/Mage.Sets/src/mage/sets/planechase/BogardanFirefiend.java +++ b/Mage.Sets/src/mage/sets/planechase/BogardanFirefiend.java @@ -48,7 +48,7 @@ public class BogardanFirefiend extends CardImpl { this.expansionSetCode = "HOP"; this.subtype.add("Elemental"); this.subtype.add("Spirit"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(2), false); diff --git a/Mage.Sets/src/mage/sets/planechase/BogardanRager.java b/Mage.Sets/src/mage/sets/planechase/BogardanRager.java index e38d87a978e..d8848089804 100644 --- a/Mage.Sets/src/mage/sets/planechase/BogardanRager.java +++ b/Mage.Sets/src/mage/sets/planechase/BogardanRager.java @@ -50,7 +50,7 @@ public class BogardanRager extends CardImpl { super(ownerId, 49, "Bogardan Rager", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{R}"); this.expansionSetCode = "HOP"; this.subtype.add("Elemental"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/planechase/DarkRitual.java b/Mage.Sets/src/mage/sets/planechase/DarkRitual.java index da6f4bb41c2..c972b4c29c5 100644 --- a/Mage.Sets/src/mage/sets/planechase/DarkRitual.java +++ b/Mage.Sets/src/mage/sets/planechase/DarkRitual.java @@ -43,7 +43,7 @@ public class DarkRitual extends CardImpl { public DarkRitual(UUID ownerId) { super(ownerId, 24, "Dark Ritual", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "HOP"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new BasicManaEffect(new Mana(0, 0, 0, 0, 3, 0, 0))); } diff --git a/Mage.Sets/src/mage/sets/planechase/ExplosiveVegetation.java b/Mage.Sets/src/mage/sets/planechase/ExplosiveVegetation.java index 50de73414e0..6afb62a73fc 100644 --- a/Mage.Sets/src/mage/sets/planechase/ExplosiveVegetation.java +++ b/Mage.Sets/src/mage/sets/planechase/ExplosiveVegetation.java @@ -46,7 +46,7 @@ public class ExplosiveVegetation extends CardImpl { public ExplosiveVegetation(UUID ownerId) { super(ownerId, 70, "Explosive Vegetation", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "HOP"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, filter), true)); } diff --git a/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java b/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java index 36754386cae..ae576f7572c 100644 --- a/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java +++ b/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java @@ -50,7 +50,7 @@ public class FesteringGoblin extends CardImpl { this.expansionSetCode = "HOP"; this.subtype.add("Zombie"); this.subtype.add("Goblin"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), false); diff --git a/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java b/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java index 1ce2697528b..17a7e7d2550 100644 --- a/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java +++ b/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java @@ -57,8 +57,8 @@ public class FiresOfYavimaya extends CardImpl { public FiresOfYavimaya(UUID ownerId) { super(ownerId, 87, "Fires of Yavimaya", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{G}"); this.expansionSetCode = "HOP"; - this.color.setRed(true); - this.color.setGreen(true); + + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/planechase/FlametongueKavu.java b/Mage.Sets/src/mage/sets/planechase/FlametongueKavu.java index a0f7023a993..1ee78188cbb 100644 --- a/Mage.Sets/src/mage/sets/planechase/FlametongueKavu.java +++ b/Mage.Sets/src/mage/sets/planechase/FlametongueKavu.java @@ -47,7 +47,7 @@ public class FlametongueKavu extends CardImpl { super(ownerId, 54, "Flametongue Kavu", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "HOP"; this.subtype.add("Kavu"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(4), false); diff --git a/Mage.Sets/src/mage/sets/planechase/PhyrexianGhoul.java b/Mage.Sets/src/mage/sets/planechase/PhyrexianGhoul.java index 14fd88e7681..ed0df66c4ec 100644 --- a/Mage.Sets/src/mage/sets/planechase/PhyrexianGhoul.java +++ b/Mage.Sets/src/mage/sets/planechase/PhyrexianGhoul.java @@ -50,7 +50,7 @@ public class PhyrexianGhoul extends CardImpl { super(ownerId, 37, "Phyrexian Ghoul", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "HOP"; this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); diff --git a/Mage.Sets/src/mage/sets/planechase/SarcomiteMyr.java b/Mage.Sets/src/mage/sets/planechase/SarcomiteMyr.java index b7f614c56f6..9b184cdf993 100644 --- a/Mage.Sets/src/mage/sets/planechase/SarcomiteMyr.java +++ b/Mage.Sets/src/mage/sets/planechase/SarcomiteMyr.java @@ -53,7 +53,7 @@ public class SarcomiteMyr extends CardImpl { super(ownerId, 13, "Sarcomite Myr", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "HOP"; this.subtype.add("Myr"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2))); diff --git a/Mage.Sets/src/mage/sets/planechase/SilvergladeElemental.java b/Mage.Sets/src/mage/sets/planechase/SilvergladeElemental.java index 5e3d2d89bd4..fc2799cd66d 100644 --- a/Mage.Sets/src/mage/sets/planechase/SilvergladeElemental.java +++ b/Mage.Sets/src/mage/sets/planechase/SilvergladeElemental.java @@ -54,7 +54,7 @@ public class SilvergladeElemental extends CardImpl { super(ownerId, 78, "Silverglade Elemental", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "HOP"; this.subtype.add("Elemental"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false, false), true)); diff --git a/Mage.Sets/src/mage/sets/planechase/SyphonSoul.java b/Mage.Sets/src/mage/sets/planechase/SyphonSoul.java index d114ff745f4..e8906dabdaa 100644 --- a/Mage.Sets/src/mage/sets/planechase/SyphonSoul.java +++ b/Mage.Sets/src/mage/sets/planechase/SyphonSoul.java @@ -45,7 +45,7 @@ public class SyphonSoul extends CardImpl { public SyphonSoul(UUID ownerId) { super(ownerId, 43, "Syphon Soul", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "HOP"; - this.color.setBlack(true); + // Syphon Soul deals 2 damage to each other player. You gain life equal to the damage dealt this way. this.getSpellAbility().addEffect(new SyphonSoulEffect()); diff --git a/Mage.Sets/src/mage/sets/planechase2012/ArmoredGriffin.java b/Mage.Sets/src/mage/sets/planechase2012/ArmoredGriffin.java index ed7d48ea720..b84e81ba526 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/ArmoredGriffin.java +++ b/Mage.Sets/src/mage/sets/planechase2012/ArmoredGriffin.java @@ -45,7 +45,7 @@ public class ArmoredGriffin extends CardImpl { super(ownerId, 1, "Armored Griffin", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "PC2"; 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/planechase2012/BalefulStrix.java b/Mage.Sets/src/mage/sets/planechase2012/BalefulStrix.java index b855331c189..9adaa256a71 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/BalefulStrix.java +++ b/Mage.Sets/src/mage/sets/planechase2012/BalefulStrix.java @@ -47,8 +47,8 @@ public class BalefulStrix extends CardImpl { super(ownerId, 82, "Baleful Strix", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{U}{B}"); this.expansionSetCode = "PC2"; this.subtype.add("Bird"); - this.color.setBlue(true); - this.color.setBlack(true); + + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planechase2012/BeetlebackChief.java b/Mage.Sets/src/mage/sets/planechase2012/BeetlebackChief.java index 8721de7ff28..f1b2cb90f9d 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/BeetlebackChief.java +++ b/Mage.Sets/src/mage/sets/planechase2012/BeetlebackChief.java @@ -47,7 +47,7 @@ public class BeetlebackChief extends CardImpl { this.expansionSetCode = "PC2"; 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/planechase2012/BrindleShoat.java b/Mage.Sets/src/mage/sets/planechase2012/BrindleShoat.java index 2732baf1ad9..93ebf6ad31e 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/BrindleShoat.java +++ b/Mage.Sets/src/mage/sets/planechase2012/BrindleShoat.java @@ -46,7 +46,7 @@ public class BrindleShoat extends CardImpl { super(ownerId, 60, "Brindle Shoat", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "PC2"; this.subtype.add("Boar"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planechase2012/DragonlairSpider.java b/Mage.Sets/src/mage/sets/planechase2012/DragonlairSpider.java index b0c389bf9e4..4a54ce6e770 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/DragonlairSpider.java +++ b/Mage.Sets/src/mage/sets/planechase2012/DragonlairSpider.java @@ -47,8 +47,8 @@ public class DragonlairSpider extends CardImpl { super(ownerId, 87, "Dragonlair Spider", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}{R}{G}{G}"); this.expansionSetCode = "PC2"; this.subtype.add("Spider"); - this.color.setRed(true); - this.color.setGreen(true); + + this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/planechase2012/DreampodDruid.java b/Mage.Sets/src/mage/sets/planechase2012/DreampodDruid.java index de7a4b4fa75..000d9c2c08b 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/DreampodDruid.java +++ b/Mage.Sets/src/mage/sets/planechase2012/DreampodDruid.java @@ -52,7 +52,7 @@ public class DreampodDruid extends CardImpl { this.expansionSetCode = "PC2"; this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/planechase2012/EtheriumHornSorcerer.java b/Mage.Sets/src/mage/sets/planechase2012/EtheriumHornSorcerer.java index 1e96f29e204..fc12bfb5dc3 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/EtheriumHornSorcerer.java +++ b/Mage.Sets/src/mage/sets/planechase2012/EtheriumHornSorcerer.java @@ -49,8 +49,8 @@ public class EtheriumHornSorcerer extends CardImpl { this.expansionSetCode = "PC2"; this.subtype.add("Minotaur"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setRed(true); + + this.power = new MageInt(3); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/planechase2012/KrondTheDawnClad.java b/Mage.Sets/src/mage/sets/planechase2012/KrondTheDawnClad.java index db822952545..a42a96ec85f 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/KrondTheDawnClad.java +++ b/Mage.Sets/src/mage/sets/planechase2012/KrondTheDawnClad.java @@ -51,8 +51,8 @@ public class KrondTheDawnClad extends CardImpl { this.expansionSetCode = "PC2"; this.supertype.add("Legendary"); this.subtype.add("Archon"); - 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/planechase2012/PreyseizerDragon.java b/Mage.Sets/src/mage/sets/planechase2012/PreyseizerDragon.java index e1074c2c0f1..93ef160cbe6 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/PreyseizerDragon.java +++ b/Mage.Sets/src/mage/sets/planechase2012/PreyseizerDragon.java @@ -52,7 +52,7 @@ public class PreyseizerDragon extends CardImpl { super(ownerId, 50, "Preyseizer Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{R}{R}"); this.expansionSetCode = "PC2"; this.subtype.add("Dragon"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/prophecy/Abolish.java b/Mage.Sets/src/mage/sets/prophecy/Abolish.java index 384e06284a3..a9ddad89e92 100644 --- a/Mage.Sets/src/mage/sets/prophecy/Abolish.java +++ b/Mage.Sets/src/mage/sets/prophecy/Abolish.java @@ -55,7 +55,7 @@ public class Abolish extends CardImpl { public Abolish(UUID ownerId) { super(ownerId, 1, "Abolish", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}{W}"); this.expansionSetCode = "PCY"; - this.color.setWhite(true); + // You may discard a Plains card rather than pay Abolish's mana cost. this.addAbility(new AlternativeCostSourceAbility(new DiscardTargetCost(new TargetCardInHand(filterCost)))); diff --git a/Mage.Sets/src/mage/sets/prophecy/AgentOfShauku.java b/Mage.Sets/src/mage/sets/prophecy/AgentOfShauku.java index bd3e983308a..3313c6eadd9 100644 --- a/Mage.Sets/src/mage/sets/prophecy/AgentOfShauku.java +++ b/Mage.Sets/src/mage/sets/prophecy/AgentOfShauku.java @@ -58,7 +58,7 @@ public class AgentOfShauku extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Human"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/prophecy/BogGlider.java b/Mage.Sets/src/mage/sets/prophecy/BogGlider.java index eb51ef2b50c..228dfedd17e 100644 --- a/Mage.Sets/src/mage/sets/prophecy/BogGlider.java +++ b/Mage.Sets/src/mage/sets/prophecy/BogGlider.java @@ -67,7 +67,7 @@ public class BogGlider extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Human"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/prophecy/PitRaptor.java b/Mage.Sets/src/mage/sets/prophecy/PitRaptor.java index 6a00fba052b..5faf7959d0e 100644 --- a/Mage.Sets/src/mage/sets/prophecy/PitRaptor.java +++ b/Mage.Sets/src/mage/sets/prophecy/PitRaptor.java @@ -50,7 +50,7 @@ public class PitRaptor extends CardImpl { this.expansionSetCode = "PCY"; this.subtype.add("Bird"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/ravnica/AgrusKosWojekVeteran.java b/Mage.Sets/src/mage/sets/ravnica/AgrusKosWojekVeteran.java index cc8c014f5b4..5e45d1f4798 100644 --- a/Mage.Sets/src/mage/sets/ravnica/AgrusKosWojekVeteran.java +++ b/Mage.Sets/src/mage/sets/ravnica/AgrusKosWojekVeteran.java @@ -61,8 +61,8 @@ public class AgrusKosWojekVeteran extends CardImpl { this.supertype.add("Legendary"); 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(3); // Whenever Agrus Kos, Wojek Veteran attacks, attacking red creatures get +2/+0 and attacking white creatures get +0/+2 until end of turn. diff --git a/Mage.Sets/src/mage/sets/ravnica/AutochthonWurm.java b/Mage.Sets/src/mage/sets/ravnica/AutochthonWurm.java index 2cf2955bf59..b7b0b8c8f7c 100644 --- a/Mage.Sets/src/mage/sets/ravnica/AutochthonWurm.java +++ b/Mage.Sets/src/mage/sets/ravnica/AutochthonWurm.java @@ -46,8 +46,8 @@ public class AutochthonWurm extends CardImpl { super(ownerId, 191, "Autochthon Wurm", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{10}{G}{G}{G}{W}{W}"); this.expansionSetCode = "RAV"; this.subtype.add("Wurm"); - this.color.setGreen(true); - this.color.setWhite(true); + + this.power = new MageInt(9); this.toughness = new MageInt(14); diff --git a/Mage.Sets/src/mage/sets/ravnica/BarbarianRiftcutter.java b/Mage.Sets/src/mage/sets/ravnica/BarbarianRiftcutter.java index 902d9288095..6599a9fe2ce 100644 --- a/Mage.Sets/src/mage/sets/ravnica/BarbarianRiftcutter.java +++ b/Mage.Sets/src/mage/sets/ravnica/BarbarianRiftcutter.java @@ -53,7 +53,7 @@ public class BarbarianRiftcutter extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Human"); this.subtype.add("Barbarian"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); // {R}, Sacrifice Barbarian Riftcutter: Destroy target land. diff --git a/Mage.Sets/src/mage/sets/ravnica/BenevolentAncestor.java b/Mage.Sets/src/mage/sets/ravnica/BenevolentAncestor.java index d1ff6bbeb8c..e8e2bdb7d89 100644 --- a/Mage.Sets/src/mage/sets/ravnica/BenevolentAncestor.java +++ b/Mage.Sets/src/mage/sets/ravnica/BenevolentAncestor.java @@ -52,7 +52,7 @@ public class BenevolentAncestor extends CardImpl { super(ownerId, 3, "Benevolent Ancestor", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.expansionSetCode = "RAV"; this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(0); this.toughness = new MageInt(4); this.addAbility(DefenderAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/ravnica/BorosGuildmage.java b/Mage.Sets/src/mage/sets/ravnica/BorosGuildmage.java index d19e7b9174b..7dc9ce40305 100644 --- a/Mage.Sets/src/mage/sets/ravnica/BorosGuildmage.java +++ b/Mage.Sets/src/mage/sets/ravnica/BorosGuildmage.java @@ -55,8 +55,8 @@ public class BorosGuildmage extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setWhite(true); - this.color.setRed(true); + + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{R}")); diff --git a/Mage.Sets/src/mage/sets/ravnica/BrambleElemental.java b/Mage.Sets/src/mage/sets/ravnica/BrambleElemental.java index c3b8a8a96a9..1014dfabecd 100644 --- a/Mage.Sets/src/mage/sets/ravnica/BrambleElemental.java +++ b/Mage.Sets/src/mage/sets/ravnica/BrambleElemental.java @@ -46,7 +46,7 @@ public class BrambleElemental extends CardImpl { super(ownerId, 154, "Bramble Elemental", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "RAV"; 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/ravnica/GolgariGuildmage.java b/Mage.Sets/src/mage/sets/ravnica/GolgariGuildmage.java index 6ce94b035ed..7c8fa5de696 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GolgariGuildmage.java +++ b/Mage.Sets/src/mage/sets/ravnica/GolgariGuildmage.java @@ -58,8 +58,8 @@ public class GolgariGuildmage extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setBlack(true); - this.color.setGreen(true); + + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{4}{B}")); diff --git a/Mage.Sets/src/mage/sets/ravnica/GrayscaledGharial.java b/Mage.Sets/src/mage/sets/ravnica/GrayscaledGharial.java index 3d59096a984..328975a0bce 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GrayscaledGharial.java +++ b/Mage.Sets/src/mage/sets/ravnica/GrayscaledGharial.java @@ -45,7 +45,7 @@ public class GrayscaledGharial extends CardImpl { super(ownerId, 52, "Grayscaled Gharial", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}"); this.expansionSetCode = "RAV"; this.subtype.add("Crocodile"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new IslandwalkAbility()); diff --git a/Mage.Sets/src/mage/sets/ravnica/LightningHelix.java b/Mage.Sets/src/mage/sets/ravnica/LightningHelix.java index e3e4fc6812f..941b43f266c 100644 --- a/Mage.Sets/src/mage/sets/ravnica/LightningHelix.java +++ b/Mage.Sets/src/mage/sets/ravnica/LightningHelix.java @@ -45,8 +45,8 @@ public class LightningHelix extends CardImpl { public LightningHelix (UUID ownerId) { super(ownerId, 213, "Lightning Helix", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}{W}"); this.expansionSetCode = "RAV"; - this.color.setRed(true); - this.color.setWhite(true); + + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addEffect(new GainLifeEffect(3)); diff --git a/Mage.Sets/src/mage/sets/ravnica/NightguardPatrol.java b/Mage.Sets/src/mage/sets/ravnica/NightguardPatrol.java index 710228392aa..5455c14e17f 100644 --- a/Mage.Sets/src/mage/sets/ravnica/NightguardPatrol.java +++ b/Mage.Sets/src/mage/sets/ravnica/NightguardPatrol.java @@ -47,7 +47,7 @@ public class NightguardPatrol extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(FirstStrikeAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/ravnica/Putrefy.java b/Mage.Sets/src/mage/sets/ravnica/Putrefy.java index 936b6ccf4ce..f533c7ea40f 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Putrefy.java +++ b/Mage.Sets/src/mage/sets/ravnica/Putrefy.java @@ -54,8 +54,8 @@ public class Putrefy extends CardImpl { public Putrefy (UUID ownerId) { super(ownerId, 221, "Putrefy", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{B}{G}"); this.expansionSetCode = "RAV"; - this.color.setBlack(true); - this.color.setGreen(true); + + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); } diff --git a/Mage.Sets/src/mage/sets/ravnica/RoofstalkerWight.java b/Mage.Sets/src/mage/sets/ravnica/RoofstalkerWight.java index 9c268840d53..7c6a0deafce 100644 --- a/Mage.Sets/src/mage/sets/ravnica/RoofstalkerWight.java +++ b/Mage.Sets/src/mage/sets/ravnica/RoofstalkerWight.java @@ -50,7 +50,7 @@ public class RoofstalkerWight extends CardImpl { super(ownerId, 102, "Roofstalker Wight", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.expansionSetCode = "RAV"; this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{U}"))); diff --git a/Mage.Sets/src/mage/sets/ravnica/SelesnyaGuildmage.java b/Mage.Sets/src/mage/sets/ravnica/SelesnyaGuildmage.java index 5f4d5f1f400..bfd855af2d9 100644 --- a/Mage.Sets/src/mage/sets/ravnica/SelesnyaGuildmage.java +++ b/Mage.Sets/src/mage/sets/ravnica/SelesnyaGuildmage.java @@ -53,8 +53,8 @@ public class SelesnyaGuildmage extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Elf"); this.subtype.add("Wizard"); - 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/ravnica/SistersOfStoneDeath.java b/Mage.Sets/src/mage/sets/ravnica/SistersOfStoneDeath.java index b1e045edb4f..1c74a4d7b71 100644 --- a/Mage.Sets/src/mage/sets/ravnica/SistersOfStoneDeath.java +++ b/Mage.Sets/src/mage/sets/ravnica/SistersOfStoneDeath.java @@ -68,8 +68,8 @@ public class SistersOfStoneDeath extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Gorgon"); - this.color.setGreen(true); - this.color.setBlack(true); + + this.power = new MageInt(7); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/ravnica/SkyknightLegionnaire.java b/Mage.Sets/src/mage/sets/ravnica/SkyknightLegionnaire.java index 4e93a0a4434..b73ebadada3 100644 --- a/Mage.Sets/src/mage/sets/ravnica/SkyknightLegionnaire.java +++ b/Mage.Sets/src/mage/sets/ravnica/SkyknightLegionnaire.java @@ -47,8 +47,8 @@ public class SkyknightLegionnaire extends CardImpl { this.expansionSetCode = "RAV"; 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); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/ravnica/SnappingDrake.java b/Mage.Sets/src/mage/sets/ravnica/SnappingDrake.java index d15245d950d..818ce06f463 100644 --- a/Mage.Sets/src/mage/sets/ravnica/SnappingDrake.java +++ b/Mage.Sets/src/mage/sets/ravnica/SnappingDrake.java @@ -45,7 +45,7 @@ public class SnappingDrake extends CardImpl { super(ownerId, 64, "Snapping Drake", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "RAV"; this.subtype.add("Drake"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/ravnica/TatteredDrake.java b/Mage.Sets/src/mage/sets/ravnica/TatteredDrake.java index 6bc56b8bb7a..590298cbb84 100644 --- a/Mage.Sets/src/mage/sets/ravnica/TatteredDrake.java +++ b/Mage.Sets/src/mage/sets/ravnica/TatteredDrake.java @@ -50,7 +50,7 @@ public class TatteredDrake extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Zombie"); this.subtype.add("Drake"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/ravnica/VotaryOfTheConclave.java b/Mage.Sets/src/mage/sets/ravnica/VotaryOfTheConclave.java index 62097cbb643..9a460234d1d 100644 --- a/Mage.Sets/src/mage/sets/ravnica/VotaryOfTheConclave.java +++ b/Mage.Sets/src/mage/sets/ravnica/VotaryOfTheConclave.java @@ -49,7 +49,7 @@ public class VotaryOfTheConclave extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{2}{G}"))); diff --git a/Mage.Sets/src/mage/sets/ravnica/Watchwolf.java b/Mage.Sets/src/mage/sets/ravnica/Watchwolf.java index 417266c6174..ad320302025 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Watchwolf.java +++ b/Mage.Sets/src/mage/sets/ravnica/Watchwolf.java @@ -44,8 +44,8 @@ public class Watchwolf extends CardImpl { super(ownerId, 239, "Watchwolf", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{G}{W}"); this.expansionSetCode = "RAV"; this.subtype.add("Wolf"); - this.color.setGreen(true); - this.color.setWhite(true); + + this.power = new MageInt(3); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AbruptDecay.java b/Mage.Sets/src/mage/sets/returntoravnica/AbruptDecay.java index 5fda69b4543..f90fc15f002 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AbruptDecay.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AbruptDecay.java @@ -58,8 +58,8 @@ public class AbruptDecay extends CardImpl { public AbruptDecay (UUID ownerId) { super(ownerId, 141, "Abrupt Decay", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{B}{G}"); this.expansionSetCode = "RTR"; - this.color.setGreen(true); - this.color.setBlack(true); + + // Abrupt Decay can't be countered by spells or abilities. Effect effect = new CantBeCounteredSourceEffect(); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java b/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java index 3b2f4e65124..097d9b5995d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java @@ -55,7 +55,7 @@ public class AerialPredation extends CardImpl { public AerialPredation(UUID ownerId) { super(ownerId, 113, "Aerial Predation", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "RTR"; - this.color.setGreen(true); + // Destroy target creature with flying. You gain 2 life. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AngelOfSerenity.java b/Mage.Sets/src/mage/sets/returntoravnica/AngelOfSerenity.java index 278aff1a9b9..e59ab2b006f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AngelOfSerenity.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AngelOfSerenity.java @@ -63,7 +63,7 @@ public class AngelOfSerenity extends CardImpl { super(ownerId, 1, "Angel of Serenity", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{W}{W}{W}"); this.expansionSetCode = "RTR"; this.subtype.add("Angel"); - this.color.setWhite(true); + this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AnnihilatingFire.java b/Mage.Sets/src/mage/sets/returntoravnica/AnnihilatingFire.java index d5e18b42755..9ec377e67ea 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AnnihilatingFire.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AnnihilatingFire.java @@ -47,7 +47,7 @@ public class AnnihilatingFire extends CardImpl { public AnnihilatingFire(UUID ownerId) { super(ownerId, 85, "Annihilating Fire", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}{R}"); this.expansionSetCode = "RTR"; - this.color.setRed(true); + // Annihilating Fire deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ArmadaWurm.java b/Mage.Sets/src/mage/sets/returntoravnica/ArmadaWurm.java index dd70eee038e..4aa5f82ae24 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ArmadaWurm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ArmadaWurm.java @@ -50,8 +50,8 @@ public class ArmadaWurm extends CardImpl { super(ownerId, 143, "Armada Wurm", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{2}{G}{G}{W}{W}"); this.expansionSetCode = "RTR"; this.subtype.add("Wurm"); - 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/returntoravnica/AshZealot.java b/Mage.Sets/src/mage/sets/returntoravnica/AshZealot.java index ab5fd64713c..b6aa841b69b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AshZealot.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AshZealot.java @@ -57,7 +57,7 @@ public class AshZealot extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AzorsElocutors.java b/Mage.Sets/src/mage/sets/returntoravnica/AzorsElocutors.java index a7916737446..a70782eca81 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AzorsElocutors.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AzorsElocutors.java @@ -59,8 +59,8 @@ public class AzorsElocutors extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Human"); this.subtype.add("Advisor"); - this.color.setWhite(true); - this.color.setBlue(true); + + this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Batterhorn.java b/Mage.Sets/src/mage/sets/returntoravnica/Batterhorn.java index bbf636163b7..3680b8a1a81 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Batterhorn.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Batterhorn.java @@ -48,7 +48,7 @@ public class Batterhorn extends CardImpl { super(ownerId, 87, "Batterhorn", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{R}"); this.expansionSetCode = "RTR"; this.subtype.add("Beast"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/BellowsLizard.java b/Mage.Sets/src/mage/sets/returntoravnica/BellowsLizard.java index ec3197c44c8..9a7de437189 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/BellowsLizard.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/BellowsLizard.java @@ -50,7 +50,7 @@ public class BellowsLizard extends CardImpl { super(ownerId, 88, "Bellows Lizard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{R}"); this.expansionSetCode = "RTR"; this.subtype.add("Lizard"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java b/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java index b8e3c763dd0..8089abfcf45 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java @@ -59,8 +59,8 @@ public class BlistercoilWeird extends CardImpl { super(ownerId, 211, "Blistercoil Weird", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{U/R}"); this.expansionSetCode = "RTR"; this.subtype.add("Weird"); - this.color.setBlue(true); - this.color.setRed(true); + + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/BloodfrayGiant.java b/Mage.Sets/src/mage/sets/returntoravnica/BloodfrayGiant.java index 5e564cd5645..c72472058a9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/BloodfrayGiant.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/BloodfrayGiant.java @@ -46,7 +46,7 @@ public class BloodfrayGiant extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Giant"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CarnivalHellsteed.java b/Mage.Sets/src/mage/sets/returntoravnica/CarnivalHellsteed.java index 2a64b81f487..8e6c978ce08 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CarnivalHellsteed.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CarnivalHellsteed.java @@ -48,8 +48,8 @@ public class CarnivalHellsteed extends CardImpl { this.subtype.add("Nightmare"); this.subtype.add("Horse"); - this.color.setBlack(true); - this.color.setRed(true); + + this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ChorusOfMight.java b/Mage.Sets/src/mage/sets/returntoravnica/ChorusOfMight.java index ac876b0822c..ff82d031ae6 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ChorusOfMight.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ChorusOfMight.java @@ -50,7 +50,7 @@ public class ChorusOfMight extends CardImpl { public ChorusOfMight(UUID ownerId) { super(ownerId, 119, "Chorus of Might", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{G}"); this.expansionSetCode = "RTR"; - this.color.setGreen(true); + // Until end of turn, target creature gets +1/+1 for each creature you control and gains trample. PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ChronicFlooding.java b/Mage.Sets/src/mage/sets/returntoravnica/ChronicFlooding.java index f1721ffd2dd..fb6f584b6cf 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ChronicFlooding.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ChronicFlooding.java @@ -58,7 +58,7 @@ public class ChronicFlooding extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Aura"); - this.color.setBlue(true); + // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Cobblebrute.java b/Mage.Sets/src/mage/sets/returntoravnica/Cobblebrute.java index 018650d30fc..83ddc72f64c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Cobblebrute.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Cobblebrute.java @@ -44,7 +44,7 @@ public class Cobblebrute extends CardImpl { super(ownerId, 91, "Cobblebrute", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "RTR"; this.subtype.add("Elemental"); - this.color.setRed(true); + this.power = new MageInt(5); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DeadReveler.java b/Mage.Sets/src/mage/sets/returntoravnica/DeadReveler.java index e28c4c1d49e..9f318e509ee 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DeadReveler.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DeadReveler.java @@ -45,7 +45,7 @@ public class DeadReveler extends CardImpl { this.expansionSetCode = "RTR"; 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/returntoravnica/DeathriteShaman.java b/Mage.Sets/src/mage/sets/returntoravnica/DeathriteShaman.java index 9c69ad4dcfc..14e6e99cf6a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DeathriteShaman.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DeathriteShaman.java @@ -68,8 +68,8 @@ public class DeathriteShaman extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setBlack(true); - this.color.setGreen(true); + + this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java b/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java index 499fe6410a7..32601942dde 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java @@ -52,7 +52,7 @@ public class DeathsPresence extends CardImpl { public DeathsPresence(UUID ownerId) { super(ownerId, 121, "Death's Presence", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{5}{G}"); this.expansionSetCode = "RTR"; - this.color.setGreen(true); + // Whenever a creature you control dies, put X +1/+1 counters on target creature you control, where X is the power of the creature that died. this.addAbility(new DeathsPresenceTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DesecrationDemon.java b/Mage.Sets/src/mage/sets/returntoravnica/DesecrationDemon.java index 3caa252cb6e..d8ba05431bb 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DesecrationDemon.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DesecrationDemon.java @@ -58,7 +58,7 @@ public class DesecrationDemon extends CardImpl { super(ownerId, 63, "Desecration Demon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); this.expansionSetCode = "RTR"; this.subtype.add("Demon"); - this.color.setBlack(true); + this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java b/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java index e88e7e06c62..f0884af84c9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java @@ -50,7 +50,7 @@ public class DrainpipeVermin extends CardImpl { super(ownerId, 66, "Drainpipe Vermin", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}"); this.expansionSetCode = "RTR"; 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/returntoravnica/EtherealArmor.java b/Mage.Sets/src/mage/sets/returntoravnica/EtherealArmor.java index 30cd9631afc..da64cbd09a0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/EtherealArmor.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/EtherealArmor.java @@ -67,7 +67,7 @@ public class EtherealArmor extends CardImpl { super(ownerId, 9, "Ethereal Armor", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}"); this.expansionSetCode = "RTR"; this.subtype.add("Aura"); - this.color.setWhite(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ExplosiveImpact.java b/Mage.Sets/src/mage/sets/returntoravnica/ExplosiveImpact.java index 45047bad3ad..2fab152c8a8 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ExplosiveImpact.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ExplosiveImpact.java @@ -44,7 +44,7 @@ public class ExplosiveImpact extends CardImpl { public ExplosiveImpact(UUID ownerId) { super(ownerId, 94, "Explosive Impact", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{5}{R}"); this.expansionSetCode = "RTR"; - this.color.setRed(true); + // Explosive Impact deals 5 damage to target creature or player. this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GoblinRally.java b/Mage.Sets/src/mage/sets/returntoravnica/GoblinRally.java index c2be044bcc7..fadadd3434c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GoblinRally.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GoblinRally.java @@ -44,7 +44,7 @@ public class GoblinRally extends CardImpl { public GoblinRally(UUID ownerId) { super(ownerId, 95, "Goblin Rally", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); this.expansionSetCode = "RTR"; - this.color.setRed(true); + // Put four 1/1 red Goblin creature tokens onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new GoblinToken(), 4)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GoreHouseChainwalker.java b/Mage.Sets/src/mage/sets/returntoravnica/GoreHouseChainwalker.java index cddbf97189a..d0d651edd9d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GoreHouseChainwalker.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GoreHouseChainwalker.java @@ -46,7 +46,7 @@ public class GoreHouseChainwalker 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/returntoravnica/GraveBetrayal.java b/Mage.Sets/src/mage/sets/returntoravnica/GraveBetrayal.java index cd1acf681db..9ca8f30b745 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GraveBetrayal.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GraveBetrayal.java @@ -64,7 +64,7 @@ public class GraveBetrayal extends CardImpl { public GraveBetrayal (UUID ownerId) { super(ownerId, 67, "Grave Betrayal", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{5}{B}{B}"); this.expansionSetCode = "RTR"; - this.color.setBlack(true); + // Whenever a creature you don't control dies, return it to the battlefield under // your control with an additional +1/+1 counter on it at the beginning of the diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GrimRoustabout.java b/Mage.Sets/src/mage/sets/returntoravnica/GrimRoustabout.java index 0d4bd8644f0..fad404834c4 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GrimRoustabout.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GrimRoustabout.java @@ -50,7 +50,7 @@ public class GrimRoustabout 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/returntoravnica/Guttersnipe.java b/Mage.Sets/src/mage/sets/returntoravnica/Guttersnipe.java index dbc5b509629..d9b04ae1440 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Guttersnipe.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Guttersnipe.java @@ -60,7 +60,7 @@ public class Guttersnipe extends CardImpl { this.expansionSetCode = "RTR"; 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/returntoravnica/HellholeFlailer.java b/Mage.Sets/src/mage/sets/returntoravnica/HellholeFlailer.java index 0a0afef1d8d..1059a9cf4c4 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/HellholeFlailer.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/HellholeFlailer.java @@ -54,8 +54,8 @@ public class HellholeFlailer extends CardImpl { this.subtype.add("Ogre"); this.subtype.add("Warrior"); - this.color.setBlack(true); - this.color.setRed(true); + + this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java b/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java index 54c43ce8d9a..3b32ba62c73 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java @@ -55,7 +55,7 @@ public class InactionInjunction extends CardImpl { super(ownerId, 41, "Inaction Injunction", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{U}"); this.expansionSetCode = "RTR"; - this.color.setBlue(true); + // Detain target creature an opponent controls. // (Until your next turn, that creature can't attack or block and its activated abilities can't be activated.) diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IsperiaSupremeJudge.java b/Mage.Sets/src/mage/sets/returntoravnica/IsperiaSupremeJudge.java index 4bc59680843..1b95436c831 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/IsperiaSupremeJudge.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/IsperiaSupremeJudge.java @@ -57,8 +57,8 @@ public class IsperiaSupremeJudge extends CardImpl { this.subtype.add("Sphinx"); this.supertype.add("Legendary"); - this.color.setWhite(true); - this.color.setBlue(true); + + this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IzzetStaticaster.java b/Mage.Sets/src/mage/sets/returntoravnica/IzzetStaticaster.java index 7c1dd241c34..9b151e75285 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/IzzetStaticaster.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/IzzetStaticaster.java @@ -60,8 +60,8 @@ public class IzzetStaticaster extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setRed(true); + + this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/JaradGolgariLichLord.java b/Mage.Sets/src/mage/sets/returntoravnica/JaradGolgariLichLord.java index 0d40f172336..2485d50ab60 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/JaradGolgariLichLord.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/JaradGolgariLichLord.java @@ -76,8 +76,8 @@ public class JaradGolgariLichLord extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Zombie"); this.subtype.add("Elf"); - this.color.setBlack(true); - this.color.setGreen(true); + + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/JudgesFamiliar.java b/Mage.Sets/src/mage/sets/returntoravnica/JudgesFamiliar.java index d8ff43f135a..be18e69c9a5 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/JudgesFamiliar.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/JudgesFamiliar.java @@ -62,8 +62,8 @@ public class JudgesFamiliar extends CardImpl { super(ownerId, 218, "Judge's Familiar", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W/U}"); this.expansionSetCode = "RTR"; this.subtype.add("Bird"); - this.color.setWhite(true); - this.color.setBlue(true); + + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java b/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java index 2a0a5cc2628..5f845246fb8 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java @@ -60,7 +60,7 @@ public class KnightlyValor extends CardImpl { super(ownerId, 13, "Knightly Valor", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{W}"); this.expansionSetCode = "RTR"; this.subtype.add("Aura"); - this.color.setWhite(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/KorozdaGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/KorozdaGuildmage.java index 6064c636caf..61d28926b6a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/KorozdaGuildmage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/KorozdaGuildmage.java @@ -68,8 +68,8 @@ public class KorozdaGuildmage extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setBlack(true); - this.color.setGreen(true); + + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/LaunchParty.java b/Mage.Sets/src/mage/sets/returntoravnica/LaunchParty.java index 3e3b5dc0b5b..e54e8e95141 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/LaunchParty.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/LaunchParty.java @@ -46,7 +46,7 @@ public class LaunchParty extends CardImpl { public LaunchParty(UUID ownerId) { super(ownerId, 69, "Launch Party", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{B}"); this.expansionSetCode = "RTR"; - this.color.setBlack(true); + // As an additional cost to cast Launch Party, sacrifice a creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/LobberCrew.java b/Mage.Sets/src/mage/sets/returntoravnica/LobberCrew.java index 8bf477a6403..9d8a1a6b558 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/LobberCrew.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/LobberCrew.java @@ -57,7 +57,7 @@ public class LobberCrew extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/LoxodonSmiter.java b/Mage.Sets/src/mage/sets/returntoravnica/LoxodonSmiter.java index 87e3eb2d8d2..3ec4636e9c7 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/LoxodonSmiter.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/LoxodonSmiter.java @@ -57,8 +57,8 @@ public class LoxodonSmiter extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Elephant"); this.subtype.add("Soldier"); - this.color.setGreen(true); - this.color.setWhite(true); + + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/LyevSkyknight.java b/Mage.Sets/src/mage/sets/returntoravnica/LyevSkyknight.java index 7b1eef562ae..511ddcdb60a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/LyevSkyknight.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/LyevSkyknight.java @@ -60,8 +60,8 @@ public class LyevSkyknight extends CardImpl { this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setBlue(true); - this.color.setWhite(true); + + this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MercurialChemister.java b/Mage.Sets/src/mage/sets/returntoravnica/MercurialChemister.java index 00e7f9f37fb..d608b8e7b76 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/MercurialChemister.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/MercurialChemister.java @@ -55,8 +55,8 @@ public class MercurialChemister extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); - this.color.setRed(true); + + this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MinotaurAggressor.java b/Mage.Sets/src/mage/sets/returntoravnica/MinotaurAggressor.java index 5d289547d80..fd065a90c27 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/MinotaurAggressor.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/MinotaurAggressor.java @@ -47,7 +47,7 @@ public class MinotaurAggressor extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Minotaur"); this.subtype.add("Berserker"); - this.color.setRed(true); + this.power = new MageInt(6); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/NecropolisRegent.java b/Mage.Sets/src/mage/sets/returntoravnica/NecropolisRegent.java index fe7e62703a6..3cdce461326 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/NecropolisRegent.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/NecropolisRegent.java @@ -56,7 +56,7 @@ public class NecropolisRegent extends CardImpl { super(ownerId, 71, "Necropolis Regent", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{3}{B}{B}{B}"); this.expansionSetCode = "RTR"; this.subtype.add("Vampire"); - this.color.setBlack(true); + this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/NewPrahvGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/NewPrahvGuildmage.java index f79131f48e4..b7ae1071aea 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/NewPrahvGuildmage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/NewPrahvGuildmage.java @@ -65,8 +65,8 @@ public class NewPrahvGuildmage extends CardImpl { this.subtype.add("Human"); 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/returntoravnica/Pyroconvergence.java b/Mage.Sets/src/mage/sets/returntoravnica/Pyroconvergence.java index 238f073d081..cb2b6d91a03 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Pyroconvergence.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Pyroconvergence.java @@ -50,7 +50,7 @@ public class Pyroconvergence extends CardImpl { public Pyroconvergence(UUID ownerId) { super(ownerId, 103, "Pyroconvergence", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}"); this.expansionSetCode = "RTR"; - this.color.setRed(true); + // Whenever you cast a multicolored spell, Pyroconvergence deals 2 damage to target creature or player. this.addAbility(new PyroconvergenceTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosCackler.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosCackler.java index 4a1c7a523e3..68a1eca4b14 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosCackler.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosCackler.java @@ -45,8 +45,8 @@ public class RakdosCackler extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Devil"); - this.color.setBlack(true); - this.color.setRed(true); + + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java index 397f6680fd2..af610757380 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java @@ -46,8 +46,8 @@ public class RakdossReturn extends CardImpl { public RakdossReturn (UUID ownerId) { super(ownerId, 188, "Rakdos's Return", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{X}{B}{R}"); this.expansionSetCode = "RTR"; - this.color.setRed(true); - this.color.setBlack(true); + + // Rakdos's Return deals X damage to target opponent. That player discards X cards. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java b/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java index 5655d4586b5..e41e3b94058 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java @@ -57,8 +57,8 @@ public class RighteousAuthority extends CardImpl { super(ownerId, 189, "Righteous Authority", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}{U}"); this.expansionSetCode = "RTR"; this.subtype.add("Aura"); - this.color.setWhite(true); - this.color.setBlue(true); + + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ShriekingAffliction.java b/Mage.Sets/src/mage/sets/returntoravnica/ShriekingAffliction.java index dd80626f935..fc91274ff33 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ShriekingAffliction.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ShriekingAffliction.java @@ -62,7 +62,7 @@ public class ShriekingAffliction extends CardImpl { public ShriekingAffliction (UUID ownerId) { super(ownerId, 76, "Shrieking Affliction", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "RTR"; - this.color.setBlack(true); + // At the beginning of each opponent's upkeep, if that player has one or fewer cards in hand, he or she loses 3 life. this.addAbility(new ShriekingAfflictionTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SpawnOfRixMaadi.java b/Mage.Sets/src/mage/sets/returntoravnica/SpawnOfRixMaadi.java index 2b23fe20e3c..6280dd94266 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SpawnOfRixMaadi.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SpawnOfRixMaadi.java @@ -45,8 +45,8 @@ public class SpawnOfRixMaadi extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Horror"); - this.color.setBlack(true); - this.color.setRed(true); + + this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SplatterThug.java b/Mage.Sets/src/mage/sets/returntoravnica/SplatterThug.java index 1b8c1650338..6b1cd91622b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SplatterThug.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SplatterThug.java @@ -47,7 +47,7 @@ public class SplatterThug extends CardImpl { this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java b/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java index 5abd8922b74..7785a08edec 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java @@ -59,7 +59,7 @@ public class StabWound extends CardImpl { super(ownerId, 78, "Stab Wound", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "RTR"; this.subtype.add("Aura"); - this.color.setBlack(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SwiftJustice.java b/Mage.Sets/src/mage/sets/returntoravnica/SwiftJustice.java index 0e84acda28b..1530ca62083 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SwiftJustice.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SwiftJustice.java @@ -49,7 +49,7 @@ public class SwiftJustice extends CardImpl { public SwiftJustice(UUID ownerId) { super(ownerId, 26, "Swift Justice", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "RTR"; - this.color.setWhite(true); + // Until end of turn, target creature gets +1/+0 and gains first strike and lifelink. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ThrillKillAssassin.java b/Mage.Sets/src/mage/sets/returntoravnica/ThrillKillAssassin.java index 1b2eed6bc53..05b8ae15c19 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ThrillKillAssassin.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ThrillKillAssassin.java @@ -47,7 +47,7 @@ public class ThrillKillAssassin extends CardImpl { this.subtype.add("Human"); this.subtype.add("Assassin"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TreasuredFind.java b/Mage.Sets/src/mage/sets/returntoravnica/TreasuredFind.java index ebe5537d2f3..86f2863e788 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TreasuredFind.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TreasuredFind.java @@ -44,8 +44,8 @@ public class TreasuredFind extends CardImpl { public TreasuredFind(UUID ownerId) { super(ownerId, 204, "Treasured Find", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}{G}"); this.expansionSetCode = "RTR"; - this.color.setBlack(true); - this.color.setGreen(true); + + // Return target card from your graveyard to your hand. Exile Treasured Find. this.getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TrestleTroll.java b/Mage.Sets/src/mage/sets/returntoravnica/TrestleTroll.java index c86e3fb76fd..c729cefed9c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TrestleTroll.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TrestleTroll.java @@ -50,8 +50,8 @@ public class TrestleTroll extends CardImpl { super(ownerId, 205, "Trestle Troll", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}{G}"); this.expansionSetCode = "RTR"; this.subtype.add("Troll"); - this.color.setBlack(true); - this.color.setGreen(true); + + this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/UrbanBurgeoning.java b/Mage.Sets/src/mage/sets/returntoravnica/UrbanBurgeoning.java index 12852a94100..b108ac96043 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/UrbanBurgeoning.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/UrbanBurgeoning.java @@ -63,7 +63,7 @@ public class UrbanBurgeoning extends CardImpl { super(ownerId, 138, "Urban Burgeoning", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "RTR"; this.subtype.add("Aura"); - this.color.setGreen(true); + // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/VituGhaziGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/VituGhaziGuildmage.java index cf7f3757cb7..471000a92a9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/VituGhaziGuildmage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/VituGhaziGuildmage.java @@ -50,8 +50,8 @@ public class VituGhaziGuildmage extends CardImpl { this.expansionSetCode = "RTR"; this.subtype.add("Dryad"); this.subtype.add("Shaman"); - 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/riseoftheeldrazi/AncientStirrings.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AncientStirrings.java index 72894c03ef0..e8d1a74c219 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AncientStirrings.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AncientStirrings.java @@ -53,7 +53,7 @@ public class AncientStirrings extends CardImpl { public AncientStirrings(UUID ownerId) { super(ownerId, 174, "Ancient Stirrings", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{G}"); this.expansionSetCode = "ROE"; - this.color.setGreen(true); + // Look at the top five cards of your library. You may reveal a colorless card from among them and put it into your hand. // Then put the rest on the bottom of your library in any order. (Cards with no colored mana in their mana costs are colorless. Lands are also colorless.) diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java index 417f12ce441..6eaa7d2c8be 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java @@ -29,11 +29,11 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.game.events.GameEvent.EventType; import mage.game.permanent.token.EldraziSpawnToken; @@ -46,7 +46,6 @@ public class AwakeningZone extends CardImpl { public AwakeningZone(UUID ownerId) { super(ownerId, 176, "Awakening Zone", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "ROE"; - this.getColor().setGreen(true); this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new CreateTokenEffect(new EldraziSpawnToken()), true)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodriteInvoker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodriteInvoker.java index c92030c198d..7191f363fed 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodriteInvoker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodriteInvoker.java @@ -53,7 +53,7 @@ public class BloodriteInvoker extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Vampire"); this.subtype.add("Shaman"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(3), new GenericManaCost(8)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java index bfaf96fdb25..4fbd5953424 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java @@ -49,7 +49,7 @@ public class BloodthroneVampire extends CardImpl { public BloodthroneVampire(UUID ownerId) { super(ownerId, 98, "Bloodthrone Vampire", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); + this.subtype.add("Vampire"); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathlessAngel.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathlessAngel.java index b348afde557..47e34d7f43b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathlessAngel.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathlessAngel.java @@ -54,7 +54,7 @@ public class DeathlessAngel extends CardImpl { super(ownerId, 17, "Deathless Angel", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{W}{W}"); this.expansionSetCode = "ROE"; this.subtype.add("Angel"); - this.color.setWhite(true); + this.power = new MageInt(5); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DemonicAppetite.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DemonicAppetite.java index af5a5bbb0ab..d467a009fb5 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DemonicAppetite.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DemonicAppetite.java @@ -52,7 +52,7 @@ public class DemonicAppetite extends CardImpl { super(ownerId, 106, "Demonic Appetite", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setBlack(true); + TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java index 69b10349a65..c54b6b577b6 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java @@ -50,7 +50,7 @@ public class Deprive extends CardImpl { public Deprive(UUID ownerId) { super(ownerId, 59, "Deprive", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}{U}"); this.expansionSetCode = "ROE"; - this.color.setBlue(true); + // As an additional cost to cast Deprive, return a land you control to its owner's hand. this.getSpellAbility().addCost(new ReturnToHandTargetCost(new TargetControlledPermanent(filter))); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreadDrone.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreadDrone.java index f11b3af6aab..eb073a6a821 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreadDrone.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreadDrone.java @@ -48,7 +48,7 @@ public class DreadDrone extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Eldrazi"); this.subtype.add("Drone"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(1); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new EldraziSpawnToken(), 2))); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java index 93343c9355c..9dc06206ccf 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java @@ -48,7 +48,7 @@ public class EmrakulsHatcher extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Eldrazi"); this.subtype.add("Drone"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EssenceFeed.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EssenceFeed.java index 65331c254c5..230dae479a1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EssenceFeed.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EssenceFeed.java @@ -47,7 +47,7 @@ public class EssenceFeed extends CardImpl { public EssenceFeed (UUID ownerId) { super(ownerId, 110, "Essence Feed", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{5}{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new LoseLifeTargetEffect(3)); this.getSpellAbility().addEffect(new GainLifeEffect(3)); this.getSpellAbility().addEffect(new CreateTokenEffect(new EldraziSpawnToken(), 3)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java index c25e4999545..1851647f65a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java @@ -44,7 +44,7 @@ public class FlameSlash extends CardImpl { public FlameSlash(UUID ownerId) { super(ownerId, 145, "Flame Slash", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "ROE"; - this.color.setRed(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DamageTargetEffect(4)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FleetingDistraction.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FleetingDistraction.java index 63bb84c57f7..060a50d221e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FleetingDistraction.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FleetingDistraction.java @@ -47,7 +47,7 @@ public class FleetingDistraction extends CardImpl { public FleetingDistraction (UUID ownerId) { super(ownerId, 67, "Fleeting Distraction", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "ROE"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(-1, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java index b9dc230c317..b52ecc52b86 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java @@ -69,7 +69,7 @@ public class GideonJura extends CardImpl { super(ownerId, 21, "Gideon Jura", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{W}{W}"); this.expansionSetCode = "ROE"; this.subtype.add("Gideon"); - this.color.setWhite(true); + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(6)), false)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gigantomancer.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gigantomancer.java index afb3888df69..750846653b4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gigantomancer.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gigantomancer.java @@ -52,7 +52,7 @@ public class Gigantomancer extends CardImpl { this.expansionSetCode = "ROE"; 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/riseoftheeldrazi/Gloomhunter.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gloomhunter.java index 42c2b074caa..02d5cef1a94 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gloomhunter.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gloomhunter.java @@ -45,7 +45,7 @@ public class Gloomhunter extends CardImpl { super(ownerId, 111, "Gloomhunter", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "ROE"; this.subtype.add("Bat"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GlorySeeker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GlorySeeker.java index 6c69d011190..c26edccafca 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GlorySeeker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GlorySeeker.java @@ -45,7 +45,7 @@ public class GlorySeeker extends CardImpl { this.expansionSetCode = "ROE"; 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/riseoftheeldrazi/GoblinTunneler.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java index ab8f45c82ce..7de153f649f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java @@ -60,7 +60,7 @@ public class GoblinTunneler extends CardImpl { this.expansionSetCode = "ROE"; 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/riseoftheeldrazi/GuardDuty.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardDuty.java index 307acc080a6..8a83db8e3bd 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardDuty.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardDuty.java @@ -51,7 +51,7 @@ public class GuardDuty extends CardImpl { super(ownerId, 23, "Guard Duty", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}"); this.expansionSetCode = "ROE"; this.subtype.add("Aura"); - this.color.setWhite(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java index c38f1206769..a41129f6e60 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java @@ -57,7 +57,7 @@ public class InquisitionOfKozilek extends CardImpl { public InquisitionOfKozilek(UUID ownerId){ super(ownerId, 115, "Inquisition of Kozilek", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY},"{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter, TargetController.ANY)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JwariScuttler.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JwariScuttler.java index 2d23c5e2443..a175615a772 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JwariScuttler.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JwariScuttler.java @@ -44,7 +44,7 @@ public class JwariScuttler extends CardImpl { super(ownerId, 73, "Jwari Scuttler", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "ROE"; this.subtype.add("Crab"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java index 93f52d18f4c..e7d149d9ec4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java @@ -48,7 +48,7 @@ public class KozileksPredator extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Eldrazi"); this.subtype.add("Drone"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LagacLizard.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LagacLizard.java index e18bbaa08ba..d46ef0394b7 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LagacLizard.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LagacLizard.java @@ -44,7 +44,7 @@ public class LagacLizard extends CardImpl { super(ownerId, 154, "Lagac Lizard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "ROE"; this.subtype.add("Lizard"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LastKiss.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LastKiss.java index 2e51c50e0b3..8a7da217975 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LastKiss.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LastKiss.java @@ -45,7 +45,7 @@ public class LastKiss extends CardImpl { public LastKiss (UUID ownerId) { super(ownerId, 116, "Last Kiss", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addEffect(new GainLifeEffect(2)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LinvalaKeeperOfSilence.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LinvalaKeeperOfSilence.java index c90deeb6ac6..a0940028901 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LinvalaKeeperOfSilence.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LinvalaKeeperOfSilence.java @@ -53,7 +53,7 @@ public class LinvalaKeeperOfSilence extends CardImpl { this.expansionSetCode = "ROE"; this.supertype.add("Legendary"); 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/riseoftheeldrazi/MakindiGriffin.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MakindiGriffin.java index 602862bbfec..f41b1c8b0e5 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MakindiGriffin.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MakindiGriffin.java @@ -45,7 +45,7 @@ public class MakindiGriffin extends CardImpl { super(ownerId, 36, "Makindi Griffin", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "ROE"; this.subtype.add("Griffin"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NemaSiltlurker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NemaSiltlurker.java index c64cd4c6c85..b2fd8543077 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NemaSiltlurker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NemaSiltlurker.java @@ -44,7 +44,7 @@ public class NemaSiltlurker extends CardImpl { super(ownerId, 200, "Nema Siltlurker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "ROE"; this.subtype.add("Lizard"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java index 7916d043b89..2ff6acf23fd 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java @@ -48,7 +48,7 @@ public class NestInvader extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Eldrazi"); this.subtype.add("Drone"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Nighthaze.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Nighthaze.java index b998cee14fa..f80eb32a57f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Nighthaze.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Nighthaze.java @@ -48,7 +48,7 @@ public class Nighthaze extends CardImpl { public Nighthaze (UUID ownerId) { super(ownerId, 118, "Nighthaze", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "ROE"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PestilenceDemon.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PestilenceDemon.java index 99bdeb20c72..69e7612cb17 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PestilenceDemon.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PestilenceDemon.java @@ -55,7 +55,7 @@ public class PestilenceDemon extends CardImpl { super(ownerId, 124, "Pestilence Demon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{B}{B}{B}"); this.expansionSetCode = "ROE"; this.subtype.add("Demon"); - this.color.setBlack(true); + this.power = new MageInt(7); this.toughness = new MageInt(6); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PreysVengeance.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PreysVengeance.java index 03813e1b506..bad1b69b220 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PreysVengeance.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PreysVengeance.java @@ -47,7 +47,7 @@ public class PreysVengeance extends CardImpl { public PreysVengeance (UUID ownerId) { super(ownerId, 205, "Prey's Vengeance", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "ROE"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.addAbility(new ReboundAbility()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java index b26f998bde4..a3ef56ea6b3 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java @@ -48,7 +48,7 @@ public class SeaGateOracle extends CardImpl { public SeaGateOracle(UUID ownerId) { super(ownerId, 85, "Sea Gate Oracle", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "ROE"; - this.color.setBlue(true); + this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java index a5e0d791e2c..d4a8c1df124 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java @@ -51,7 +51,7 @@ public class SeeBeyond extends CardImpl { public SeeBeyond(UUID ownerId) { super(ownerId, 86, "See Beyond", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{U}"); this.expansionSetCode = "ROE"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new SeeBeyondEffect()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulboundGuardians.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulboundGuardians.java index 663a81169df..faec20764a4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulboundGuardians.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulboundGuardians.java @@ -47,7 +47,7 @@ public class SoulboundGuardians extends CardImpl { this.expansionSetCode = "ROE"; this.subtype.add("Kor"); this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(4); this.toughness = new MageInt(5); this.addAbility(DefenderAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxOfMagosi.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxOfMagosi.java index 08a312b27a9..5b9f8f70216 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxOfMagosi.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxOfMagosi.java @@ -53,7 +53,7 @@ public class SphinxOfMagosi extends CardImpl { super(ownerId, 89, "Sphinx of Magosi", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{U}{U}{U}"); this.expansionSetCode = "ROE"; this.subtype.add("Sphinx"); - this.color.setBlue(true); + this.power = new MageInt(6); this.toughness = new MageInt(6); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/StomperCub.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/StomperCub.java index f0beb4d2e88..ab072cbf8ae 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/StomperCub.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/StomperCub.java @@ -45,7 +45,7 @@ public class StomperCub extends CardImpl { super(ownerId, 210, "Stomper Cub", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "ROE"; this.subtype.add("Beast"); - this.color.setGreen(true); + this.power = new MageInt(5); this.toughness = new MageInt(3); this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer.java index 1b3af29e2c3..da8438f3ed2 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer.java @@ -49,7 +49,7 @@ public class TuktukTheExplorer extends CardImpl { this.expansionSetCode = "ROE"; this.supertype.add("Legendary"); this.subtype.add("Goblin"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java index cc61e303359..29304d0dc9e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java @@ -49,7 +49,7 @@ public class UnifiedWill extends CardImpl { public UnifiedWill(UUID ownerId) { super(ownerId, 92, "Unified Will", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "ROE"; - this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetSpell()); this.getSpellAbility().addEffect(new UnifiedWillEffect()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java index 9271f85b1e9..9c7ba35b6b1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java @@ -54,7 +54,7 @@ public class Vengevine extends CardImpl { super(ownerId, 212, "Vengevine", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.expansionSetCode = "ROE"; this.subtype.add("Elemental"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java index 78ba59e4f88..2b68b4fc8c4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java @@ -47,7 +47,7 @@ public class WallOfOmens extends CardImpl { super(ownerId, 53, "Wall of Omens", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "ROE"; this.subtype.add("Wall"); - this.color.setWhite(true); + this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiDrillmaster.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiDrillmaster.java index 2bda4ab3f46..207714f69a3 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiDrillmaster.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiDrillmaster.java @@ -53,7 +53,7 @@ public class AkkiDrillmaster extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); // {tap}: Target creature gains haste until end of turn. diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java index 9e7e0b3c932..d188a166e1e 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java @@ -51,7 +51,7 @@ public class BriarknitKami extends CardImpl { super(ownerId, 124, "Briarknit Kami", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); // Whenever you cast a Spirit or Arcane spell, put a +1/+1 counter on target creature. diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CaptiveFlame.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CaptiveFlame.java index 019ceaa5642..6e3a5d204a9 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CaptiveFlame.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CaptiveFlame.java @@ -46,7 +46,7 @@ public class CaptiveFlame extends CardImpl { public CaptiveFlame(UUID ownerId) { super(ownerId, 96, "Captive Flame", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "SOK"; - this.color.setRed(true); + // {R}: Target creature gets +1/+0 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfSoramaro.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfSoramaro.java index 2b05f542415..64f0198f0fd 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfSoramaro.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfSoramaro.java @@ -50,7 +50,7 @@ public class DescendantOfSoramaro extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); // {1}{U}: Look at the top X cards of your library, where X is the number of cards in your hand, then put them back in any order. diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DosansOldestChant.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DosansOldestChant.java index 45f20b4202d..702be60af9e 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DosansOldestChant.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DosansOldestChant.java @@ -43,7 +43,7 @@ public class DosansOldestChant extends CardImpl { public DosansOldestChant(UUID ownerId) { super(ownerId, 127, "Dosan's Oldest Chant", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{G}"); this.expansionSetCode = "SOK"; - this.color.setGreen(true); + // You gain 6 life. this.getSpellAbility().addEffect(new GainLifeEffect(6)); // Draw a card. diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/EiganjoFreeRiders.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/EiganjoFreeRiders.java index 09dd0236ebe..afa25d68a40 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/EiganjoFreeRiders.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/EiganjoFreeRiders.java @@ -56,7 +56,7 @@ public class EiganjoFreeRiders extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java index b0a714b8eb7..a6216c7b106 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java @@ -48,7 +48,7 @@ public class FiddleheadKami extends CardImpl { super(ownerId, 130, "Fiddlehead Kami", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FreedFromTheReal.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FreedFromTheReal.java index c9f80dc8bbf..ebc694c336c 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FreedFromTheReal.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FreedFromTheReal.java @@ -52,7 +52,7 @@ public class FreedFromTheReal extends CardImpl { public FreedFromTheReal(UUID ownerId) { super(ownerId, 38, "Freed from the Real", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "SOK"; - this.color.setBlue(true); + this.subtype.add("Aura"); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GnatMiser.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GnatMiser.java index 2dfeae5d24e..0711e608bc6 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GnatMiser.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GnatMiser.java @@ -58,7 +58,7 @@ public class GnatMiser extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Rat"); 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/saviorsofkamigawa/HandOfCruelty.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfCruelty.java index 9ab88cb19e3..b0e4820d84a 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfCruelty.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfCruelty.java @@ -55,7 +55,7 @@ public class HandOfCruelty extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); // Protection from white diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfHonor.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfHonor.java index 47b7792c96e..82d485ccfc7 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfHonor.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfHonor.java @@ -55,7 +55,7 @@ public class HandOfHonor extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); // Protection from black diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.java index 351ee88314a..38803993440 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.java @@ -50,7 +50,7 @@ public class HaruOnna extends CardImpl { super(ownerId, 132, "Haru-Onna", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/IizukaTheRuthless.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/IizukaTheRuthless.java index 45dff7548a8..8f2c938896a 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/IizukaTheRuthless.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/IizukaTheRuthless.java @@ -64,7 +64,7 @@ public class IizukaTheRuthless extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Samurai"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new BushidoAbility(2)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheTendedGarden.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheTendedGarden.java index 5152c5aaebd..8e57811db6d 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheTendedGarden.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheTendedGarden.java @@ -50,7 +50,7 @@ public class KamiOfTheTendedGarden extends CardImpl { super(ownerId, 134, "Kami of the Tended Garden", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KatakiWarsWage.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KatakiWarsWage.java index 153b50cfd45..033b9b66c6c 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KatakiWarsWage.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KatakiWarsWage.java @@ -59,7 +59,7 @@ public class KatakiWarsWage extends CardImpl { this.expansionSetCode = "SOK"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); // All artifacts have "At the beginning of your upkeep, sacrifice this artifact unless you pay {1}." diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java index 55760cb7292..7759ca00cf8 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java @@ -52,7 +52,7 @@ public class KemuriOnna extends CardImpl { super(ownerId, 76, "Kemuri-Onna", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{B}"); this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java index 2c7d22012f1..e15fc50e1b9 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java @@ -52,7 +52,7 @@ public class KiriOnna extends CardImpl { super(ownerId, 43, "Kiri-Onna", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KitsuneDawnblade.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KitsuneDawnblade.java index 23d8f0d1dd6..1d69ac36733 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KitsuneDawnblade.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KitsuneDawnblade.java @@ -49,7 +49,7 @@ public class KitsuneDawnblade extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Fox"); this.subtype.add("Samurai"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); this.addAbility(new BushidoAbility(1)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KurosTaken.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KurosTaken.java index 3a77f826f06..429b8b12a80 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KurosTaken.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KurosTaken.java @@ -50,7 +50,7 @@ public class KurosTaken extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Rat"); this.subtype.add("Samurai"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new BushidoAbility(1)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/LocustMiser.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/LocustMiser.java index 8cf997bab0a..3953a6c4c8b 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/LocustMiser.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/LocustMiser.java @@ -58,7 +58,7 @@ public class LocustMiser extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Rat"); this.subtype.add("Shaman"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MinamoScrollkeeper.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MinamoScrollkeeper.java index 8ef2c755fd4..f725f453e80 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MinamoScrollkeeper.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MinamoScrollkeeper.java @@ -51,7 +51,7 @@ public class MinamoScrollkeeper extends CardImpl { this.expansionSetCode = "SOK"; 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/saviorsofkamigawa/MoltingSkin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoltingSkin.java index afd3627ccd9..e5def0d4249 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoltingSkin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoltingSkin.java @@ -48,7 +48,7 @@ public class MoltingSkin extends CardImpl { public MoltingSkin(UUID ownerId) { super(ownerId, 138, "Molting Skin", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "SOK"; - this.color.setGreen(true); + // Return Molting Skin to its owner's hand: Regenerate target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ReturnToHandSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonwingMoth.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonwingMoth.java index 0040407f2d4..b6fdb663a64 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonwingMoth.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonwingMoth.java @@ -47,7 +47,7 @@ public class MoonwingMoth extends CardImpl { super(ownerId, 20, "Moonwing Moth", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}{W}"); this.expansionSetCode = "SOK"; this.subtype.add("Insect"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java index 59579bab2ce..50919d9206c 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java @@ -51,7 +51,7 @@ public class NikkoOnna extends CardImpl { super(ownerId, 21, "Nikko-Onna", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.expansionSetCode = "SOK"; 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/saviorsofkamigawa/OboroBreezecaller.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java index e800b8e6ea7..4ce0b84509b 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java @@ -57,7 +57,7 @@ public class OboroBreezecaller extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Moonfolk"); 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/saviorsofkamigawa/OniOfWildPlaces.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OniOfWildPlaces.java index f9f297d7727..81c251a2fde 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OniOfWildPlaces.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OniOfWildPlaces.java @@ -57,7 +57,7 @@ public class OniOfWildPlaces extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Demon"); this.subtype.add("Spirit"); - this.color.setRed(true); + this.power = new MageInt(6); this.toughness = new MageInt(5); this.addAbility(HasteAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PathOfAngersFlame.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PathOfAngersFlame.java index 06774a8f826..26024f68adf 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PathOfAngersFlame.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PathOfAngersFlame.java @@ -46,7 +46,7 @@ public class PathOfAngersFlame extends CardImpl { super(ownerId, 109, "Path of Anger's Flame", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setRed(true); + // Creatures you control get +2/+0 until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn, new FilterCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java index 381537d1668..67b476aca08 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java @@ -55,7 +55,7 @@ public class RekiTheHistoryOfKamigawa extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); // Whenever you cast a legendary spell, draw a card. diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SeekTheHorizon.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SeekTheHorizon.java index e567882f650..5cce30abf72 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SeekTheHorizon.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SeekTheHorizon.java @@ -44,7 +44,7 @@ public class SeekTheHorizon extends CardImpl { public SeekTheHorizon(UUID ownerId) { super(ownerId, 147, "Seek the Horizon", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "SOK"; - this.color.setGreen(true); + // Search your library for up to three basic land cards, reveal them, and put them into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 3, new FilterBasicLandCard()), true)); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkullCollector.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkullCollector.java index e7d1b978b18..51397257322 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkullCollector.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkullCollector.java @@ -60,7 +60,7 @@ public class SkullCollector extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Ogre"); this.subtype.add("Warrior"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); // At the beginning of your upkeep, return a black creature you control to its owner's hand. diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/StampedingSerow.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/StampedingSerow.java index a8732e8b4c3..33026d70117 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/StampedingSerow.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/StampedingSerow.java @@ -56,7 +56,7 @@ public class StampedingSerow extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Antelope"); this.subtype.add("Beast"); - this.color.setGreen(true); + this.power = new MageInt(5); this.toughness = new MageInt(4); this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java index 06cee3937f2..b464f6b216b 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java @@ -55,7 +55,7 @@ public class SunderFromWithin extends CardImpl { super(ownerId, 117, "Sunder from Within", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); this.expansionSetCode = "SOK"; this.subtype.add("Arcane"); - this.color.setRed(true); + // Destroy target artifact or land. this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/TrustedAdvisor.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/TrustedAdvisor.java index 3c009df64ea..cd62ca54547 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/TrustedAdvisor.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/TrustedAdvisor.java @@ -61,7 +61,7 @@ public class TrustedAdvisor extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Human"); this.subtype.add("Advisor"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java index 35bb2366599..8c9f6a80da0 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java @@ -59,7 +59,7 @@ public class YukiOnna extends CardImpl { super(ownerId, 120, "Yuki-Onna", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "SOK"; this.subtype.add("Spirit"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java index 749b94a58ca..c8cd3683099 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java @@ -61,7 +61,7 @@ public class AbunaAcolyte extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Cat"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java index d07735510f9..732f47d78e3 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java @@ -56,7 +56,7 @@ public class AcidWebSpider extends CardImpl { super(ownerId, 108, "Acid Web Spider", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "SOM"; this.subtype.add("Spider"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(5); this.addAbility(ReachAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AlphaTyrranax.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AlphaTyrranax.java index bb75a78a6b6..4611e110869 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AlphaTyrranax.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AlphaTyrranax.java @@ -45,7 +45,7 @@ public class AlphaTyrranax extends CardImpl { super(ownerId, 109, "Alpha Tyrranax", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); this.expansionSetCode = "SOM"; 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/scarsofmirrodin/ArgentSphinx.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentSphinx.java index dd93aadc947..3613ce6d0d4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentSphinx.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentSphinx.java @@ -57,7 +57,7 @@ public class ArgentSphinx extends CardImpl { super(ownerId, 28, "Argent Sphinx", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); this.expansionSetCode = "SOM"; this.subtype.add("Sphinx"); - this.color.setBlue(true); + this.power = new MageInt(4); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java index 68eee367d82..eee542d8424 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java @@ -52,7 +52,7 @@ public class Asceticism extends CardImpl { public Asceticism(UUID ownerId) { super(ownerId, 110, "Asceticism", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}{G}"); this.expansionSetCode = "SOM"; - this.color.setGreen(true); + // Creatures you control have hexproof. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent()))); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BellowingTanglewurm.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BellowingTanglewurm.java index 16de549a910..72cffeabe4e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BellowingTanglewurm.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BellowingTanglewurm.java @@ -59,7 +59,7 @@ public class BellowingTanglewurm extends CardImpl { super(ownerId, 111, "Bellowing Tanglewurm", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "SOM"; this.subtype.add("Wurm"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(IntimidateAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveGoblin.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveGoblin.java index 2ab9f5c3f6b..2ce0644152c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveGoblin.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveGoblin.java @@ -47,7 +47,7 @@ public class BlackcleaveGoblin extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Goblin"); this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BlightMamba.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BlightMamba.java index 0c664de2d35..7333d87f2ee 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BlightMamba.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BlightMamba.java @@ -49,7 +49,7 @@ public class BlightMamba extends CardImpl { super(ownerId, 112, "Blight Mamba", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "SOM"; this.subtype.add("Snake"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(InfectAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Blistergrub.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Blistergrub.java index 6167fa50662..4d091c48df8 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Blistergrub.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Blistergrub.java @@ -51,7 +51,7 @@ public class Blistergrub extends CardImpl { super(ownerId, 56, "Blistergrub", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "SOM"; this.subtype.add("Horror"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new DiesTriggeredAbility(new BlistergrubEffect(), false)); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BluntTheAssault.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BluntTheAssault.java index e0b15199a5a..ba640738461 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BluntTheAssault.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BluntTheAssault.java @@ -50,7 +50,7 @@ public class BluntTheAssault extends CardImpl { public BluntTheAssault (UUID ownerId) { super(ownerId, 113, "Blunt the Assault", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{G}"); this.expansionSetCode = "SOM"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter))); this.getSpellAbility().addEffect(new PreventAllDamageByAllEffect(Duration.EndOfTurn, true)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsOfQuicksilver.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsOfQuicksilver.java index 981a1d6e9ef..f3508145ea7 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsOfQuicksilver.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsOfQuicksilver.java @@ -54,7 +54,7 @@ public class BondsOfQuicksilver extends CardImpl { super(ownerId, 29, "Bonds of Quicksilver", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); this.expansionSetCode = "SOM"; this.subtype.add("Aura"); - this.color.setBlue(true); + // Flash (You may cast this spell any time you could cast an instant.) this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java index c3d1f665e94..09423029ead 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java @@ -53,7 +53,7 @@ public class CarapaceForger extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Elf"); this.subtype.add("Artificer"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarnifexDemon.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarnifexDemon.java index e0db52f26b4..9463abfea20 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarnifexDemon.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarnifexDemon.java @@ -58,7 +58,7 @@ public class CarnifexDemon extends CardImpl { super(ownerId, 57, "Carnifex Demon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{B}{B}"); this.expansionSetCode = "SOM"; this.subtype.add("Demon"); - this.color.setBlack(true); + this.power = new MageInt(6); this.toughness = new MageInt(6); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarrionCall.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarrionCall.java index d1369d1abf4..b5df5712a3a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarrionCall.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarrionCall.java @@ -44,7 +44,7 @@ public class CarrionCall extends CardImpl { public CarrionCall (UUID ownerId) { super(ownerId, 115, "Carrion Call", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{G}"); this.expansionSetCode = "SOM"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new CreateTokenEffect(new InsectToken("SOM"), 2)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java index 596aaacfe2d..318cd6d1486 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java @@ -54,7 +54,7 @@ public class CerebralEruption extends CardImpl { public CerebralEruption(UUID ownerId) { super(ownerId, 86, "Cerebral Eruption", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); this.expansionSetCode = "SOM"; - this.color.setRed(true); + // Target opponent reveals the top card of his or her library. Cerebral Eruption deals damage equal to the revealed card's converted mana cost to that player and each creature he or she controls. If a land card is revealed this way, return Cerebral Eruption to its owner's hand. this.getSpellAbility().addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagiousNim.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagiousNim.java index ab34bd21dba..3f39211df1b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagiousNim.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagiousNim.java @@ -45,7 +45,7 @@ public class ContagiousNim extends CardImpl { super(ownerId, 58, "Contagious Nim", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "SOM"; this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(InfectAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CorruptedHarvester.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CorruptedHarvester.java index 360dcf63580..407c056021c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CorruptedHarvester.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CorruptedHarvester.java @@ -51,7 +51,7 @@ public class CorruptedHarvester extends CardImpl { super(ownerId, 59, "Corrupted Harvester", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{B}{B}"); this.expansionSetCode = "SOM"; this.subtype.add("Horror"); - this.color.setBlack(true); + this.power = new MageInt(6); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}")); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickDrake.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickDrake.java index 6e5563ff686..1ed34d2cf03 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickDrake.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickDrake.java @@ -48,7 +48,7 @@ public class DarkslickDrake extends CardImpl { super(ownerId, 30, "Darkslick Drake", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); this.expansionSetCode = "SOM"; this.subtype.add("Drake"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DissipationField.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DissipationField.java index 9d25fde35cc..c68c61942b4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DissipationField.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DissipationField.java @@ -49,7 +49,7 @@ public class DissipationField extends CardImpl { public DissipationField(UUID ownerId) { super(ownerId, 32, "Dissipation Field", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}"); this.expansionSetCode = "SOM"; - this.color.setBlue(true); + // Whenever a permanent deals damage to you, return it to its owner's hand. this.addAbility(new DissipationFieldAbility()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java index d7940efefbf..6bb956eb1c0 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java @@ -52,7 +52,7 @@ public class DrossHopper extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Insect"); this.subtype.add("Horror"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ElspethTirel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ElspethTirel.java index 83b24da256b..9de094b78e4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ElspethTirel.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ElspethTirel.java @@ -58,7 +58,7 @@ public class ElspethTirel extends CardImpl { super(ownerId, 6, "Elspeth Tirel", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{W}{W}"); this.expansionSetCode = "SOM"; this.subtype.add("Elspeth"); - this.color.setWhite(true); + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false)); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EngulfingSlagwurm.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EngulfingSlagwurm.java index 87627be6211..aeea7373f9e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EngulfingSlagwurm.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EngulfingSlagwurm.java @@ -52,7 +52,7 @@ public class EngulfingSlagwurm extends CardImpl { super(ownerId, 118, "Engulfing Slagwurm", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{G}{G}"); this.expansionSetCode = "SOM"; 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/scarsofmirrodin/Exsanguinate.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Exsanguinate.java index 36c79bff347..a629e27450f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Exsanguinate.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Exsanguinate.java @@ -47,7 +47,7 @@ public class Exsanguinate extends CardImpl { public Exsanguinate (UUID ownerId) { super(ownerId, 61, "Exsanguinate", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{B}{B}"); this.expansionSetCode = "SOM"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new ExsanguinateEffect()); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java index 3f5a992fda4..90a0777cd71 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java @@ -56,7 +56,7 @@ public class EzurisBrigade extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); ContinuousEffect boostSource = new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java index d62b747d66b..6761d0c03c0 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java @@ -60,7 +60,7 @@ public class FleshAllergy extends CardImpl { public FleshAllergy (UUID ownerId) { super(ownerId, 62, "Flesh Allergy", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{B}{B}"); this.expansionSetCode = "SOM"; - this.color.setBlack(true); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FumeSpitter.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FumeSpitter.java index ac9645b7c89..a2cebc5776e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FumeSpitter.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FumeSpitter.java @@ -51,7 +51,7 @@ public class FumeSpitter extends CardImpl { super(ownerId, 63, "Fume Spitter", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}"); this.expansionSetCode = "SOM"; this.subtype.add("Horror"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FurnaceCelebration.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FurnaceCelebration.java index 42ae993788c..85b12616967 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FurnaceCelebration.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FurnaceCelebration.java @@ -49,7 +49,7 @@ public class FurnaceCelebration extends CardImpl { public FurnaceCelebration(UUID ownerId) { super(ownerId, 90, "Furnace Celebration", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{R}"); this.expansionSetCode = "SOM"; - this.color.setRed(true); + this.addAbility(new FurnaceCelebrationAbility()); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java index 60c365bc76a..54846b2cddd 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java @@ -57,7 +57,7 @@ public class GenesisWave extends CardImpl { public GenesisWave(UUID ownerId) { super(ownerId, 122, "Genesis Wave", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{G}{G}{G}"); this.expansionSetCode = "SOM"; - this.color.setGreen(true); + // Reveal the top X cards of your library. You may put any number of permanent cards with converted mana // cost X or less from among them onto the battlefield. Then put all cards revealed this way that weren't diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordOfTheVault.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordOfTheVault.java index 2a1d209ad63..a14d871ffc1 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordOfTheVault.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordOfTheVault.java @@ -63,7 +63,7 @@ public class GethLordOfTheVault extends CardImpl { this.expansionSetCode = "SOM"; this.supertype.add("Legendary"); this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java index 21605c80875..702958609f5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java @@ -54,7 +54,7 @@ public class GhalmasWarden extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Elephant"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(4); ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java index 7e0dadabf5b..c2e167aebfc 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java @@ -83,7 +83,7 @@ public class GrandArchitect extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Vedalken"); this.subtype.add("Artificer"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness.java index 4562c87371b..24c8dc266dd 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness.java @@ -45,7 +45,7 @@ public class GraspOfDarkness extends CardImpl { public GraspOfDarkness (UUID ownerId) { super(ownerId, 65, "Grasp of Darkness", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}{B}"); this.expansionSetCode = "SOM"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(-4, -4, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HaltOrder.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HaltOrder.java index 4efbde9d738..43863e366bd 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HaltOrder.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HaltOrder.java @@ -53,7 +53,7 @@ public class HaltOrder extends CardImpl { public HaltOrder (UUID ownerId) { super(ownerId, 34, "Halt Order", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "SOM"; - this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetSpell(filter)); this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java index fd29f64e36b..af37d6e382e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java @@ -61,7 +61,7 @@ public class HoardSmelterDragon extends CardImpl { super(ownerId, 93, "Hoard-Smelter Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{R}{R}"); this.expansionSetCode = "SOM"; this.subtype.add("Dragon"); - this.color.setRed(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/IchorRats.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/IchorRats.java index 5fed33c9a4a..33a2ad09923 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/IchorRats.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/IchorRats.java @@ -53,7 +53,7 @@ public class IchorRats extends CardImpl { super(ownerId, 67, "Ichor Rats", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); this.expansionSetCode = "SOM"; this.subtype.add("Rat"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(InfectAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java index 50d8ffe6830..4ae5aa5a910 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java @@ -63,7 +63,7 @@ public class IndomitableArchangel extends CardImpl { super(ownerId, 11, "Indomitable Archangel", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); this.expansionSetCode = "SOM"; this.subtype.add("Angel"); - this.color.setWhite(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/InexorableTide.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/InexorableTide.java index 2deafa715e0..3ddce6fa260 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/InexorableTide.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/InexorableTide.java @@ -44,7 +44,7 @@ public class InexorableTide extends CardImpl { public InexorableTide (UUID ownerId) { super(ownerId, 35, "Inexorable Tide", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}{U}"); this.expansionSetCode = "SOM"; - this.color.setBlue(true); + this.addAbility(new SpellCastControllerTriggeredAbility(new ProliferateEffect(), false)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/InstillInfection.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/InstillInfection.java index f16d9eb75bc..4d3c07c8aa6 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/InstillInfection.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/InstillInfection.java @@ -46,7 +46,7 @@ public class InstillInfection extends CardImpl { public InstillInfection (UUID ownerId) { super(ownerId, 68, "Instill Infection", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{B}"); this.expansionSetCode = "SOM"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.M1M1.createInstance())); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/KothOfTheHammer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/KothOfTheHammer.java index 4fb1394696b..02128386942 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/KothOfTheHammer.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/KothOfTheHammer.java @@ -78,7 +78,7 @@ public class KothOfTheHammer extends CardImpl { super(ownerId, 94, "Koth of the Hammer", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{R}{R}"); this.expansionSetCode = "SOM"; this.subtype.add("Koth"); - this.color.setRed(true); + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), false)); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaPhoenix.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaPhoenix.java index 84bee600a1e..853978ad2fe 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaPhoenix.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaPhoenix.java @@ -55,7 +55,7 @@ public class KuldothaPhoenix extends CardImpl { super(ownerId, 95, "Kuldotha Phoenix", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}{R}{R}"); this.expansionSetCode = "SOM"; this.subtype.add("Phoenix"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaRebirth.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaRebirth.java index 0b960951788..0def5d46f32 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaRebirth.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaRebirth.java @@ -54,7 +54,7 @@ public class KuldothaRebirth extends CardImpl { public KuldothaRebirth (UUID ownerId) { super(ownerId, 96, "Kuldotha Rebirth", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "SOM"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new CreateTokenEffect(new GoblinToken(), 3)); this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeOfTheTangle.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeOfTheTangle.java index ba4b3e27c4a..f17f803ebe9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeOfTheTangle.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeOfTheTangle.java @@ -66,7 +66,7 @@ public class LiegeOfTheTangle extends CardImpl { super(ownerId, 123, "Liege of the Tangle", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{6}{G}{G}"); this.expansionSetCode = "SOM"; this.subtype.add("Elemental"); - this.color.setGreen(true); + this.power = new MageInt(8); this.toughness = new MageInt(8); this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LoxodonWayfarer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LoxodonWayfarer.java index 232905a99b5..1c30a1daab7 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LoxodonWayfarer.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LoxodonWayfarer.java @@ -46,7 +46,7 @@ public class LoxodonWayfarer extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Elephant"); this.subtype.add("Monk"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MeltTerrain.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MeltTerrain.java index d5ebeb60e0f..8c95d5de0b3 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MeltTerrain.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MeltTerrain.java @@ -52,7 +52,7 @@ public class MeltTerrain extends CardImpl { public MeltTerrain (UUID ownerId) { super(ownerId, 97, "Melt Terrain", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); this.expansionSetCode = "SOM"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new MeltTerrainEffect()); this.getSpellAbility().addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java index cb634662585..d3ce0fab37e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java @@ -53,7 +53,7 @@ public class Memoricide extends CardImpl { public Memoricide(UUID ownerId) { super(ownerId, 69, "Memoricide", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "SOM"; - this.color.setBlack(true); + // Name a nonland card. Search target player's graveyard, hand, and library for any number of cards with // that name and exile them. Then that player shuffles his or her library diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java index 023e8de55d8..9b944c42689 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java @@ -55,7 +55,7 @@ public class MoltenPsyche extends CardImpl { public MoltenPsyche(UUID ownerId) { super(ownerId, 98, "Molten Psyche", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); this.expansionSetCode = "SOM"; - this.color.setRed(true); + // Each player shuffles the cards from his or her hand into his or her library, then draws that many cards. // Metalcraft - If you control three or more artifacts, Molten Psyche deals damage to each opponent equal to the number of cards that player has drawn this turn. diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoriokReaver.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoriokReaver.java index 6288a4933a8..7bc4ee736b9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoriokReaver.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoriokReaver.java @@ -45,7 +45,7 @@ public class MoriokReaver extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenScudder.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenScudder.java index ca194daafe2..e58f644ba0b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenScudder.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenScudder.java @@ -47,7 +47,7 @@ public class NecrogenScudder extends CardImpl { super(ownerId, 71, "Necrogen Scudder", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "SOM"; this.subtype.add("Horror"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new EntersBattlefieldTriggeredAbility(new LoseLifeSourceControllerEffect(3))); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NecroticOoze.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NecroticOoze.java index b9bc7982553..65d7927c47c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NecroticOoze.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NecroticOoze.java @@ -56,7 +56,7 @@ public class NecroticOoze extends CardImpl { super(ownerId, 72, "Necrotic Ooze", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); this.expansionSetCode = "SOM"; this.subtype.add("Ooze"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java index 5699d30269e..e066c623dd2 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java @@ -50,7 +50,7 @@ public class NeurokInvisimancer extends CardImpl { this.expansionSetCode = "SOM"; 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/scarsofmirrodin/OgreGeargrabber.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/OgreGeargrabber.java index 14f91f126d4..82e3be572b5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/OgreGeargrabber.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/OgreGeargrabber.java @@ -68,7 +68,7 @@ public class OgreGeargrabber extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Ogre"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); Ability ability = new AttacksTriggeredAbility(new OgreGeargrabberEffect1(), false); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PlagueStinger.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PlagueStinger.java index b622dbe9c35..8ceb9f8c8e1 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PlagueStinger.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PlagueStinger.java @@ -48,7 +48,7 @@ public class PlagueStinger extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Insect"); this.subtype.add("Horror"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PlatedSeastrider.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PlatedSeastrider.java index a8772b10bcf..058add5710c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PlatedSeastrider.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PlatedSeastrider.java @@ -45,7 +45,7 @@ public class PlatedSeastrider extends CardImpl { super(ownerId, 38, "Plated Seastrider", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}{U}"); this.expansionSetCode = "SOM"; this.subtype.add("Beast"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java index c479f2358c8..389297a1198 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java @@ -49,7 +49,7 @@ public class PsychicMiasma extends CardImpl { public PsychicMiasma(UUID ownerId) { super(ownerId, 76, "Psychic Miasma", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "SOM"; - this.color.setBlack(true); + // Target player discards a card. If a land card is discarded this way, return Psychic Miasma to its owner's hand. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Putrefax.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Putrefax.java index 824abab8779..0d836ec2de2 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Putrefax.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Putrefax.java @@ -50,7 +50,7 @@ public class Putrefax extends CardImpl { super(ownerId, 126, "Putrefax", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "SOM"; this.subtype.add("Horror"); - this.color.setGreen(true); + this.power = new MageInt(5); this.toughness = new MageInt(3); this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/QuicksilverGargantuan.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/QuicksilverGargantuan.java index b21e03fb74e..07a5ef4dde3 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/QuicksilverGargantuan.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/QuicksilverGargantuan.java @@ -56,7 +56,7 @@ public class QuicksilverGargantuan extends CardImpl { super(ownerId, 39, "Quicksilver Gargantuan", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{5}{U}{U}"); this.expansionSetCode = "SOM"; this.subtype.add("Shapeshifter"); - this.color.setBlue(true); + this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RelicPutrescence.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RelicPutrescence.java index 67994d7abad..5c063b2fcfe 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RelicPutrescence.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RelicPutrescence.java @@ -58,7 +58,7 @@ public class RelicPutrescence extends CardImpl { super(ownerId, 77, "Relic Putrescence", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "SOM"; this.subtype.add("Aura"); - this.color.setBlack(true); + TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java index 1f38da01b1f..554cefc08b4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java @@ -55,7 +55,7 @@ public class RevokeExistence extends CardImpl { public RevokeExistence (UUID ownerId) { super(ownerId, 18, "Revoke Existence", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{W}"); this.expansionSetCode = "SOM"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ScrapdiverSerpent.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ScrapdiverSerpent.java index 01d5a9f76a5..587659a457b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ScrapdiverSerpent.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ScrapdiverSerpent.java @@ -52,7 +52,7 @@ public class ScrapdiverSerpent extends CardImpl { super(ownerId, 41, "Scrapdiver Serpent", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{U}{U}"); this.expansionSetCode = "SOM"; 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/scarsofmirrodin/SeizeTheInitiative.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java index d0a7f68c5d7..1d4a34b3ded 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java @@ -48,7 +48,7 @@ public class SeizeTheInitiative extends CardImpl { public SeizeTheInitiative (UUID ownerId) { super(ownerId, 20, "Seize the Initiative", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "SOM"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ShapeAnew.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ShapeAnew.java index 12a81997d18..cef5f23b882 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ShapeAnew.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ShapeAnew.java @@ -63,7 +63,7 @@ public class ShapeAnew extends CardImpl { public ShapeAnew (UUID ownerId) { super(ownerId, 43, "Shape Anew", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "SOM"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new SacrificeTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new ShapeAnewEffect()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Skinrender.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Skinrender.java index 38cdcfb420b..95b1cf31dc6 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Skinrender.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Skinrender.java @@ -52,7 +52,7 @@ public class Skinrender extends CardImpl { super(ownerId, 78, "Skinrender", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); this.expansionSetCode = "SOM"; this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxTheBlightDragon.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxTheBlightDragon.java index 68381fb9e72..a6347a05c12 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxTheBlightDragon.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxTheBlightDragon.java @@ -55,7 +55,7 @@ public class SkithiryxTheBlightDragon extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Dragon"); this.subtype.add("Skeleton"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SkyEelSchool.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SkyEelSchool.java index 5b8a15b0fa8..0dfb9da8159 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SkyEelSchool.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SkyEelSchool.java @@ -47,7 +47,7 @@ public class SkyEelSchool extends CardImpl { super(ownerId, 44, "Sky-Eel School", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}{U}"); this.expansionSetCode = "SOM"; this.subtype.add("Fish"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java index 1621a2e4603..a66f44aa3fa 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java @@ -55,7 +55,7 @@ public class SliceinTwain extends CardImpl { public SliceinTwain (UUID ownerId) { super(ownerId, 127, "Slice in Twain", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{G}{G}"); this.expansionSetCode = "SOM"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); this.getSpellAbility().addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SoulParry.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SoulParry.java index 32e477ff382..fb6d6675626 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SoulParry.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SoulParry.java @@ -46,7 +46,7 @@ public class SoulParry extends CardImpl { public SoulParry (UUID ownerId) { super(ownerId, 21, "Soul Parry", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "SOM"; - this.color.setWhite(true); + // Prevent all damage one or two target creatures would deal this turn Target target = new TargetCreaturePermanent(1,2); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SpikeshotElder.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SpikeshotElder.java index d61f0cac74e..8eebc2acb8a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SpikeshotElder.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SpikeshotElder.java @@ -56,7 +56,7 @@ public class SpikeshotElder extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Goblin"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SpikeshotElderEffect(), new ManaCostsImpl("{1}{R}{R}")); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SteadyProgress.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SteadyProgress.java index e0dbef1baf9..5da30c9d1c1 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SteadyProgress.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SteadyProgress.java @@ -44,7 +44,7 @@ public class SteadyProgress extends CardImpl { public SteadyProgress (UUID ownerId) { super(ownerId, 45, "Steady Progress", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "SOM"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new ProliferateEffect()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/StoicRebuttal.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/StoicRebuttal.java index eb29694a64d..73a7c72902e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/StoicRebuttal.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/StoicRebuttal.java @@ -50,7 +50,7 @@ public class StoicRebuttal extends CardImpl { public StoicRebuttal(UUID ownerId) { super(ownerId, 46, "Stoic Rebuttal", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{U}"); this.expansionSetCode = "SOM"; - this.color.setBlue(true); + // Metalcraft - Stoic Rebuttal costs {1} less to cast if you control three or more artifacts. Ability ability = new SimpleStaticAbility(Zone.STACK, new SpellCostReductionSourceEffect(1, MetalcraftCondition.getInstance())); ability.setRuleAtTheTop(true); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SunblastAngel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SunblastAngel.java index 68d02e9d677..bb03f305b11 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SunblastAngel.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SunblastAngel.java @@ -56,7 +56,7 @@ public class SunblastAngel extends CardImpl { super(ownerId, 22, "Sunblast Angel", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{W}{W}"); this.expansionSetCode = "SOM"; this.subtype.add("Angel"); - this.color.setWhite(true); + this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java index 9540e0824de..d6ad06d282b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java @@ -47,7 +47,7 @@ public class TaintedStrike extends CardImpl { public TaintedStrike (UUID ownerId) { super(ownerId, 80, "Tainted Strike", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "SOM"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(InfectAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TangleAngler.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TangleAngler.java index fe1f44d16ce..4ffe65ac09c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TangleAngler.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TangleAngler.java @@ -50,7 +50,7 @@ public class TangleAngler extends CardImpl { super(ownerId, 128, "Tangle Angler", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "SOM"; this.subtype.add("Horror"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java index 2940eba512a..9109412479b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java @@ -47,7 +47,7 @@ public class TelJiladDefiance extends CardImpl { public TelJiladDefiance(UUID ownerId) { super(ownerId, 129, "Tel-Jilad Defiance", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "SOM"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new GainProtectionFromTypeTargetEffect(Duration.EndOfTurn, new FilterArtifactCard("artifacts"))); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java index 580e2281be6..a4e5a064603 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java @@ -48,7 +48,7 @@ public class TelJiladFallen extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(1); this.addAbility(InfectAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TemperedSteel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TemperedSteel.java index dc1f0408779..0164d9e77de 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TemperedSteel.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TemperedSteel.java @@ -54,7 +54,7 @@ public class TemperedSteel extends CardImpl { public TemperedSteel (UUID ownerId) { super(ownerId, 24, "Tempered Steel", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}{W}"); this.expansionSetCode = "SOM"; - this.color.setWhite(true); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrinketMage.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrinketMage.java index 8274481dbc7..cfd4e1e5b50 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrinketMage.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrinketMage.java @@ -60,7 +60,7 @@ public class TrinketMage extends CardImpl { this.expansionSetCode = "SOM"; 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/scarsofmirrodin/TunnelIgnus.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java index 56265845a21..cb13e9a6900 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java @@ -58,7 +58,7 @@ public class TunnelIgnus extends CardImpl { super(ownerId, 105, "Tunnel Ignus", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.expansionSetCode = "SOM"; this.subtype.add("Elemental"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnAside.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnAside.java index 551057306db..f6f9cb5c4c9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnAside.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnAside.java @@ -57,7 +57,7 @@ public class TurnAside extends CardImpl { public TurnAside(UUID ownerId) { super(ownerId, 49, "Turn Aside", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "SOM"; - this.color.setBlue(true); + // Counter target spell that targets a permanent you control. this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java index 4d20bcf0c01..15bc55278e2 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java @@ -51,7 +51,7 @@ public class TurnToSlag extends CardImpl { public TurnToSlag (UUID ownerId) { super(ownerId, 106, "Turn to Slag", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); this.expansionSetCode = "SOM"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new TurnToSlagEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TwistedImage.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TwistedImage.java index a0473291e9e..a1217d14aaf 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TwistedImage.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TwistedImage.java @@ -47,7 +47,7 @@ public class TwistedImage extends CardImpl { public TwistedImage (UUID ownerId) { super(ownerId, 50, "Twisted Image", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "SOM"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java index 8efdee44395..4a951b0be65 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java @@ -46,7 +46,7 @@ public class UntamedMight extends CardImpl { public UntamedMight(UUID ownerId) { super(ownerId, 131, "Untamed Might", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{X}{G}"); this.expansionSetCode = "SOM"; - this.color.setGreen(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(new ManacostVariableValue(), new ManacostVariableValue(), Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java index b5ee89dfd16..3f3a6736a21 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java @@ -47,7 +47,7 @@ public class VaultSkyward extends CardImpl { public VaultSkyward (UUID ownerId) { super(ownerId, 51, "Vault Skyward", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "SOM"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java index 067b0aedec8..689500fcb8c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java @@ -65,7 +65,7 @@ public class VedalkenCertarch extends CardImpl { this.expansionSetCode = "SOM"; 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/scarsofmirrodin/VenserTheSojourner.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java index 111361e9948..f9103782c4c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java @@ -80,8 +80,8 @@ public class VenserTheSojourner extends CardImpl { super(ownerId, 135, "Venser, the Sojourner", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{W}{U}"); this.expansionSetCode = "SOM"; this.subtype.add("Venser"); - this.color.setWhite(true); - this.color.setBlue(true); + + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), false)); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java index 8faf8259234..5b3de9f46b2 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java @@ -54,7 +54,7 @@ public class VigilForTheLost extends CardImpl { public VigilForTheLost (UUID ownerId) { super(ownerId, 26, "Vigil for the Lost", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "SOM"; - this.color.setWhite(true); + this.addAbility(new VigilForTheLostTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java index d48efdd6c3e..8df89f9a4b9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java @@ -51,7 +51,7 @@ public class ViridianRevel extends CardImpl { public ViridianRevel (UUID ownerId) { super(ownerId, 132, "Viridian Revel", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}{G}"); this.expansionSetCode = "SOM"; - this.color.setGreen(true); + // Whenever an artifact is put into an opponent's graveyard from the battlefield, you may draw a card. this.addAbility(new ViridianRevelTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java index 2cd527a8901..acec0deffa2 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java @@ -55,7 +55,7 @@ public class VolitionReins extends CardImpl { super(ownerId, 53, "Volition Reins", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}{U}{U}"); this.expansionSetCode = "SOM"; this.subtype.add("Aura"); - this.color.setBlue(true); + TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java index 5d31d155ad7..8b2be209abe 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java @@ -50,7 +50,7 @@ public class VulshokHeartstoker extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WhitesunsPassage.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WhitesunsPassage.java index c4e7cfd68cf..bdf607fce6d 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WhitesunsPassage.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WhitesunsPassage.java @@ -44,7 +44,7 @@ public class WhitesunsPassage extends CardImpl { public WhitesunsPassage (UUID ownerId) { super(ownerId, 27, "Whitesun's Passage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "SOM"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new GainLifeEffect(5)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java index d3b1798ecd6..2ad2901ea46 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java @@ -47,7 +47,7 @@ public class WithstandDeath extends CardImpl { public WithstandDeath (UUID ownerId) { super(ownerId, 134, "Withstand Death", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "SOM"; - this.color.setGreen(true); + // Target creature is indestructible this turn. Effect effect = new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/sets/scourge/Kurgadon.java b/Mage.Sets/src/mage/sets/scourge/Kurgadon.java index 268e7bcd948..27f457233cf 100644 --- a/Mage.Sets/src/mage/sets/scourge/Kurgadon.java +++ b/Mage.Sets/src/mage/sets/scourge/Kurgadon.java @@ -57,7 +57,7 @@ public class Kurgadon extends CardImpl { super(ownerId, 124, "Kurgadon", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "SCG"; 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/shadowmoor/AphoticWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java index 9559eaf451d..20096cb783e 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java @@ -50,7 +50,7 @@ public class AphoticWisps extends CardImpl { public AphoticWisps (UUID ownerId) { super(ownerId, 55, "Aphotic Wisps", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "SHM"; - this.color.setBlack(true); + // Target creature becomes black and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.) this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BecomesColorTargetEffect(ObjectColor.BLACK, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BlowflyInfestation.java b/Mage.Sets/src/mage/sets/shadowmoor/BlowflyInfestation.java index d1fc3cef6cf..dea4b7ed247 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BlowflyInfestation.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BlowflyInfestation.java @@ -60,7 +60,7 @@ public class BlowflyInfestation extends CardImpl { public BlowflyInfestation(UUID ownerId) { super(ownerId, 58, "Blowfly Infestation", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "SHM"; - this.color.setBlack(true); + Effect effect = new BlowflyInfestationEffect(); TriggeredAbility triggeredAbility = new DiesCreatureTriggeredAbility(effect, false, false, true); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java index e3ab23b9f08..dcecf07ef75 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java @@ -49,7 +49,7 @@ public class CeruleanWisps extends CardImpl { public CeruleanWisps (UUID ownerId) { super(ownerId, 31, "Cerulean Wisps", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "SHM"; - this.color.setBlue(true); + // Target creature becomes blue until end of turn. Untap that creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BecomesColorTargetEffect(ObjectColor.BLUE, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java index 3e8849f08a9..a16f737efaf 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java @@ -50,7 +50,7 @@ public class CrimsonWisps extends CardImpl { public CrimsonWisps (UUID ownerId) { super(ownerId, 88, "Crimson Wisps", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "SHM"; - this.color.setRed(true); + // Target creature becomes red and gains haste until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BecomesColorTargetEffect(ObjectColor.RED, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java index e74858b3f56..52577c079fb 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java @@ -49,7 +49,7 @@ public class NiveousWisps extends CardImpl { public NiveousWisps (UUID ownerId) { super(ownerId, 15, "Niveous Wisps", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "SHM"; - this.color.setWhite(true); + // Target creature becomes white until end of turn. Tap that creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BecomesColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java index 33b665cfa13..665683aa456 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java @@ -49,7 +49,7 @@ public class ViridescentWisps extends CardImpl { public ViridescentWisps (UUID ownerId) { super(ownerId, 132, "Viridescent Wisps", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "SHM"; - this.color.setGreen(true); + // Target creature becomes green and gets +1/+0 until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BecomesColorTargetEffect(ObjectColor.GREEN, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java b/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java index f7b24ba9303..ee4ee7cc2ca 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java @@ -63,8 +63,8 @@ public class AjaniVengeant extends CardImpl { super(ownerId, 154, "Ajani Vengeant", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{R}{W}"); this.expansionSetCode = "ALA"; this.subtype.add("Ajani"); - this.color.setRed(true); - this.color.setWhite(true); + + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), false)); // +1: Target permanent doesn't untap during its controller's next untap step. diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AkrasanSquire.java b/Mage.Sets/src/mage/sets/shardsofalara/AkrasanSquire.java index f06ed78b11e..fce2e6705e4 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AkrasanSquire.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AkrasanSquire.java @@ -46,7 +46,7 @@ public class AkrasanSquire extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new ExaltedAbility()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java b/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java index 5350f4e4a47..a2961d9c93c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java @@ -46,7 +46,7 @@ public class Angelsong extends CardImpl { public Angelsong(UUID ownerId) { super(ownerId, 4, "Angelsong", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "ALA"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new PreventAllDamageByAllEffect(Duration.EndOfTurn, true)); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java index a35a466ff22..391d4c8b94d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java @@ -55,7 +55,7 @@ public class BantBattlemage extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{G}")); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java b/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java index 3766ae6c8a9..ac3646c87cf 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java @@ -56,7 +56,7 @@ public class BattlegraceAngel extends CardImpl { super(ownerId, 6, "Battlegrace Angel", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); this.expansionSetCode = "ALA"; 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/shardsofalara/Blightning.java b/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java index 5ed32286175..e7af1ef9f5a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java @@ -45,8 +45,8 @@ public class Blightning extends CardImpl { public Blightning(UUID ownerId) { super(ownerId, 156, "Blightning", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}{R}"); this.expansionSetCode = "ALA"; - this.color.setBlack(true); - this.color.setRed(true); + + // Blightning deals 3 damage to target player. That player discards two cards. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java b/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java index c1b3ec7e952..17032c22284 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java @@ -29,13 +29,13 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.game.permanent.token.DragonToken; /** @@ -50,9 +50,8 @@ public class BroodmateDragon extends CardImpl { super(ownerId, 160, "Broodmate Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{B}{R}{G}"); this.expansionSetCode = "ALA"; this.subtype.add("Dragon"); - this.color.setRed(true); - this.color.setGreen(true); - this.color.setBlack(true); + + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BullCerodon.java b/Mage.Sets/src/mage/sets/shardsofalara/BullCerodon.java index 72a17a1727c..772330d6fa7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BullCerodon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BullCerodon.java @@ -46,8 +46,8 @@ public class BullCerodon extends CardImpl { super(ownerId, 161, "Bull Cerodon", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{R}{W}"); this.expansionSetCode = "ALA"; this.subtype.add("Beast"); - this.color.setRed(true); - this.color.setWhite(true); + + this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(VigilanceAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CalderaHellion.java b/Mage.Sets/src/mage/sets/shardsofalara/CalderaHellion.java index 925c9fea608..b572be40509 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CalderaHellion.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CalderaHellion.java @@ -48,7 +48,7 @@ public class CalderaHellion extends CardImpl { super(ownerId, 95, "Caldera Hellion", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); this.expansionSetCode = "ALA"; this.subtype.add("Hellion"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CavernThoctar.java b/Mage.Sets/src/mage/sets/shardsofalara/CavernThoctar.java index aaf9b7bbf1c..b6e9d93192f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CavernThoctar.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CavernThoctar.java @@ -49,7 +49,7 @@ public class CavernThoctar extends CardImpl { super(ownerId, 125, "Cavern Thoctar", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{G}"); this.expansionSetCode = "ALA"; this.subtype.add("Beast"); - this.color.setGreen(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CloudheathDrake.java b/Mage.Sets/src/mage/sets/shardsofalara/CloudheathDrake.java index 6abe51a4716..fe326c5a510 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CloudheathDrake.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CloudheathDrake.java @@ -52,7 +52,7 @@ public class CloudheathDrake extends CardImpl { super(ownerId, 35, "Cloudheath Drake", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}{U}"); this.expansionSetCode = "ALA"; this.subtype.add("Drake"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CouriersCapsule.java b/Mage.Sets/src/mage/sets/shardsofalara/CouriersCapsule.java index 1e6b1354a6f..903cf74c23b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CouriersCapsule.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CouriersCapsule.java @@ -48,7 +48,7 @@ public class CouriersCapsule extends CardImpl { public CouriersCapsule (UUID ownerId) { super(ownerId, 37, "Courier's Capsule", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}{U}"); this.expansionSetCode = "ALA"; - this.color.setBlue(true); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl("{1}{U}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CourtArchers.java b/Mage.Sets/src/mage/sets/shardsofalara/CourtArchers.java index 21213546a11..cb48ea3ecb7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CourtArchers.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CourtArchers.java @@ -47,7 +47,7 @@ public class CourtArchers extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Human"); this.subtype.add("Archer"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); this.addAbility(ReachAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java b/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java index 7ee09a4537e..c97df39afc4 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java @@ -61,7 +61,7 @@ public class DeathBaron extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Zombie"); this.subtype.add("Wizard"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java b/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java index e2b04830231..29d1688d48d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java @@ -60,7 +60,7 @@ public class DispellersCapsule extends CardImpl { public DispellersCapsule (UUID ownerId) { super(ownerId, 8, "Dispeller's Capsule", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{W}"); this.expansionSetCode = "ALA"; - this.color.setWhite(true); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{W}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DregReaver.java b/Mage.Sets/src/mage/sets/shardsofalara/DregReaver.java index 7e2f863fde7..36249e6a5a5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DregReaver.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DregReaver.java @@ -45,7 +45,7 @@ public class DregReaver extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Zombie"); this.subtype.add("Beast"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(3); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DregscapeZombie.java b/Mage.Sets/src/mage/sets/shardsofalara/DregscapeZombie.java index 69397c8ac22..ee92478d497 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DregscapeZombie.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DregscapeZombie.java @@ -46,7 +46,7 @@ public class DregscapeZombie extends CardImpl { super(ownerId, 74, "Dregscape Zombie", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.expansionSetCode = "ALA"; this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new UnearthAbility(new ManaCostsImpl("{B}"))); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DruidOfTheAnima.java b/Mage.Sets/src/mage/sets/shardsofalara/DruidOfTheAnima.java index c255440ea2c..1634676ddc7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DruidOfTheAnima.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DruidOfTheAnima.java @@ -48,7 +48,7 @@ public class DruidOfTheAnima extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new RedManaAbility()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java b/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java index a7cff07b911..b37b88c0d95 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java @@ -66,7 +66,7 @@ public class ElspethKnightErrant extends CardImpl { super(ownerId, 9, "Elspeth, Knight-Errant", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{W}{W}"); this.expansionSetCode = "ALA"; this.subtype.add("Elspeth"); - this.color.setWhite(true); + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ElvishVisionary.java b/Mage.Sets/src/mage/sets/shardsofalara/ElvishVisionary.java index a905a6866db..f45d72ea2f5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ElvishVisionary.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ElvishVisionary.java @@ -47,7 +47,7 @@ public class ElvishVisionary extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java b/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java index 495e538708b..16a38f11498 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java @@ -44,7 +44,7 @@ public class Excommunicate extends CardImpl { public Excommunicate(UUID ownerId) { super(ownerId, 11, "Excommunicate", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{W}"); this.expansionSetCode = "ALA"; - this.color.setWhite(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java b/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java index 2eb343337f4..d0f1b7af1ed 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java @@ -58,7 +58,7 @@ public class FiligreeSages extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Vedalken"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{2}{U}")); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java b/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java index c3b4a2a428e..2f8ef49e6fe 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java @@ -55,7 +55,7 @@ public class FlameblastDragon extends CardImpl { super(ownerId, 100, "Flameblast Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{R}{R}"); this.expansionSetCode = "ALA"; 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/shardsofalara/GoblinMountaineer.java b/Mage.Sets/src/mage/sets/shardsofalara/GoblinMountaineer.java index e604f50182a..948922ec18a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GoblinMountaineer.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GoblinMountaineer.java @@ -46,7 +46,7 @@ public class GoblinMountaineer extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Goblin"); this.subtype.add("Scout"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new MountainwalkAbility()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Godsire.java b/Mage.Sets/src/mage/sets/shardsofalara/Godsire.java index 8942eeac4a0..3f6c99805bc 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Godsire.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Godsire.java @@ -29,15 +29,14 @@ package mage.sets.shardsofalara; import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.Zone; import mage.game.permanent.token.Token; @@ -51,9 +50,8 @@ public class Godsire extends CardImpl { super(ownerId, 170, "Godsire", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{R}{G}{G}{W}"); this.expansionSetCode = "ALA"; this.subtype.add("Beast"); - this.color.setRed(true); - this.color.setGreen(true); - this.color.setWhite(true); + + this.power = new MageInt(8); this.toughness = new MageInt(8); this.addAbility(VigilanceAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GuardiansOfAkrasa.java b/Mage.Sets/src/mage/sets/shardsofalara/GuardiansOfAkrasa.java index 7386e1fe4ca..91a934b69f6 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GuardiansOfAkrasa.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GuardiansOfAkrasa.java @@ -47,7 +47,7 @@ public class GuardiansOfAkrasa extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(0); this.toughness = new MageInt(4); this.addAbility(DefenderAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/HellkiteOverlord.java b/Mage.Sets/src/mage/sets/shardsofalara/HellkiteOverlord.java index eda492b03a4..ee547a1bed0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/HellkiteOverlord.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/HellkiteOverlord.java @@ -29,19 +29,19 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Rarity; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.RegenerateSourceEffect; +import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; /** * @@ -53,9 +53,8 @@ public class HellkiteOverlord extends CardImpl { super(ownerId, 172, "Hellkite Overlord", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{B}{R}{R}{G}"); this.expansionSetCode = "ALA"; this.subtype.add("Dragon"); - this.color.setBlack(true); - this.color.setRed(true); - this.color.setGreen(true); + + this.power = new MageInt(8); this.toughness = new MageInt(8); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java b/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java index 4a13e5aeb30..1e6a7260e38 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java @@ -51,7 +51,7 @@ public class HellsThunder extends CardImpl { super(ownerId, 103, "Hell's Thunder", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); this.expansionSetCode = "ALA"; 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/shardsofalara/IncurableOgre.java b/Mage.Sets/src/mage/sets/shardsofalara/IncurableOgre.java index aa7bf5c7751..5449a1ec296 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/IncurableOgre.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/IncurableOgre.java @@ -45,7 +45,7 @@ public class IncurableOgre extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Ogre"); this.subtype.add("Mutant"); - this.color.setRed(true); + this.power = new MageInt(5); this.toughness = new MageInt(1); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JhessianInfiltrator.java b/Mage.Sets/src/mage/sets/shardsofalara/JhessianInfiltrator.java index 551218e8340..8683c116044 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JhessianInfiltrator.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JhessianInfiltrator.java @@ -46,8 +46,8 @@ public class JhessianInfiltrator extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setGreen(true); - this.color.setBlue(true); + + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new CantBeBlockedSourceAbility()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JhessianLookout.java b/Mage.Sets/src/mage/sets/shardsofalara/JhessianLookout.java index d1b210f9eb2..bd22ad78269 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JhessianLookout.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JhessianLookout.java @@ -45,7 +45,7 @@ public class JhessianLookout extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Human"); 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/shardsofalara/JundBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/JundBattlemage.java index 03b2f960693..e2150ba87a7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JundBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JundBattlemage.java @@ -54,7 +54,7 @@ public class JundBattlemage extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{B}")); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JungleWeaver.java b/Mage.Sets/src/mage/sets/shardsofalara/JungleWeaver.java index 2f9d618c31b..39a90ab77ca 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JungleWeaver.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JungleWeaver.java @@ -47,7 +47,7 @@ public class JungleWeaver extends CardImpl { super(ownerId, 134, "Jungle Weaver", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{G}{G}"); this.expansionSetCode = "ALA"; this.subtype.add("Spider"); - this.color.setGreen(true); + this.power = new MageInt(5); this.toughness = new MageInt(6); this.addAbility(ReachAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java b/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java index d4e274d327d..34237aead7a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java @@ -48,7 +48,7 @@ public class KathariScreecher extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Bird"); 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/shardsofalara/KnightOfTheWhiteOrchid.java b/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java index 23fb2a8ac83..92a3e4ead30 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java @@ -53,7 +53,7 @@ public class KnightOfTheWhiteOrchid extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/LightningTalons.java b/Mage.Sets/src/mage/sets/shardsofalara/LightningTalons.java index fb437fc0504..726d24ee10d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/LightningTalons.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/LightningTalons.java @@ -57,7 +57,7 @@ public class LightningTalons extends CardImpl { super(ownerId, 107, "Lightning Talons", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "ALA"; this.subtype.add("Aura"); - this.color.setRed(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MarbleChalice.java b/Mage.Sets/src/mage/sets/shardsofalara/MarbleChalice.java index f6a2df84634..398bbe17b49 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MarbleChalice.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MarbleChalice.java @@ -46,7 +46,7 @@ public class MarbleChalice extends CardImpl { public MarbleChalice (UUID ownerId) { super(ownerId, 18, "Marble Chalice", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}{W}"); this.expansionSetCode = "ALA"; - this.color.setWhite(true); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java b/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java index b34db0832e6..3e7eb972d6e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java @@ -61,7 +61,7 @@ public class MasterOfEtherium extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Vedalken"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(0); this.toughness = new MageInt(0); this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filterCounted), Duration.EndOfGame))); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Mycoloth.java b/Mage.Sets/src/mage/sets/shardsofalara/Mycoloth.java index 350d7fb128c..1a22384a384 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Mycoloth.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Mycoloth.java @@ -51,7 +51,7 @@ public class Mycoloth extends CardImpl { super(ownerId, 140, "Mycoloth", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "ALA"; this.subtype.add("Fungus"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/NayaBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/NayaBattlemage.java index 364c5b98898..a164b9c0d78 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/NayaBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/NayaBattlemage.java @@ -54,7 +54,7 @@ public class NayaBattlemage extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Human"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/OnyxGoblet.java b/Mage.Sets/src/mage/sets/shardsofalara/OnyxGoblet.java index 6db9e9f7594..f3be604cb5a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/OnyxGoblet.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/OnyxGoblet.java @@ -48,7 +48,7 @@ public class OnyxGoblet extends CardImpl { public OnyxGoblet (UUID ownerId) { super(ownerId, 81, "Onyx Goblet", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}{B}"); this.expansionSetCode = "ALA"; - this.color.setBlack(true); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/OutriderOfJhess.java b/Mage.Sets/src/mage/sets/shardsofalara/OutriderOfJhess.java index 42881c21242..cda843dcd05 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/OutriderOfJhess.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/OutriderOfJhess.java @@ -46,7 +46,7 @@ public class OutriderOfJhess extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new ExaltedAbility()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/PredatorDragon.java b/Mage.Sets/src/mage/sets/shardsofalara/PredatorDragon.java index 1754783d8af..3f51b296371 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/PredatorDragon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/PredatorDragon.java @@ -47,7 +47,7 @@ public class PredatorDragon extends CardImpl { super(ownerId, 109, "Predator Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}{R}{R}"); this.expansionSetCode = "ALA"; this.subtype.add("Dragon"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java b/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java index 6dccf0cb416..9fd2d5a7039 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java @@ -54,9 +54,8 @@ public class RafiqOfTheMany extends CardImpl { public RafiqOfTheMany(UUID ownerId) { super(ownerId, 185, "Rafiq of the Many", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{1}{G}{W}{U}"); this.expansionSetCode = "ALA"; - this.color.setGreen(true); - this.color.setWhite(true); - this.color.setBlue(true); + + this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Knight"); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java b/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java index d66aec05dd9..fc88cd0e7ef 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java @@ -57,7 +57,7 @@ public class RangerOfEos extends CardImpl { public RangerOfEos(UUID ownerId) { super(ownerId, 21, "Ranger of Eos", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "ALA"; - this.color.setWhite(true); + this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RhoxCharger.java b/Mage.Sets/src/mage/sets/shardsofalara/RhoxCharger.java index ec5065225a4..4225b89d493 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RhoxCharger.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RhoxCharger.java @@ -47,7 +47,7 @@ public class RhoxCharger extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Rhino"); this.subtype.add("Soldier"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java b/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java index 7ae39904382..05910ed6257 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java @@ -29,11 +29,11 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; /** * @@ -46,9 +46,8 @@ public class RhoxWarMonk extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Rhino"); this.subtype.add("Monk"); - this.color.setWhite(true); - this.color.setBlue(true); - this.color.setGreen(true); + + this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java b/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java index 18692b9c71b..4377e3fb628 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java @@ -61,8 +61,8 @@ public class SarkhanVol extends CardImpl { super(ownerId, 191, "Sarkhan Vol", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{R}{G}"); this.expansionSetCode = "ALA"; this.subtype.add("Sarkhan"); - this.color.setRed(true); - this.color.setGreen(true); + + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false)); // +1: Creatures you control get +1/+1 and gain haste until end of turn. diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SavageHunger.java b/Mage.Sets/src/mage/sets/shardsofalara/SavageHunger.java index d355bfa032c..016c8e3963b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SavageHunger.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SavageHunger.java @@ -58,7 +58,7 @@ public class SavageHunger extends CardImpl { super(ownerId, 147, "Savage Hunger", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "ALA"; this.subtype.add("Aura"); - this.color.setGreen(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SightedCasteSorcerer.java b/Mage.Sets/src/mage/sets/shardsofalara/SightedCasteSorcerer.java index 6eadedfea19..3bd9490efe9 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SightedCasteSorcerer.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SightedCasteSorcerer.java @@ -53,7 +53,7 @@ public class SightedCasteSorcerer extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new ExaltedAbility()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SigiledPaladin.java b/Mage.Sets/src/mage/sets/shardsofalara/SigiledPaladin.java index 2b1f1d8fd5d..d1a6004eb8a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SigiledPaladin.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SigiledPaladin.java @@ -47,7 +47,7 @@ public class SigiledPaladin extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FirstStrikeAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Skullmulcher.java b/Mage.Sets/src/mage/sets/shardsofalara/Skullmulcher.java index 784dc1bb58d..5edbf39a92f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Skullmulcher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Skullmulcher.java @@ -48,7 +48,7 @@ public class Skullmulcher extends CardImpl { super(ownerId, 148, "Skullmulcher", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "ALA"; this.subtype.add("Elemental"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java b/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java index 0b1be4c6765..bf76685968a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java @@ -29,12 +29,12 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.game.permanent.token.SaprolingToken; /** @@ -48,9 +48,8 @@ public class SproutingThrinax extends CardImpl { public SproutingThrinax(UUID ownerId) { super(ownerId, 197, "Sprouting Thrinax", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{B}{R}{G}"); this.expansionSetCode = "ALA"; - this.color.setBlack(true); - this.color.setRed(true); - this.color.setGreen(true); + + this.subtype.add("Lizard"); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/StewardOfValeron.java b/Mage.Sets/src/mage/sets/shardsofalara/StewardOfValeron.java index d23f8bac214..14080c040fc 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/StewardOfValeron.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/StewardOfValeron.java @@ -48,8 +48,8 @@ public class StewardOfValeron extends CardImpl { this.subtype.add("Human"); this.subtype.add("Druid"); this.subtype.add("Knight"); - this.color.setGreen(true); - this.color.setWhite(true); + + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(VigilanceAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java b/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java index c02ece3ede7..1acdb649ca4 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java @@ -50,7 +50,7 @@ public class TarFiend extends CardImpl { super(ownerId, 89, "Tar Fiend", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{B}"); this.expansionSetCode = "ALA"; this.subtype.add("Elemental"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ThornThrashViashino.java b/Mage.Sets/src/mage/sets/shardsofalara/ThornThrashViashino.java index c363b7e6b43..c316d2bdc00 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ThornThrashViashino.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ThornThrashViashino.java @@ -52,7 +52,7 @@ public class ThornThrashViashino extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Viashino"); 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/shardsofalara/ThunderThrashElder.java b/Mage.Sets/src/mage/sets/shardsofalara/ThunderThrashElder.java index 0bba0a0aad1..beed22e93c7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ThunderThrashElder.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ThunderThrashElder.java @@ -46,7 +46,7 @@ public class ThunderThrashElder extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Viashino"); 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/shardsofalara/UndeadLeotau.java b/Mage.Sets/src/mage/sets/shardsofalara/UndeadLeotau.java index 8e2502b4a31..fc534d63e70 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/UndeadLeotau.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/UndeadLeotau.java @@ -51,7 +51,7 @@ public class UndeadLeotau extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Zombie"); this.subtype.add("Cat"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(+1, -1, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/VectisSilencers.java b/Mage.Sets/src/mage/sets/shardsofalara/VectisSilencers.java index f4e43d64189..0c57590135c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/VectisSilencers.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/VectisSilencers.java @@ -51,7 +51,7 @@ public class VectisSilencers extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}{B}"))); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ViolentUltimatum.java b/Mage.Sets/src/mage/sets/shardsofalara/ViolentUltimatum.java index f61b90fda37..1bf3871080c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ViolentUltimatum.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ViolentUltimatum.java @@ -29,10 +29,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.filter.FilterPermanent; import mage.target.TargetPermanent; @@ -45,9 +45,8 @@ public class ViolentUltimatum extends CardImpl { public ViolentUltimatum (UUID ownerId) { super(ownerId, 206, "Violent Ultimatum", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{B}{B}{R}{R}{R}{G}{G}"); this.expansionSetCode = "ALA"; - this.color.setBlack(true); - this.color.setRed(true); - this.color.setGreen(true); + + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(3, 3, new FilterPermanent(), false)); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WaveskimmerAven.java b/Mage.Sets/src/mage/sets/shardsofalara/WaveskimmerAven.java index 0975e35c1cb..2b16b905277 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WaveskimmerAven.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WaveskimmerAven.java @@ -29,12 +29,12 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; /** * @@ -47,9 +47,8 @@ public class WaveskimmerAven extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Bird"); this.subtype.add("Soldier"); - this.color.setGreen(true); - this.color.setWhite(true); - this.color.setBlue(true); + + this.power = new MageInt(2 ); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java b/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java index 94878b04ab4..72bc9ad7c81 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java @@ -56,7 +56,7 @@ public class WildNacatl extends CardImpl { public WildNacatl(UUID ownerId) { super(ownerId, 152, "Wild Nacatl", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "ALA"; - this.color.setGreen(true); + this.subtype.add("Cat"); this.subtype.add("Warrior"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java b/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java index 13dacf22ff0..dded98f9b7f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java @@ -29,10 +29,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; /** * @@ -43,9 +43,8 @@ public class WoollyThoctar extends CardImpl { public WoollyThoctar(UUID ownerId) { super(ownerId, 209, "Woolly Thoctar", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{R}{G}{W}"); this.expansionSetCode = "ALA"; - this.color.setRed(true); - this.color.setGreen(true); - this.color.setWhite(true); + + this.subtype.add("Beast"); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/YokedPlowbeast.java b/Mage.Sets/src/mage/sets/shardsofalara/YokedPlowbeast.java index 00aeb604998..7cdad14a3c6 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/YokedPlowbeast.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/YokedPlowbeast.java @@ -46,7 +46,7 @@ public class YokedPlowbeast extends CardImpl { super(ownerId, 31, "Yoked Plowbeast", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{W}{W}"); this.expansionSetCode = "ALA"; this.subtype.add("Beast"); - this.color.setWhite(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); diff --git a/Mage.Sets/src/mage/sets/tempest/AdvanceScout.java b/Mage.Sets/src/mage/sets/tempest/AdvanceScout.java index b245f3a05d4..ac9f63f5c19 100644 --- a/Mage.Sets/src/mage/sets/tempest/AdvanceScout.java +++ b/Mage.Sets/src/mage/sets/tempest/AdvanceScout.java @@ -51,7 +51,7 @@ public class AdvanceScout extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); this.subtype.add("Scout"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FirstStrikeAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tempest/Aftershock.java b/Mage.Sets/src/mage/sets/tempest/Aftershock.java index 7d2610124c4..d8a1bad0f43 100644 --- a/Mage.Sets/src/mage/sets/tempest/Aftershock.java +++ b/Mage.Sets/src/mage/sets/tempest/Aftershock.java @@ -56,7 +56,7 @@ public class Aftershock extends CardImpl { public Aftershock(UUID ownerId) { super(ownerId, 160, "Aftershock", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); this.expansionSetCode = "TMP"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DamageControllerEffect(3)); diff --git a/Mage.Sets/src/mage/sets/tempest/ArmorSliver.java b/Mage.Sets/src/mage/sets/tempest/ArmorSliver.java index d6446d108df..b208140102f 100644 --- a/Mage.Sets/src/mage/sets/tempest/ArmorSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/ArmorSliver.java @@ -59,7 +59,7 @@ public class ArmorSliver extends CardImpl { super(ownerId, 216, "Armor Sliver", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.expansionSetCode = "TMP"; this.subtype.add("Sliver"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new GenericManaCost(2)), Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/sets/tempest/Auratog.java b/Mage.Sets/src/mage/sets/tempest/Auratog.java index dd8ce8201d5..9d4c1b88d38 100644 --- a/Mage.Sets/src/mage/sets/tempest/Auratog.java +++ b/Mage.Sets/src/mage/sets/tempest/Auratog.java @@ -58,7 +58,7 @@ public class Auratog extends CardImpl { super(ownerId, 218, "Auratog", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "TMP"; this.subtype.add("Atog"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); diff --git a/Mage.Sets/src/mage/sets/tempest/BarbedSliver.java b/Mage.Sets/src/mage/sets/tempest/BarbedSliver.java index 73fa3a94757..f2be586befe 100644 --- a/Mage.Sets/src/mage/sets/tempest/BarbedSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/BarbedSliver.java @@ -59,7 +59,7 @@ public class BarbedSliver extends CardImpl { super(ownerId, 163, "Barbed Sliver", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.expansionSetCode = "TMP"; this.subtype.add("Sliver"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2)), Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/sets/tempest/BloodPet.java b/Mage.Sets/src/mage/sets/tempest/BloodPet.java index 46b9815bbf4..1f851fb6012 100644 --- a/Mage.Sets/src/mage/sets/tempest/BloodPet.java +++ b/Mage.Sets/src/mage/sets/tempest/BloodPet.java @@ -48,7 +48,7 @@ public class BloodPet extends CardImpl { super(ownerId, 3, "Blood Pet", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}"); this.expansionSetCode = "TMP"; 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/tempest/Boil.java b/Mage.Sets/src/mage/sets/tempest/Boil.java index 030e3c81aba..81330963314 100644 --- a/Mage.Sets/src/mage/sets/tempest/Boil.java +++ b/Mage.Sets/src/mage/sets/tempest/Boil.java @@ -50,7 +50,7 @@ public class Boil extends CardImpl { public Boil(UUID ownerId) { super(ownerId, 165, "Boil", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{R}"); this.expansionSetCode = "TMP"; - this.color.setRed(true); + // Destroy all Islands. this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/tempest/BrokenFall.java b/Mage.Sets/src/mage/sets/tempest/BrokenFall.java index 07ed993ec92..da96953dc56 100644 --- a/Mage.Sets/src/mage/sets/tempest/BrokenFall.java +++ b/Mage.Sets/src/mage/sets/tempest/BrokenFall.java @@ -48,7 +48,7 @@ public class BrokenFall extends CardImpl { public BrokenFall(UUID ownerId) { super(ownerId, 110, "Broken Fall", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "TMP"; - this.color.setGreen(true); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ReturnToHandSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tempest/ClergyEnVec.java b/Mage.Sets/src/mage/sets/tempest/ClergyEnVec.java index 2e8281b613f..69269b5e9f9 100644 --- a/Mage.Sets/src/mage/sets/tempest/ClergyEnVec.java +++ b/Mage.Sets/src/mage/sets/tempest/ClergyEnVec.java @@ -52,7 +52,7 @@ public class ClergyEnVec extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn ,1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/tempest/ClotSliver.java b/Mage.Sets/src/mage/sets/tempest/ClotSliver.java index 6e0b977b81c..dd94a7feb53 100644 --- a/Mage.Sets/src/mage/sets/tempest/ClotSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/ClotSliver.java @@ -58,7 +58,7 @@ public class ClotSliver extends CardImpl { super(ownerId, 6, "Clot Sliver", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.expansionSetCode = "TMP"; this.subtype.add("Sliver"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(2)), Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java b/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java index 540a2edf9b0..136f46e49c0 100644 --- a/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java +++ b/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java @@ -56,7 +56,7 @@ public class CloudchaserEagle extends CardImpl { super(ownerId, 227, "Cloudchaser Eagle", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "TMP"; this.subtype.add("Bird"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tempest/CommanderGrevenIlVec.java b/Mage.Sets/src/mage/sets/tempest/CommanderGrevenIlVec.java index bdc7026f2e0..1ca56981e19 100644 --- a/Mage.Sets/src/mage/sets/tempest/CommanderGrevenIlVec.java +++ b/Mage.Sets/src/mage/sets/tempest/CommanderGrevenIlVec.java @@ -50,7 +50,7 @@ public class CommanderGrevenIlVec extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Warrior"); - this.color.setBlack(true); + this.power = new MageInt(7); this.toughness = new MageInt(5); Ability ability = new EntersBattlefieldTriggeredAbility(new SacrificeTargetEffect(), false); diff --git a/Mage.Sets/src/mage/sets/tempest/Counterspell.java b/Mage.Sets/src/mage/sets/tempest/Counterspell.java index 029a554eed9..83e9e7256b7 100644 --- a/Mage.Sets/src/mage/sets/tempest/Counterspell.java +++ b/Mage.Sets/src/mage/sets/tempest/Counterspell.java @@ -43,7 +43,7 @@ public class Counterspell extends CardImpl { public Counterspell(UUID ownerId) { super(ownerId, 57, "Counterspell", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}{U}"); this.expansionSetCode = "TMP"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetSpell()); } diff --git a/Mage.Sets/src/mage/sets/tempest/CrownOfFlames.java b/Mage.Sets/src/mage/sets/tempest/CrownOfFlames.java index a9d448eba7f..f5ae2b954d7 100644 --- a/Mage.Sets/src/mage/sets/tempest/CrownOfFlames.java +++ b/Mage.Sets/src/mage/sets/tempest/CrownOfFlames.java @@ -51,7 +51,7 @@ public class CrownOfFlames extends CardImpl { super(ownerId, 169, "Crown of Flames", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{R}"); this.expansionSetCode = "TMP"; this.subtype.add("Aura"); - this.color.setRed(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java b/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java index 24ecf687f18..e2a1fd30542 100644 --- a/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java +++ b/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java @@ -53,7 +53,7 @@ public class DarkBanishing extends CardImpl { public DarkBanishing(UUID ownerId) { super(ownerId, 11, "Dark Banishing", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "TMP"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/tempest/DarklingStalker.java b/Mage.Sets/src/mage/sets/tempest/DarklingStalker.java index fdbba237e3b..a91b6d01d56 100644 --- a/Mage.Sets/src/mage/sets/tempest/DarklingStalker.java +++ b/Mage.Sets/src/mage/sets/tempest/DarklingStalker.java @@ -48,7 +48,7 @@ public class DarklingStalker extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Shade"); this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); diff --git a/Mage.Sets/src/mage/sets/tempest/DauthiMercenary.java b/Mage.Sets/src/mage/sets/tempest/DauthiMercenary.java index 2beee0bd516..fee4114ee96 100644 --- a/Mage.Sets/src/mage/sets/tempest/DauthiMercenary.java +++ b/Mage.Sets/src/mage/sets/tempest/DauthiMercenary.java @@ -51,7 +51,7 @@ public class DauthiMercenary extends CardImpl { this.subtype.add("Dauthi"); this.subtype.add("Knight"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tempest/DiabolicEdict.java b/Mage.Sets/src/mage/sets/tempest/DiabolicEdict.java index 32400da733f..638f4e0b470 100644 --- a/Mage.Sets/src/mage/sets/tempest/DiabolicEdict.java +++ b/Mage.Sets/src/mage/sets/tempest/DiabolicEdict.java @@ -44,7 +44,7 @@ public class DiabolicEdict extends CardImpl { public DiabolicEdict(UUID ownerId) { super(ownerId, 22, "Diabolic Edict", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "TMP"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new SacrificeEffect(new FilterCreaturePermanent(), 1, "Target player")); this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/tempest/Disenchant.java b/Mage.Sets/src/mage/sets/tempest/Disenchant.java index 481e83eceb1..1a217e67c26 100644 --- a/Mage.Sets/src/mage/sets/tempest/Disenchant.java +++ b/Mage.Sets/src/mage/sets/tempest/Disenchant.java @@ -54,7 +54,7 @@ public class Disenchant extends CardImpl { public Disenchant(UUID ownerId) { super(ownerId, 228, "Disenchant", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "TMP"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/tempest/Dismiss.java b/Mage.Sets/src/mage/sets/tempest/Dismiss.java index 24440256e92..5069cea03bf 100644 --- a/Mage.Sets/src/mage/sets/tempest/Dismiss.java +++ b/Mage.Sets/src/mage/sets/tempest/Dismiss.java @@ -44,7 +44,7 @@ public class Dismiss extends CardImpl { public Dismiss(UUID ownerId) { super(ownerId, 58, "Dismiss", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); this.expansionSetCode = "TMP"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetSpell()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/tempest/DreadOfNight.java b/Mage.Sets/src/mage/sets/tempest/DreadOfNight.java index db941595ec4..292cd0a5abb 100644 --- a/Mage.Sets/src/mage/sets/tempest/DreadOfNight.java +++ b/Mage.Sets/src/mage/sets/tempest/DreadOfNight.java @@ -55,7 +55,7 @@ public class DreadOfNight extends CardImpl { public DreadOfNight(UUID ownerId) { super(ownerId, 24, "Dread of Night", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "TMP"; - this.color.setBlack(true); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/sets/tempest/Earthcraft.java b/Mage.Sets/src/mage/sets/tempest/Earthcraft.java index 877890d7bf4..6cb7f0d416e 100644 --- a/Mage.Sets/src/mage/sets/tempest/Earthcraft.java +++ b/Mage.Sets/src/mage/sets/tempest/Earthcraft.java @@ -63,7 +63,7 @@ public class Earthcraft extends CardImpl { public Earthcraft(UUID ownerId) { super(ownerId, 116, "Earthcraft", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "TMP"; - this.color.setGreen(true); + // Tap an untapped creature you control: Untap target basic land. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filterCreature, true))); diff --git a/Mage.Sets/src/mage/sets/tempest/EladamriLordOfLeaves.java b/Mage.Sets/src/mage/sets/tempest/EladamriLordOfLeaves.java index 6c0f057487d..86885f7dbce 100644 --- a/Mage.Sets/src/mage/sets/tempest/EladamriLordOfLeaves.java +++ b/Mage.Sets/src/mage/sets/tempest/EladamriLordOfLeaves.java @@ -63,7 +63,7 @@ public class EladamriLordOfLeaves extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Elf"); this.subtype.add("Warrior"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new ForestwalkAbility(), Duration.WhileOnBattlefield, filterCreatures, true))); diff --git a/Mage.Sets/src/mage/sets/tempest/EliteJavelineer.java b/Mage.Sets/src/mage/sets/tempest/EliteJavelineer.java index 3d37cb7ed3f..6a857edd2ee 100644 --- a/Mage.Sets/src/mage/sets/tempest/EliteJavelineer.java +++ b/Mage.Sets/src/mage/sets/tempest/EliteJavelineer.java @@ -49,7 +49,7 @@ public class EliteJavelineer extends CardImpl { this.expansionSetCode = "TMP"; 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/tempest/ElvishFury.java b/Mage.Sets/src/mage/sets/tempest/ElvishFury.java index d063bffcfe4..c799fd0692b 100644 --- a/Mage.Sets/src/mage/sets/tempest/ElvishFury.java +++ b/Mage.Sets/src/mage/sets/tempest/ElvishFury.java @@ -45,7 +45,7 @@ public class ElvishFury extends CardImpl { public ElvishFury(UUID ownerId) { super(ownerId, 120, "Elvish Fury", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "TMP"; - this.color.setGreen(true); + // Buyback {4} (You may pay an additional {4} as you cast this spell. If you do, put this card into your hand as it resolves.) this.addAbility(new BuybackAbility("{4}")); diff --git a/Mage.Sets/src/mage/sets/tempest/Enfeeblement.java b/Mage.Sets/src/mage/sets/tempest/Enfeeblement.java index 4172cfb2fb1..6537f9594df 100644 --- a/Mage.Sets/src/mage/sets/tempest/Enfeeblement.java +++ b/Mage.Sets/src/mage/sets/tempest/Enfeeblement.java @@ -48,7 +48,7 @@ public class Enfeeblement extends CardImpl { super(ownerId, 27, "Enfeeblement", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}{B}"); this.expansionSetCode = "TMP"; this.subtype.add("Aura"); - this.color.setBlack(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); diff --git a/Mage.Sets/src/mage/sets/tempest/FeveredConvulsions.java b/Mage.Sets/src/mage/sets/tempest/FeveredConvulsions.java index 02cb74ca86c..b7b02243605 100644 --- a/Mage.Sets/src/mage/sets/tempest/FeveredConvulsions.java +++ b/Mage.Sets/src/mage/sets/tempest/FeveredConvulsions.java @@ -49,7 +49,7 @@ public class FeveredConvulsions extends CardImpl { public FeveredConvulsions(UUID ownerId) { super(ownerId, 30, "Fevered Convulsions", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}{B}"); this.expansionSetCode = "TMP"; - this.color.setBlack(true); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance(1)), new ManaCostsImpl("{2}{B}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tempest/Firefly.java b/Mage.Sets/src/mage/sets/tempest/Firefly.java index 68216c6098b..4fda3c2c835 100644 --- a/Mage.Sets/src/mage/sets/tempest/Firefly.java +++ b/Mage.Sets/src/mage/sets/tempest/Firefly.java @@ -47,7 +47,7 @@ public class Firefly extends CardImpl { super(ownerId, 172, "Firefly", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "TMP"; this.subtype.add("Insect"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tempest/Fireslinger.java b/Mage.Sets/src/mage/sets/tempest/Fireslinger.java index 904d67eccd0..6a26ec68f7a 100644 --- a/Mage.Sets/src/mage/sets/tempest/Fireslinger.java +++ b/Mage.Sets/src/mage/sets/tempest/Fireslinger.java @@ -52,7 +52,7 @@ public class Fireslinger extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/tempest/FlowstoneGiant.java b/Mage.Sets/src/mage/sets/tempest/FlowstoneGiant.java index 40df1cd1958..4986719fdea 100644 --- a/Mage.Sets/src/mage/sets/tempest/FlowstoneGiant.java +++ b/Mage.Sets/src/mage/sets/tempest/FlowstoneGiant.java @@ -46,7 +46,7 @@ public class FlowstoneGiant extends CardImpl { super(ownerId, 174, "Flowstone Giant", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); this.expansionSetCode = "TMP"; this.subtype.add("Giant"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); diff --git a/Mage.Sets/src/mage/sets/tempest/FlowstoneWyvern.java b/Mage.Sets/src/mage/sets/tempest/FlowstoneWyvern.java index ebd788cc9ce..bf43f20434d 100644 --- a/Mage.Sets/src/mage/sets/tempest/FlowstoneWyvern.java +++ b/Mage.Sets/src/mage/sets/tempest/FlowstoneWyvern.java @@ -47,7 +47,7 @@ public class FlowstoneWyvern extends CardImpl { super(ownerId, 176, "Flowstone Wyvern", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); this.expansionSetCode = "TMP"; this.subtype.add("Drake"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tempest/FrogTongue.java b/Mage.Sets/src/mage/sets/tempest/FrogTongue.java index 163d58c4472..cdf489a2992 100644 --- a/Mage.Sets/src/mage/sets/tempest/FrogTongue.java +++ b/Mage.Sets/src/mage/sets/tempest/FrogTongue.java @@ -51,7 +51,7 @@ public class FrogTongue extends CardImpl { super(ownerId, 122, "Frog Tongue", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "TMP"; this.subtype.add("Aura"); - this.color.setGreen(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/tempest/Gallantry.java b/Mage.Sets/src/mage/sets/tempest/Gallantry.java index d5b627fbb5f..306771c6ac9 100644 --- a/Mage.Sets/src/mage/sets/tempest/Gallantry.java +++ b/Mage.Sets/src/mage/sets/tempest/Gallantry.java @@ -50,7 +50,7 @@ public class Gallantry extends CardImpl { public Gallantry(UUID ownerId) { super(ownerId, 232, "Gallantry", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "TMP"; - this.color.setWhite(true); + // Target blocking 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/tempest/GerrardsBattleCry.java b/Mage.Sets/src/mage/sets/tempest/GerrardsBattleCry.java index e93ad8a80b2..d124e6dff29 100644 --- a/Mage.Sets/src/mage/sets/tempest/GerrardsBattleCry.java +++ b/Mage.Sets/src/mage/sets/tempest/GerrardsBattleCry.java @@ -48,7 +48,7 @@ public class GerrardsBattleCry extends CardImpl { public GerrardsBattleCry(UUID ownerId) { super(ownerId, 233, "Gerrard's Battle Cry", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{W}"); this.expansionSetCode = "TMP"; - this.color.setWhite(true); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn, new FilterCreaturePermanent(), false), new ManaCostsImpl("{2}{W}"))); } diff --git a/Mage.Sets/src/mage/sets/tempest/GiantCrab.java b/Mage.Sets/src/mage/sets/tempest/GiantCrab.java index b24025aeb9c..1e66f26ece2 100644 --- a/Mage.Sets/src/mage/sets/tempest/GiantCrab.java +++ b/Mage.Sets/src/mage/sets/tempest/GiantCrab.java @@ -46,7 +46,7 @@ public class GiantCrab extends CardImpl { super(ownerId, 66, "Giant Crab", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); this.expansionSetCode = "TMP"; this.subtype.add("Crab"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); diff --git a/Mage.Sets/src/mage/sets/tempest/GiantStrength.java b/Mage.Sets/src/mage/sets/tempest/GiantStrength.java index ddd54ab544f..5b7eaa5af27 100644 --- a/Mage.Sets/src/mage/sets/tempest/GiantStrength.java +++ b/Mage.Sets/src/mage/sets/tempest/GiantStrength.java @@ -48,7 +48,7 @@ public class GiantStrength extends CardImpl { super(ownerId, 178, "Giant Strength", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{R}{R}"); this.expansionSetCode = "TMP"; this.subtype.add("Aura"); - this.color.setRed(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/tempest/GoblinBombardment.java b/Mage.Sets/src/mage/sets/tempest/GoblinBombardment.java index 48d2a467cf2..805f606cf3d 100644 --- a/Mage.Sets/src/mage/sets/tempest/GoblinBombardment.java +++ b/Mage.Sets/src/mage/sets/tempest/GoblinBombardment.java @@ -49,7 +49,7 @@ public class GoblinBombardment extends CardImpl { public GoblinBombardment(UUID ownerId) { super(ownerId, 179, "Goblin Bombardment", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); this.expansionSetCode = "TMP"; - this.color.setRed(true); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1))); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tempest/HannasCustody.java b/Mage.Sets/src/mage/sets/tempest/HannasCustody.java index 3b0e46ec6d0..061e881705f 100644 --- a/Mage.Sets/src/mage/sets/tempest/HannasCustody.java +++ b/Mage.Sets/src/mage/sets/tempest/HannasCustody.java @@ -55,7 +55,7 @@ public class HannasCustody extends CardImpl { public HannasCustody(UUID ownerId) { super(ownerId, 234, "Hanna's Custody", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "TMP"; - this.color.setWhite(true); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/sets/tempest/HeartSliver.java b/Mage.Sets/src/mage/sets/tempest/HeartSliver.java index 092c465fbd7..8f7aead4520 100644 --- a/Mage.Sets/src/mage/sets/tempest/HeartSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/HeartSliver.java @@ -56,7 +56,7 @@ public class HeartSliver extends CardImpl { super(ownerId, 182, "Heart Sliver", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.expansionSetCode = "TMP"; this.subtype.add("Sliver"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java b/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java index 62b58da0836..061850afb42 100644 --- a/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java +++ b/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java @@ -60,7 +60,7 @@ public class HeartwoodGiant extends CardImpl { super(ownerId, 126, "Heartwood Giant", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "TMP"; this.subtype.add("Giant"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/tempest/HerosResolve.java b/Mage.Sets/src/mage/sets/tempest/HerosResolve.java index 4ce21629e90..cebec589450 100644 --- a/Mage.Sets/src/mage/sets/tempest/HerosResolve.java +++ b/Mage.Sets/src/mage/sets/tempest/HerosResolve.java @@ -49,7 +49,7 @@ public class HerosResolve extends CardImpl { super(ownerId, 235, "Hero's Resolve", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "TMP"; this.subtype.add("Aura"); - this.color.setWhite(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/tempest/HornedSliver.java b/Mage.Sets/src/mage/sets/tempest/HornedSliver.java index f8d5f142839..e46064c8f61 100644 --- a/Mage.Sets/src/mage/sets/tempest/HornedSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/HornedSliver.java @@ -56,7 +56,7 @@ public class HornedSliver extends CardImpl { super(ownerId, 128, "Horned Sliver", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "TMP"; this.subtype.add("Sliver"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/sets/tempest/LightningBlast.java b/Mage.Sets/src/mage/sets/tempest/LightningBlast.java index c542c6ef830..7a3c17fc589 100644 --- a/Mage.Sets/src/mage/sets/tempest/LightningBlast.java +++ b/Mage.Sets/src/mage/sets/tempest/LightningBlast.java @@ -43,7 +43,7 @@ public class LightningBlast extends CardImpl { public LightningBlast(UUID ownerId) { super(ownerId, 185, "Lightning Blast", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{R}"); this.expansionSetCode = "TMP"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } diff --git a/Mage.Sets/src/mage/sets/tempest/MantaRiders.java b/Mage.Sets/src/mage/sets/tempest/MantaRiders.java index 7b38796d243..35a0885f4fd 100644 --- a/Mage.Sets/src/mage/sets/tempest/MantaRiders.java +++ b/Mage.Sets/src/mage/sets/tempest/MantaRiders.java @@ -47,7 +47,7 @@ public class MantaRiders extends CardImpl { super(ownerId, 74, "Manta Riders", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}"); this.expansionSetCode = "TMP"; this.subtype.add("Merfolk"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); diff --git a/Mage.Sets/src/mage/sets/tempest/MarshLurker.java b/Mage.Sets/src/mage/sets/tempest/MarshLurker.java index 0edb4cf6905..39236aa1a1c 100644 --- a/Mage.Sets/src/mage/sets/tempest/MarshLurker.java +++ b/Mage.Sets/src/mage/sets/tempest/MarshLurker.java @@ -59,7 +59,7 @@ public class MarshLurker extends CardImpl { super(ownerId, 38, "Marsh Lurker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "TMP"; this.subtype.add("Beast"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); diff --git a/Mage.Sets/src/mage/sets/tempest/MasterDecoy.java b/Mage.Sets/src/mage/sets/tempest/MasterDecoy.java index 48cda64a6af..e4aeff0204d 100644 --- a/Mage.Sets/src/mage/sets/tempest/MasterDecoy.java +++ b/Mage.Sets/src/mage/sets/tempest/MasterDecoy.java @@ -53,7 +53,7 @@ public class MasterDecoy extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); diff --git a/Mage.Sets/src/mage/sets/tempest/Mawcor.java b/Mage.Sets/src/mage/sets/tempest/Mawcor.java index 83c32853589..387b2f1d8a6 100644 --- a/Mage.Sets/src/mage/sets/tempest/Mawcor.java +++ b/Mage.Sets/src/mage/sets/tempest/Mawcor.java @@ -51,7 +51,7 @@ public class Mawcor extends CardImpl { super(ownerId, 75, "Mawcor", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{U}{U}"); this.expansionSetCode = "TMP"; this.subtype.add("Beast"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tempest/MnemonicSliver.java b/Mage.Sets/src/mage/sets/tempest/MnemonicSliver.java index 596cdda0363..2db5d02fd4a 100644 --- a/Mage.Sets/src/mage/sets/tempest/MnemonicSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/MnemonicSliver.java @@ -60,7 +60,7 @@ public class MnemonicSliver extends CardImpl { super(ownerId, 77, "Mnemonic Sliver", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "TMP"; this.subtype.add("Sliver"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); diff --git a/Mage.Sets/src/mage/sets/tempest/MoggRaider.java b/Mage.Sets/src/mage/sets/tempest/MoggRaider.java index c3629349881..2c65a825bde 100644 --- a/Mage.Sets/src/mage/sets/tempest/MoggRaider.java +++ b/Mage.Sets/src/mage/sets/tempest/MoggRaider.java @@ -60,7 +60,7 @@ public class MoggRaider extends CardImpl { super(ownerId, 191, "Mogg Raider", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{R}"); this.expansionSetCode = "TMP"; this.subtype.add("Goblin"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter))); diff --git a/Mage.Sets/src/mage/sets/tempest/MuscleSliver.java b/Mage.Sets/src/mage/sets/tempest/MuscleSliver.java index fa2395eba90..2797e3c229c 100644 --- a/Mage.Sets/src/mage/sets/tempest/MuscleSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/MuscleSliver.java @@ -55,7 +55,7 @@ public class MuscleSliver extends CardImpl { super(ownerId, 132, "Muscle Sliver", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "TMP"; this.subtype.add("Sliver"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java b/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java index d4eb8af4f54..87056136c57 100644 --- a/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java +++ b/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java @@ -43,7 +43,7 @@ public class NaturalSpring extends CardImpl { public NaturalSpring(UUID ownerId) { super(ownerId, 133, "Natural Spring", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); this.expansionSetCode = "TMP"; - this.color.setGreen(true); + // Target player gains 8 life. this.getSpellAbility().addEffect(new GainLifeTargetEffect(8)); diff --git a/Mage.Sets/src/mage/sets/tempest/NeedleStorm.java b/Mage.Sets/src/mage/sets/tempest/NeedleStorm.java index e3b32ee37a7..031e941902c 100644 --- a/Mage.Sets/src/mage/sets/tempest/NeedleStorm.java +++ b/Mage.Sets/src/mage/sets/tempest/NeedleStorm.java @@ -51,7 +51,7 @@ public class NeedleStorm extends CardImpl { public NeedleStorm(UUID ownerId) { super(ownerId, 135, "Needle Storm", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "TMP"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new DamageAllEffect(4, filter)); } diff --git a/Mage.Sets/src/mage/sets/tempest/Opportunist.java b/Mage.Sets/src/mage/sets/tempest/Opportunist.java index 21a6ee7263e..5082facf68b 100644 --- a/Mage.Sets/src/mage/sets/tempest/Opportunist.java +++ b/Mage.Sets/src/mage/sets/tempest/Opportunist.java @@ -59,7 +59,7 @@ public class Opportunist extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tempest/OrimSamiteHealer.java b/Mage.Sets/src/mage/sets/tempest/OrimSamiteHealer.java index 81ee4dec893..7c8fe655afe 100644 --- a/Mage.Sets/src/mage/sets/tempest/OrimSamiteHealer.java +++ b/Mage.Sets/src/mage/sets/tempest/OrimSamiteHealer.java @@ -53,7 +53,7 @@ public class OrimSamiteHealer extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/tempest/Propaganda.java b/Mage.Sets/src/mage/sets/tempest/Propaganda.java index ad4fabbee30..d366094f9b7 100644 --- a/Mage.Sets/src/mage/sets/tempest/Propaganda.java +++ b/Mage.Sets/src/mage/sets/tempest/Propaganda.java @@ -53,7 +53,7 @@ public class Propaganda extends CardImpl { public Propaganda (UUID ownerId) { super(ownerId, 80, "Propaganda", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "TMP"; - this.color.setBlue(true); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PropagandaReplacementEffect())); } diff --git a/Mage.Sets/src/mage/sets/tempest/RainOfTears.java b/Mage.Sets/src/mage/sets/tempest/RainOfTears.java index 462c2c84d76..a8dbc6c2fca 100644 --- a/Mage.Sets/src/mage/sets/tempest/RainOfTears.java +++ b/Mage.Sets/src/mage/sets/tempest/RainOfTears.java @@ -43,7 +43,7 @@ public class RainOfTears extends CardImpl { public RainOfTears(UUID ownerId) { super(ownerId, 43, "Rain of Tears", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{B}{B}"); this.expansionSetCode = "TMP"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetLandPermanent()); } diff --git a/Mage.Sets/src/mage/sets/tempest/RangerEnVec.java b/Mage.Sets/src/mage/sets/tempest/RangerEnVec.java index 3438f45d6cf..a0794b542a4 100644 --- a/Mage.Sets/src/mage/sets/tempest/RangerEnVec.java +++ b/Mage.Sets/src/mage/sets/tempest/RangerEnVec.java @@ -52,8 +52,8 @@ public class RangerEnVec extends CardImpl { this.subtype.add("Human"); this.subtype.add("Soldier"); this.subtype.add("Archer"); - this.color.setGreen(true); - this.color.setWhite(true); + + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FirstStrikeAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tempest/RecklessSpite.java b/Mage.Sets/src/mage/sets/tempest/RecklessSpite.java index f17fcbab35a..16610b617d2 100644 --- a/Mage.Sets/src/mage/sets/tempest/RecklessSpite.java +++ b/Mage.Sets/src/mage/sets/tempest/RecklessSpite.java @@ -54,7 +54,7 @@ public class RecklessSpite extends CardImpl { public RecklessSpite(UUID ownerId) { super(ownerId, 46, "Reckless Spite", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{B}{B}"); this.expansionSetCode = "TMP"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(2, 2, filter, false)); this.getSpellAbility().addEffect(new LoseLifeSourceControllerEffect(5)); diff --git a/Mage.Sets/src/mage/sets/tempest/RenegadeWarlord.java b/Mage.Sets/src/mage/sets/tempest/RenegadeWarlord.java index 35c700b7071..635df8338ad 100644 --- a/Mage.Sets/src/mage/sets/tempest/RenegadeWarlord.java +++ b/Mage.Sets/src/mage/sets/tempest/RenegadeWarlord.java @@ -49,7 +49,7 @@ public class RenegadeWarlord extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FirstStrikeAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tempest/Rootwalla.java b/Mage.Sets/src/mage/sets/tempest/Rootwalla.java index aedc6ff33ae..034be198e49 100644 --- a/Mage.Sets/src/mage/sets/tempest/Rootwalla.java +++ b/Mage.Sets/src/mage/sets/tempest/Rootwalla.java @@ -49,7 +49,7 @@ public class Rootwalla extends CardImpl { super(ownerId, 146, "Rootwalla", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "TMP"; this.subtype.add("Lizard"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); diff --git a/Mage.Sets/src/mage/sets/tempest/RootwaterHunter.java b/Mage.Sets/src/mage/sets/tempest/RootwaterHunter.java index 493d3f841be..756976e1ee4 100644 --- a/Mage.Sets/src/mage/sets/tempest/RootwaterHunter.java +++ b/Mage.Sets/src/mage/sets/tempest/RootwaterHunter.java @@ -50,7 +50,7 @@ public class RootwaterHunter extends CardImpl { super(ownerId, 82, "Rootwater Hunter", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "TMP"; this.subtype.add("Merfolk"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/tempest/ScreechingHarpy.java b/Mage.Sets/src/mage/sets/tempest/ScreechingHarpy.java index 8494e6625f0..d4b3f89e9ca 100644 --- a/Mage.Sets/src/mage/sets/tempest/ScreechingHarpy.java +++ b/Mage.Sets/src/mage/sets/tempest/ScreechingHarpy.java @@ -50,7 +50,7 @@ public class ScreechingHarpy extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Harpy"); this.subtype.add("Beast"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tempest/SearingTouch.java b/Mage.Sets/src/mage/sets/tempest/SearingTouch.java index ade0c9fa5fe..58af570f633 100644 --- a/Mage.Sets/src/mage/sets/tempest/SearingTouch.java +++ b/Mage.Sets/src/mage/sets/tempest/SearingTouch.java @@ -44,7 +44,7 @@ public class SearingTouch extends CardImpl { public SearingTouch(UUID ownerId) { super(ownerId, 201, "Searing Touch", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "TMP"; - this.color.setRed(true); + // Buyback {4} (You may pay an additional {4} as you cast this spell. If you do, put this card into your hand as it resolves.) this.addAbility(new BuybackAbility("{4}")); diff --git a/Mage.Sets/src/mage/sets/tempest/SeekerOfSkybreak.java b/Mage.Sets/src/mage/sets/tempest/SeekerOfSkybreak.java index 0d006e5d8d5..37f6bcc20c8 100644 --- a/Mage.Sets/src/mage/sets/tempest/SeekerOfSkybreak.java +++ b/Mage.Sets/src/mage/sets/tempest/SeekerOfSkybreak.java @@ -50,7 +50,7 @@ public class SeekerOfSkybreak extends CardImpl { super(ownerId, 148, "Seeker of Skybreak", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "TMP"; this.subtype.add("Elf"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/tempest/SeleniaDarkAngel.java b/Mage.Sets/src/mage/sets/tempest/SeleniaDarkAngel.java index f41ca3f4db2..d8fc9f2fc06 100644 --- a/Mage.Sets/src/mage/sets/tempest/SeleniaDarkAngel.java +++ b/Mage.Sets/src/mage/sets/tempest/SeleniaDarkAngel.java @@ -50,8 +50,8 @@ public class SeleniaDarkAngel extends CardImpl { this.expansionSetCode = "TMP"; this.supertype.add("Legendary"); this.subtype.add("Angel"); - this.color.setBlack(true); - this.color.setWhite(true); + + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/tempest/ShimmeringWings.java b/Mage.Sets/src/mage/sets/tempest/ShimmeringWings.java index be2bf0b09d9..b41e107fe2d 100644 --- a/Mage.Sets/src/mage/sets/tempest/ShimmeringWings.java +++ b/Mage.Sets/src/mage/sets/tempest/ShimmeringWings.java @@ -53,7 +53,7 @@ public class ShimmeringWings extends CardImpl { super(ownerId, 87, "Shimmering Wings", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{U}"); this.expansionSetCode = "TMP"; this.subtype.add("Aura"); - this.color.setBlue(true); + // Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.) TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/tempest/SkyshroudTroll.java b/Mage.Sets/src/mage/sets/tempest/SkyshroudTroll.java index af8dfa1e63c..a55ca3b4593 100644 --- a/Mage.Sets/src/mage/sets/tempest/SkyshroudTroll.java +++ b/Mage.Sets/src/mage/sets/tempest/SkyshroudTroll.java @@ -49,7 +49,7 @@ public class SkyshroudTroll extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Troll"); this.subtype.add("Giant"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"))); diff --git a/Mage.Sets/src/mage/sets/tempest/Souldrinker.java b/Mage.Sets/src/mage/sets/tempest/Souldrinker.java index ccef2d4212c..817b457e79d 100644 --- a/Mage.Sets/src/mage/sets/tempest/Souldrinker.java +++ b/Mage.Sets/src/mage/sets/tempest/Souldrinker.java @@ -49,7 +49,7 @@ public class Souldrinker extends CardImpl { super(ownerId, 52, "Souldrinker", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "TMP"; this.subtype.add("Spirit"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new PayLifeCost(3))); diff --git a/Mage.Sets/src/mage/sets/tempest/SpikeDrone.java b/Mage.Sets/src/mage/sets/tempest/SpikeDrone.java index fd6448cb0f0..3fca3587a1e 100644 --- a/Mage.Sets/src/mage/sets/tempest/SpikeDrone.java +++ b/Mage.Sets/src/mage/sets/tempest/SpikeDrone.java @@ -56,7 +56,7 @@ public class SpikeDrone extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Spike"); this.subtype.add("Drone"); - this.color.setGreen(true); + this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/tempest/SpontaneousCombustion.java b/Mage.Sets/src/mage/sets/tempest/SpontaneousCombustion.java index 5d9baaad602..36d738af713 100644 --- a/Mage.Sets/src/mage/sets/tempest/SpontaneousCombustion.java +++ b/Mage.Sets/src/mage/sets/tempest/SpontaneousCombustion.java @@ -45,8 +45,8 @@ public class SpontaneousCombustion extends CardImpl { public SpontaneousCombustion(UUID ownerId) { super(ownerId, 348, "Spontaneous Combustion", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{B}{R}"); this.expansionSetCode = "TMP"; - this.color.setRed(true); - this.color.setBlack(true); + + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.getSpellAbility().addEffect(new DamageAllEffect(3, new FilterCreaturePermanent())); } diff --git a/Mage.Sets/src/mage/sets/tempest/StaunchDefenders.java b/Mage.Sets/src/mage/sets/tempest/StaunchDefenders.java index 3d0c81ddb58..39fe7dbece7 100644 --- a/Mage.Sets/src/mage/sets/tempest/StaunchDefenders.java +++ b/Mage.Sets/src/mage/sets/tempest/StaunchDefenders.java @@ -46,7 +46,7 @@ public class StaunchDefenders extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Human"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(4), false)); diff --git a/Mage.Sets/src/mage/sets/tempest/StoneRain.java b/Mage.Sets/src/mage/sets/tempest/StoneRain.java index 4c3810af651..8982d9f6e34 100644 --- a/Mage.Sets/src/mage/sets/tempest/StoneRain.java +++ b/Mage.Sets/src/mage/sets/tempest/StoneRain.java @@ -45,7 +45,7 @@ public class StoneRain extends CardImpl { public StoneRain (UUID ownerId) { super(ownerId, 206, "Stone Rain", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "TMP"; - this.color.setRed(true); + this.getSpellAbility().addTarget(new TargetPermanent(new FilterLandPermanent())); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/tempest/TalonSliver.java b/Mage.Sets/src/mage/sets/tempest/TalonSliver.java index 07bef10d469..42f86124abf 100644 --- a/Mage.Sets/src/mage/sets/tempest/TalonSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/TalonSliver.java @@ -56,7 +56,7 @@ public class TalonSliver extends CardImpl { super(ownerId, 262, "Talon Sliver", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "TMP"; this.subtype.add("Sliver"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/sets/tempest/TimeEbb.java b/Mage.Sets/src/mage/sets/tempest/TimeEbb.java index 30fc92487a3..d022a93f9bf 100644 --- a/Mage.Sets/src/mage/sets/tempest/TimeEbb.java +++ b/Mage.Sets/src/mage/sets/tempest/TimeEbb.java @@ -43,7 +43,7 @@ public class TimeEbb extends CardImpl { public TimeEbb(UUID ownerId) { super(ownerId, 96, "Time Ebb", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "TMP"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/tempest/ToothAndClaw.java b/Mage.Sets/src/mage/sets/tempest/ToothAndClaw.java index 43f2132f385..d6b92ccf7c2 100644 --- a/Mage.Sets/src/mage/sets/tempest/ToothAndClaw.java +++ b/Mage.Sets/src/mage/sets/tempest/ToothAndClaw.java @@ -49,7 +49,7 @@ public class ToothAndClaw extends CardImpl { public ToothAndClaw(UUID ownerId) { super(ownerId, 210, "Tooth and Claw", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); this.expansionSetCode = "TMP"; - this.color.setRed(true); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CarnivoreToken(), 1), new SacrificeTargetCost(new TargetControlledCreaturePermanent(2)))); } diff --git a/Mage.Sets/src/mage/sets/tempest/TradewindRider.java b/Mage.Sets/src/mage/sets/tempest/TradewindRider.java index ffe945e9a68..8e33ae4eef1 100644 --- a/Mage.Sets/src/mage/sets/tempest/TradewindRider.java +++ b/Mage.Sets/src/mage/sets/tempest/TradewindRider.java @@ -61,7 +61,7 @@ public class TradewindRider extends CardImpl { super(ownerId, 98, "Tradewind Rider", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "TMP"; this.subtype.add("Spirit"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tempest/Tranquility.java b/Mage.Sets/src/mage/sets/tempest/Tranquility.java index 1c400adcf9b..3ea78b39b5f 100644 --- a/Mage.Sets/src/mage/sets/tempest/Tranquility.java +++ b/Mage.Sets/src/mage/sets/tempest/Tranquility.java @@ -49,7 +49,7 @@ public class Tranquility extends CardImpl { public Tranquility(UUID ownerId) { super(ownerId, 155, "Tranquility", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "TMP"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new TranquilityEffect()); } diff --git a/Mage.Sets/src/mage/sets/tempest/VerdantForce.java b/Mage.Sets/src/mage/sets/tempest/VerdantForce.java index 3ec4a9b4d5e..4377abe9c5b 100644 --- a/Mage.Sets/src/mage/sets/tempest/VerdantForce.java +++ b/Mage.Sets/src/mage/sets/tempest/VerdantForce.java @@ -48,7 +48,7 @@ public class VerdantForce extends CardImpl { super(ownerId, 157, "Verdant Force", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{G}{G}{G}"); this.expansionSetCode = "TMP"; this.subtype.add("Elemental"); - this.color.setGreen(true); + this.power = new MageInt(7); this.toughness = new MageInt(7); this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), TargetController.ANY, false)); diff --git a/Mage.Sets/src/mage/sets/tempest/Verdigris.java b/Mage.Sets/src/mage/sets/tempest/Verdigris.java index 9fc36c87520..dbcf4169c3d 100644 --- a/Mage.Sets/src/mage/sets/tempest/Verdigris.java +++ b/Mage.Sets/src/mage/sets/tempest/Verdigris.java @@ -51,7 +51,7 @@ public class Verdigris extends CardImpl { public Verdigris(UUID ownerId) { super(ownerId, 158, "Verdigris", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "TMP"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/tempest/WhispersOfTheMuse.java b/Mage.Sets/src/mage/sets/tempest/WhispersOfTheMuse.java index 1a33e7ef8fb..ec7269674b3 100644 --- a/Mage.Sets/src/mage/sets/tempest/WhispersOfTheMuse.java +++ b/Mage.Sets/src/mage/sets/tempest/WhispersOfTheMuse.java @@ -43,7 +43,7 @@ public class WhispersOfTheMuse extends CardImpl { public WhispersOfTheMuse(UUID ownerId) { super(ownerId, 103, "Whispers of the Muse", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "TMP"; - this.color.setBlue(true); + // Buyback {5} (You may pay an additional {5} as you cast this spell. If you do, put this card into your hand as it resolves.) this.addAbility(new BuybackAbility("{5}")); diff --git a/Mage.Sets/src/mage/sets/tempest/WindDancer.java b/Mage.Sets/src/mage/sets/tempest/WindDancer.java index 1385ebd6e77..a010fd4e3ca 100644 --- a/Mage.Sets/src/mage/sets/tempest/WindDancer.java +++ b/Mage.Sets/src/mage/sets/tempest/WindDancer.java @@ -52,7 +52,7 @@ public class WindDancer extends CardImpl { super(ownerId, 104, "Wind Dancer", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "TMP"; this.subtype.add("Faerie"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tempest/WingedSliver.java b/Mage.Sets/src/mage/sets/tempest/WingedSliver.java index 0147747518e..ca13031bad8 100644 --- a/Mage.Sets/src/mage/sets/tempest/WingedSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/WingedSliver.java @@ -56,7 +56,7 @@ public class WingedSliver extends CardImpl { super(ownerId, 106, "Winged Sliver", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "TMP"; this.subtype.add("Sliver"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/sets/tempest/WintersGrasp.java b/Mage.Sets/src/mage/sets/tempest/WintersGrasp.java index ffd504ccc1b..4b164026bb1 100644 --- a/Mage.Sets/src/mage/sets/tempest/WintersGrasp.java +++ b/Mage.Sets/src/mage/sets/tempest/WintersGrasp.java @@ -43,7 +43,7 @@ public class WintersGrasp extends CardImpl { public WintersGrasp(UUID ownerId) { super(ownerId, 159, "Winter's Grasp", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{G}{G}"); this.expansionSetCode = "TMP"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetLandPermanent()); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/Afflict.java b/Mage.Sets/src/mage/sets/tenthedition/Afflict.java index 36b7b23ae97..04ea764621a 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Afflict.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Afflict.java @@ -46,7 +46,7 @@ public class Afflict extends CardImpl { public Afflict(UUID ownerId) { super(ownerId, 125, "Afflict", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "10E"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(-1, -1, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/AggressiveUrge.java b/Mage.Sets/src/mage/sets/tenthedition/AggressiveUrge.java index 02ecca35b9e..e62d211e629 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/AggressiveUrge.java +++ b/Mage.Sets/src/mage/sets/tenthedition/AggressiveUrge.java @@ -46,7 +46,7 @@ public class AggressiveUrge extends CardImpl { public AggressiveUrge(UUID ownerId) { super(ownerId, 250, "Aggressive Urge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "10E"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/AncestorsChosen.java b/Mage.Sets/src/mage/sets/tenthedition/AncestorsChosen.java index e4f1bfef3e8..0d3682d76fc 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/AncestorsChosen.java +++ b/Mage.Sets/src/mage/sets/tenthedition/AncestorsChosen.java @@ -48,7 +48,7 @@ public class AncestorsChosen extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(FirstStrikeAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/AngelOfMercy.java b/Mage.Sets/src/mage/sets/tenthedition/AngelOfMercy.java index 36f30fa1030..d93f5632875 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/AngelOfMercy.java +++ b/Mage.Sets/src/mage/sets/tenthedition/AngelOfMercy.java @@ -46,7 +46,7 @@ public class AngelOfMercy extends CardImpl { super(ownerId, 2, "Angel of Mercy", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "10E"; this.subtype.add("Angel"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/ArcaneTeachings.java b/Mage.Sets/src/mage/sets/tenthedition/ArcaneTeachings.java index 5a08c36603e..8fab43a28d6 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/ArcaneTeachings.java +++ b/Mage.Sets/src/mage/sets/tenthedition/ArcaneTeachings.java @@ -54,7 +54,7 @@ public class ArcaneTeachings extends CardImpl { super(ownerId, 188, "Arcane Teachings", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "10E"; this.subtype.add("Aura"); - this.color.setRed(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/ArcanisTheOmnipotent.java b/Mage.Sets/src/mage/sets/tenthedition/ArcanisTheOmnipotent.java index 7ddba543a37..d8e03618e55 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/ArcanisTheOmnipotent.java +++ b/Mage.Sets/src/mage/sets/tenthedition/ArcanisTheOmnipotent.java @@ -51,7 +51,7 @@ public class ArcanisTheOmnipotent extends CardImpl { this.expansionSetCode = "10E"; this.supertype.add("Legendary"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Assassinate.java b/Mage.Sets/src/mage/sets/tenthedition/Assassinate.java index a49ab3a6fdf..474ca14107f 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Assassinate.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Assassinate.java @@ -52,7 +52,7 @@ public class Assassinate extends CardImpl { public Assassinate(UUID ownerId) { super(ownerId, 128, "Assassinate", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "10E"; - this.color.setBlack(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/AvenCloudchaser.java b/Mage.Sets/src/mage/sets/tenthedition/AvenCloudchaser.java index 822b8fd775b..2648d21ea27 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/AvenCloudchaser.java +++ b/Mage.Sets/src/mage/sets/tenthedition/AvenCloudchaser.java @@ -57,7 +57,7 @@ public class AvenCloudchaser extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Bird"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/AvenFisher.java b/Mage.Sets/src/mage/sets/tenthedition/AvenFisher.java index 00d673fc804..cd36a007249 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/AvenFisher.java +++ b/Mage.Sets/src/mage/sets/tenthedition/AvenFisher.java @@ -47,7 +47,7 @@ public class AvenFisher extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Bird"); this.subtype.add("Soldier"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Bandage.java b/Mage.Sets/src/mage/sets/tenthedition/Bandage.java index 20a0fd707fb..2bc60d862e2 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Bandage.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Bandage.java @@ -46,7 +46,7 @@ public class Bandage extends CardImpl { public Bandage(UUID ownerId) { super(ownerId, 9, "Bandage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "10E"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/BeaconOfDestruction.java b/Mage.Sets/src/mage/sets/tenthedition/BeaconOfDestruction.java index aa7b9ae7fa9..762d9faa19c 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/BeaconOfDestruction.java +++ b/Mage.Sets/src/mage/sets/tenthedition/BeaconOfDestruction.java @@ -44,7 +44,7 @@ public class BeaconOfDestruction extends CardImpl { public BeaconOfDestruction(UUID ownerId) { super(ownerId, 189, "Beacon of Destruction", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{R}{R}"); this.expansionSetCode = "10E"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(5)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(ShuffleSpellEffect.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/BlanchwoodArmor.java b/Mage.Sets/src/mage/sets/tenthedition/BlanchwoodArmor.java index 007324d37af..9d691738c34 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/BlanchwoodArmor.java +++ b/Mage.Sets/src/mage/sets/tenthedition/BlanchwoodArmor.java @@ -58,7 +58,7 @@ public class BlanchwoodArmor extends CardImpl { super(ownerId, 253, "Blanchwood Armor", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "10E"; this.subtype.add("Aura"); - this.color.setGreen(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/BloodrockCyclops.java b/Mage.Sets/src/mage/sets/tenthedition/BloodrockCyclops.java index 8ddbb9669da..99f176c1ab5 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/BloodrockCyclops.java +++ b/Mage.Sets/src/mage/sets/tenthedition/BloodrockCyclops.java @@ -44,7 +44,7 @@ public class BloodrockCyclops extends CardImpl { super(ownerId, 192, "Bloodrock Cyclops", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.expansionSetCode = "10E"; this.subtype.add("Cyclops"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new AttacksEachTurnStaticAbility()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Boomerang.java b/Mage.Sets/src/mage/sets/tenthedition/Boomerang.java index 26f7881b132..799dd729207 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Boomerang.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Boomerang.java @@ -43,7 +43,7 @@ public class Boomerang extends CardImpl { public Boomerang(UUID ownerId) { super(ownerId, 70, "Boomerang", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}{U}"); this.expansionSetCode = "10E"; - this.color.setBlue(true); + // Return target permanent to its owner's hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Cancel.java b/Mage.Sets/src/mage/sets/tenthedition/Cancel.java index fc5c331f8f3..62cde765b10 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Cancel.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Cancel.java @@ -44,7 +44,7 @@ public class Cancel extends CardImpl { public Cancel(UUID ownerId) { super(ownerId, 71, "Cancel", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{U}"); this.expansionSetCode = "10E"; - this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetSpell()); this.getSpellAbility().addEffect(new CounterTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/ChoMannoRevolutionary.java b/Mage.Sets/src/mage/sets/tenthedition/ChoMannoRevolutionary.java index c92e1e969d4..6d55b2fc7a6 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/ChoMannoRevolutionary.java +++ b/Mage.Sets/src/mage/sets/tenthedition/ChoMannoRevolutionary.java @@ -50,7 +50,7 @@ public class ChoMannoRevolutionary extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Rebel"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageToSourceEffect(Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/tenthedition/CivicWayfinder.java b/Mage.Sets/src/mage/sets/tenthedition/CivicWayfinder.java index e2a2d29f4b2..7383ba7fcf5 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/CivicWayfinder.java +++ b/Mage.Sets/src/mage/sets/tenthedition/CivicWayfinder.java @@ -49,7 +49,7 @@ public class CivicWayfinder extends CardImpl { this.subtype.add("Elf"); this.subtype.add("Warrior"); 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/tenthedition/Clone.java b/Mage.Sets/src/mage/sets/tenthedition/Clone.java index b598651ab9d..2284d16afac 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Clone.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Clone.java @@ -48,7 +48,7 @@ public class Clone extends CardImpl { public Clone(UUID ownerId) { super(ownerId, 73, "Clone", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "10E"; - this.color.setBlue(true); + this.subtype.add("Shapeshifter"); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/tenthedition/CloudSprite.java b/Mage.Sets/src/mage/sets/tenthedition/CloudSprite.java index cb2c0e709ed..dbbe2ff27cc 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/CloudSprite.java +++ b/Mage.Sets/src/mage/sets/tenthedition/CloudSprite.java @@ -45,7 +45,7 @@ public class CloudSprite extends CardImpl { super(ownerId, 75, "Cloud Sprite", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}"); this.expansionSetCode = "10E"; this.subtype.add("Faerie"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Condemn.java b/Mage.Sets/src/mage/sets/tenthedition/Condemn.java index 15741a54323..3b2faf0c018 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Condemn.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Condemn.java @@ -51,7 +51,7 @@ public class Condemn extends CardImpl { public Condemn(UUID ownerId) { super(ownerId, 13, "Condemn", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "10E"; - this.color.setWhite(true); + // Put target attacking creature on the bottom of its owner's library. this.getSpellAbility().addTarget(new TargetAttackingCreature()); this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(false)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/CraftyPathmage.java b/Mage.Sets/src/mage/sets/tenthedition/CraftyPathmage.java index 2f59d7a4f4b..c4e7cd4c865 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/CraftyPathmage.java +++ b/Mage.Sets/src/mage/sets/tenthedition/CraftyPathmage.java @@ -60,7 +60,7 @@ public class CraftyPathmage extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tenthedition/CreepingMold.java b/Mage.Sets/src/mage/sets/tenthedition/CreepingMold.java index 8c8f29fd178..ce0abd6da27 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/CreepingMold.java +++ b/Mage.Sets/src/mage/sets/tenthedition/CreepingMold.java @@ -55,7 +55,7 @@ public class CreepingMold extends CardImpl { public CreepingMold(UUID ownerId) { super(ownerId, 258, "Creeping Mold", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}{G}"); this.expansionSetCode = "10E"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/CruelEdict.java b/Mage.Sets/src/mage/sets/tenthedition/CruelEdict.java index 29ee3f7aa33..068250fb897 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/CruelEdict.java +++ b/Mage.Sets/src/mage/sets/tenthedition/CruelEdict.java @@ -44,7 +44,7 @@ public class CruelEdict extends CardImpl { public CruelEdict(UUID ownerId) { super(ownerId, 133, "Cruel Edict", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "10E"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new SacrificeEffect(new FilterCreaturePermanent(), 1, "Target opponent sacrifices a creature")); this.getSpellAbility().addTarget(new TargetOpponent()); // Target opponent sacrifices a creature. diff --git a/Mage.Sets/src/mage/sets/tenthedition/Deathmark.java b/Mage.Sets/src/mage/sets/tenthedition/Deathmark.java index fe630640326..ece1fcd73bc 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Deathmark.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Deathmark.java @@ -56,7 +56,7 @@ public class Deathmark extends CardImpl { public Deathmark(UUID ownerId) { super(ownerId, 134, "Deathmark", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "10E"; - this.color.setBlack(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/Demolish.java b/Mage.Sets/src/mage/sets/tenthedition/Demolish.java index 2c8e99bc79e..0993c60d5a2 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Demolish.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Demolish.java @@ -55,7 +55,7 @@ public class Demolish extends CardImpl { public Demolish(UUID ownerId) { super(ownerId, 196, "Demolish", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "10E"; - this.color.setRed(true); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/Demystify.java b/Mage.Sets/src/mage/sets/tenthedition/Demystify.java index 5381bcd54bf..ddd901cfd4d 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Demystify.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Demystify.java @@ -52,7 +52,7 @@ public class Demystify extends CardImpl { public Demystify (UUID ownerId) { super(ownerId, 14, "Demystify", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "10E"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/DiabolicTutor.java b/Mage.Sets/src/mage/sets/tenthedition/DiabolicTutor.java index 4c1a720194a..77782bd6896 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/DiabolicTutor.java +++ b/Mage.Sets/src/mage/sets/tenthedition/DiabolicTutor.java @@ -44,7 +44,7 @@ public class DiabolicTutor extends CardImpl { public DiabolicTutor(UUID ownerId){ super(ownerId, 135, "Diabolic Tutor", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY},"{2}{B}{B}"); this.expansionSetCode = "10E"; - this.color.setBlack(true); + TargetCardInLibrary target = new TargetCardInLibrary(); this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(target)); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/Discombobulate.java b/Mage.Sets/src/mage/sets/tenthedition/Discombobulate.java index 60a2b69f729..b7db4301850 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Discombobulate.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Discombobulate.java @@ -45,7 +45,7 @@ public class Discombobulate extends CardImpl { public Discombobulate(UUID ownerId) { super(ownerId, 81, "Discombobulate", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); this.expansionSetCode = "10E"; - this.color.setBlue(true); + // Counter target spell. Look at the top four cards of your library, then put them back in any order. this.getSpellAbility().addTarget(new TargetSpell()); this.getSpellAbility().addEffect(new CounterTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/DoomedNecromancer.java b/Mage.Sets/src/mage/sets/tenthedition/DoomedNecromancer.java index 46c9ff97cfd..3908ef081fe 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/DoomedNecromancer.java +++ b/Mage.Sets/src/mage/sets/tenthedition/DoomedNecromancer.java @@ -56,7 +56,7 @@ public class DoomedNecromancer extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tenthedition/DragonRoost.java b/Mage.Sets/src/mage/sets/tenthedition/DragonRoost.java index 4ee5551d43c..1fbc6d5c431 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/DragonRoost.java +++ b/Mage.Sets/src/mage/sets/tenthedition/DragonRoost.java @@ -50,7 +50,7 @@ public class DragonRoost extends CardImpl { public DragonRoost(UUID ownerId) { super(ownerId, 197, "Dragon Roost", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}{R}"); this.expansionSetCode = "10E"; - this.color.setRed(true); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DragonToken2(), 1), new ManaCostsImpl("{5}{R}{R}"))); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/EarthElemental.java b/Mage.Sets/src/mage/sets/tenthedition/EarthElemental.java index 36efa103b72..ab8131c4fbc 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/EarthElemental.java +++ b/Mage.Sets/src/mage/sets/tenthedition/EarthElemental.java @@ -44,7 +44,7 @@ public class EarthElemental extends CardImpl { super(ownerId, 199, "Earth Elemental", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); this.expansionSetCode = "10E"; this.subtype.add("Elemental"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/ElvishChampion.java b/Mage.Sets/src/mage/sets/tenthedition/ElvishChampion.java index 45347f922ba..69d75d5e6ad 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/ElvishChampion.java +++ b/Mage.Sets/src/mage/sets/tenthedition/ElvishChampion.java @@ -56,7 +56,7 @@ public class ElvishChampion extends CardImpl { super(ownerId, 261, "Elvish Champion", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}{G}"); this.expansionSetCode = "10E"; this.subtype.add("Elf"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tenthedition/FemerefArchers.java b/Mage.Sets/src/mage/sets/tenthedition/FemerefArchers.java index 2c5143edf3a..faf1c6ec69f 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/FemerefArchers.java +++ b/Mage.Sets/src/mage/sets/tenthedition/FemerefArchers.java @@ -60,7 +60,7 @@ public class FemerefArchers extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Human"); this.subtype.add("Archer"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/FistsOfTheAnvil.java b/Mage.Sets/src/mage/sets/tenthedition/FistsOfTheAnvil.java index 68955c64e27..1e0b3498a34 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/FistsOfTheAnvil.java +++ b/Mage.Sets/src/mage/sets/tenthedition/FistsOfTheAnvil.java @@ -45,7 +45,7 @@ public class FistsOfTheAnvil extends CardImpl { public FistsOfTheAnvil(UUID ownerId) { super(ownerId, 201, "Fists of the Anvil", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "10E"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(4, 0, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/FlamewaveInvoker.java b/Mage.Sets/src/mage/sets/tenthedition/FlamewaveInvoker.java index a8872fa27aa..388c1592426 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/FlamewaveInvoker.java +++ b/Mage.Sets/src/mage/sets/tenthedition/FlamewaveInvoker.java @@ -51,7 +51,7 @@ public class FlamewaveInvoker extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Goblin"); this.subtype.add("Mutant"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new ManaCostsImpl("{7}{R}")); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Flashfreeze.java b/Mage.Sets/src/mage/sets/tenthedition/Flashfreeze.java index 0a53f2927de..0a654b8d0cf 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Flashfreeze.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Flashfreeze.java @@ -56,7 +56,7 @@ public class Flashfreeze extends CardImpl { public Flashfreeze(UUID ownerId) { super(ownerId, 84, "Flashfreeze", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "10E"; - this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetSpell(filter)); this.getSpellAbility().addEffect(new CounterTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/FurnaceWhelp.java b/Mage.Sets/src/mage/sets/tenthedition/FurnaceWhelp.java index afe6b4bb46e..8357a7b5823 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/FurnaceWhelp.java +++ b/Mage.Sets/src/mage/sets/tenthedition/FurnaceWhelp.java @@ -47,7 +47,7 @@ public class FurnaceWhelp extends CardImpl { super(ownerId, 205, "Furnace Whelp", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); this.expansionSetCode = "10E"; this.subtype.add("Dragon"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/GhostWarden.java b/Mage.Sets/src/mage/sets/tenthedition/GhostWarden.java index ac06c89d6f2..0bec6c014f7 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/GhostWarden.java +++ b/Mage.Sets/src/mage/sets/tenthedition/GhostWarden.java @@ -51,7 +51,7 @@ public class GhostWarden extends CardImpl { super(ownerId, 16, "Ghost Warden", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "10E"; this.subtype.add("Spirit"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/GiantGrowth.java b/Mage.Sets/src/mage/sets/tenthedition/GiantGrowth.java index 2babd6d7f7d..116d44ff873 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/GiantGrowth.java +++ b/Mage.Sets/src/mage/sets/tenthedition/GiantGrowth.java @@ -45,7 +45,7 @@ public class GiantGrowth extends CardImpl { public GiantGrowth(UUID ownerId) { super(ownerId, 266, "Giant Growth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "10E"; - this.color.setGreen(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/GiantSpider.java b/Mage.Sets/src/mage/sets/tenthedition/GiantSpider.java index c535fab929b..a68f9c774e1 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/GiantSpider.java +++ b/Mage.Sets/src/mage/sets/tenthedition/GiantSpider.java @@ -45,7 +45,7 @@ public class GiantSpider extends CardImpl { super(ownerId, 267, "Giant Spider", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "10E"; 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/tenthedition/GloriousAnthem.java b/Mage.Sets/src/mage/sets/tenthedition/GloriousAnthem.java index 3bd77a13cd5..3cbe7486ec9 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/GloriousAnthem.java +++ b/Mage.Sets/src/mage/sets/tenthedition/GloriousAnthem.java @@ -47,7 +47,7 @@ public class GloriousAnthem extends CardImpl { public GloriousAnthem(UUID ownerId) { super(ownerId, 17, "Glorious Anthem", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}{W}"); this.expansionSetCode = "10E"; - this.color.setWhite(true); + // Creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); diff --git a/Mage.Sets/src/mage/sets/tenthedition/GoblinEliteInfantry.java b/Mage.Sets/src/mage/sets/tenthedition/GoblinEliteInfantry.java index ad208064de0..ffc36ff2fd8 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/GoblinEliteInfantry.java +++ b/Mage.Sets/src/mage/sets/tenthedition/GoblinEliteInfantry.java @@ -48,7 +48,7 @@ public class GoblinEliteInfantry extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Goblin"); this.subtype.add("Warrior"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new BlocksOrBecomesBlockedTriggeredAbility(new BoostSourceEffect(-1, -1, Duration.EndOfTurn), false)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/GoblinPiker.java b/Mage.Sets/src/mage/sets/tenthedition/GoblinPiker.java index c7085e7f6e4..a1a79ae0744 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/GoblinPiker.java +++ b/Mage.Sets/src/mage/sets/tenthedition/GoblinPiker.java @@ -45,7 +45,7 @@ public class GoblinPiker extends CardImpl { this.expansionSetCode = "10E"; 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/tenthedition/Gravedigger.java b/Mage.Sets/src/mage/sets/tenthedition/Gravedigger.java index 61df63a67d8..a79ee71029d 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Gravedigger.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Gravedigger.java @@ -49,7 +49,7 @@ public class Gravedigger extends CardImpl { super(ownerId, 146, "Gravedigger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "10E"; this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/tenthedition/HateWeaver.java b/Mage.Sets/src/mage/sets/tenthedition/HateWeaver.java index 34fc48fc43a..4ecb18c4b7e 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/HateWeaver.java +++ b/Mage.Sets/src/mage/sets/tenthedition/HateWeaver.java @@ -64,7 +64,7 @@ public class HateWeaver extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Zombie"); this.subtype.add("Wizard"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/HiddenHorror.java b/Mage.Sets/src/mage/sets/tenthedition/HiddenHorror.java index 9cee7555abd..a4f2c9d16c6 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/HiddenHorror.java +++ b/Mage.Sets/src/mage/sets/tenthedition/HiddenHorror.java @@ -48,7 +48,7 @@ public class HiddenHorror extends CardImpl { super(ownerId, 149, "Hidden Horror", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); this.expansionSetCode = "10E"; this.subtype.add("Horror"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new DiscardTargetCost(new TargetCardInHand(new FilterCreatureCard("a creature card")))))); diff --git a/Mage.Sets/src/mage/sets/tenthedition/HighwayRobber.java b/Mage.Sets/src/mage/sets/tenthedition/HighwayRobber.java index 2f6bc06fd88..6937d8e1ef0 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/HighwayRobber.java +++ b/Mage.Sets/src/mage/sets/tenthedition/HighwayRobber.java @@ -50,7 +50,7 @@ public class HighwayRobber extends CardImpl { this.subtype.add("Human"); this.subtype.add("Rogue"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new GainLifeEffect(2)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/HolyStrength.java b/Mage.Sets/src/mage/sets/tenthedition/HolyStrength.java index a91a7778c8d..1a1b309f896 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/HolyStrength.java +++ b/Mage.Sets/src/mage/sets/tenthedition/HolyStrength.java @@ -52,7 +52,7 @@ public class HolyStrength extends CardImpl { public HolyStrength(UUID ownerId) { super(ownerId, 22, "Holy Strength", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}"); this.expansionSetCode = "10E"; - this.color.setWhite(true); + this.subtype.add("Aura"); TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/tenthedition/HorseshoeCrab.java b/Mage.Sets/src/mage/sets/tenthedition/HorseshoeCrab.java index 13752152ad4..58e00030425 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/HorseshoeCrab.java +++ b/Mage.Sets/src/mage/sets/tenthedition/HorseshoeCrab.java @@ -49,7 +49,7 @@ public class HorseshoeCrab extends CardImpl { super(ownerId, 87, "Horseshoe Crab", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "10E"; this.subtype.add("Crab"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ColoredManaCost(ColoredManaSymbol.U))); diff --git a/Mage.Sets/src/mage/sets/tenthedition/IcatianPriest.java b/Mage.Sets/src/mage/sets/tenthedition/IcatianPriest.java index 3a6c02b1555..3956ecd9471 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/IcatianPriest.java +++ b/Mage.Sets/src/mage/sets/tenthedition/IcatianPriest.java @@ -52,7 +52,7 @@ public class IcatianPriest extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}{W}{W}")); diff --git a/Mage.Sets/src/mage/sets/tenthedition/JoinerAdept.java b/Mage.Sets/src/mage/sets/tenthedition/JoinerAdept.java index 7612b453ce8..83ecce44a5e 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/JoinerAdept.java +++ b/Mage.Sets/src/mage/sets/tenthedition/JoinerAdept.java @@ -51,7 +51,7 @@ public class JoinerAdept extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new AnyColorManaAbility(), Duration.WhileOnBattlefield, new FilterLandPermanent(), false))); diff --git a/Mage.Sets/src/mage/sets/tenthedition/KamahlPitFighter.java b/Mage.Sets/src/mage/sets/tenthedition/KamahlPitFighter.java index 012da212659..80f794b5f47 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/KamahlPitFighter.java +++ b/Mage.Sets/src/mage/sets/tenthedition/KamahlPitFighter.java @@ -53,7 +53,7 @@ public class KamahlPitFighter extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Barbarian"); - this.color.setRed(true); + this.power = new MageInt(6); this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/KavuClimber.java b/Mage.Sets/src/mage/sets/tenthedition/KavuClimber.java index 8d7d31d19da..1cc4d43ad33 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/KavuClimber.java +++ b/Mage.Sets/src/mage/sets/tenthedition/KavuClimber.java @@ -45,7 +45,7 @@ public class KavuClimber extends CardImpl { super(ownerId, 273, "Kavu Climber", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "10E"; this.subtype.add("Kavu"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/LavaAxe.java b/Mage.Sets/src/mage/sets/tenthedition/LavaAxe.java index e9c12612ec0..cde1f6d7250 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/LavaAxe.java +++ b/Mage.Sets/src/mage/sets/tenthedition/LavaAxe.java @@ -44,7 +44,7 @@ public class LavaAxe extends CardImpl { public LavaAxe(UUID ownerId) { super(ownerId, 215, "Lava Axe", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{R}"); this.expansionSetCode = "10E"; - this.color.setRed(true); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DamageTargetEffect(5)); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/LightningElemental.java b/Mage.Sets/src/mage/sets/tenthedition/LightningElemental.java index cd75822ffa0..0f0afffc20f 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/LightningElemental.java +++ b/Mage.Sets/src/mage/sets/tenthedition/LightningElemental.java @@ -45,7 +45,7 @@ public class LightningElemental extends CardImpl { super(ownerId, 217, "Lightning Elemental", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "10E"; this.subtype.add("Elemental"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/LlanowarElves.java b/Mage.Sets/src/mage/sets/tenthedition/LlanowarElves.java index f851d1b6778..7bc4d5fa442 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/LlanowarElves.java +++ b/Mage.Sets/src/mage/sets/tenthedition/LlanowarElves.java @@ -46,7 +46,7 @@ public class LlanowarElves extends CardImpl { this.expansionSetCode = "10E"; 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/tenthedition/Megrim.java b/Mage.Sets/src/mage/sets/tenthedition/Megrim.java index 58221f91f18..171234edc7c 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Megrim.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Megrim.java @@ -49,7 +49,7 @@ public class Megrim extends CardImpl { public Megrim (UUID ownerId) { super(ownerId, 157, "Megrim", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "10E"; - this.color.setBlack(true); + this.addAbility(new MergimTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/MightWeaver.java b/Mage.Sets/src/mage/sets/tenthedition/MightWeaver.java index 0f0e4636dbf..3b7ef33cfaf 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/MightWeaver.java +++ b/Mage.Sets/src/mage/sets/tenthedition/MightWeaver.java @@ -65,7 +65,7 @@ public class MightWeaver extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/MindRot.java b/Mage.Sets/src/mage/sets/tenthedition/MindRot.java index a2044018687..18d9e3cdd4c 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/MindRot.java +++ b/Mage.Sets/src/mage/sets/tenthedition/MindRot.java @@ -44,7 +44,7 @@ public class MindRot extends CardImpl { public MindRot(UUID ownerId){ super(ownerId, 159, "Mind Rot", Rarity.COMMON, new CardType[]{CardType.SORCERY},"{2}{B}"); this.expansionSetCode = "10E"; - this.color.setBlack(true); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DiscardTargetEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/Mobilization.java b/Mage.Sets/src/mage/sets/tenthedition/Mobilization.java index 930bcb19df1..20c9af59f66 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Mobilization.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Mobilization.java @@ -59,7 +59,7 @@ public class Mobilization extends CardImpl { public Mobilization(UUID ownerId) { super(ownerId, 29, "Mobilization", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "10E"; - this.color.setWhite(true); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierToken(), 1), new ManaCostsImpl("{2}{W}"))); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/MolimoMaroSorcerer.java b/Mage.Sets/src/mage/sets/tenthedition/MolimoMaroSorcerer.java index d7f48b3c8bc..365d25b30f0 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/MolimoMaroSorcerer.java +++ b/Mage.Sets/src/mage/sets/tenthedition/MolimoMaroSorcerer.java @@ -54,7 +54,7 @@ public class MolimoMaroSorcerer extends CardImpl { this.expansionSetCode = "10E"; this.supertype.add("Legendary"); 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/tenthedition/Mortivore.java b/Mage.Sets/src/mage/sets/tenthedition/Mortivore.java index 0355f2a42e0..a7f3ae3cc50 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Mortivore.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Mortivore.java @@ -54,7 +54,7 @@ public class Mortivore extends CardImpl { super(ownerId, 161, "Mortivore", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); this.expansionSetCode = "10E"; this.subtype.add("Lhurgoyf"); - this.color.setBlack(true); + this.power = new MageInt(0); this.toughness = new MageInt(0); this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInAllGraveyardsCount(new FilterCreatureCard("creature cards")), Duration.EndOfGame))); diff --git a/Mage.Sets/src/mage/sets/tenthedition/NantukoHusk.java b/Mage.Sets/src/mage/sets/tenthedition/NantukoHusk.java index 0fc49996f7f..473cd6334dd 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/NantukoHusk.java +++ b/Mage.Sets/src/mage/sets/tenthedition/NantukoHusk.java @@ -51,7 +51,7 @@ public class NantukoHusk extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Zombie"); this.subtype.add("Insect"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Naturalize.java b/Mage.Sets/src/mage/sets/tenthedition/Naturalize.java index 6ae7f5a9900..3476eec9d73 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Naturalize.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Naturalize.java @@ -55,7 +55,7 @@ public class Naturalize extends CardImpl { public Naturalize(UUID ownerId){ super(ownerId, 282, "Naturalize", Rarity.COMMON, new CardType[]{CardType.INSTANT},"{1}{G}"); this.expansionSetCode = "10E"; - this.color.setGreen(true); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/Nightmare.java b/Mage.Sets/src/mage/sets/tenthedition/Nightmare.java index fc57ea7ec7e..42e0b57e4f9 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Nightmare.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Nightmare.java @@ -58,7 +58,7 @@ public class Nightmare extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Nightmare"); this.subtype.add("Horse"); - this.color.setBlack(true); + this.power = new MageInt(0); this.toughness = new MageInt(0); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Pacifism.java b/Mage.Sets/src/mage/sets/tenthedition/Pacifism.java index 8b3f85a012b..9f7675d16ca 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Pacifism.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Pacifism.java @@ -52,7 +52,7 @@ public class Pacifism extends CardImpl { public Pacifism(UUID ownerId) { super(ownerId, 31, "Pacifism", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "10E"; - this.color.setWhite(true); + this.subtype.add("Aura"); TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/tenthedition/PhyrexianRager.java b/Mage.Sets/src/mage/sets/tenthedition/PhyrexianRager.java index 126c4f8fb9a..8d88548df80 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/PhyrexianRager.java +++ b/Mage.Sets/src/mage/sets/tenthedition/PhyrexianRager.java @@ -48,7 +48,7 @@ public class PhyrexianRager extends CardImpl { super(ownerId, 167, "Phyrexian Rager", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "10E"; this.subtype.add("Horror"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false); diff --git a/Mage.Sets/src/mage/sets/tenthedition/PrimalRage.java b/Mage.Sets/src/mage/sets/tenthedition/PrimalRage.java index a1fc5ce4623..76780a7a00a 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/PrimalRage.java +++ b/Mage.Sets/src/mage/sets/tenthedition/PrimalRage.java @@ -48,7 +48,7 @@ public class PrimalRage extends CardImpl { public PrimalRage(UUID ownerId) { super(ownerId, 286, "Primal Rage", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "10E"; - this.color.setGreen(true); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/ProdigalPyromancer.java b/Mage.Sets/src/mage/sets/tenthedition/ProdigalPyromancer.java index 0e6c0c3db21..e3bd29d65c1 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/ProdigalPyromancer.java +++ b/Mage.Sets/src/mage/sets/tenthedition/ProdigalPyromancer.java @@ -51,7 +51,7 @@ public class ProdigalPyromancer extends CardImpl { this.expansionSetCode = "10E"; 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/tenthedition/Pyroclasm.java b/Mage.Sets/src/mage/sets/tenthedition/Pyroclasm.java index a59a35e2189..0197b3caf31 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Pyroclasm.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Pyroclasm.java @@ -44,7 +44,7 @@ public class Pyroclasm extends CardImpl { public Pyroclasm(UUID ownerId) { super(ownerId, 222, "Pyroclasm", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "10E"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DamageAllEffect(2, new FilterCreaturePermanent())); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/QuirionDryad.java b/Mage.Sets/src/mage/sets/tenthedition/QuirionDryad.java index dca7ac4fbe3..b9a635e5b62 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/QuirionDryad.java +++ b/Mage.Sets/src/mage/sets/tenthedition/QuirionDryad.java @@ -60,7 +60,7 @@ public class QuirionDryad extends CardImpl { super(ownerId, 287, "Quirion Dryad", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "10E"; this.subtype.add("Dryad"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), filter, false)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/RageWeaver.java b/Mage.Sets/src/mage/sets/tenthedition/RageWeaver.java index bcaaa56a91f..a7d247274ac 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/RageWeaver.java +++ b/Mage.Sets/src/mage/sets/tenthedition/RageWeaver.java @@ -65,7 +65,7 @@ public class RageWeaver extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/RavenousRats.java b/Mage.Sets/src/mage/sets/tenthedition/RavenousRats.java index 2d66ca0caa9..3450322beda 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/RavenousRats.java +++ b/Mage.Sets/src/mage/sets/tenthedition/RavenousRats.java @@ -49,7 +49,7 @@ public class RavenousRats extends CardImpl { super(ownerId, 171, "Ravenous Rats", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.expansionSetCode = "10E"; this.subtype.add("Rat"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(1)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/RelentlessRats.java b/Mage.Sets/src/mage/sets/tenthedition/RelentlessRats.java index 7b90ec9b653..5272130bcbf 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/RelentlessRats.java +++ b/Mage.Sets/src/mage/sets/tenthedition/RelentlessRats.java @@ -63,7 +63,7 @@ public class RelentlessRats extends CardImpl { super(ownerId, 173, "Relentless Rats", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); this.expansionSetCode = "10E"; 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/tenthedition/RevivingDose.java b/Mage.Sets/src/mage/sets/tenthedition/RevivingDose.java index 161f671f857..9dd7ba925f8 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/RevivingDose.java +++ b/Mage.Sets/src/mage/sets/tenthedition/RevivingDose.java @@ -43,7 +43,7 @@ public class RevivingDose extends CardImpl { public RevivingDose(UUID ownerId) { super(ownerId, 34, "Reviving Dose", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "10E"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new GainLifeEffect(3)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/ReyaDawnbringer.java b/Mage.Sets/src/mage/sets/tenthedition/ReyaDawnbringer.java index 3fa0aab87d1..79e42120e7b 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/ReyaDawnbringer.java +++ b/Mage.Sets/src/mage/sets/tenthedition/ReyaDawnbringer.java @@ -52,7 +52,7 @@ public class ReyaDawnbringer extends CardImpl { this.expansionSetCode = "10E"; this.supertype.add("Legendary"); this.subtype.add("Angel"); - this.color.setWhite(true); + this.power = new MageInt(4); this.toughness = new MageInt(6); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Rhox.java b/Mage.Sets/src/mage/sets/tenthedition/Rhox.java index 450663e4762..cf0dd56a332 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Rhox.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Rhox.java @@ -49,7 +49,7 @@ public class Rhox extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Rhino"); 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/tenthedition/RobeOfMirrors.java b/Mage.Sets/src/mage/sets/tenthedition/RobeOfMirrors.java index 25241ff48fa..3be0a71fcc8 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/RobeOfMirrors.java +++ b/Mage.Sets/src/mage/sets/tenthedition/RobeOfMirrors.java @@ -50,7 +50,7 @@ public class RobeOfMirrors extends CardImpl { super(ownerId, 101, "Robe of Mirrors", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{U}"); this.expansionSetCode = "10E"; this.subtype.add("Aura"); - this.color.setBlue(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/tenthedition/RoyalAssassin.java b/Mage.Sets/src/mage/sets/tenthedition/RoyalAssassin.java index cd70716fb28..84f48dd5774 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/RoyalAssassin.java +++ b/Mage.Sets/src/mage/sets/tenthedition/RoyalAssassin.java @@ -57,7 +57,7 @@ public class RoyalAssassin extends CardImpl { public RoyalAssassin(UUID ownerId){ super(ownerId, 174, "Royal Assassin", Rarity.RARE, new CardType[]{CardType.CREATURE},"{1}{B}{B}"); this.expansionSetCode = "10E"; - this.color.setBlack(true); + this.subtype.add("Human"); this.subtype.add("Assassin"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SamiteHealer.java b/Mage.Sets/src/mage/sets/tenthedition/SamiteHealer.java index 9cf5adbe16f..29e213c3a02 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SamiteHealer.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SamiteHealer.java @@ -52,7 +52,7 @@ public class SamiteHealer extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/ScionOfTheWild.java b/Mage.Sets/src/mage/sets/tenthedition/ScionOfTheWild.java index 3b629f8717c..fc0dca2d924 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/ScionOfTheWild.java +++ b/Mage.Sets/src/mage/sets/tenthedition/ScionOfTheWild.java @@ -51,7 +51,7 @@ public class ScionOfTheWild extends CardImpl { super(ownerId, 295, "Scion of the Wild", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}{G}"); this.expansionSetCode = "10E"; this.subtype.add("Avatar"); - this.color.setGreen(true); + this.power = new MageInt(0); this.toughness = new MageInt(0); this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SerraAngel.java b/Mage.Sets/src/mage/sets/tenthedition/SerraAngel.java index 316476e0abe..3f7e5dad7e4 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SerraAngel.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SerraAngel.java @@ -46,7 +46,7 @@ public class SerraAngel extends CardImpl { super(ownerId, 39, "Serra Angel", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); this.expansionSetCode = "10E"; 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/tenthedition/SerrasEmbrace.java b/Mage.Sets/src/mage/sets/tenthedition/SerrasEmbrace.java index 739cbcedc2e..e4e3c20d733 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SerrasEmbrace.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SerrasEmbrace.java @@ -52,7 +52,7 @@ public class SerrasEmbrace extends CardImpl { super(ownerId, 40, "Serra's Embrace", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "10E"; this.subtype.add("Aura"); - this.color.setWhite(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SeveredLegion.java b/Mage.Sets/src/mage/sets/tenthedition/SeveredLegion.java index 7bf6c23c4ab..caec3c04a55 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SeveredLegion.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SeveredLegion.java @@ -45,7 +45,7 @@ public class SeveredLegion extends CardImpl { super(ownerId, 177, "Severed Legion", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); this.expansionSetCode = "10E"; this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FearAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/ShivanDragon.java b/Mage.Sets/src/mage/sets/tenthedition/ShivanDragon.java index fcb8e085f20..9c7c2d5daef 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/ShivanDragon.java +++ b/Mage.Sets/src/mage/sets/tenthedition/ShivanDragon.java @@ -47,7 +47,7 @@ public class ShivanDragon extends CardImpl { super(ownerId, 230, "Shivan Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{R}{R}"); this.expansionSetCode = "10E"; this.subtype.add("Dragon"); - this.color.setRed(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/ShivanHellkite.java b/Mage.Sets/src/mage/sets/tenthedition/ShivanHellkite.java index ba81a5302e2..53a16a04698 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/ShivanHellkite.java +++ b/Mage.Sets/src/mage/sets/tenthedition/ShivanHellkite.java @@ -51,7 +51,7 @@ public class ShivanHellkite extends CardImpl { super(ownerId, 231, "Shivan Hellkite", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{R}{R}"); this.expansionSetCode = "10E"; this.subtype.add("Dragon"); - this.color.setRed(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Shock.java b/Mage.Sets/src/mage/sets/tenthedition/Shock.java index d4a6c29b6a4..3eb2da8dc82 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Shock.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Shock.java @@ -44,7 +44,7 @@ public class Shock extends CardImpl { public Shock (UUID ownerId) { super(ownerId, 232, "Shock", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "10E"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/SkyWeaver.java b/Mage.Sets/src/mage/sets/tenthedition/SkyWeaver.java index 6b48cb9955b..ce4e9a86262 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SkyWeaver.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SkyWeaver.java @@ -65,7 +65,7 @@ public class SkyWeaver extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Metathran"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SoulFeast.java b/Mage.Sets/src/mage/sets/tenthedition/SoulFeast.java index 16a07d746fc..8394690a954 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SoulFeast.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SoulFeast.java @@ -44,7 +44,7 @@ public class SoulFeast extends CardImpl { public SoulFeast(UUID ownerId) { super(ownerId, 179, "Soul Feast", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "10E"; - this.color.setBlack(true); + this.getSpellAbility().addEffect(new LoseLifeTargetEffect(4)); this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new GainLifeEffect(4)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SpiketailHatchling.java b/Mage.Sets/src/mage/sets/tenthedition/SpiketailHatchling.java index 5692e04b880..ee92d324c74 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SpiketailHatchling.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SpiketailHatchling.java @@ -52,7 +52,7 @@ public class SpiketailHatchling extends CardImpl { super(ownerId, 111, "Spiketail Hatchling", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "10E"; this.subtype.add("Drake"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SpinedWurm.java b/Mage.Sets/src/mage/sets/tenthedition/SpinedWurm.java index d4e5f447f6a..b32bb692d5d 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SpinedWurm.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SpinedWurm.java @@ -44,7 +44,7 @@ public class SpinedWurm extends CardImpl { super(ownerId, 298, "Spined Wurm", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "10E"; this.subtype.add("Wurm"); - this.color.setGreen(true); + this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SpinelessThug.java b/Mage.Sets/src/mage/sets/tenthedition/SpinelessThug.java index 3ab469119a1..7ce9d65aeab 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SpinelessThug.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SpinelessThug.java @@ -45,7 +45,7 @@ public class SpinelessThug extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Zombie"); this.subtype.add("Mercenary"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new CantBlockAbility()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SpiritWeaver.java b/Mage.Sets/src/mage/sets/tenthedition/SpiritWeaver.java index 5820cb93220..052fbafa2c2 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SpiritWeaver.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SpiritWeaver.java @@ -64,7 +64,7 @@ public class SpiritWeaver extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new GenericManaCost(2)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SpittingEarth.java b/Mage.Sets/src/mage/sets/tenthedition/SpittingEarth.java index 82e25f3c6f5..49e4ca8ec98 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SpittingEarth.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SpittingEarth.java @@ -52,7 +52,7 @@ public class SpittingEarth extends CardImpl { public SpittingEarth(UUID ownerId) { super(ownerId, 238, "Spitting Earth", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "10E"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/StarlightInvoker.java b/Mage.Sets/src/mage/sets/tenthedition/StarlightInvoker.java index 9db3b25e44d..a2c4c2af758 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/StarlightInvoker.java +++ b/Mage.Sets/src/mage/sets/tenthedition/StarlightInvoker.java @@ -50,7 +50,7 @@ public class StarlightInvoker extends CardImpl { this.subtype.add("Human"); this.subtype.add("Cleric"); this.subtype.add("Mutant"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(3); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(5), new ManaCostsImpl("{7}{W}"))); diff --git a/Mage.Sets/src/mage/sets/tenthedition/SylvanScrying.java b/Mage.Sets/src/mage/sets/tenthedition/SylvanScrying.java index 00c43781f2e..c4193c4ecd1 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/SylvanScrying.java +++ b/Mage.Sets/src/mage/sets/tenthedition/SylvanScrying.java @@ -46,7 +46,7 @@ public class SylvanScrying extends CardImpl { public SylvanScrying(UUID ownerId) { super(ownerId, 302, "Sylvan Scrying", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "10E"; - this.color.setGreen(true); + // Search your library for a land card, reveal it, and put it into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Threaten.java b/Mage.Sets/src/mage/sets/tenthedition/Threaten.java index bd6f9731351..7c52aaf033f 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Threaten.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Threaten.java @@ -48,7 +48,7 @@ public class Threaten extends CardImpl { public Threaten(UUID ownerId) { super(ownerId, 242, "Threaten", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "10E"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Tidings.java b/Mage.Sets/src/mage/sets/tenthedition/Tidings.java index 93bdd9fc42f..30f8fa8e9c7 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Tidings.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Tidings.java @@ -42,7 +42,7 @@ public class Tidings extends CardImpl { public Tidings(UUID ownerId) { super(ownerId, 116, "Tidings", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{U}{U}"); this.expansionSetCode = "10E"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(4)); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/TreasureHunter.java b/Mage.Sets/src/mage/sets/tenthedition/TreasureHunter.java index f59e1a2963c..d9c667dae83 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/TreasureHunter.java +++ b/Mage.Sets/src/mage/sets/tenthedition/TreasureHunter.java @@ -48,7 +48,7 @@ public class TreasureHunter extends CardImpl { super(ownerId, 52, "Treasure Hunter", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.expansionSetCode = "10E"; this.subtype.add("Human"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true); diff --git a/Mage.Sets/src/mage/sets/tenthedition/UnholyStrength.java b/Mage.Sets/src/mage/sets/tenthedition/UnholyStrength.java index bd4a52c58f0..e208e21130b 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/UnholyStrength.java +++ b/Mage.Sets/src/mage/sets/tenthedition/UnholyStrength.java @@ -51,7 +51,7 @@ public class UnholyStrength extends CardImpl { public UnholyStrength(UUID ownerId) { super(ownerId, 185, "Unholy Strength", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "10E"; - this.color.setBlack(true); + this.subtype.add("Aura"); TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/tenthedition/Unsummon.java b/Mage.Sets/src/mage/sets/tenthedition/Unsummon.java index 86be22f4c71..f1f83522f38 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Unsummon.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Unsummon.java @@ -44,7 +44,7 @@ public class Unsummon extends CardImpl { public Unsummon(UUID ownerId) { super(ownerId, 122, "Unsummon", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "10E"; - this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/VedalkenMastermind.java b/Mage.Sets/src/mage/sets/tenthedition/VedalkenMastermind.java index 78497e68149..fbd43c951f2 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/VedalkenMastermind.java +++ b/Mage.Sets/src/mage/sets/tenthedition/VedalkenMastermind.java @@ -53,7 +53,7 @@ public class VedalkenMastermind extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Vedalken"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); diff --git a/Mage.Sets/src/mage/sets/tenthedition/VenerableMonk.java b/Mage.Sets/src/mage/sets/tenthedition/VenerableMonk.java index 59afb2086fe..5b46688a5c9 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/VenerableMonk.java +++ b/Mage.Sets/src/mage/sets/tenthedition/VenerableMonk.java @@ -47,7 +47,7 @@ public class VenerableMonk extends CardImpl { this.subtype.add("Human"); this.subtype.add("Monk"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(2))); diff --git a/Mage.Sets/src/mage/sets/tenthedition/ViridianShaman.java b/Mage.Sets/src/mage/sets/tenthedition/ViridianShaman.java index b7613f3c6b2..e77a4b3ab1d 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/ViridianShaman.java +++ b/Mage.Sets/src/mage/sets/tenthedition/ViridianShaman.java @@ -56,7 +56,7 @@ public class ViridianShaman extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Elf"); this.subtype.add("Shaman"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); diff --git a/Mage.Sets/src/mage/sets/tenthedition/WallOfFire.java b/Mage.Sets/src/mage/sets/tenthedition/WallOfFire.java index d97b134bfcb..32e92aaf8b7 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/WallOfFire.java +++ b/Mage.Sets/src/mage/sets/tenthedition/WallOfFire.java @@ -47,7 +47,7 @@ public class WallOfFire extends CardImpl { super(ownerId, 247, "Wall of Fire", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); this.expansionSetCode = "10E"; this.subtype.add("Wall"); - this.color.setRed(true); + this.power = new MageInt(0); this.toughness = new MageInt(5); this.addAbility(DefenderAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenthedition/WarriorsHonor.java b/Mage.Sets/src/mage/sets/tenthedition/WarriorsHonor.java index 8a876abda15..76db9a07e65 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/WarriorsHonor.java +++ b/Mage.Sets/src/mage/sets/tenthedition/WarriorsHonor.java @@ -45,7 +45,7 @@ public class WarriorsHonor extends CardImpl { public WarriorsHonor(UUID ownerId) { super(ownerId, 58, "Warrior's Honor", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "10E"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn, new FilterCreaturePermanent(), false)); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/WildGriffin.java b/Mage.Sets/src/mage/sets/tenthedition/WildGriffin.java index 60c5e5f8d16..7a950e91f09 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/WildGriffin.java +++ b/Mage.Sets/src/mage/sets/tenthedition/WildGriffin.java @@ -45,7 +45,7 @@ public class WildGriffin extends CardImpl { super(ownerId, 59, "Wild Griffin", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.expansionSetCode = "10E"; 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/tenthedition/YavimayaEnchantress.java b/Mage.Sets/src/mage/sets/tenthedition/YavimayaEnchantress.java index 5b3ecc42684..f10ac0031cc 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/YavimayaEnchantress.java +++ b/Mage.Sets/src/mage/sets/tenthedition/YavimayaEnchantress.java @@ -58,7 +58,7 @@ public class YavimayaEnchantress extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/thedark/Venom.java b/Mage.Sets/src/mage/sets/thedark/Venom.java index eb2c763a830..385cbe0be98 100644 --- a/Mage.Sets/src/mage/sets/thedark/Venom.java +++ b/Mage.Sets/src/mage/sets/thedark/Venom.java @@ -56,7 +56,7 @@ public class Venom extends CardImpl { super(ownerId, 53, "Venom", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}{G}"); this.expansionSetCode = "DRK"; this.subtype.add("Aura"); - this.color.setGreen(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/theros/CavalryPegasus.java b/Mage.Sets/src/mage/sets/theros/CavalryPegasus.java index da21ad742c9..c120f2f0139 100644 --- a/Mage.Sets/src/mage/sets/theros/CavalryPegasus.java +++ b/Mage.Sets/src/mage/sets/theros/CavalryPegasus.java @@ -57,7 +57,7 @@ public class CavalryPegasus extends CardImpl { super(ownerId, 2, "Cavalry Pegasus", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "THS"; this.subtype.add("Pegasus"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timeshifted/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/timeshifted/ProdigalSorcerer.java index 9a04c9b9332..b59409f41c3 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/ProdigalSorcerer.java +++ b/Mage.Sets/src/mage/sets/timeshifted/ProdigalSorcerer.java @@ -49,7 +49,7 @@ public class ProdigalSorcerer extends CardImpl { this.expansionSetCode = "TSB"; this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/timespiral/DemonicCollusion.java b/Mage.Sets/src/mage/sets/timespiral/DemonicCollusion.java index a34c96483d5..c3f0df0d2bf 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DemonicCollusion.java +++ b/Mage.Sets/src/mage/sets/timespiral/DemonicCollusion.java @@ -47,7 +47,7 @@ public class DemonicCollusion extends CardImpl { public DemonicCollusion(UUID ownerId) { super(ownerId, 103, "Demonic Collusion", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "TSP"; - this.color.setBlack(true); + // Buyback—Discard two cards. (You may discard two cards in addition to any other costs as you cast this spell. If you do, put this card into your hand as it resolves.) this.addAbility(new BuybackAbility(new DiscardTargetCost(new TargetCardInHand(2, new FilterCard("two cards"))))); diff --git a/Mage.Sets/src/mage/sets/timespiral/TwoHeadedSliver.java b/Mage.Sets/src/mage/sets/timespiral/TwoHeadedSliver.java index 4f1f6c7e081..28e5deb3320 100644 --- a/Mage.Sets/src/mage/sets/timespiral/TwoHeadedSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/TwoHeadedSliver.java @@ -57,7 +57,7 @@ public class TwoHeadedSliver extends CardImpl { super(ownerId, 183, "Two-Headed Sliver", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.expansionSetCode = "TSP"; 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/timespiral/WalkTheAeons.java b/Mage.Sets/src/mage/sets/timespiral/WalkTheAeons.java index b9fbde54213..cfd5c073c49 100644 --- a/Mage.Sets/src/mage/sets/timespiral/WalkTheAeons.java +++ b/Mage.Sets/src/mage/sets/timespiral/WalkTheAeons.java @@ -58,7 +58,7 @@ public class WalkTheAeons extends CardImpl { public WalkTheAeons(UUID ownerId) { super(ownerId, 93, "Walk the Aeons", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{U}{U}"); this.expansionSetCode = "TSP"; - this.color.setBlue(true); + // Buyback—Sacrifice three Islands. (You may sacrifice three Islands in addition to any other costs as you cast this spell. If you do, put this card into your hand as it resolves.) this.addAbility(new BuybackAbility(new SacrificeTargetCost(new TargetControlledPermanent(3,3, filter, true)))); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java b/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java index c68be2a38f6..cd409b970ad 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java @@ -48,7 +48,7 @@ public class AetherSting extends CardImpl { public AetherSting(UUID ownerId) { super(ownerId, 76, "AEther Sting", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); this.expansionSetCode = "UDS"; - this.color.setRed(true); + // Whenever an opponent casts a creature spell, AEther Sting deals 1 damage to that player. this.addAbility(new AetherStingTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/AncientSilverback.java b/Mage.Sets/src/mage/sets/urzasdestiny/AncientSilverback.java index b3800759c88..9199764e501 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/AncientSilverback.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/AncientSilverback.java @@ -47,7 +47,7 @@ public class AncientSilverback extends CardImpl { super(ownerId, 101, "Ancient Silverback", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); this.expansionSetCode = "UDS"; this.subtype.add("Ape"); - this.color.setGreen(true); + this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java b/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java index b2b3b80e285..5767adb5221 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java @@ -58,7 +58,7 @@ public class Attrition extends CardImpl { public Attrition(UUID ownerId) { super(ownerId, 52, "Attrition", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}"); this.expansionSetCode = "UDS"; - this.color.setBlack(true); + //{B}, Sacrifice a creature: Destroy target nonblack creature. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{B}")); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/BlizzardElemental.java b/Mage.Sets/src/mage/sets/urzasdestiny/BlizzardElemental.java index caeec03731e..2cc2f95bb8a 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/BlizzardElemental.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/BlizzardElemental.java @@ -48,7 +48,7 @@ public class BlizzardElemental extends CardImpl { super(ownerId, 27, "Blizzard Elemental", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{U}{U}"); this.expansionSetCode = "UDS"; this.subtype.add("Elemental"); - this.color.setBlue(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/BloodshotCyclops.java b/Mage.Sets/src/mage/sets/urzasdestiny/BloodshotCyclops.java index 13d9d7330c9..3a9f747a28c 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/BloodshotCyclops.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/BloodshotCyclops.java @@ -56,7 +56,7 @@ public class BloodshotCyclops extends CardImpl { this.expansionSetCode = "UDS"; this.subtype.add("Cyclops"); 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/urzasdestiny/BubblingBeebles.java b/Mage.Sets/src/mage/sets/urzasdestiny/BubblingBeebles.java index 59b768e76a9..da1abd37126 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/BubblingBeebles.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/BubblingBeebles.java @@ -56,7 +56,7 @@ public class BubblingBeebles extends CardImpl { super(ownerId, 29, "Bubbling Beebles", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); this.expansionSetCode = "UDS"; this.subtype.add("Beeble"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/CapashenKnight.java b/Mage.Sets/src/mage/sets/urzasdestiny/CapashenKnight.java index cc976cea38d..d8187e38584 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/CapashenKnight.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/CapashenKnight.java @@ -50,7 +50,7 @@ public class CapashenKnight extends CardImpl { this.expansionSetCode = "UDS"; this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/CapashenTemplar.java b/Mage.Sets/src/mage/sets/urzasdestiny/CapashenTemplar.java index 03741a042f8..710ca8ad760 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/CapashenTemplar.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/CapashenTemplar.java @@ -49,7 +49,7 @@ public class CapashenTemplar extends CardImpl { this.expansionSetCode = "UDS"; 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/urzasdestiny/GoblinMarshal.java b/Mage.Sets/src/mage/sets/urzasdestiny/GoblinMarshal.java index e3d94e1012a..b7b12da069e 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/GoblinMarshal.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/GoblinMarshal.java @@ -49,7 +49,7 @@ public class GoblinMarshal extends CardImpl { this.expansionSetCode = "UDS"; 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/urzasdestiny/HuntingMoa.java b/Mage.Sets/src/mage/sets/urzasdestiny/HuntingMoa.java index b6d780bbb67..348d0e075a8 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/HuntingMoa.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/HuntingMoa.java @@ -50,7 +50,7 @@ public class HuntingMoa extends CardImpl { this.expansionSetCode = "UDS"; this.subtype.add("Bird"); 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/urzasdestiny/RofellosLlanowarEmissary.java b/Mage.Sets/src/mage/sets/urzasdestiny/RofellosLlanowarEmissary.java index 5d48d7b1da6..19d40557c8f 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/RofellosLlanowarEmissary.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/RofellosLlanowarEmissary.java @@ -57,7 +57,7 @@ public class RofellosLlanowarEmissary extends CardImpl { this.supertype.add("Legendary"); 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/urzasdestiny/ThornElemental.java b/Mage.Sets/src/mage/sets/urzasdestiny/ThornElemental.java index fab963b49e6..05df8a87b56 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/ThornElemental.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/ThornElemental.java @@ -44,7 +44,7 @@ public class ThornElemental extends CardImpl { super(ownerId, 123, "Thorn Elemental", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{G}{G}"); this.expansionSetCode = "UDS"; 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/urzaslegacy/AboutFace.java b/Mage.Sets/src/mage/sets/urzaslegacy/AboutFace.java index e0a355fa886..71cce76c1c6 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/AboutFace.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/AboutFace.java @@ -45,7 +45,7 @@ public class AboutFace extends CardImpl { public AboutFace(UUID ownerId) { super(ownerId, 73, "About Face", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "ULG"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/AngelicCurator.java b/Mage.Sets/src/mage/sets/urzaslegacy/AngelicCurator.java index 86a47f272a7..ae150b50683 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/AngelicCurator.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/AngelicCurator.java @@ -47,7 +47,7 @@ public class AngelicCurator extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Angel"); 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/urzaslegacy/Archivist.java b/Mage.Sets/src/mage/sets/urzaslegacy/Archivist.java index acc398c2cbe..2234d37471a 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Archivist.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Archivist.java @@ -49,7 +49,7 @@ public class Archivist extends CardImpl { this.expansionSetCode = "ULG"; 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/urzaslegacy/AvalancheRiders.java b/Mage.Sets/src/mage/sets/urzaslegacy/AvalancheRiders.java index 695c9eb655b..44f27822132 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/AvalancheRiders.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/AvalancheRiders.java @@ -50,7 +50,7 @@ public class AvalancheRiders extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Human"); this.subtype.add("Nomad"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BloatedToad.java b/Mage.Sets/src/mage/sets/urzaslegacy/BloatedToad.java index d58405a1380..d49de5b112f 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BloatedToad.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BloatedToad.java @@ -55,7 +55,7 @@ public class BloatedToad extends CardImpl { super(ownerId, 97, "Bloated Toad", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "ULG"; this.subtype.add("Frog"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java b/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java index 5f3d4b85768..16236d8e3f8 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java @@ -62,7 +62,7 @@ public class BoneShredder extends CardImpl { super(ownerId, 49, "Bone Shredder", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "ULG"; this.subtype.add("Minion"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BouncingBeebles.java b/Mage.Sets/src/mage/sets/urzaslegacy/BouncingBeebles.java index 1ad39bc9655..207802dc484 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BouncingBeebles.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BouncingBeebles.java @@ -51,7 +51,7 @@ public class BouncingBeebles extends CardImpl { super(ownerId, 28, "Bouncing Beebles", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "ULG"; this.subtype.add("Beeble"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java b/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java index a7e938fbef4..db0ef083220 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java @@ -54,7 +54,7 @@ public class Cessation extends CardImpl { super(ownerId, 4, "Cessation", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "ULG"; this.subtype.add("Aura"); - this.color.setWhite(true); + //Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DarkwatchElves.java b/Mage.Sets/src/mage/sets/urzaslegacy/DarkwatchElves.java index e25b339489e..2416acebc40 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/DarkwatchElves.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/DarkwatchElves.java @@ -55,7 +55,7 @@ public class DarkwatchElves extends CardImpl { super(ownerId, 99, "Darkwatch Elves", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "ULG"; this.subtype.add("Elf"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfChaos.java b/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfChaos.java index 3ea8864116b..0195ff47dad 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfChaos.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfChaos.java @@ -55,7 +55,7 @@ public class DefenderOfChaos extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Human"); this.subtype.add("Knight"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfLaw.java b/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfLaw.java index 6b09dd8e74f..29ca51dce65 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfLaw.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfLaw.java @@ -55,7 +55,7 @@ public class DefenderOfLaw extends CardImpl { this.expansionSetCode = "ULG"; 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/urzaslegacy/DelusionsOfMediocrity.java b/Mage.Sets/src/mage/sets/urzaslegacy/DelusionsOfMediocrity.java index a8892ab5c85..1cf3cb31de0 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/DelusionsOfMediocrity.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/DelusionsOfMediocrity.java @@ -44,7 +44,7 @@ public class DelusionsOfMediocrity extends CardImpl { public DelusionsOfMediocrity(UUID ownerId) { super(ownerId, 30, "Delusions of Mediocrity", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); this.expansionSetCode = "ULG"; - this.color.setBlue(true); + //When Delusions of Mediocrity enters the battlefield, you gain 10 life. this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(10), false)); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GhituSlinger.java b/Mage.Sets/src/mage/sets/urzaslegacy/GhituSlinger.java index 828cd13019a..9a3a0f26859 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/GhituSlinger.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/GhituSlinger.java @@ -49,7 +49,7 @@ public class GhituSlinger extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Human"); this.subtype.add("Nomad"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/KarmicGuide.java b/Mage.Sets/src/mage/sets/urzaslegacy/KarmicGuide.java index 7791b06661c..0fc33757c31 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/KarmicGuide.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/KarmicGuide.java @@ -61,7 +61,7 @@ public class KarmicGuide extends CardImpl { this.expansionSetCode = "ULG"; this.subtype.add("Angel"); 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/urzaslegacy/LoneWolf.java b/Mage.Sets/src/mage/sets/urzaslegacy/LoneWolf.java index 72b6015526e..cc7ebb2cf5c 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/LoneWolf.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/LoneWolf.java @@ -44,7 +44,7 @@ public class LoneWolf extends CardImpl { super(ownerId, 105, "Lone Wolf", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "ULG"; 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/urzaslegacy/YavimayaGranger.java b/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaGranger.java index 050c7231978..afcb9c05562 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaGranger.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaGranger.java @@ -50,7 +50,7 @@ public class YavimayaGranger extends CardImpl { super(ownerId, 118, "Yavimaya Granger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "ULG"; this.subtype.add("Elf"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzassaga/AbsoluteGrace.java b/Mage.Sets/src/mage/sets/urzassaga/AbsoluteGrace.java index 9fc9296722a..f5d22a23b68 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/AbsoluteGrace.java +++ b/Mage.Sets/src/mage/sets/urzassaga/AbsoluteGrace.java @@ -58,7 +58,7 @@ public class AbsoluteGrace extends CardImpl { public AbsoluteGrace(UUID ownerId) { super(ownerId, 1, "Absolute Grace", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "USG"; - this.color.setWhite(true); + Ability ability = new ProtectionAbility(filter); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/AbsoluteLaw.java b/Mage.Sets/src/mage/sets/urzassaga/AbsoluteLaw.java index 55be2274a91..fe7724012e6 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/AbsoluteLaw.java +++ b/Mage.Sets/src/mage/sets/urzassaga/AbsoluteLaw.java @@ -58,7 +58,7 @@ public class AbsoluteLaw extends CardImpl { public AbsoluteLaw(UUID ownerId) { super(ownerId, 2, "Absolute Law", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "USG"; - this.color.setWhite(true); + Ability ability = new ProtectionAbility(filter); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java b/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java index 53c27942baf..f1695047ab8 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java +++ b/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java @@ -49,7 +49,7 @@ public class AbyssalHorror extends CardImpl { super(ownerId, 115, "Abyssal Horror", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{B}{B}"); this.expansionSetCode = "USG"; this.subtype.add("Horror"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/AcidicSoil.java b/Mage.Sets/src/mage/sets/urzassaga/AcidicSoil.java index ff345fefac2..1baa9aee39b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/AcidicSoil.java +++ b/Mage.Sets/src/mage/sets/urzassaga/AcidicSoil.java @@ -50,7 +50,7 @@ public class AcidicSoil extends CardImpl { public AcidicSoil(UUID ownerId) { super(ownerId, 172, "Acidic Soil", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "USG"; - this.color.setRed(true); + //Acidic Soil deals damage to each player equal to the number of lands he or she controls. this.getSpellAbility().addEffect(new AcidicSoilEffect()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Acridian.java b/Mage.Sets/src/mage/sets/urzassaga/Acridian.java index 6c6c30fbdcf..3c097210d6b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Acridian.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Acridian.java @@ -45,7 +45,7 @@ public class Acridian extends CardImpl { super(ownerId, 230, "Acridian", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "USG"; this.subtype.add("Insect"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(4); this.addAbility(new EchoAbility("{1}{G}")); diff --git a/Mage.Sets/src/mage/sets/urzassaga/AlbinoTroll.java b/Mage.Sets/src/mage/sets/urzassaga/AlbinoTroll.java index c9249d45082..56e79e05efa 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/AlbinoTroll.java +++ b/Mage.Sets/src/mage/sets/urzassaga/AlbinoTroll.java @@ -49,7 +49,7 @@ public class AlbinoTroll extends CardImpl{ super(ownerId, 231, "Albino Troll", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "USG"; this.subtype.add("Troll"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new EchoAbility("{1}{G}")); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Anaconda.java b/Mage.Sets/src/mage/sets/urzassaga/Anaconda.java index 50aa436e021..bfdb37799de 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Anaconda.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Anaconda.java @@ -45,7 +45,7 @@ public class Anaconda extends CardImpl { super(ownerId, 232, "Anaconda", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "USG"; this.subtype.add("Snake"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new SwampwalkAbility()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/AngelicPage.java b/Mage.Sets/src/mage/sets/urzassaga/AngelicPage.java index 1d9808e5f4f..67389c47a6d 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/AngelicPage.java +++ b/Mage.Sets/src/mage/sets/urzassaga/AngelicPage.java @@ -53,7 +53,7 @@ public class AngelicPage extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Angel"); 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/urzassaga/ArcLightning.java b/Mage.Sets/src/mage/sets/urzassaga/ArcLightning.java index 84357225e2f..9eb01c20212 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ArcLightning.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ArcLightning.java @@ -44,7 +44,7 @@ public class ArcLightning extends CardImpl { public ArcLightning(UUID ownerId) { super(ownerId, 174, "Arc Lightning", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "USG"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DamageMultiEffect(3)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(3)); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/ArgothianElder.java b/Mage.Sets/src/mage/sets/urzassaga/ArgothianElder.java index 3406047844b..854d163d16b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ArgothianElder.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ArgothianElder.java @@ -52,7 +52,7 @@ public class ArgothianElder extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/ArgothianSwine.java b/Mage.Sets/src/mage/sets/urzassaga/ArgothianSwine.java index 6f55669862a..f0493bbb118 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ArgothianSwine.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ArgothianSwine.java @@ -45,7 +45,7 @@ public class ArgothianSwine extends CardImpl { super(ownerId, 235, "Argothian Swine", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "USG"; this.subtype.add("Boar"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Attunement.java b/Mage.Sets/src/mage/sets/urzassaga/Attunement.java index 241374b55dc..6fdbe0c8437 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Attunement.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Attunement.java @@ -46,7 +46,7 @@ public class Attunement extends CardImpl { public Attunement(UUID ownerId) { super(ownerId, 61, "Attunement", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "USG"; - this.color.setBlue(true); + // Return Attunement to its owner's hand: Draw three cards, then discard four cards. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(3), new ReturnToHandSourceCost()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/BarrinMasterWizard.java b/Mage.Sets/src/mage/sets/urzassaga/BarrinMasterWizard.java index 8c0229a5f86..68ab8009fe6 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BarrinMasterWizard.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BarrinMasterWizard.java @@ -52,7 +52,7 @@ public class BarrinMasterWizard extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Bedlam.java b/Mage.Sets/src/mage/sets/urzassaga/Bedlam.java index 28996f273ab..4e973dd462f 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Bedlam.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Bedlam.java @@ -50,7 +50,7 @@ public class Bedlam extends CardImpl { public Bedlam(UUID ownerId) { super(ownerId, 175, "Bedlam", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{R}"); this.expansionSetCode = "USG"; - this.color.setRed(true); + // Creatures can't block. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BedlamEffect())); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Bereavement.java b/Mage.Sets/src/mage/sets/urzassaga/Bereavement.java index d9d3204e7f6..780d76549e3 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Bereavement.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Bereavement.java @@ -49,7 +49,7 @@ public class Bereavement extends CardImpl { public Bereavement(UUID ownerId) { super(ownerId, 117, "Bereavement", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "USG"; - this.color.setBlack(true); + // Whenever a green creature dies, its controller discards a card. this.addAbility(new BereavementTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/BlanchwoodTreefolk.java b/Mage.Sets/src/mage/sets/urzassaga/BlanchwoodTreefolk.java index 6591b701951..dc0ab2fabdc 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BlanchwoodTreefolk.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BlanchwoodTreefolk.java @@ -44,7 +44,7 @@ public class BlanchwoodTreefolk extends CardImpl { super(ownerId, 238, "Blanchwood Treefolk", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "USG"; this.subtype.add("Treefolk"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/BloodVassal.java b/Mage.Sets/src/mage/sets/urzassaga/BloodVassal.java index 25a33c430ba..f6cd45274b8 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BloodVassal.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BloodVassal.java @@ -49,7 +49,7 @@ public class BloodVassal extends CardImpl { super(ownerId, 118, "Blood Vassal", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "USG"; this.subtype.add("Thrull"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Bravado.java b/Mage.Sets/src/mage/sets/urzassaga/Bravado.java index 06b83cedfd2..550e923b377 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Bravado.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Bravado.java @@ -52,7 +52,7 @@ public class Bravado extends CardImpl { super(ownerId, 177, "Bravado", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); this.expansionSetCode = "USG"; this.subtype.add("Aura"); - this.color.setRed(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzassaga/BullHippo.java b/Mage.Sets/src/mage/sets/urzassaga/BullHippo.java index f39d4a7bdcc..8e1756e8af3 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BullHippo.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BullHippo.java @@ -45,7 +45,7 @@ public class BullHippo extends CardImpl { super(ownerId, 239, "Bull Hippo", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "USG"; this.subtype.add("Hippo"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new IslandwalkAbility()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Bulwark.java b/Mage.Sets/src/mage/sets/urzassaga/Bulwark.java index dee1a4edf0e..1a399548001 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Bulwark.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Bulwark.java @@ -50,7 +50,7 @@ public class Bulwark extends CardImpl { public Bulwark(UUID ownerId) { super(ownerId, 178, "Bulwark", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}{R}"); this.expansionSetCode = "USG"; - this.color.setRed(true); + // At the beginning of your upkeep, Bulwark deals X damage to target opponent, where X is // the number of cards in your hand minus the number of cards in that player's hand. diff --git a/Mage.Sets/src/mage/sets/urzassaga/CacklingFiend.java b/Mage.Sets/src/mage/sets/urzassaga/CacklingFiend.java index 54795f5bd50..66f4639b0bc 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CacklingFiend.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CacklingFiend.java @@ -53,7 +53,7 @@ public class CacklingFiend extends CardImpl { super(ownerId, 121, "Cackling Fiend", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); this.expansionSetCode = "USG"; this.subtype.add("Zombie"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Catalog.java b/Mage.Sets/src/mage/sets/urzassaga/Catalog.java index 1e4885246fc..80bac1a9452 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Catalog.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Catalog.java @@ -47,7 +47,7 @@ public class Catalog extends CardImpl { public Catalog(UUID ownerId) { super(ownerId, 64, "Catalog", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "USG"; - this.color.setBlue(true); + // Draw two cards, then discard a card. this.getSpellAbility().addEffect(new DrawDiscardControllerEffect(2,1)); diff --git a/Mage.Sets/src/mage/sets/urzassaga/CaveTiger.java b/Mage.Sets/src/mage/sets/urzassaga/CaveTiger.java index 0bc9e4a7b4d..0d6628203d3 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CaveTiger.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CaveTiger.java @@ -46,7 +46,7 @@ public class CaveTiger extends CardImpl { super(ownerId, 241, "Cave Tiger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "USG"; this.subtype.add("Cat"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzassaga/ChildOfGaea.java b/Mage.Sets/src/mage/sets/urzassaga/ChildOfGaea.java index 184abcfea1e..8af6f1f85b4 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ChildOfGaea.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ChildOfGaea.java @@ -53,7 +53,7 @@ public class ChildOfGaea extends CardImpl { super(ownerId, 242, "Child of Gaea", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{G}{G}{G}"); this.expansionSetCode = "USG"; 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/urzassaga/CitanulCentaurs.java b/Mage.Sets/src/mage/sets/urzassaga/CitanulCentaurs.java index 73aeae10b31..38b9c9bb804 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CitanulCentaurs.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CitanulCentaurs.java @@ -46,7 +46,7 @@ public class CitanulCentaurs extends CardImpl{ super(ownerId, 243, "Citanul Centaurs", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "USG"; this.subtype.add("Centaur"); - this.color.setGreen(true); + this.power = new MageInt(6); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzassaga/CitanulHierophants.java b/Mage.Sets/src/mage/sets/urzassaga/CitanulHierophants.java index 5dde5b02e1a..20335610086 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CitanulHierophants.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CitanulHierophants.java @@ -57,7 +57,7 @@ public class CitanulHierophants extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Human"); this.subtype.add("Druid"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Clear.java b/Mage.Sets/src/mage/sets/urzassaga/Clear.java index f6df98c6f61..c28f6724b80 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Clear.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Clear.java @@ -54,7 +54,7 @@ public class Clear extends CardImpl { public Clear(UUID ownerId) { super(ownerId, 7, "Clear", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "USG"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/CradleGuard.java b/Mage.Sets/src/mage/sets/urzassaga/CradleGuard.java index 974ca49e848..e7c2aafc8c7 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CradleGuard.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CradleGuard.java @@ -46,7 +46,7 @@ public class CradleGuard extends CardImpl{ super(ownerId, 245, "Cradle Guard", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{G}{G}"); this.expansionSetCode = "USG"; this.subtype.add("Treefolk"); - this.color.setGreen(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/urzassaga/CraterHellion.java b/Mage.Sets/src/mage/sets/urzassaga/CraterHellion.java index fc56f38b004..c0478ec2215 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CraterHellion.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CraterHellion.java @@ -54,7 +54,7 @@ public class CraterHellion extends CardImpl{ this.expansionSetCode = "USG"; this.subtype.add("Hellion"); this.subtype.add("Beast"); - this.color.setRed(true); + this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/urzassaga/CrazedSkirge.java b/Mage.Sets/src/mage/sets/urzassaga/CrazedSkirge.java index fd35fbf55cc..d46c017f73b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CrazedSkirge.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CrazedSkirge.java @@ -46,7 +46,7 @@ public class CrazedSkirge extends CardImpl { super(ownerId, 125, "Crazed Skirge", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "USG"; this.subtype.add("Imp"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java b/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java index b8252fb3815..eccda333cc8 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java +++ b/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java @@ -58,7 +58,7 @@ public class DarkHatchling extends CardImpl { super(ownerId, 126, "Dark Hatchling", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{B}{B}"); this.expansionSetCode = "USG"; 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/urzassaga/DiscipleOfLaw.java b/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfLaw.java index 932ab256c21..8edffd89acc 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfLaw.java +++ b/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfLaw.java @@ -57,7 +57,7 @@ public class DiscipleOfLaw extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(new ProtectionAbility(filter)); diff --git a/Mage.Sets/src/mage/sets/urzassaga/DriftingDjinn.java b/Mage.Sets/src/mage/sets/urzassaga/DriftingDjinn.java index 9670b0f6d06..e8d50dd5365 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/DriftingDjinn.java +++ b/Mage.Sets/src/mage/sets/urzassaga/DriftingDjinn.java @@ -51,7 +51,7 @@ public class DriftingDjinn extends CardImpl { super(ownerId, 71, "Drifting Djinn", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); this.expansionSetCode = "USG"; this.subtype.add("Djinn"); - this.color.setBlue(true); + this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java b/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java index 5cb86ee3f74..6c5e2bb84ff 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java +++ b/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java @@ -62,7 +62,7 @@ public class EasternPaladin extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Zombie"); this.subtype.add("Knight"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{B}{B}")); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Expunge.java b/Mage.Sets/src/mage/sets/urzassaga/Expunge.java index 16ed868e80a..52b7b53a83d 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Expunge.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Expunge.java @@ -57,7 +57,7 @@ public class Expunge extends CardImpl { public Expunge(UUID ownerId) { super(ownerId, 135, "Expunge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "USG"; - this.color.setBlack(true); + // Destroy target nonartifact, nonblack creature. It can't be regenerated. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/urzassaga/GaeasEmbrace.java b/Mage.Sets/src/mage/sets/urzassaga/GaeasEmbrace.java index 66b2cd11c2e..62339dbe560 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GaeasEmbrace.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GaeasEmbrace.java @@ -57,7 +57,7 @@ public class GaeasEmbrace extends CardImpl { super(ownerId, 255, "Gaea's Embrace", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); this.expansionSetCode = "USG"; this.subtype.add("Aura"); - this.color.setGreen(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinPatrol.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinPatrol.java index 5692b18d4c2..a8fad3aa6fe 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GoblinPatrol.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinPatrol.java @@ -45,7 +45,7 @@ public class GoblinPatrol extends CardImpl{ super(ownerId, 193, "Goblin Patrol", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{R}"); this.expansionSetCode = "USG"; this.subtype.add("Goblin"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinWarBuggy.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinWarBuggy.java index 1fe048b0059..692e05ac9b4 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GoblinWarBuggy.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinWarBuggy.java @@ -46,7 +46,7 @@ public class GoblinWarBuggy extends CardImpl{ super(ownerId, 196, "Goblin War Buggy", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.expansionSetCode = "USG"; 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/urzassaga/GorillaWarrior.java b/Mage.Sets/src/mage/sets/urzassaga/GorillaWarrior.java index ad3d8a399dd..5c20c56b30c 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GorillaWarrior.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GorillaWarrior.java @@ -44,7 +44,7 @@ public class GorillaWarrior extends CardImpl { super(ownerId, 256, "Gorilla Warrior", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "USG"; this.subtype.add("Ape"); - this.color.setGreen(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Guma.java b/Mage.Sets/src/mage/sets/urzassaga/Guma.java index 04bac340fa4..4d58b681f60 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Guma.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Guma.java @@ -54,7 +54,7 @@ public class Guma extends CardImpl { super(ownerId, 197, "Guma", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.expansionSetCode = "USG"; this.subtype.add("Cat"); - this.color.setRed(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new ProtectionAbility(filter)); diff --git a/Mage.Sets/src/mage/sets/urzassaga/HawkeaterMoth.java b/Mage.Sets/src/mage/sets/urzassaga/HawkeaterMoth.java index c1798ff0421..d2d3cf800ef 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/HawkeaterMoth.java +++ b/Mage.Sets/src/mage/sets/urzassaga/HawkeaterMoth.java @@ -46,7 +46,7 @@ public class HawkeaterMoth extends CardImpl { super(ownerId, 259, "Hawkeater Moth", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "USG"; this.subtype.add("Insect"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/HeraldOfSerra.java b/Mage.Sets/src/mage/sets/urzassaga/HeraldOfSerra.java index 688f0e457c5..63acd1b9b3f 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/HeraldOfSerra.java +++ b/Mage.Sets/src/mage/sets/urzassaga/HeraldOfSerra.java @@ -47,7 +47,7 @@ public class HeraldOfSerra extends CardImpl{ super(ownerId, 17, "Herald of Serra", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); this.expansionSetCode = "USG"; 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/urzassaga/Hush.java b/Mage.Sets/src/mage/sets/urzassaga/Hush.java index 541c0b659f9..23831385842 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Hush.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Hush.java @@ -51,7 +51,7 @@ public class Hush extends CardImpl { public Hush(UUID ownerId) { super(ownerId, 266, "Hush", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "USG"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new HushEffect()); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/LayWaste.java b/Mage.Sets/src/mage/sets/urzassaga/LayWaste.java index 13820c6b00a..7bfee4a3912 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/LayWaste.java +++ b/Mage.Sets/src/mage/sets/urzassaga/LayWaste.java @@ -45,7 +45,7 @@ public class LayWaste extends CardImpl { public LayWaste(UUID ownerId) { super(ownerId, 201, "Lay Waste", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "USG"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/LightningDragon.java b/Mage.Sets/src/mage/sets/urzassaga/LightningDragon.java index b5690c41e2f..b84b52872b6 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/LightningDragon.java +++ b/Mage.Sets/src/mage/sets/urzassaga/LightningDragon.java @@ -52,7 +52,7 @@ public class LightningDragon extends CardImpl{ super(ownerId, 202, "Lightning Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); this.expansionSetCode = "USG"; this.subtype.add("Dragon"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Lull.java b/Mage.Sets/src/mage/sets/urzassaga/Lull.java index 96ac0eea95d..3ec979ab4ab 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Lull.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Lull.java @@ -45,7 +45,7 @@ public class Lull extends CardImpl { public Lull(UUID ownerId) { super(ownerId, 267, "Lull", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "USG"; - 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/urzassaga/Pariah.java b/Mage.Sets/src/mage/sets/urzassaga/Pariah.java index 66abaa40980..a2967c460b0 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Pariah.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Pariah.java @@ -56,7 +56,7 @@ public class Pariah extends CardImpl { super(ownerId, 28, "Pariah", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "USG"; this.subtype.add("Aura"); - this.color.setWhite(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Pestilence.java b/Mage.Sets/src/mage/sets/urzassaga/Pestilence.java index f6b682e0a57..375939ea64a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Pestilence.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Pestilence.java @@ -54,7 +54,7 @@ public class Pestilence extends CardImpl { public Pestilence(UUID ownerId) { super(ownerId, 147, "Pestilence", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "USG"; - this.color.setBlack(true); + // At the beginning of the end step, if no creatures are on the battlefield, sacrifice Pestilence. TriggeredAbility triggered = new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of the end step", true, new SacrificeSourceEffect()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/PouncingJaguar.java b/Mage.Sets/src/mage/sets/urzassaga/PouncingJaguar.java index 0c27726c909..adb94abfe2b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/PouncingJaguar.java +++ b/Mage.Sets/src/mage/sets/urzassaga/PouncingJaguar.java @@ -45,7 +45,7 @@ public class PouncingJaguar extends CardImpl{ super(ownerId, 269, "Pouncing Jaguar", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "USG"; this.subtype.add("Cat"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/urzassaga/PriestOfTitania.java b/Mage.Sets/src/mage/sets/urzassaga/PriestOfTitania.java index d67b7a70bbd..29101a91bf0 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/PriestOfTitania.java +++ b/Mage.Sets/src/mage/sets/urzassaga/PriestOfTitania.java @@ -56,7 +56,7 @@ public class PriestOfTitania extends CardImpl { this.expansionSetCode = "USG"; 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/urzassaga/RainOfSalt.java b/Mage.Sets/src/mage/sets/urzassaga/RainOfSalt.java index c0e6e7bb6bb..1dba1f20f31 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/RainOfSalt.java +++ b/Mage.Sets/src/mage/sets/urzassaga/RainOfSalt.java @@ -48,7 +48,7 @@ public class RainOfSalt extends CardImpl { public RainOfSalt(UUID ownerId) { super(ownerId, 206, "Rain of Salt", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{R}{R}"); this.expansionSetCode = "USG"; - this.color.setRed(true); + // Destroy two target lands. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Rejuvenate.java b/Mage.Sets/src/mage/sets/urzassaga/Rejuvenate.java index 0b768d581b7..5f1323c8fed 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Rejuvenate.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Rejuvenate.java @@ -45,7 +45,7 @@ public class Rejuvenate extends CardImpl { public Rejuvenate (UUID ownerId) { super(ownerId, 271, "Rejuvenate", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "USG"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new GainLifeEffect(6)); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Rescind.java b/Mage.Sets/src/mage/sets/urzassaga/Rescind.java index ef4b4d0cfc0..e7b7e4fe6d6 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Rescind.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Rescind.java @@ -45,7 +45,7 @@ public class Rescind extends CardImpl { public Rescind(UUID ownerId) { super(ownerId, 92, "Rescind", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{U}"); this.expansionSetCode = "USG"; - this.color.setBlue(true); + this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent()); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionBlack.java b/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionBlack.java index f5de900c768..8e87afc2fc6 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionBlack.java +++ b/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionBlack.java @@ -52,7 +52,7 @@ public class RuneOfProtectionBlack extends CardImpl { public RuneOfProtectionBlack(UUID ownerId) { super(ownerId, 36, "Rune of Protection: Black", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "USG"; - this.color.setWhite(true); + // {W}: The next time a black source of your choice would deal damage to you this turn, prevent that damage. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RuneOfProtectionBlackEffect() , new ManaCostsImpl("W"))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionBlue.java b/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionBlue.java index 812a58ca6f6..6fbe2162ab0 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionBlue.java +++ b/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionBlue.java @@ -52,7 +52,7 @@ public class RuneOfProtectionBlue extends CardImpl { public RuneOfProtectionBlue(UUID ownerId) { super(ownerId, 37, "Rune of Protection: Blue", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "USG"; - this.color.setWhite(true); + // {W}: The next time a blue source of your choice would deal damage to you this turn, prevent that damage. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RuneOfProtectionBlueEffect() , new ManaCostsImpl("W"))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionGreen.java b/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionGreen.java index 143791dccef..3e35ce462d1 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionGreen.java +++ b/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionGreen.java @@ -52,7 +52,7 @@ public class RuneOfProtectionGreen extends CardImpl { public RuneOfProtectionGreen(UUID ownerId) { super(ownerId, 38, "Rune of Protection: Green", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "USG"; - this.color.setWhite(true); + // {W}: The next time a green source of your choice would deal damage to you this turn, prevent that damage. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RuneOfProtectionGreenEffect() , new ManaCostsImpl("W"))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionRed.java b/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionRed.java index 806ddf13e25..bdface007d5 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionRed.java +++ b/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionRed.java @@ -52,7 +52,7 @@ public class RuneOfProtectionRed extends CardImpl { public RuneOfProtectionRed(UUID ownerId) { super(ownerId, 40, "Rune of Protection: Red", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "USG"; - this.color.setWhite(true); + // {W}: The next time a red source of your choice would deal damage to you this turn, prevent that damage. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RuneOfProtectionRedEffect() , new ManaCostsImpl("W"))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionWhite.java b/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionWhite.java index 455b1235e92..7fc9c76cb8e 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionWhite.java +++ b/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionWhite.java @@ -52,7 +52,7 @@ public class RuneOfProtectionWhite extends CardImpl { public RuneOfProtectionWhite(UUID ownerId) { super(ownerId, 41, "Rune of Protection: White", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "USG"; - this.color.setWhite(true); + // {W}: The next time a white source of your choice would deal damage to you this turn, prevent that damage. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RuneOfProtectionWhiteEffect() , new ManaCostsImpl("W"))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/SanguineGuard.java b/Mage.Sets/src/mage/sets/urzassaga/SanguineGuard.java index e6b9ea5e8c9..914686f9c91 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SanguineGuard.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SanguineGuard.java @@ -50,7 +50,7 @@ public class SanguineGuard extends CardImpl{ this.expansionSetCode = "USG"; this.subtype.add("Zombie"); this.subtype.add("Knight"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FirstStrikeAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Scrap.java b/Mage.Sets/src/mage/sets/urzassaga/Scrap.java index 67ea827179a..3d98daa3a90 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Scrap.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Scrap.java @@ -54,7 +54,7 @@ public class Scrap extends CardImpl { public Scrap(UUID ownerId) { super(ownerId, 213, "Scrap", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "USG"; - this.color.setRed(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/ShivanRaptor.java b/Mage.Sets/src/mage/sets/urzassaga/ShivanRaptor.java index 83ffdfc1e34..d980763a3fe 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ShivanRaptor.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ShivanRaptor.java @@ -47,7 +47,7 @@ public class ShivanRaptor extends CardImpl{ super(ownerId, 215, "Shivan Raptor", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.expansionSetCode = "USG"; this.subtype.add("Lizard"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/SilentAttendant.java b/Mage.Sets/src/mage/sets/urzassaga/SilentAttendant.java index 80c8422db8d..50fae628bf8 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SilentAttendant.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SilentAttendant.java @@ -49,7 +49,7 @@ public class SilentAttendant extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Human"); this.subtype.add("Cleric"); - this.color.setWhite(true); + this.power = new MageInt(0); this.toughness = new MageInt(2); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost())); diff --git a/Mage.Sets/src/mage/sets/urzassaga/StrokeOfGenius.java b/Mage.Sets/src/mage/sets/urzassaga/StrokeOfGenius.java index 6612b22ee20..6b01e445d15 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/StrokeOfGenius.java +++ b/Mage.Sets/src/mage/sets/urzassaga/StrokeOfGenius.java @@ -45,7 +45,7 @@ public class StrokeOfGenius extends CardImpl { public StrokeOfGenius (UUID ownerId) { super(ownerId, 100, "Stroke of Genius", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{2}{U}"); this.expansionSetCode = "USG"; - this.color.setBlue(true); + // Target player draws X cards. this.getSpellAbility().addEffect(new DrawCardTargetEffect(new ManacostVariableValue())); diff --git a/Mage.Sets/src/mage/sets/urzassaga/TitaniasBoon.java b/Mage.Sets/src/mage/sets/urzassaga/TitaniasBoon.java index 9a532954bf0..f2d84f3e023 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/TitaniasBoon.java +++ b/Mage.Sets/src/mage/sets/urzassaga/TitaniasBoon.java @@ -45,7 +45,7 @@ public class TitaniasBoon extends CardImpl { public TitaniasBoon(UUID ownerId) { super(ownerId, 276, "Titania's Boon", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "USG"; - this.color.setGreen(true); + // Put a +1/+1 counter on each creature you control. this.getSpellAbility().addEffect(new AddCountersAllEffect(CounterType.P1P1.createInstance(), new FilterControlledCreaturePermanent("creature you control"))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/TitaniasChosen.java b/Mage.Sets/src/mage/sets/urzassaga/TitaniasChosen.java index 0d05b435317..ccb6947cae5 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/TitaniasChosen.java +++ b/Mage.Sets/src/mage/sets/urzassaga/TitaniasChosen.java @@ -53,7 +53,7 @@ public class TitaniasChosen extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Elf"); this.subtype.add("Archer"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/urzassaga/TreefolkSeedlings.java b/Mage.Sets/src/mage/sets/urzassaga/TreefolkSeedlings.java index 0b455167bb8..eb87d73b280 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/TreefolkSeedlings.java +++ b/Mage.Sets/src/mage/sets/urzassaga/TreefolkSeedlings.java @@ -56,7 +56,7 @@ public class TreefolkSeedlings extends CardImpl { super(ownerId, 278, "Treefolk Seedlings", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "USG"; this.subtype.add("Treefolk"); - this.color.setGreen(true); + this.power = new MageInt(2); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/urzassaga/UnworthyDead.java b/Mage.Sets/src/mage/sets/urzassaga/UnworthyDead.java index addd189d345..29ccacbc18a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/UnworthyDead.java +++ b/Mage.Sets/src/mage/sets/urzassaga/UnworthyDead.java @@ -48,7 +48,7 @@ public class UnworthyDead extends CardImpl{ super(ownerId, 163, "Unworthy Dead", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.expansionSetCode = "USG"; this.subtype.add("Skeleton"); - this.color.setBlack(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java b/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java index 5691a43253e..6aebd11671e 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java +++ b/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java @@ -58,7 +58,7 @@ public class VampiricEmbrace extends CardImpl { super(ownerId, 164, "Vampiric Embrace", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "USG"; this.subtype.add("Aura"); - this.color.setBlack(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/urzassaga/ViashinoOutrider.java b/Mage.Sets/src/mage/sets/urzassaga/ViashinoOutrider.java index 7ead0a9df26..45f424c86a4 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ViashinoOutrider.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ViashinoOutrider.java @@ -45,7 +45,7 @@ public class ViashinoOutrider extends CardImpl{ super(ownerId, 223, "Viashino Outrider", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.expansionSetCode = "USG"; this.subtype.add("Viashino"); - this.color.setRed(true); + this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/urzassaga/VoiceOfGrace.java b/Mage.Sets/src/mage/sets/urzassaga/VoiceOfGrace.java index feb53f7ff3b..fa51e7b9e59 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/VoiceOfGrace.java +++ b/Mage.Sets/src/mage/sets/urzassaga/VoiceOfGrace.java @@ -56,7 +56,7 @@ public class VoiceOfGrace extends CardImpl { super(ownerId, 54, "Voice Of Grace", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "USG"; this.subtype.add("Angel"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/VoiceOfLaw.java b/Mage.Sets/src/mage/sets/urzassaga/VoiceOfLaw.java index 3ac61db66c0..898152c6247 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/VoiceOfLaw.java +++ b/Mage.Sets/src/mage/sets/urzassaga/VoiceOfLaw.java @@ -55,7 +55,7 @@ public class VoiceOfLaw extends CardImpl { super(ownerId, 55, "Voice Of Law", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "USG"; this.subtype.add("Angel"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/VugLizard.java b/Mage.Sets/src/mage/sets/urzassaga/VugLizard.java index a0d03558ab3..abbd0c90b51 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/VugLizard.java +++ b/Mage.Sets/src/mage/sets/urzassaga/VugLizard.java @@ -46,7 +46,7 @@ public class VugLizard extends CardImpl{ super(ownerId, 227, "Vug Lizard", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); this.expansionSetCode = "USG"; this.subtype.add("Lizard"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/urzassaga/WesternPaladin.java b/Mage.Sets/src/mage/sets/urzassaga/WesternPaladin.java index f53200ef7ce..5e78761d5bb 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/WesternPaladin.java +++ b/Mage.Sets/src/mage/sets/urzassaga/WesternPaladin.java @@ -62,7 +62,7 @@ public class WesternPaladin extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Zombie"); this.subtype.add("Knight"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{B}{B}")); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Wildfire.java b/Mage.Sets/src/mage/sets/urzassaga/Wildfire.java index 96adfc4fda5..2c63d5edd37 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Wildfire.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Wildfire.java @@ -48,7 +48,7 @@ public class Wildfire extends CardImpl { public Wildfire(UUID ownerId) { super(ownerId, 228, "Wildfire", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{R}{R}"); this.expansionSetCode = "USG"; - this.color.setRed(true); + //Each player sacrifices four lands. this.getSpellAbility().addEffect(new SacrificeAllEffect(4, filter)); diff --git a/Mage.Sets/src/mage/sets/urzassaga/WindingWurm.java b/Mage.Sets/src/mage/sets/urzassaga/WindingWurm.java index c7f902f49fb..c0f4907a0bf 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/WindingWurm.java +++ b/Mage.Sets/src/mage/sets/urzassaga/WindingWurm.java @@ -45,7 +45,7 @@ public class WindingWurm extends CardImpl{ super(ownerId, 285, "Winding Wurm", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "USG"; 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/urzassaga/Zephid.java b/Mage.Sets/src/mage/sets/urzassaga/Zephid.java index 03b862eb9ce..70fffba2b4a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Zephid.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Zephid.java @@ -47,7 +47,7 @@ public class Zephid extends CardImpl { super(ownerId, 113, "Zephid", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); this.expansionSetCode = "USG"; this.subtype.add("Illusion"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/ZephidsEmbrace.java b/Mage.Sets/src/mage/sets/urzassaga/ZephidsEmbrace.java index 5720bf7c617..0c90e838c91 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ZephidsEmbrace.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ZephidsEmbrace.java @@ -58,7 +58,7 @@ public class ZephidsEmbrace extends CardImpl { public ZephidsEmbrace(UUID ownerId) { super(ownerId, 114, "Zephid's Embrace", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}"); this.expansionSetCode = "USG"; - this.color.setBlue(true); + this.subtype.add("Aura"); TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/visions/CryptRats.java b/Mage.Sets/src/mage/sets/visions/CryptRats.java index d5d05db6227..b22670d7d01 100644 --- a/Mage.Sets/src/mage/sets/visions/CryptRats.java +++ b/Mage.Sets/src/mage/sets/visions/CryptRats.java @@ -60,7 +60,7 @@ public class CryptRats extends CardImpl { super(ownerId, 5, "Crypt Rats", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "VIS"; 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/visions/ElvenCache.java b/Mage.Sets/src/mage/sets/visions/ElvenCache.java index 2e7dd9b8453..620c1569e12 100644 --- a/Mage.Sets/src/mage/sets/visions/ElvenCache.java +++ b/Mage.Sets/src/mage/sets/visions/ElvenCache.java @@ -43,7 +43,7 @@ public class ElvenCache extends CardImpl { public ElvenCache(UUID ownerId) { super(ownerId, 55, "Elven Cache", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{G}{G}"); this.expansionSetCode = "VIS"; - this.color.setGreen(true); + // Return target card from your graveyard to your hand. this.getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java b/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java index febd0e1377a..6f943749edf 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java +++ b/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java @@ -54,7 +54,7 @@ public class AbyssalPersecutor extends CardImpl { super(ownerId, 47, "Abyssal Persecutor", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); this.expansionSetCode = "WWK"; this.subtype.add("Demon"); - this.color.setBlack(true); + this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/worldwake/ArborElf.java b/Mage.Sets/src/mage/sets/worldwake/ArborElf.java index 513820fd120..a60ad638295 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ArborElf.java +++ b/Mage.Sets/src/mage/sets/worldwake/ArborElf.java @@ -59,7 +59,7 @@ public class ArborElf extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Elf"); this.subtype.add("Druid"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/worldwake/BattleHurda.java b/Mage.Sets/src/mage/sets/worldwake/BattleHurda.java index 5271cc33a84..aa0afc3f6e8 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BattleHurda.java +++ b/Mage.Sets/src/mage/sets/worldwake/BattleHurda.java @@ -45,7 +45,7 @@ public class BattleHurda extends CardImpl { super(ownerId, 4, "Battle Hurda", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "WWK"; this.subtype.add("Giant"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FirstStrikeAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java b/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java index 544b86be38b..f2d1aa08190 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java +++ b/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java @@ -46,7 +46,7 @@ public class BestialMenace extends CardImpl { public BestialMenace(UUID ownerId) { super(ownerId, 97, "Bestial Menace", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); this.expansionSetCode = "WWK"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new CreateTokenEffect(new SnakeToken())); this.getSpellAbility().addEffect(new CreateTokenEffect(new WolfToken())); this.getSpellAbility().addEffect(new CreateTokenEffect(new ElephantToken())); diff --git a/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java b/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java index 00a6b030fa8..d9ae21d721e 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java +++ b/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java @@ -53,7 +53,7 @@ public class BloodhuskRitualist extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Vampire"); this.subtype.add("Shaman"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java b/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java index e512a9feecb..303ff8ef6c8 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java +++ b/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java @@ -68,7 +68,7 @@ public class ClawsOfValakut extends CardImpl { super(ownerId, 75, "Claws of Valakut", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{R}"); this.expansionSetCode = "WWK"; this.subtype.add("Aura"); - this.color.setRed(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/worldwake/Dispel.java b/Mage.Sets/src/mage/sets/worldwake/Dispel.java index 858ff5e972b..48119eedff8 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Dispel.java +++ b/Mage.Sets/src/mage/sets/worldwake/Dispel.java @@ -51,7 +51,7 @@ public class Dispel extends CardImpl { public Dispel(UUID ownerId) { super(ownerId, 26, "Dispel", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "WWK"; - this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetSpell(filter)); this.getSpellAbility().addEffect(new CounterTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/worldwake/Explore.java b/Mage.Sets/src/mage/sets/worldwake/Explore.java index 1d96cb5147b..1294a4a9213 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Explore.java +++ b/Mage.Sets/src/mage/sets/worldwake/Explore.java @@ -46,7 +46,7 @@ public class Explore extends CardImpl { public Explore(UUID ownerId) { super(ownerId, 99, "Explore", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "WWK"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new PlayAdditionalLandsControllerEffect(1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/worldwake/GoliathSphinx.java b/Mage.Sets/src/mage/sets/worldwake/GoliathSphinx.java index 8f9d9b230f4..e443ddadcc2 100644 --- a/Mage.Sets/src/mage/sets/worldwake/GoliathSphinx.java +++ b/Mage.Sets/src/mage/sets/worldwake/GoliathSphinx.java @@ -45,7 +45,7 @@ public class GoliathSphinx extends CardImpl { super(ownerId, 28, "Goliath Sphinx", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{U}{U}"); this.expansionSetCode = "WWK"; this.subtype.add("Sphinx"); - this.color.setBlue(true); + this.power = new MageInt(8); this.toughness = new MageInt(7); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/worldwake/Groundswell.java b/Mage.Sets/src/mage/sets/worldwake/Groundswell.java index 6bff573e174..1296415b715 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Groundswell.java +++ b/Mage.Sets/src/mage/sets/worldwake/Groundswell.java @@ -54,7 +54,7 @@ public class Groundswell extends CardImpl { public Groundswell(UUID ownerId) { super(ownerId, 104, "Groundswell", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "WWK"; - this.color.setGreen(true); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GroundswellEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/worldwake/HorizonDrake.java b/Mage.Sets/src/mage/sets/worldwake/HorizonDrake.java index 69b92ea96ea..798b5aea518 100644 --- a/Mage.Sets/src/mage/sets/worldwake/HorizonDrake.java +++ b/Mage.Sets/src/mage/sets/worldwake/HorizonDrake.java @@ -49,7 +49,7 @@ public class HorizonDrake extends CardImpl { super(ownerId, 30, "Horizon Drake", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); this.expansionSetCode = "WWK"; this.subtype.add("Drake"); - this.color.setBlue(true); + this.power = new MageInt(3); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java b/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java index faaf1804c39..016805ba087 100644 --- a/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java +++ b/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java @@ -54,7 +54,7 @@ public class IonasJudgment extends CardImpl { public IonasJudgment (UUID ownerId) { super(ownerId, 8, "Iona's Judgment", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{W}"); this.expansionSetCode = "WWK"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java b/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java index 410a15a87db..a2d920cfae6 100644 --- a/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java +++ b/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java @@ -61,7 +61,7 @@ public class JaceTheMindSculptor extends CardImpl { super(ownerId, 31, "Jace, the Mind Sculptor", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{U}{U}"); this.expansionSetCode = "WWK"; this.subtype.add("Jace"); - this.color.setBlue(true); + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), false)); // +2: Look at the top card of target player's library. You may put that card on the bottom of that player's library. diff --git a/Mage.Sets/src/mage/sets/worldwake/KorFirewalker.java b/Mage.Sets/src/mage/sets/worldwake/KorFirewalker.java index 825f6fd3230..3e9552fac4a 100644 --- a/Mage.Sets/src/mage/sets/worldwake/KorFirewalker.java +++ b/Mage.Sets/src/mage/sets/worldwake/KorFirewalker.java @@ -60,7 +60,7 @@ public class KorFirewalker extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Kor"); this.subtype.add("Soldier"); - this.color.setWhite(true); + this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/worldwake/LeatherbackBaloth.java b/Mage.Sets/src/mage/sets/worldwake/LeatherbackBaloth.java index e2294058a25..9120eb9bf2a 100644 --- a/Mage.Sets/src/mage/sets/worldwake/LeatherbackBaloth.java +++ b/Mage.Sets/src/mage/sets/worldwake/LeatherbackBaloth.java @@ -44,7 +44,7 @@ public class LeatherbackBaloth extends CardImpl { super(ownerId, 107, "Leatherback Baloth", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{G}{G}{G}"); this.expansionSetCode = "WWK"; 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/worldwake/NaturesClaim.java b/Mage.Sets/src/mage/sets/worldwake/NaturesClaim.java index 90eb54b9007..08fcea4fdfd 100644 --- a/Mage.Sets/src/mage/sets/worldwake/NaturesClaim.java +++ b/Mage.Sets/src/mage/sets/worldwake/NaturesClaim.java @@ -62,7 +62,7 @@ public class NaturesClaim extends CardImpl { public NaturesClaim (UUID ownerId) { super(ownerId, 108, "Nature's Claim", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "WWK"; - this.color.setGreen(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new NaturesClaimEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/worldwake/OmnathLocusOfMana.java b/Mage.Sets/src/mage/sets/worldwake/OmnathLocusOfMana.java index c854141a918..12eb7c76e7a 100644 --- a/Mage.Sets/src/mage/sets/worldwake/OmnathLocusOfMana.java +++ b/Mage.Sets/src/mage/sets/worldwake/OmnathLocusOfMana.java @@ -58,7 +58,7 @@ public class OmnathLocusOfMana extends CardImpl { this.expansionSetCode = "WWK"; this.supertype.add("Legendary"); this.subtype.add("Elemental"); - this.color.setGreen(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java index 6f6f606532a..ec39deffdac 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java +++ b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java @@ -58,7 +58,7 @@ public class SearingBlaze extends CardImpl { public SearingBlaze(UUID ownerId) { super(ownerId, 90, "Searing Blaze", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}{R}"); this.expansionSetCode = "WWK"; - this.color.setRed(true); + // Searing Blaze deals 1 damage to target player and 1 damage to target creature that player controls. // Landfall - If you had a land enter the battlefield under your control this turn, Searing Blaze deals 3 damage to that player and 3 damage to that creature instead. diff --git a/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java b/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java index fa9d92b6a6d..714e5b4a1f2 100644 --- a/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java +++ b/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java @@ -71,7 +71,7 @@ public class StoneforgeMystic extends CardImpl { public StoneforgeMystic(UUID ownerId) { super(ownerId, 20, "Stoneforge Mystic", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "WWK"; - this.color.setWhite(true); + this.subtype.add("Kor"); this.subtype.add("Artificer"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java b/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java index 572bb3e25f2..f3e07b654b3 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java +++ b/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java @@ -62,7 +62,7 @@ public class TalusPaladin extends CardImpl { this.subtype.add("Knight"); this.subtype.add("Ally"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java b/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java index 759bb3d91a6..874c3879a74 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java +++ b/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java @@ -46,7 +46,7 @@ public class VeteransReflexes extends CardImpl { public VeteransReflexes (UUID ownerId) { super(ownerId, 23, "Veteran's Reflexes", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "WWK"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java b/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java index fe240bbd2a7..5c98f247990 100644 --- a/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java +++ b/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java @@ -49,7 +49,7 @@ public class WolfbriarElemental extends CardImpl { super(ownerId, 118, "Wolfbriar Elemental", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.expansionSetCode = "WWK"; 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/zendikar/AetherFigment.java b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java index b3bae81f7be..da7a28bd75e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java +++ b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java @@ -54,7 +54,7 @@ public class AetherFigment extends CardImpl { super(ownerId, 40, "AEther Figment", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "ZEN"; 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/zendikar/ArrowVolleyTrap.java b/Mage.Sets/src/mage/sets/zendikar/ArrowVolleyTrap.java index 33d3dfdb688..704c1011a60 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArrowVolleyTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArrowVolleyTrap.java @@ -54,7 +54,7 @@ public class ArrowVolleyTrap extends CardImpl { public ArrowVolleyTrap(UUID ownerId) { super(ownerId, 2, "Arrow Volley Trap", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{W}{W}"); this.expansionSetCode = "ZEN"; - this.color.setWhite(true); + // If four or more creatures are attacking, you may pay {1}{W} rather than pay Arrow Volley Trap's mana cost. this.getSpellAbility().addAlternativeCost(new ArrowVolleyTrapAlternativeCost()); diff --git a/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java b/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java index 39e129408a5..c396f64f6db 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java @@ -53,7 +53,7 @@ public class BeastmasterAscension extends CardImpl { public BeastmasterAscension(UUID ownerId) { super(ownerId, 159, "Beastmaster Ascension", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "ZEN"; - this.color.setGreen(true); + this.addAbility(new AttacksCreatureYouControlTriggeredAbility(new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BeastmasterAscensionEffect())); diff --git a/Mage.Sets/src/mage/sets/zendikar/BladetuskBoar.java b/Mage.Sets/src/mage/sets/zendikar/BladetuskBoar.java index 708bd1d9c50..71f0984f7c3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BladetuskBoar.java +++ b/Mage.Sets/src/mage/sets/zendikar/BladetuskBoar.java @@ -45,7 +45,7 @@ public class BladetuskBoar extends CardImpl { super(ownerId, 118, "Bladetusk Boar", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "ZEN"; this.subtype.add("Boar"); - this.color.setRed(true); + this.power = new MageInt(3); this.toughness = new MageInt(2); this.addAbility(IntimidateAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/zendikar/BogTatters.java b/Mage.Sets/src/mage/sets/zendikar/BogTatters.java index 96561933cca..1a49abc22e1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BogTatters.java +++ b/Mage.Sets/src/mage/sets/zendikar/BogTatters.java @@ -45,7 +45,7 @@ public class BogTatters extends CardImpl { super(ownerId, 84, "Bog Tatters", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{B}"); this.expansionSetCode = "ZEN"; this.subtype.add("Wraith"); - this.color.setBlack(true); + this.power = new MageInt(4); this.toughness = new MageInt(2); this.addAbility(new SwampwalkAbility()); diff --git a/Mage.Sets/src/mage/sets/zendikar/BoldDefense.java b/Mage.Sets/src/mage/sets/zendikar/BoldDefense.java index c8353718a70..6ef7b91204b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BoldDefense.java +++ b/Mage.Sets/src/mage/sets/zendikar/BoldDefense.java @@ -52,7 +52,7 @@ public class BoldDefense extends CardImpl { public BoldDefense(UUID ownerId) { super(ownerId, 3, "Bold Defense", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "ZEN"; - this.color.setWhite(true); + // Kicker {3}{W} (You may pay an additional {3}{W} as you cast this spell.) this.addAbility(new KickerAbility("{3}{W}")); diff --git a/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java b/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java index 1bc6732b5b4..e5da2306596 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java +++ b/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java @@ -58,7 +58,7 @@ public class BraveTheElements extends CardImpl { public BraveTheElements(UUID ownerId) { super(ownerId, 4, "Brave the Elements", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "ZEN"; - this.color.setWhite(true); + // Choose a color. White creatures you control gain protection from the chosen color until end of turn. this.getSpellAbility().addEffect(new BraveTheElementsChooseColorEffect()); diff --git a/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java b/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java index c8a4c818b9b..788878c4df4 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java +++ b/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java @@ -47,7 +47,7 @@ public class BurstLightning extends CardImpl { public BurstLightning(UUID ownerId) { super(ownerId, 119, "Burst Lightning", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "ZEN"; - this.color.setRed(true); + // Kicker {4} (You may pay an additional {4} as you cast this spell.) this.addAbility(new KickerAbility("{4}")); diff --git a/Mage.Sets/src/mage/sets/zendikar/CallerOfGales.java b/Mage.Sets/src/mage/sets/zendikar/CallerOfGales.java index ecf22b2c2b6..b91bd3d2572 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CallerOfGales.java +++ b/Mage.Sets/src/mage/sets/zendikar/CallerOfGales.java @@ -55,7 +55,7 @@ public class CallerOfGales extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlue(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{U}")); diff --git a/Mage.Sets/src/mage/sets/zendikar/CaravanHurda.java b/Mage.Sets/src/mage/sets/zendikar/CaravanHurda.java index ee8beb77bf1..4ad93c65c0c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CaravanHurda.java +++ b/Mage.Sets/src/mage/sets/zendikar/CaravanHurda.java @@ -45,7 +45,7 @@ public class CaravanHurda extends CardImpl { super(ownerId, 5, "Caravan Hurda", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "ZEN"; this.subtype.add("Giant"); - this.color.setWhite(true); + this.power = new MageInt(1); this.toughness = new MageInt(5); this.addAbility(LifelinkAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java b/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java index 7fe1f355e0c..5dfe4bbde0d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java +++ b/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java @@ -58,7 +58,7 @@ public class CelestialMantle extends CardImpl { super(ownerId, 6, "Celestial Mantle", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}{W}{W}"); this.expansionSetCode = "ZEN"; this.subtype.add("Aura"); - this.color.setWhite(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/zendikar/CliffThreader.java b/Mage.Sets/src/mage/sets/zendikar/CliffThreader.java index 566cc46c50f..f2791d026a6 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CliffThreader.java +++ b/Mage.Sets/src/mage/sets/zendikar/CliffThreader.java @@ -46,7 +46,7 @@ public class CliffThreader extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Kor"); this.subtype.add("Scout"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new MountainwalkAbility()); diff --git a/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java b/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java index 20a07760744..de37a7675b9 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java +++ b/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java @@ -48,7 +48,7 @@ public class ConquerorsPledge extends CardImpl { public ConquerorsPledge(UUID ownerId) { super(ownerId, 8, "Conqueror's Pledge", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{W}{W}{W}"); this.expansionSetCode = "ZEN"; - this.color.setWhite(true); + this.addAbility(new KickerAbility("{6}")); diff --git a/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java b/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java index 69c1026ab2f..fa76e1a0781 100644 --- a/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java +++ b/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java @@ -44,7 +44,7 @@ public class DayOfJudgment extends CardImpl { public DayOfJudgment(UUID ownerId) { super(ownerId, 9, "Day of Judgment", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{W}{W}"); this.expansionSetCode = "ZEN"; - this.color.setWhite(true); + this.getSpellAbility().addEffect(new DestroyAllEffect(new FilterCreaturePermanent())); } diff --git a/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java b/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java index 5081437205a..31e88702455 100644 --- a/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java +++ b/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java @@ -48,7 +48,7 @@ public class EmeriaAngel extends CardImpl { super(ownerId, 11, "Emeria Angel", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); this.expansionSetCode = "ZEN"; 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/zendikar/GoblinGuide.java b/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java index c5f6beb8c66..ffe3e4e5b5a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java @@ -59,7 +59,7 @@ public class GoblinGuide extends CardImpl { public GoblinGuide(UUID ownerId) { super(ownerId, 126, "Goblin Guide", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{R}"); this.expansionSetCode = "ZEN"; - this.color.setRed(true); + this.subtype.add("Goblin"); this.subtype.add("Scout"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java b/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java index 004a922a242..346eb3e1e54 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java @@ -50,7 +50,7 @@ public class GoblinRuinblaster extends CardImpl { public GoblinRuinblaster(UUID ownerId) { super(ownerId, 127, "Goblin Ruinblaster", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.expansionSetCode = "ZEN"; - this.color.setRed(true); + this.subtype.add("Goblin"); this.subtype.add("Shaman"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/HellkiteCharger.java b/Mage.Sets/src/mage/sets/zendikar/HellkiteCharger.java index 5a5f1360029..503f7f9ab36 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HellkiteCharger.java +++ b/Mage.Sets/src/mage/sets/zendikar/HellkiteCharger.java @@ -58,7 +58,7 @@ public class HellkiteCharger extends CardImpl { super(ownerId, 131, "Hellkite Charger", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{R}{R}"); this.expansionSetCode = "ZEN"; 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/zendikar/IntoTheRoil.java b/Mage.Sets/src/mage/sets/zendikar/IntoTheRoil.java index da4e046d924..0bc46b29d59 100644 --- a/Mage.Sets/src/mage/sets/zendikar/IntoTheRoil.java +++ b/Mage.Sets/src/mage/sets/zendikar/IntoTheRoil.java @@ -48,7 +48,7 @@ public class IntoTheRoil extends CardImpl { public IntoTheRoil(UUID ownerId) { super(ownerId, 48, "Into the Roil", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "ZEN"; - this.color.setBlue(true); + // Kicker {1}{U} (You may pay an additional {1}{U} as you cast this spell.) this.addAbility(new KickerAbility("{1}{U}")); diff --git a/Mage.Sets/src/mage/sets/zendikar/IonaShieldOfEmeria.java b/Mage.Sets/src/mage/sets/zendikar/IonaShieldOfEmeria.java index 36cc4ab4b17..8bfef2890eb 100644 --- a/Mage.Sets/src/mage/sets/zendikar/IonaShieldOfEmeria.java +++ b/Mage.Sets/src/mage/sets/zendikar/IonaShieldOfEmeria.java @@ -62,7 +62,7 @@ public class IonaShieldOfEmeria extends CardImpl { this.expansionSetCode = "ZEN"; this.supertype.add("Legendary"); this.subtype.add("Angel"); - this.color.setWhite(true); + this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java b/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java index 886918dca7d..e4b5afec2e3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java +++ b/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java @@ -52,7 +52,7 @@ public class JourneyToNowhere extends CardImpl { public JourneyToNowhere(UUID ownerId) { super(ownerId, 14, "Journey to Nowhere", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "ZEN"; - this.color.setWhite(true); + // When Journey to Nowhere enters the battlefield, exile target creature. FilterCreaturePermanent filter = new FilterCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/zendikar/KhalniHeartExpedition.java b/Mage.Sets/src/mage/sets/zendikar/KhalniHeartExpedition.java index 6713babdf62..199503eece9 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KhalniHeartExpedition.java +++ b/Mage.Sets/src/mage/sets/zendikar/KhalniHeartExpedition.java @@ -53,7 +53,7 @@ public class KhalniHeartExpedition extends CardImpl { public KhalniHeartExpedition(UUID ownerId) { super(ownerId, 167, "Khalni Heart Expedition", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "ZEN"; - this.color.setGreen(true); + this.addAbility(new LandfallAbility(new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true)); TargetCardInLibrary target = new TargetCardInLibrary(0, 2, new FilterBasicLandCard()); diff --git a/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java b/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java index 028a6e443ae..938a174c885 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java @@ -61,7 +61,7 @@ public class KorSanctifiers extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Kor"); 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/zendikar/KorSkyfisher.java b/Mage.Sets/src/mage/sets/zendikar/KorSkyfisher.java index 38138ba0bc6..8861663eab4 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorSkyfisher.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorSkyfisher.java @@ -49,7 +49,7 @@ public class KorSkyfisher extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Kor"); 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/zendikar/KrakenHatchling.java b/Mage.Sets/src/mage/sets/zendikar/KrakenHatchling.java index 212e1e70614..660a5f2e809 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KrakenHatchling.java +++ b/Mage.Sets/src/mage/sets/zendikar/KrakenHatchling.java @@ -44,7 +44,7 @@ public class KrakenHatchling extends CardImpl { super(ownerId, 50, "Kraken Hatchling", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}"); this.expansionSetCode = "ZEN"; this.subtype.add("Kraken"); - this.color.setBlue(true); + this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/zendikar/MagmaRift.java b/Mage.Sets/src/mage/sets/zendikar/MagmaRift.java index 226b18c1ffd..91d0e008ed5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MagmaRift.java +++ b/Mage.Sets/src/mage/sets/zendikar/MagmaRift.java @@ -49,7 +49,7 @@ public class MagmaRift extends CardImpl { public MagmaRift(UUID ownerId) { super(ownerId, 136, "Magma Rift", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "ZEN"; - this.color.setRed(true); + // As an additional cost to cast Magma Rift, sacrifice a land. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); diff --git a/Mage.Sets/src/mage/sets/zendikar/NimbusWings.java b/Mage.Sets/src/mage/sets/zendikar/NimbusWings.java index d430f444342..131fdb28c5c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/NimbusWings.java +++ b/Mage.Sets/src/mage/sets/zendikar/NimbusWings.java @@ -56,7 +56,7 @@ public class NimbusWings extends CardImpl { super(ownerId, 28, "Nimbus Wings", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "ZEN"; this.subtype.add("Aura"); - this.color.setWhite(true); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen.java b/Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen.java index 78dfef2c37b..188de65c582 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen.java +++ b/Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen.java @@ -52,7 +52,7 @@ public class ObNixilisTheFallen extends CardImpl { this.expansionSetCode = "ZEN"; this.supertype.add("Legendary"); this.subtype.add("Demon"); - this.color.setBlack(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/zendikar/ObsidianFireheart.java b/Mage.Sets/src/mage/sets/zendikar/ObsidianFireheart.java index 1d74f6507e1..96bcd5adf49 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ObsidianFireheart.java +++ b/Mage.Sets/src/mage/sets/zendikar/ObsidianFireheart.java @@ -69,7 +69,7 @@ public class ObsidianFireheart extends CardImpl { super(ownerId, 140, "Obsidian Fireheart", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{1}{R}{R}{R}"); this.expansionSetCode = "ZEN"; 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/zendikar/OracleOfMulDaya.java b/Mage.Sets/src/mage/sets/zendikar/OracleOfMulDaya.java index 365e0b97f38..c2f5e9a90e3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/OracleOfMulDaya.java +++ b/Mage.Sets/src/mage/sets/zendikar/OracleOfMulDaya.java @@ -53,7 +53,7 @@ public class OracleOfMulDaya extends CardImpl { this.expansionSetCode = "ZEN"; 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/zendikar/PillarfieldOx.java b/Mage.Sets/src/mage/sets/zendikar/PillarfieldOx.java index 4a116c70bf9..928e12ea632 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PillarfieldOx.java +++ b/Mage.Sets/src/mage/sets/zendikar/PillarfieldOx.java @@ -44,7 +44,7 @@ public class PillarfieldOx extends CardImpl { super(ownerId, 31, "Pillarfield Ox", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "ZEN"; this.subtype.add("Ox"); - this.color.setWhite(true); + this.power = new MageInt(2); this.toughness = new MageInt(4); } diff --git a/Mage.Sets/src/mage/sets/zendikar/PlatedGeopede.java b/Mage.Sets/src/mage/sets/zendikar/PlatedGeopede.java index 201764a86da..29834fb4802 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PlatedGeopede.java +++ b/Mage.Sets/src/mage/sets/zendikar/PlatedGeopede.java @@ -48,7 +48,7 @@ public class PlatedGeopede extends CardImpl { super(ownerId, 141, "Plated Geopede", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.expansionSetCode = "ZEN"; this.subtype.add("Insect"); - this.color.setRed(true); + this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FirstStrikeAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java b/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java index f91943a2f28..dc5f38f7122 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java @@ -57,7 +57,7 @@ public class PyromancerAscension extends CardImpl { public PyromancerAscension(UUID ownerId) { super(ownerId, 143, "Pyromancer Ascension", Rarity.RARE, new CardType[] { CardType.ENCHANTMENT }, "{1}{R}"); this.expansionSetCode = "ZEN"; - this.color.setRed(true); + // Whenever you cast an instant or sorcery spell that has the same name as a card in your graveyard, you may put a quest counter on Pyromancer Ascension. this.addAbility(new PyromancerAscensionQuestTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java b/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java index 8040d9d8ee1..7a721a310f0 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java +++ b/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java @@ -48,7 +48,7 @@ public class RampagingBaloths extends CardImpl { super(ownerId, 178, "Rampaging Baloths", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); this.expansionSetCode = "ZEN"; this.subtype.add("Beast"); - this.color.setGreen(true); + this.power = new MageInt(6); this.toughness = new MageInt(6); this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java b/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java index 648b1c34cc6..02672c8f867 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java +++ b/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java @@ -48,7 +48,7 @@ public class RiverBoa extends CardImpl { public RiverBoa(UUID ownerId) { super(ownerId, 180, "River Boa", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "ZEN"; - this.color.setGreen(true); + this.subtype.add("Snake"); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java b/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java index 24de580178a..7488dfa2e17 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java +++ b/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java @@ -51,7 +51,7 @@ public class ScuteMob extends CardImpl { public ScuteMob(UUID ownerId) { super(ownerId, 182, "Scute Mob", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "ZEN"; - this.color.setGreen(true); + this.subtype.add("Insect"); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/ShepherdOfTheLost.java b/Mage.Sets/src/mage/sets/zendikar/ShepherdOfTheLost.java index 78f9dbb7ee8..204dbb24483 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ShepherdOfTheLost.java +++ b/Mage.Sets/src/mage/sets/zendikar/ShepherdOfTheLost.java @@ -47,7 +47,7 @@ public class ShepherdOfTheLost extends CardImpl { super(ownerId, 34, "Shepherd of the Lost", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "ZEN"; this.subtype.add("Angel"); - this.color.setWhite(true); + this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/zendikar/SpellPierce.java b/Mage.Sets/src/mage/sets/zendikar/SpellPierce.java index b9c3b36f833..500a9770bbb 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SpellPierce.java +++ b/Mage.Sets/src/mage/sets/zendikar/SpellPierce.java @@ -55,7 +55,7 @@ public class SpellPierce extends CardImpl { public SpellPierce(UUID ownerId) { super(ownerId, 67, "Spell Pierce", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "ZEN"; - this.color.setBlue(true); + // Counter target noncreature spell unless its controller pays . this.getSpellAbility().addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java b/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java index 25f3ae69902..7b75921e09f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java +++ b/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java @@ -53,7 +53,7 @@ public class SpreadingSeas extends CardImpl { public SpreadingSeas(UUID ownerId) { super(ownerId, 70, "Spreading Seas", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "ZEN"; - this.color.setBlue(true); + this.subtype.add("Aura"); TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java b/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java index 7f2f3b96b7d..10c7c39b975 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java +++ b/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java @@ -47,7 +47,7 @@ public class SteppeLynx extends CardImpl { super(ownerId, 36, "Steppe Lynx", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); this.expansionSetCode = "ZEN"; this.subtype.add("Cat"); - this.color.setWhite(true); + this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java b/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java index 6a2e06b5dd0..79c8dd03d17 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java +++ b/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java @@ -54,7 +54,7 @@ public class SunspringExpedition extends CardImpl { public SunspringExpedition(UUID ownerId) { super(ownerId, 37, "Sunspring Expedition", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}"); this.expansionSetCode = "ZEN"; - this.color.setWhite(true); + this.addAbility(new LandfallAbility(new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true)); Costs costs = new CostsImpl<>(); diff --git a/Mage.Sets/src/mage/sets/zendikar/VampireLacerator.java b/Mage.Sets/src/mage/sets/zendikar/VampireLacerator.java index 7608862e0e7..82635edee88 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VampireLacerator.java +++ b/Mage.Sets/src/mage/sets/zendikar/VampireLacerator.java @@ -51,7 +51,7 @@ public class VampireLacerator extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Vampire"); this.subtype.add("Warrior"); - this.color.setBlack(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/zendikar/WindriderEel.java b/Mage.Sets/src/mage/sets/zendikar/WindriderEel.java index 6cedf96a20d..83500f610ff 100644 --- a/Mage.Sets/src/mage/sets/zendikar/WindriderEel.java +++ b/Mage.Sets/src/mage/sets/zendikar/WindriderEel.java @@ -48,7 +48,7 @@ public class WindriderEel extends CardImpl { super(ownerId, 78, "Windrider Eel", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "ZEN"; this.subtype.add("Fish"); - this.color.setBlue(true); + this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance());