diff --git a/Mage.Sets/src/mage/sets/apocalypse/BattlefieldForge.java b/Mage.Sets/src/mage/sets/apocalypse/BattlefieldForge.java index 3d4010874b5..9249e78220f 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/BattlefieldForge.java +++ b/Mage.Sets/src/mage/sets/apocalypse/BattlefieldForge.java @@ -28,14 +28,16 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; +import mage.Mana; import mage.abilities.Ability; +import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.ColorlessManaAbility; -import mage.abilities.mana.RedManaAbility; -import mage.abilities.mana.WhiteManaAbility; +import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; /** * @@ -46,13 +48,15 @@ public class BattlefieldForge extends CardImpl { public BattlefieldForge(UUID ownerId) { super(ownerId, 139, "Battlefield Forge", Rarity.RARE, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "APC"; + + // Tap: Add 1 to your mana pool. this.addAbility(new ColorlessManaAbility()); - Ability redManaAbility = new RedManaAbility(); + // Tap: Add Red or White to your mana pool. Battlefield Forge deals 1 damage to you. + Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new TapSourceCost()); redManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(redManaAbility); - - Ability whiteManaAbility = new WhiteManaAbility(); + Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana, new TapSourceCost()); whiteManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(whiteManaAbility); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/CavesOfKoilos.java b/Mage.Sets/src/mage/sets/apocalypse/CavesOfKoilos.java index aa61609dd7b..b1e785367a4 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/CavesOfKoilos.java +++ b/Mage.Sets/src/mage/sets/apocalypse/CavesOfKoilos.java @@ -28,14 +28,16 @@ package mage.sets.apocalypse; import java.util.UUID; +import mage.Mana; +import mage.abilities.Ability; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.DamageControllerEffect; +import mage.abilities.mana.ColorlessManaAbility; +import mage.abilities.mana.SimpleManaAbility; +import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.Ability; -import mage.abilities.effects.common.DamageControllerEffect; -import mage.abilities.mana.BlackManaAbility; -import mage.abilities.mana.ColorlessManaAbility; -import mage.abilities.mana.WhiteManaAbility; -import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -46,11 +48,16 @@ public class CavesOfKoilos extends CardImpl { public CavesOfKoilos(UUID ownerId) { super(ownerId, 140, "Caves of Koilos", Rarity.RARE, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "APC"; + + + // Tap: Add 1 to your mana pool. this.addAbility(new ColorlessManaAbility()); - Ability whiteManaAbility = new WhiteManaAbility(); + + // Tap: Add White or Black to your mana pool. Caves of Koilos deals 1 damage to you. + Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana, new TapSourceCost()); whiteManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(whiteManaAbility); - Ability blackManaAbility = new BlackManaAbility(); + Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new TapSourceCost()); blackManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(blackManaAbility); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/LlanowarWastes.java b/Mage.Sets/src/mage/sets/apocalypse/LlanowarWastes.java index bbd0346db0a..ad86d704930 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LlanowarWastes.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LlanowarWastes.java @@ -28,14 +28,16 @@ package mage.sets.apocalypse; import java.util.UUID; +import mage.Mana; +import mage.abilities.Ability; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.DamageControllerEffect; +import mage.abilities.mana.ColorlessManaAbility; +import mage.abilities.mana.SimpleManaAbility; +import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.Ability; -import mage.abilities.effects.common.DamageControllerEffect; -import mage.abilities.mana.BlackManaAbility; -import mage.abilities.mana.ColorlessManaAbility; -import mage.abilities.mana.GreenManaAbility; -import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -46,11 +48,15 @@ public class LlanowarWastes extends CardImpl { public LlanowarWastes(UUID ownerId) { super(ownerId, 141, "Llanowar Wastes", Rarity.RARE, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "APC"; + + // Tap: Add 1 to your mana pool. this.addAbility(new ColorlessManaAbility()); - Ability blackManaAbility = new BlackManaAbility(); + + // Tap: Add Black or Green to your mana pool. Llanowar Wastes deals 1 damage to you. + Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new TapSourceCost()); blackManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(blackManaAbility); - Ability greenManaAbility = new GreenManaAbility(); + Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana, new TapSourceCost()); greenManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(greenManaAbility); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/ShivanReef.java b/Mage.Sets/src/mage/sets/apocalypse/ShivanReef.java index 41afbf47110..390599b642e 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/ShivanReef.java +++ b/Mage.Sets/src/mage/sets/apocalypse/ShivanReef.java @@ -28,14 +28,16 @@ package mage.sets.apocalypse; import java.util.UUID; +import mage.Mana; +import mage.abilities.Ability; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.DamageControllerEffect; +import mage.abilities.mana.ColorlessManaAbility; +import mage.abilities.mana.SimpleManaAbility; +import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.Ability; -import mage.abilities.effects.common.DamageControllerEffect; -import mage.abilities.mana.BlueManaAbility; -import mage.abilities.mana.ColorlessManaAbility; -import mage.abilities.mana.RedManaAbility; -import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -46,11 +48,15 @@ public class ShivanReef extends CardImpl { public ShivanReef(UUID ownerId) { super(ownerId, 142, "Shivan Reef", Rarity.RARE, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "APC"; + + // Tap: Add 1 to your mana pool. this.addAbility(new ColorlessManaAbility()); - Ability blueManaAbility = new BlueManaAbility(); + + //Tap: Add Blue or Red to your mana pool. Shivan Reef deals 1 damage to you. + Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana, new TapSourceCost()); blueManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(blueManaAbility); - Ability redManaAbility = new RedManaAbility(); + Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new TapSourceCost()); redManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(redManaAbility); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/YavimayaCoast.java b/Mage.Sets/src/mage/sets/apocalypse/YavimayaCoast.java index b1bbfc22738..2857fbe48d7 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/YavimayaCoast.java +++ b/Mage.Sets/src/mage/sets/apocalypse/YavimayaCoast.java @@ -28,14 +28,16 @@ package mage.sets.apocalypse; import java.util.UUID; +import mage.Mana; +import mage.abilities.Ability; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.DamageControllerEffect; +import mage.abilities.mana.ColorlessManaAbility; +import mage.abilities.mana.SimpleManaAbility; +import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.Ability; -import mage.abilities.effects.common.DamageControllerEffect; -import mage.abilities.mana.BlueManaAbility; -import mage.abilities.mana.ColorlessManaAbility; -import mage.abilities.mana.GreenManaAbility; -import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -46,11 +48,15 @@ public class YavimayaCoast extends CardImpl { public YavimayaCoast(UUID ownerId) { super(ownerId, 143, "Yavimaya Coast", Rarity.RARE, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "APC"; + + // Tap: Add 1 to your mana pool. this.addAbility(new ColorlessManaAbility()); - Ability greenManaAbility = new GreenManaAbility(); + + // Tap: Add Green or Blue to your mana pool. Yavimaya Coast deals 1 damage to you. + Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana, new TapSourceCost()); greenManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(greenManaAbility); - Ability blueManaAbility = new BlueManaAbility(); + Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana, new TapSourceCost()); blueManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(blueManaAbility); } diff --git a/Mage.Sets/src/mage/sets/tenth/AdarkarWastes.java b/Mage.Sets/src/mage/sets/tenth/AdarkarWastes.java index fe505e04462..5f9416f2685 100644 --- a/Mage.Sets/src/mage/sets/tenth/AdarkarWastes.java +++ b/Mage.Sets/src/mage/sets/tenth/AdarkarWastes.java @@ -28,15 +28,16 @@ package mage.sets.tenth; import java.util.UUID; - +import mage.Mana; +import mage.abilities.Ability; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.DamageControllerEffect; +import mage.abilities.mana.ColorlessManaAbility; +import mage.abilities.mana.SimpleManaAbility; +import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.Ability; -import mage.abilities.effects.common.DamageControllerEffect; -import mage.abilities.mana.BlueManaAbility; -import mage.abilities.mana.ColorlessManaAbility; -import mage.abilities.mana.WhiteManaAbility; -import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -47,11 +48,13 @@ public class AdarkarWastes extends CardImpl { public AdarkarWastes(UUID ownerId) { super(ownerId, 347, "Adarkar Wastes", Rarity.RARE, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "10E"; + this.addAbility(new ColorlessManaAbility()); - Ability whiteManaAbility = new WhiteManaAbility(); + + Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana, new TapSourceCost()); whiteManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(whiteManaAbility); - Ability blueManaAbility = new BlueManaAbility(); + Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana, new TapSourceCost()); blueManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(blueManaAbility); } diff --git a/Mage.Sets/src/mage/sets/tenth/Brushland.java b/Mage.Sets/src/mage/sets/tenth/Brushland.java index b596aed10cd..63fa21e5bb3 100644 --- a/Mage.Sets/src/mage/sets/tenth/Brushland.java +++ b/Mage.Sets/src/mage/sets/tenth/Brushland.java @@ -28,14 +28,16 @@ package mage.sets.tenth; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; +import mage.Mana; import mage.abilities.Ability; +import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.ColorlessManaAbility; -import mage.abilities.mana.GreenManaAbility; -import mage.abilities.mana.WhiteManaAbility; +import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; /** * @@ -47,10 +49,11 @@ public class Brushland extends CardImpl { super(ownerId, 349, "Brushland", Rarity.RARE, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "10E"; this.addAbility(new ColorlessManaAbility()); - Ability greenManaAbility = new GreenManaAbility(); + + Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana, new TapSourceCost()); greenManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(greenManaAbility); - Ability whiteManaAbility = new WhiteManaAbility(); + Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana, new TapSourceCost()); whiteManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(whiteManaAbility); } diff --git a/Mage.Sets/src/mage/sets/tenth/KarplusanForest.java b/Mage.Sets/src/mage/sets/tenth/KarplusanForest.java index ac013e68d26..7f2340fdd71 100644 --- a/Mage.Sets/src/mage/sets/tenth/KarplusanForest.java +++ b/Mage.Sets/src/mage/sets/tenth/KarplusanForest.java @@ -28,14 +28,16 @@ package mage.sets.tenth; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; +import mage.Mana; import mage.abilities.Ability; +import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.ColorlessManaAbility; -import mage.abilities.mana.GreenManaAbility; -import mage.abilities.mana.RedManaAbility; +import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; /** * @@ -46,11 +48,13 @@ public class KarplusanForest extends CardImpl { public KarplusanForest(UUID ownerId) { super(ownerId, 354, "Karplusan Forest", Rarity.RARE, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "10E"; + this.addAbility(new ColorlessManaAbility()); - Ability redManaAbility = new RedManaAbility(); + + Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new TapSourceCost()); redManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(redManaAbility); - Ability greenManaAbility = new GreenManaAbility(); + Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana, new TapSourceCost()); greenManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(greenManaAbility); } diff --git a/Mage.Sets/src/mage/sets/tenth/SulfurousSprings.java b/Mage.Sets/src/mage/sets/tenth/SulfurousSprings.java index ba7d9b2c5a9..7e4fd81769c 100644 --- a/Mage.Sets/src/mage/sets/tenth/SulfurousSprings.java +++ b/Mage.Sets/src/mage/sets/tenth/SulfurousSprings.java @@ -28,14 +28,16 @@ package mage.sets.tenth; import java.util.UUID; +import mage.Mana; +import mage.abilities.Ability; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.DamageControllerEffect; +import mage.abilities.mana.ColorlessManaAbility; +import mage.abilities.mana.SimpleManaAbility; +import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.Ability; -import mage.abilities.effects.common.DamageControllerEffect; -import mage.abilities.mana.BlackManaAbility; -import mage.abilities.mana.ColorlessManaAbility; -import mage.abilities.mana.RedManaAbility; -import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -46,11 +48,13 @@ public class SulfurousSprings extends CardImpl { public SulfurousSprings(UUID ownerId) { super(ownerId, 359, "Sulfurous Springs", Rarity.RARE, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "10E"; + this.addAbility(new ColorlessManaAbility()); - Ability blackManaAbility = new BlackManaAbility(); + + Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new TapSourceCost()); blackManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(blackManaAbility); - Ability redManaAbility = new RedManaAbility(); + Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new TapSourceCost()); redManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(redManaAbility); } diff --git a/Mage.Sets/src/mage/sets/tenth/UndergroundRiver.java b/Mage.Sets/src/mage/sets/tenth/UndergroundRiver.java index d070b7c1da0..36c81d7d6b8 100644 --- a/Mage.Sets/src/mage/sets/tenth/UndergroundRiver.java +++ b/Mage.Sets/src/mage/sets/tenth/UndergroundRiver.java @@ -28,14 +28,16 @@ package mage.sets.tenth; import java.util.UUID; +import mage.Mana; +import mage.abilities.Ability; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.DamageControllerEffect; +import mage.abilities.mana.ColorlessManaAbility; +import mage.abilities.mana.SimpleManaAbility; +import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.Ability; -import mage.abilities.effects.common.DamageControllerEffect; -import mage.abilities.mana.BlackManaAbility; -import mage.abilities.mana.BlueManaAbility; -import mage.abilities.mana.ColorlessManaAbility; -import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -46,11 +48,13 @@ public class UndergroundRiver extends CardImpl { public UndergroundRiver(UUID ownerId) { super(ownerId, 362, "Underground River", Rarity.RARE, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "10E"; + this.addAbility(new ColorlessManaAbility()); - Ability blueManaAbility = new BlueManaAbility(); + + Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana, new TapSourceCost()); blueManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(blueManaAbility); - Ability blackManaAbility = new BlackManaAbility(); + Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new TapSourceCost()); blackManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(blackManaAbility); }