Removed mutable public static mana

This commit is contained in:
poixen 2015-11-29 20:12:39 +01:00
parent e678577720
commit 409e66a2e9
115 changed files with 186 additions and 192 deletions

View file

@ -52,7 +52,7 @@ public class AgentOfStromgald1 extends CardImpl {
this.toughness = new MageInt(1);
// {R}: Add {B} to your mana pool.
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new ManaCostsImpl("{R}")));
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new ManaCostsImpl("{R}")));
}
public AgentOfStromgald1(final AgentOfStromgald1 card) {

View file

@ -58,7 +58,7 @@ public class ElvishSpiritGuide extends CardImpl {
this.toughness = new MageInt(2);
// Exile Elvish Spirit Guide from your hand: Add {G} to your mana pool.
this.addAbility(new SimpleManaAbility(Zone.HAND, new BasicManaEffect(Mana.GreenMana), new ExileSourceFromHandCost()));
this.addAbility(new SimpleManaAbility(Zone.HAND, new BasicManaEffect(Mana.GreenMana(1)), new ExileSourceFromHandCost()));
}
public ElvishSpiritGuide(final ElvishSpiritGuide card) {

View file

@ -66,7 +66,7 @@ public class SoldeviAdnate1 extends CardImpl {
this.toughness = new MageInt(2);
// {T}, Sacrifice a black or artifact creature: Add to your mana pool an amount of {B} equal to the sacrificed creature's converted mana cost.
Ability ability = new DynamicManaAbility(Mana.BlackMana, new SacrificeCostConvertedMana("creature"),
Ability ability = new DynamicManaAbility(Mana.BlackMana(1), new SacrificeCostConvertedMana("creature"),
new TapSourceCost(), "add to your mana pool an amount of {B} equal to the sacrificed creature's converted mana cost");
ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter)));
this.addAbility(ability);

View file

@ -56,7 +56,7 @@ public class PriestOfYawgmoth extends CardImpl {
this.toughness = new MageInt(2);
// {T}, Sacrifice an artifact: Add to your mana pool an amount of {B} equal to the sacrificed artifact's converted mana cost.
Ability ability = new DynamicManaAbility(Mana.BlackMana, new SacrificeCostConvertedMana("artifact"),
Ability ability = new DynamicManaAbility(Mana.BlackMana(1), new SacrificeCostConvertedMana("artifact"),
new TapSourceCost(), "add to your mana pool an amount of {B} equal to the sacrificed artifact's converted mana cost");
ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledArtifactPermanent())));
this.addAbility(ability);

View file

@ -53,10 +53,10 @@ public class BattlefieldForge extends CardImpl {
this.addAbility(new ColorlessManaAbility());
// 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());
Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new TapSourceCost());
redManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(redManaAbility);
Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana, new TapSourceCost());
Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new TapSourceCost());
whiteManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(whiteManaAbility);
}

View file

@ -54,10 +54,10 @@ public class CavesOfKoilos extends CardImpl {
this.addAbility(new ColorlessManaAbility());
// 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());
Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new TapSourceCost());
whiteManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(whiteManaAbility);
Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new TapSourceCost());
Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost());
blackManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blackManaAbility);
}

View file

@ -53,10 +53,10 @@ public class LlanowarWastes extends CardImpl {
this.addAbility(new ColorlessManaAbility());
// 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());
Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost());
blackManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blackManaAbility);
Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana, new TapSourceCost());
Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new TapSourceCost());
greenManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(greenManaAbility);
}

View file

@ -53,10 +53,10 @@ public class ShivanReef extends CardImpl {
this.addAbility(new ColorlessManaAbility());
//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());
Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new TapSourceCost());
blueManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blueManaAbility);
Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new TapSourceCost());
Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new TapSourceCost());
redManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(redManaAbility);
}

View file

@ -53,10 +53,10 @@ public class YavimayaCoast extends CardImpl {
this.addAbility(new ColorlessManaAbility());
// 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());
Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new TapSourceCost());
greenManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(greenManaAbility);
Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana, new TapSourceCost());
Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new TapSourceCost());
blueManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blueManaAbility);
}

View file

@ -48,7 +48,7 @@ public class BattleHymn extends CardImpl {
// Add {R} to your mana pool for each creature you control.
this.getSpellAbility().addEffect(new DynamicManaEffect(Mana.RedMana, new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent())));
this.getSpellAbility().addEffect(new DynamicManaEffect(Mana.RedMana(1), new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent())));
}
public BattleHymn(final BattleHymn card) {

View file

@ -55,7 +55,7 @@ public class SakuraTribeSpringcaller extends CardImpl {
this.toughness = new MageInt(4);
// At the beginning of your upkeep, add {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end.
Effect effect = new AddManaToManaPoolTargetControllerEffect(new Mana(Mana.GreenMana), "your", true);
Effect effect = new AddManaToManaPoolTargetControllerEffect(new Mana(Mana.GreenMana(1)), "your", true);
effect.setText("add {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end");
this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.YOU, false));
}

View file

@ -71,7 +71,7 @@ public class HallOfTheBanditLord extends CardImpl {
this.addAbility(new EntersBattlefieldTappedAbility());
// {T}, Pay 3 life: Add {1} to your mana pool. If that mana is spent on a creature spell, it gains haste.
Mana mana = Mana.ColorlessMana;
Mana mana = Mana.ColorlessMana(1);
mana.setFlag(true);
ManaEffect effect = new BasicManaEffect(mana);
effect.setText("Add {1} to your mana pool. If that mana is spent on a creature spell, it gains haste");

View file

@ -75,7 +75,7 @@ class BraidOfFireCost extends CostImpl {
@Override
public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana) {
Player player = game.getPlayer(controllerId);
player.getManaPool().addMana(Mana.RedMana, game, ability);
player.getManaPool().addMana(Mana.RedMana(1), game, ability);
paid = true;
return true;
}

View file

@ -29,7 +29,7 @@ package mage.sets.commander;
import java.util.UUID;
import mage.MageInt;
import static mage.Mana.GreenMana;
import mage.Mana;
import mage.abilities.common.BeginningOfPreCombatMainTriggeredAbility;
import mage.abilities.effects.common.AddManaToManaPoolTargetControllerEffect;
import mage.cards.CardImpl;
@ -55,7 +55,7 @@ public class MagusOfTheVineyard extends CardImpl {
// At the beginning of each player's precombat main phase, add {G}{G} to that player's mana pool.
this.addAbility(new BeginningOfPreCombatMainTriggeredAbility(
Zone.BATTLEFIELD, new AddManaToManaPoolTargetControllerEffect(GreenMana(2), "that player's"), TargetController.ANY, false, true));
Zone.BATTLEFIELD, new AddManaToManaPoolTargetControllerEffect(Mana.GreenMana(2), "that player's"), TargetController.ANY, false, true));
}
public MagusOfTheVineyard(final MagusOfTheVineyard card) {

View file

@ -63,7 +63,7 @@ public class MagusOfTheCoffers extends CardImpl {
this.toughness = new MageInt(4);
// {2}, {T}: Add {B} to your mana pool for each Swamp you control.
Ability ability = new DynamicManaAbility(Mana.BlackMana, new PermanentsOnBattlefieldCount(filter), new GenericManaCost(2));
Ability ability = new DynamicManaAbility(Mana.BlackMana(1), new PermanentsOnBattlefieldCount(filter), new GenericManaCost(2));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
}

View file

@ -56,7 +56,7 @@ public class ManaGeyser extends CardImpl {
// Add {R} to your mana pool for each tapped land your opponents control.
this.getSpellAbility().addEffect(new DynamicManaEffect(Mana.RedMana, new PermanentsOnBattlefieldCount(filter)));
this.getSpellAbility().addEffect(new DynamicManaEffect(Mana.RedMana(1), new PermanentsOnBattlefieldCount(filter)));
}
public ManaGeyser(final ManaGeyser card) {

View file

@ -70,7 +70,7 @@ public class BottomlessVault extends CardImpl {
this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.YOU, false));
// {tap}, Remove any number of storage counters from Bottomless Vault: Add {B} to your mana pool for each storage counter removed this way.
Ability ability = new DynamicManaAbility(
Mana.BlackMana,
Mana.BlackMana(1),
new RemovedCountersForCostValue(),
new TapSourceCost(),
"Add {B} to your mana pool for each storage counter removed this way",

View file

@ -70,7 +70,7 @@ public class HollowTrees extends CardImpl {
this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.YOU, false));
// {tap}, Remove any number of storage counters from Hollow Trees: Add {G} to your mana pool for each storage counter removed this way.
Ability ability = new DynamicManaAbility(
Mana.GreenMana,
Mana.GreenMana(1),
new RemovedCountersForCostValue(),
new TapSourceCost(),
"Add {G} to your mana pool for each storage counter removed this way",

View file

@ -70,7 +70,7 @@ public class IcatianStore extends CardImpl {
this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.YOU, false));
// {tap}, Remove any number of storage counters from Icatian Store: Add {W} to your mana pool for each storage counter removed this way.
Ability ability = new DynamicManaAbility(
Mana.WhiteMana,
Mana.WhiteMana(1),
new RemovedCountersForCostValue(),
new TapSourceCost(),
"Add {W} to your mana pool for each storage counter removed this way",

View file

@ -63,7 +63,7 @@ public class Dragonrage extends CardImpl {
this.expansionSetCode = "FRF";
// Add {R} to your mana pool for each attacking creature you control.
this.getSpellAbility().addEffect(new DynamicManaEffect(Mana.RedMana,
this.getSpellAbility().addEffect(new DynamicManaEffect(Mana.RedMana(1),
new PermanentsOnBattlefieldCount(filter)));
// Until end of turn, attacking creatures you control gain "{R}: This creature gets +1/+0 until end of turn."

View file

@ -70,7 +70,7 @@ public class DwarvenHold extends CardImpl {
this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.YOU, false));
// {tap}, Remove any number of storage counters from Dwarven Hold: Add {R} to your mana pool for each storage counter removed this way.
Ability ability = new DynamicManaAbility(
Mana.RedMana,
Mana.RedMana(1),
new RemovedCountersForCostValue(),
new TapSourceCost(),
"Add {R} to your mana pool for each storage counter removed this way",

View file

@ -70,7 +70,7 @@ public class SandSilos extends CardImpl {
this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.YOU, false));
// {tap}, Remove any number of storage counters from Sand Silos: Add {U} to your mana pool for each storage counter removed this way.
Ability ability = new DynamicManaAbility(
Mana.BlueMana,
Mana.BlueMana(1),
new RemovedCountersForCostValue(),
new TapSourceCost(),
"Add {U} to your mana pool for each storage counter removed this way",

View file

@ -48,7 +48,7 @@ public class UrzasMine extends CardImpl {
this.expansionSetCode = "5ED";
// {T}: Add {1} to your mana pool. If you control an Urza's Power-Plant and an Urza's Tower, add {2} to your mana pool instead.
Ability urzaManaAbility = new DynamicManaAbility(Mana.ColorlessMana, new UrzaTerrainValue(2),
Ability urzaManaAbility = new DynamicManaAbility(Mana.ColorlessMana(1), new UrzaTerrainValue(2),
"Add {1} to your mana pool. If you control an Urza's Power-Plant and an Urza's Tower, add {2} to your mana pool instead");
this.addAbility(urzaManaAbility);
}

View file

@ -48,7 +48,7 @@ public class UrzasPowerPlant extends CardImpl {
this.expansionSetCode = "5ED";
// {T}: Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Tower, add {2} to your mana pool instead.
Ability urzaManaAbility = new DynamicManaAbility(Mana.ColorlessMana, new UrzaTerrainValue(2),
Ability urzaManaAbility = new DynamicManaAbility(Mana.ColorlessMana(1), new UrzaTerrainValue(2),
"Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Tower, add {2} to your mana pool instead");
this.addAbility(urzaManaAbility);
}

View file

@ -48,7 +48,7 @@ public class UrzasTower extends CardImpl {
this.expansionSetCode = "5ED";
// {T}: Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Power-Plant, add {3} to your mana pool instead.
Ability urzaManaAbility = new DynamicManaAbility(Mana.ColorlessMana, new UrzaTerrainValue(3),
Ability urzaManaAbility = new DynamicManaAbility(Mana.ColorlessMana(1), new UrzaTerrainValue(3),
"Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Power-Plant, add {3} to your mana pool instead");
this.addAbility(urzaManaAbility);
}

View file

@ -68,13 +68,13 @@ public class NimbusMaze extends CardImpl {
// {tap}: Add {W} to your mana pool. Activate this ability only if you control an Island.
this.addAbility(new ActivateIfConditionManaAbility(
Zone.BATTLEFIELD,
new BasicManaEffect(Mana.WhiteMana),
new BasicManaEffect(Mana.WhiteMana(1)),
new TapSourceCost(),
new PermanentsOnTheBattlefieldCondition(controlIsland)));
// {tap}: Add {U} to your mana pool. Activate this ability only if you control a Plains.
this.addAbility(new ActivateIfConditionManaAbility(
Zone.BATTLEFIELD,
new BasicManaEffect(Mana.BlueMana),
new BasicManaEffect(Mana.BlueMana(1)),
new TapSourceCost(),
new PermanentsOnTheBattlefieldCondition(controlPlains)));
}

View file

@ -52,8 +52,8 @@ public class RiverOfTears extends CardImpl {
// {T}: Add {U} to your mana pool. If you played a land this turn, add {B} to your mana pool instead.
this.addAbility(new ConditionalManaAbility(Zone.BATTLEFIELD, new ConditionalManaEffect(
new BasicManaEffect(Mana.BlackMana),
new BasicManaEffect(Mana.BlueMana),
new BasicManaEffect(Mana.BlackMana(1)),
new BasicManaEffect(Mana.BlueMana(1)),
LandfallCondition.getInstance(),
"Add {U} to your mana pool. If you played a land this turn, add {B} to your mana pool instead"),
new TapSourceCost()),

View file

@ -83,7 +83,7 @@ class CryptGhastTriggeredAbility extends TriggeredManaAbility {
}
public CryptGhastTriggeredAbility() {
super(Zone.BATTLEFIELD, new BasicManaEffect(Mana.BlackMana), false);
super(Zone.BATTLEFIELD, new BasicManaEffect(Mana.BlackMana(1)), false);
this.usesStack = false;
}

View file

@ -59,7 +59,7 @@ public class GyreSage extends CardImpl {
this.addAbility(new EvolveAbility());
//{T} : Add {G} to your mana pool for each +1/+1 counter on Gyre Sage.
this.addAbility(new DynamicManaAbility(Mana.GreenMana, new CountersCount(CounterType.P1P1)));
this.addAbility(new DynamicManaAbility(Mana.GreenMana(1), new CountersCount(CounterType.P1P1)));
}
public GyreSage(final GyreSage card) {

View file

@ -52,14 +52,14 @@ public class AnHavvaTownship extends CardImpl {
// {tap}: Add {1} to your mana pool.
this.addAbility(new ColorlessManaAbility());
// {1}, {tap}: Add {G} to your mana pool.
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana, new GenericManaCost(1));
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new GenericManaCost(1));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
// {2}, {tap}: Add {R} or {W} to your mana pool.
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new GenericManaCost(2));
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new GenericManaCost(2));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana, new GenericManaCost(2));
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new GenericManaCost(2));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
}

View file

@ -52,14 +52,14 @@ public class AysenAbbey extends CardImpl {
// {tap}: Add {1} to your mana pool.
this.addAbility(new ColorlessManaAbility());
// {1}, {tap}: Add {W} to your mana pool.
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana, new GenericManaCost(1));
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new GenericManaCost(1));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
// {2}, {tap}: Add {G} or {U} to your mana pool.
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana, new GenericManaCost(2));
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new GenericManaCost(2));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana, new GenericManaCost(2));
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new GenericManaCost(2));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
}

View file

@ -52,14 +52,14 @@ public class CastleSengir extends CardImpl {
// {tap}: Add {1} to your mana pool.
this.addAbility(new ColorlessManaAbility());
// {1}, {tap}: Add {B} to your mana pool.
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new GenericManaCost(1));
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new GenericManaCost(1));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
// {2}, {tap}: Add {U} or {R} to your mana pool.
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana, new GenericManaCost(2));
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new GenericManaCost(2));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new GenericManaCost(2));
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new GenericManaCost(2));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
}

View file

@ -52,14 +52,14 @@ public class KoskunKeep extends CardImpl {
// {tap}: Add {1} to your mana pool.
this.addAbility(new ColorlessManaAbility());
// {1}, {tap}: Add {R} to your mana pool.
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new GenericManaCost(1));
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new GenericManaCost(1));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
// {2}, {tap}: Add {B} or {G} to your mana pool.
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new GenericManaCost(2));
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new GenericManaCost(2));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana, new GenericManaCost(2));
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new GenericManaCost(2));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
}

View file

@ -52,14 +52,14 @@ public class WizardsSchool extends CardImpl {
// {tap}: Add {1} to your mana pool.
this.addAbility(new ColorlessManaAbility());
// {1}, {tap}: Add {U} to your mana pool.
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana, new GenericManaCost(1));
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new GenericManaCost(1));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
// {2}, {tap}: Add {W} or {B} to your mana pool.
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana, new GenericManaCost(2));
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new GenericManaCost(2));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new GenericManaCost(2));
ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new GenericManaCost(2));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
}

View file

@ -67,10 +67,10 @@ public class LandCap extends CardImpl {
Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.DEPLETION.createInstance()), TargetController.YOU, false);
this.addAbility(ability2);
// {T}: Add {W} or {U} to your mana pool. Put a depletion counter on Land Cap.
Ability ability3 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana, new TapSourceCost());
Ability ability3 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new TapSourceCost());
ability3.addEffect(new AddCountersSourceEffect(CounterType.DEPLETION.createInstance()));
this.addAbility(ability3);
Ability ability4 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana, new TapSourceCost());
Ability ability4 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new TapSourceCost());
ability4.addEffect(new AddCountersSourceEffect(CounterType.DEPLETION.createInstance()));
this.addAbility(ability4);
}

View file

@ -67,10 +67,10 @@ public class LavaTubes extends CardImpl {
Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.DEPLETION.createInstance()), TargetController.YOU, false);
this.addAbility(ability2);
// {tap}: Add {B} or {R} to your mana pool. Put a depletion counter on Lava Tubes.
Ability ability3 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new TapSourceCost());
Ability ability3 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost());
ability3.addEffect(new AddCountersSourceEffect(CounterType.DEPLETION.createInstance()));
this.addAbility(ability3);
Ability ability4 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new TapSourceCost());
Ability ability4 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new TapSourceCost());
ability4.addEffect(new AddCountersSourceEffect(CounterType.DEPLETION.createInstance()));
this.addAbility(ability4);
}

View file

@ -67,10 +67,10 @@ public class RiverDelta extends CardImpl {
Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.DEPLETION.createInstance()), TargetController.YOU, false);
this.addAbility(ability2);
// {tap}: Add {U} or {B} to your mana pool. Put a depletion counter on River Delta.
Ability ability3 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana, new TapSourceCost());
Ability ability3 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new TapSourceCost());
ability3.addEffect(new AddCountersSourceEffect(CounterType.DEPLETION.createInstance()));
this.addAbility(ability3);
Ability ability4 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new TapSourceCost());
Ability ability4 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost());
ability4.addEffect(new AddCountersSourceEffect(CounterType.DEPLETION.createInstance()));
this.addAbility(ability4);
}

View file

@ -47,7 +47,7 @@ public class SongsOfTheDamned extends CardImpl {
this.expansionSetCode = "ICE";
// Add {B} to your mana pool for each creature card in your graveyard.
DynamicManaEffect effect = new DynamicManaEffect(Mana.BlackMana, new CardsInControllerGraveyardCount(new FilterCreatureCard()));
DynamicManaEffect effect = new DynamicManaEffect(Mana.BlackMana(1), new CardsInControllerGraveyardCount(new FilterCreatureCard()));
this.getSpellAbility().addEffect(effect);
}

View file

@ -67,10 +67,10 @@ public class TimberlineRidge extends CardImpl {
Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.DEPLETION.createInstance()), TargetController.YOU, false);
this.addAbility(ability2);
// {tap}: Add {R} or {G} to your mana pool. Put a depletion counter on Timberline Ridge.
Ability ability3 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new TapSourceCost());
Ability ability3 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new TapSourceCost());
ability3.addEffect(new AddCountersSourceEffect(CounterType.DEPLETION.createInstance()));
this.addAbility(ability3);
Ability ability4 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana, new TapSourceCost());
Ability ability4 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new TapSourceCost());
ability4.addEffect(new AddCountersSourceEffect(CounterType.DEPLETION.createInstance()));
this.addAbility(ability4);
}

View file

@ -67,10 +67,10 @@ public class Veldt extends CardImpl {
Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.DEPLETION.createInstance()), TargetController.YOU, false);
this.addAbility(ability2);
// {tap}: Add {G} or {W} to your mana pool. Put a depletion counter on Veldt.
Ability ability3 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana, new TapSourceCost());
Ability ability3 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new TapSourceCost());
ability3.addEffect(new AddCountersSourceEffect(CounterType.DEPLETION.createInstance()));
this.addAbility(ability3);
Ability ability4 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana, new TapSourceCost());
Ability ability4 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new TapSourceCost());
ability4.addEffect(new AddCountersSourceEffect(CounterType.DEPLETION.createInstance()));
this.addAbility(ability4);
}

View file

@ -53,7 +53,7 @@ public class BogInitiate extends CardImpl {
this.toughness = new MageInt(1);
// {1}: Add {B} to your mana pool.
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new ManaCostsImpl("{1}")));
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new ManaCostsImpl("{1}")));
}
public BogInitiate(final BogInitiate card) {

View file

@ -71,7 +71,7 @@ public class ElvishArchdruid extends CardImpl {
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true)));
// {T}: Add {G} to your mana pool for each Elf you control.
this.addAbility(new DynamicManaAbility(Mana.GreenMana, new PermanentsOnBattlefieldCount(filterCount)));
this.addAbility(new DynamicManaAbility(Mana.GreenMana(1), new PermanentsOnBattlefieldCount(filterCount)));
}
public ElvishArchdruid(final ElvishArchdruid card) {

View file

@ -65,7 +65,7 @@ public class MageRingNetwork extends CardImpl {
this.addAbility(ability);
// {T}, Remove X storage counters from Mage-Ring Network: Add {x} to your mana pool.
ability = new DynamicManaAbility(
Mana.ColorlessMana,
Mana.ColorlessMana(1),
new RemovedCountersForCostValue(),
new TapSourceCost(),
"Add {X} to your mana pool",

View file

@ -58,7 +58,7 @@ public class FireSprites extends CardImpl {
// Flying
this.addAbility(FlyingAbility.getInstance());
// {G}, {tap}: Add {R} to your mana pool.
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new ManaCostsImpl("{G}"));
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new ManaCostsImpl("{G}"));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
}

View file

@ -51,7 +51,7 @@ public class EyeOfRamos extends CardImpl {
this.addAbility(new BlueManaAbility());
// Sacrifice Eye of Ramos: Add {U} to your mana pool.
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana, new SacrificeSourceCost()));
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new SacrificeSourceCost()));
}
public EyeOfRamos(final EyeOfRamos card) {

View file

@ -60,7 +60,7 @@ public class FountainOfCho extends CardImpl {
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost()));
// {T}, Remove any number of storage counters from Fountain of Cho: Add {W} to your mana pool for each storage counter removed this way.
Ability ability = new DynamicManaAbility(
Mana.WhiteMana,
Mana.WhiteMana(1),
new RemovedCountersForCostValue(),
new TapSourceCost(),
"Add {W} to your mana pool for each storage counter removed this way",

View file

@ -51,7 +51,7 @@ public class HeartOfRamos extends CardImpl {
this.addAbility(new RedManaAbility());
// Sacrifice Heart of Ramos: Add {R} to your mana pool.
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new SacrificeSourceCost()));
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new SacrificeSourceCost()));
}
public HeartOfRamos(final HeartOfRamos card) {

View file

@ -51,7 +51,7 @@ public class HornOfRamos extends CardImpl {
this.addAbility(new GreenManaAbility());
// Sacrifice Horn of Ramos: Add {G} to your mana pool.
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana, new SacrificeSourceCost()));
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new SacrificeSourceCost()));
}
public HornOfRamos(final HornOfRamos card) {

View file

@ -60,7 +60,7 @@ public class MercadianBazaar extends CardImpl {
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost()));
// {tap}, Remove any number of storage counters from Mercadian Bazaar: Add {R} to your mana pool for each storage counter removed this way.
Ability ability = new DynamicManaAbility(
Mana.RedMana,
Mana.RedMana(1),
new RemovedCountersForCostValue(),
new TapSourceCost(),
"Add {R} to your mana pool for each storage counter removed this way",

View file

@ -60,7 +60,7 @@ public class RushwoodGrove extends CardImpl {
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost()));
// {T}, Remove any number of storage counters from Rushwood Grove: Add {G} to your mana pool for each storage counter removed this way.
Ability ability = new DynamicManaAbility(
Mana.GreenMana,
Mana.GreenMana(1),
new RemovedCountersForCostValue(),
new TapSourceCost(),
"Add {G} to your mana pool for each storage counter removed this way",

View file

@ -60,7 +60,7 @@ public class SaprazzanCove extends CardImpl {
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost()));
// {tap}, Remove any number of storage counters from Saprazzan Cove: Add {U} to your mana pool for each storage counter removed this way.
Ability ability = new DynamicManaAbility(
Mana.BlueMana,
Mana.BlueMana(1),
new RemovedCountersForCostValue(),
new TapSourceCost(),
"Add {U} to your mana pool for each storage counter removed this way",

View file

@ -51,7 +51,7 @@ public class SkullOfRamos extends CardImpl {
this.addAbility(new BlackManaAbility());
// Sacrifice Skull of Ramos: Add {B} to your mana pool.
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new SacrificeSourceCost()));
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new SacrificeSourceCost()));
}
public SkullOfRamos(final SkullOfRamos card) {

View file

@ -60,7 +60,7 @@ public class SubterraneanHangar extends CardImpl {
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost()));
// {tap}, Remove any number of storage counters from Subterranean Hangar: Add {B} to your mana pool for each storage counter removed this way.
Ability ability = new DynamicManaAbility(
Mana.BlackMana,
Mana.BlackMana(1),
new RemovedCountersForCostValue(),
new TapSourceCost(),
"Add {B} to your mana pool for each storage counter removed this way",

View file

@ -51,7 +51,7 @@ public class ToothOfRamos extends CardImpl {
this.addAbility(new WhiteManaAbility());
// Sacrifice Tooth of Ramos: Add {W} to your mana pool.
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana, new SacrificeSourceCost()));
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new SacrificeSourceCost()));
}
public ToothOfRamos(final ToothOfRamos card) {

View file

@ -76,7 +76,7 @@ public class JunglePatrol extends CardImpl {
// Sacrifice a token named Wood: Add {R} to your mana pool.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
new BasicManaEffect(Mana.RedMana),
new BasicManaEffect(Mana.RedMana(1)),
new SacrificeTargetCost(new TargetControlledPermanent(1, 1, filter, true))));
}

View file

@ -59,7 +59,7 @@ public class SeaScryer extends CardImpl {
// {tap}: Add {1} to your mana pool.
this.addAbility(new ColorlessManaAbility());
// {1}, {tap}: Add {U} to your mana pool.
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(Mana.BlueMana), new GenericManaCost(1));
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(Mana.BlueMana(1)), new GenericManaCost(1));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
}

View file

@ -185,17 +185,17 @@ class ChromeMoxManaEffect extends ManaEffect {
player.choose(outcome, choice, game);
}
if (choice.getChoice().equals("Black")) {
player.getManaPool().addMana(Mana.BlackMana, game, source);
player.getManaPool().addMana(Mana.BlackMana(1), game, source);
} else if (choice.getChoice().equals("Blue")) {
player.getManaPool().addMana(Mana.BlueMana, game, source);
player.getManaPool().addMana(Mana.BlueMana(1), game, source);
} else if (choice.getChoice().equals("Red")) {
player.getManaPool().addMana(Mana.RedMana, game, source);
player.getManaPool().addMana(Mana.RedMana(1), game, source);
} else if (choice.getChoice().equals("Green")) {
player.getManaPool().addMana(Mana.GreenMana, game, source);
player.getManaPool().addMana(Mana.GreenMana(1), game, source);
} else if (choice.getChoice().equals("White")) {
player.getManaPool().addMana(Mana.WhiteMana, game, source);
player.getManaPool().addMana(Mana.WhiteMana(1), game, source);
} else if (choice.getChoice().equals("Colorless")) {
player.getManaPool().addMana(Mana.ColorlessMana, game, source);
player.getManaPool().addMana(Mana.ColorlessMana(1), game, source);
}
checkToFirePossibleEvents(mana, game, source);
player.getManaPool().addMana(mana, game, source);

View file

@ -58,7 +58,7 @@ public class Cloudpost extends CardImpl {
// Cloudpost enters the battlefield tapped.
this.addAbility(new EntersBattlefieldTappedAbility());
// {tap}: Add {1} to your mana pool for each Locus on the battlefield.
this.addAbility(new DynamicManaAbility(Mana.ColorlessMana, new PermanentsOnBattlefieldCount(filter)));
this.addAbility(new DynamicManaAbility(Mana.ColorlessMana(1), new PermanentsOnBattlefieldCount(filter)));
}
public Cloudpost(final Cloudpost card) {

View file

@ -52,7 +52,7 @@ public class ViridianJoiner extends CardImpl {
this.toughness = new MageInt(2);
// {tap}: Add to your mana pool an amount of {G} equal to Viridian Joiner's power.
this.addAbility(new DynamicManaAbility(Mana.GreenMana, new SourcePermanentPowerCount()));
this.addAbility(new DynamicManaAbility(Mana.GreenMana(1), new SourcePermanentPowerCount()));
}
public ViridianJoiner(final ViridianJoiner card) {

View file

@ -79,7 +79,7 @@ public class ChancellorOfTheTangle extends CardImpl {
class ChancellorOfTheTangleDelayedTriggeredAbility extends DelayedTriggeredAbility {
ChancellorOfTheTangleDelayedTriggeredAbility () {
super(new BasicManaEffect(Mana.GreenMana));
super(new BasicManaEffect(Mana.GreenMana(1)));
}
ChancellorOfTheTangleDelayedTriggeredAbility(ChancellorOfTheTangleDelayedTriggeredAbility ability) {

View file

@ -68,7 +68,7 @@ public class ShrineOfBoundlessGrowth extends CardImpl {
this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, false));
// {T}, Sacrifice Shrine of Boundless Growth: Add {1} to your mana pool for each charge counter on Shrine of Boundless Growth.
Ability ability = new DynamicManaAbility(Mana.ColorlessMana, new CountersCount(CounterType.CHARGE), new TapSourceCost());
Ability ability = new DynamicManaAbility(Mana.ColorlessMana(1), new CountersCount(CounterType.CHARGE), new TapSourceCost());
ability.addCost(new SacrificeSourceCost());
this.addAbility(ability);

View file

@ -68,7 +68,7 @@ public class SetonKrosanProtector extends CardImpl {
// Tap an untapped Druid you control: Add {G} to your mana pool.
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD,
new BasicManaEffect(Mana.GreenMana),
new BasicManaEffect(Mana.GreenMana(1)),
new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))));
}

View file

@ -50,7 +50,7 @@ public class TarnishedCitadel extends CardImpl {
this.expansionSetCode = "ODY";
// {tap}: Add {1} to your mana pool.
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana, new TapSourceCost()));
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(1), new TapSourceCost()));
// {tap}: Add one mana of any color to your mana pool. Tarnished Citadel deals 3 damage to you.
ManaAbility ability = new AnyColorManaAbility(new TapSourceCost());
ability.addEffect(new DamageControllerEffect(3));

View file

@ -55,7 +55,7 @@ public class BrightstoneRitual extends CardImpl {
this.expansionSetCode = "ONS";
// Add {R} to your mana pool for each Goblin on the battlefield.
this.getSpellAbility().addEffect(new DynamicManaEffect(Mana.RedMana, new PermanentsOnBattlefieldCount(filter)));
this.getSpellAbility().addEffect(new DynamicManaEffect(Mana.RedMana(1), new PermanentsOnBattlefieldCount(filter)));
}
public BrightstoneRitual(final BrightstoneRitual card) {

View file

@ -63,7 +63,7 @@ public class SkirkProspector extends CardImpl {
this.toughness = new MageInt(1);
// Sacrifice a Goblin: Add {R} to your mana pool.
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,filter,true))));
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,filter,true))));
}
public SkirkProspector(final SkirkProspector card) {

View file

@ -59,7 +59,7 @@ public class SimianSpiritGuide extends CardImpl {
this.toughness = new MageInt(2);
// Exile Simian Spirit Guide from your hand: Add {R} to your mana pool.
this.addAbility(new SimpleManaAbility(Zone.HAND, new BasicManaEffect(Mana.RedMana), new ExileSourceFromHandCost()));
this.addAbility(new SimpleManaAbility(Zone.HAND, new BasicManaEffect(Mana.RedMana(1)), new ExileSourceFromHandCost()));
}
public SimianSpiritGuide(final SimianSpiritGuide card) {

View file

@ -57,7 +57,7 @@ public class CabalCoffers extends CardImpl {
this.expansionSetCode = "HOP";
// {2}, {tap}: Add {B} to your mana pool for each Swamp you control.
Ability ability = new DynamicManaAbility(Mana.BlackMana, new PermanentsOnBattlefieldCount(filter), new GenericManaCost(2));
Ability ability = new DynamicManaAbility(Mana.BlackMana(1), new PermanentsOnBattlefieldCount(filter), new GenericManaCost(2));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
}

View file

@ -62,12 +62,12 @@ public class TaintedIsle extends CardImpl {
// {tap}: Add {U} or {B} to your mana pool. Activate this ability only if you control a Swamp.
this.addAbility(new ActivateIfConditionManaAbility(
Zone.BATTLEFIELD,
new BasicManaEffect(Mana.BlueMana),
new BasicManaEffect(Mana.BlueMana(1)),
new TapSourceCost(),
new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 0)));
this.addAbility(new ActivateIfConditionManaAbility(
Zone.BATTLEFIELD,
new BasicManaEffect(Mana.BlackMana),
new BasicManaEffect(Mana.BlackMana(1)),
new TapSourceCost(),
new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 0)));

View file

@ -180,19 +180,19 @@ class MeteorCraterEffect extends ManaEffect {
for (Permanent permanent : controlledPermanents) {
ObjectColor color = permanent.getColor(game);
if (color.isBlack()) {
types.add(Mana.BlackMana);
types.add(Mana.BlackMana(1));
}
if (color.isBlue()) {
types.add(Mana.BlueMana);
types.add(Mana.BlueMana(1));
}
if (color.isGreen()) {
types.add(Mana.GreenMana);
types.add(Mana.GreenMana(1));
}
if(color.isRed()) {
types.add(Mana.RedMana);
types.add(Mana.RedMana(1));
}
if(color.isWhite()) {
types.add(Mana.WhiteMana);
types.add(Mana.WhiteMana(1));
}
}
return types;

View file

@ -56,7 +56,7 @@ public class ElvesOfDeepShadow extends CardImpl {
this.toughness = new MageInt(1);
// {tap}: Add {B} to your mana pool. Elves of Deep Shadow deals 1 damage to you.
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new TapSourceCost());
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost());
ability.addEffect(new DamageControllerEffect(1));
this.addAbility(ability);
}

View file

@ -103,7 +103,7 @@ class ChannelSpecialAction extends SpecialAction {
ChannelSpecialAction() {
super();
this.addCost(new PayLifeCost(1));
this.addEffect(new BasicManaEffect(Mana.ColorlessMana));
this.addEffect(new BasicManaEffect(Mana.ColorlessMana(1)));
}
ChannelSpecialAction(final ChannelSpecialAction ability) {

View file

@ -87,7 +87,7 @@ class NirkanaRevenantTriggeredAbility extends TriggeredManaAbility {
}
public NirkanaRevenantTriggeredAbility() {
super(Zone.BATTLEFIELD, new BasicManaEffect(Mana.BlackMana), false);
super(Zone.BATTLEFIELD, new BasicManaEffect(Mana.BlackMana(1)), false);
this.usesStack = false;
}

View file

@ -60,7 +60,7 @@ public class OvergrownBattlement extends CardImpl {
this.toughness = new MageInt(4);
this.addAbility(DefenderAbility.getInstance());
this.addAbility(new DynamicManaAbility(Mana.GreenMana, new PermanentsOnBattlefieldCount(filter)));
this.addAbility(new DynamicManaAbility(Mana.GreenMana(1), new PermanentsOnBattlefieldCount(filter)));
}
public OvergrownBattlement(final OvergrownBattlement card) {

View file

@ -47,7 +47,7 @@ public class InnerFire extends CardImpl {
// Add {R} to your mana pool for each card in your hand.
this.getSpellAbility().addEffect(new DynamicManaEffect(Mana.RedMana, new CardsInControllerHandCount()));
this.getSpellAbility().addEffect(new DynamicManaEffect(Mana.RedMana(1), new CardsInControllerHandCount()));
}
public InnerFire(final InnerFire card) {

View file

@ -92,7 +92,7 @@ public class KothOfTheHammer extends CardImpl {
this.addAbility(ability);
// -2: Add {R} to your mana pool for each Mountain you control.
this.addAbility(new LoyaltyAbility(new DynamicManaEffect(Mana.RedMana, new PermanentsOnBattlefieldCount(filterCount)), -2));
this.addAbility(new LoyaltyAbility(new DynamicManaEffect(Mana.RedMana(1), new PermanentsOnBattlefieldCount(filterCount)), -2));
// -5: You get an emblem with "Mountains you control have '{T}: This land deals 1 damage to target creature or player.'
this.addAbility(new LoyaltyAbility(new GetEmblemEffect(new KothOfTheHammerEmblem()), -5));

View file

@ -68,7 +68,7 @@ public class LeechriddenSwamp extends CardImpl {
this.subtype.add("Swamp");
// ({tap}: Add {B} to your mana pool.)
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new TapSourceCost()));
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost()));
// Leechridden Swamp enters the battlefield tapped.
this.addAbility(new EntersBattlefieldTappedAbility());

View file

@ -53,7 +53,7 @@ public class BloodPet extends CardImpl {
this.toughness = new MageInt(1);
// Sacrifice Blood Pet: Add {B} to your mana pool.
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new SacrificeSourceCost()));
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new SacrificeSourceCost()));
}
public BloodPet(final BloodPet card) {

View file

@ -28,7 +28,8 @@
package mage.sets.tempest;
import java.util.UUID;
import static mage.Mana.GreenMana;
import mage.Mana;
import mage.abilities.common.BeginningOfPreCombatMainTriggeredAbility;
import mage.abilities.effects.common.AddManaToManaPoolTargetControllerEffect;
import mage.cards.CardImpl;
@ -50,7 +51,7 @@ public class EladamrisVineyard extends CardImpl {
// At the beginning of each player's precombat main phase, add {G}{G} to that player's mana pool.
this.addAbility(new BeginningOfPreCombatMainTriggeredAbility(
Zone.BATTLEFIELD, new AddManaToManaPoolTargetControllerEffect(GreenMana(2), "that player's"), TargetController.ANY, false, true));
Zone.BATTLEFIELD, new AddManaToManaPoolTargetControllerEffect(Mana.GreenMana(2), "that player's"), TargetController.ANY, false, true));
}
public EladamrisVineyard(final EladamrisVineyard card) {

View file

@ -59,9 +59,9 @@ public class SkyshroudElf extends CardImpl {
this.addAbility(new GreenManaAbility());
// {1}: Add {R} or {W} to your mana pool.
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new ManaCostsImpl("{1}"));
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new ManaCostsImpl("{1}"));
this.addAbility(ability);
Ability ability2 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana, new ManaCostsImpl("{1}"));
Ability ability2 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new ManaCostsImpl("{1}"));
this.addAbility(ability2);
}

View file

@ -51,10 +51,10 @@ public class AdarkarWastes extends CardImpl {
this.addAbility(new ColorlessManaAbility());
Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana, new TapSourceCost());
Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new TapSourceCost());
whiteManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(whiteManaAbility);
Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana, new TapSourceCost());
Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new TapSourceCost());
blueManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blueManaAbility);
}

View file

@ -50,10 +50,10 @@ public class Brushland extends CardImpl {
this.expansionSetCode = "10E";
this.addAbility(new ColorlessManaAbility());
Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana, new TapSourceCost());
Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new TapSourceCost());
greenManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(greenManaAbility);
Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana, new TapSourceCost());
Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new TapSourceCost());
whiteManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(whiteManaAbility);
}

View file

@ -51,10 +51,10 @@ public class KarplusanForest extends CardImpl {
this.addAbility(new ColorlessManaAbility());
Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new TapSourceCost());
Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new TapSourceCost());
redManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(redManaAbility);
Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana, new TapSourceCost());
Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new TapSourceCost());
greenManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(greenManaAbility);
}

View file

@ -51,10 +51,10 @@ public class SulfurousSprings extends CardImpl {
this.addAbility(new ColorlessManaAbility());
Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new TapSourceCost());
Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost());
blackManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blackManaAbility);
Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new TapSourceCost());
Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new TapSourceCost());
redManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(redManaAbility);
}

View file

@ -51,10 +51,10 @@ public class UndergroundRiver extends CardImpl {
this.addAbility(new ColorlessManaAbility());
Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana, new TapSourceCost());
Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new TapSourceCost());
blueManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blueManaAbility);
Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new TapSourceCost());
Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost());
blackManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blackManaAbility);
}

View file

@ -59,7 +59,7 @@ public class CityOfShadows extends CardImpl {
this.addAbility(ability);
// {T}: Add {X} to your mana pool, where X is the number of storage counters on City of Shadows.
ability = new DynamicManaAbility(Mana.ColorlessMana, new CountersCount(CounterType.STORAGE),
ability = new DynamicManaAbility(Mana.ColorlessMana(1), new CountersCount(CounterType.STORAGE),
"Add {X} to your mana pool, where X is the number of storage counters on {this}");
this.addAbility(ability);
}

View file

@ -53,7 +53,7 @@ public class KarametrasAcolyte extends CardImpl {
this.toughness = new MageInt(4);
// {T}: Add an amount of {G} to your mana pool equal to your devotion to green.
this.addAbility(new DynamicManaAbility(Mana.GreenMana, new DevotionCount(ColoredManaSymbol.G),
this.addAbility(new DynamicManaAbility(Mana.GreenMana(1), new DevotionCount(ColoredManaSymbol.G),
"Add an amount of {G} to your mana pool equal to your devotion to green. (Each {G} in the mana costs of permanents you control counts towards your devotion to green.)"));
}

View file

@ -61,7 +61,7 @@ public class WallOfRoots extends CardImpl {
// Defender
this.addAbility(DefenderAbility.getInstance());
// Put a -0/-1 counter on Wall of Roots: Add {G} to your mana pool. Activate this ability only once each turn.
this.addAbility(new ActivateOncePerTurnManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(Mana.GreenMana), new WallOfRootsCost()));
this.addAbility(new ActivateOncePerTurnManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(Mana.GreenMana(1)), new WallOfRootsCost()));
}
public WallOfRoots(final WallOfRoots card) {

View file

@ -61,7 +61,7 @@ public class GemstoneCaverns extends CardImpl {
Ability ability = new ConditionalManaAbility(Zone.BATTLEFIELD,
new ConditionalManaEffect(
new AddManaOfAnyColorEffect(),
new BasicManaEffect(Mana.ColorlessMana),
new BasicManaEffect(Mana.ColorlessMana(1)),
new SourceHasCounterCondition(CounterType.LUCK),
"Add {1} to your mana pool. If {this} has a luck counter on it, instead add one mana of any color to your mana pool."),
new TapSourceCost());

View file

@ -63,12 +63,12 @@ public class TaintedField extends CardImpl {
// {tap}: Add {W} or {B} to your mana pool. Activate this ability only if you control a Swamp.
this.addAbility(new ActivateIfConditionManaAbility(
Zone.BATTLEFIELD,
new BasicManaEffect(Mana.WhiteMana),
new BasicManaEffect(Mana.WhiteMana(1)),
new TapSourceCost(),
new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 0)));
this.addAbility(new ActivateIfConditionManaAbility(
Zone.BATTLEFIELD,
new BasicManaEffect(Mana.BlackMana),
new BasicManaEffect(Mana.BlackMana(1)),
new TapSourceCost(),
new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 0)));
}

View file

@ -63,12 +63,12 @@ public class TaintedPeak extends CardImpl {
// {tap}: Add {B} or {R} to your mana pool. Activate this ability only if you control a Swamp.
this.addAbility(new ActivateIfConditionManaAbility(
Zone.BATTLEFIELD,
new BasicManaEffect(Mana.BlackMana),
new BasicManaEffect(Mana.BlackMana(1)),
new TapSourceCost(),
new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 0)));
this.addAbility(new ActivateIfConditionManaAbility(
Zone.BATTLEFIELD,
new BasicManaEffect(Mana.RedMana),
new BasicManaEffect(Mana.RedMana(1)),
new TapSourceCost(),
new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 0)));

View file

@ -63,12 +63,12 @@ public class TaintedWood extends CardImpl {
// {tap}: Add {B} or {G} to your mana pool. Activate this ability only if you control a Swamp.
this.addAbility(new ActivateIfConditionManaAbility(
Zone.BATTLEFIELD,
new BasicManaEffect(Mana.BlackMana),
new BasicManaEffect(Mana.BlackMana(1)),
new TapSourceCost(),
new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 0)));
this.addAbility(new ActivateIfConditionManaAbility(
Zone.BATTLEFIELD,
new BasicManaEffect(Mana.GreenMana),
new BasicManaEffect(Mana.GreenMana(1)),
new TapSourceCost(),
new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 0)));
}

View file

@ -50,7 +50,7 @@ public class Sacrifice extends CardImpl {
// As an additional cost to cast Sacrifice, sacrifice a creature.
this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent()));
// Add to your mana pool an amount of {B} equal to the sacrificed creature's converted mana cost.
this.getSpellAbility().addEffect(new DynamicManaEffect(Mana.BlackMana, new SacrificeCostConvertedMana("creature"),
this.getSpellAbility().addEffect(new DynamicManaEffect(Mana.BlackMana(1), new SacrificeCostConvertedMana("creature"),
"add to your mana pool an amount of {B} equal to the sacrificed creature's converted mana cost"));
}

View file

@ -62,7 +62,7 @@ public class RofellosLlanowarEmissary extends CardImpl {
this.toughness = new MageInt(1);
// {tap}: Add {G} to your mana pool for each Forest you control.
this.addAbility(new DynamicManaAbility(Mana.GreenMana, new PermanentsOnBattlefieldCount(filter)));
this.addAbility(new DynamicManaAbility(Mana.GreenMana(1), new PermanentsOnBattlefieldCount(filter)));
}
public RofellosLlanowarEmissary(final RofellosLlanowarEmissary card) {

View file

@ -102,7 +102,7 @@ class ContaminationReplacementEffect extends ReplacementEffectImpl {
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
ManaEvent manaEvent = (ManaEvent) event;
Mana mana = manaEvent.getMana();
mana.setToMana(Mana.BlackMana);
mana.setToMana(Mana.BlackMana(1));
return false;
}

View file

@ -56,7 +56,7 @@ public class GaeasCradle extends CardImpl {
this.expansionSetCode = "USG";
this.supertype.add("Legendary");
DynamicManaAbility ability = new DynamicManaAbility(Mana.GreenMana, new PermanentsOnBattlefieldCount(filter));
DynamicManaAbility ability = new DynamicManaAbility(Mana.GreenMana(1), new PermanentsOnBattlefieldCount(filter));
this.addAbility(ability);
}

View file

@ -61,7 +61,7 @@ public class PriestOfTitania extends CardImpl {
this.toughness = new MageInt(1);
// {T}: Add {G} to your mana pool for each Elf on the battlefield.
this.addAbility(new DynamicManaAbility(Mana.GreenMana, new PermanentsOnBattlefieldCount(filter)));
this.addAbility(new DynamicManaAbility(Mana.GreenMana(1), new PermanentsOnBattlefieldCount(filter)));
}
public PriestOfTitania(final PriestOfTitania card) {

View file

@ -53,7 +53,7 @@ public class RainOfFilth extends CardImpl {
// Until end of turn, lands you control gain "Sacrifice this land: Add {B} to your mana pool."
ManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new SacrificeSourceCost());
ManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new SacrificeSourceCost());
this.getSpellAbility().addEffect(new GainAbilityAllEffect(ability, Duration.EndOfTurn, new FilterControlledLandPermanent()));
}

View file

@ -56,7 +56,7 @@ public class SerrasSanctum extends CardImpl {
this.expansionSetCode = "USG";
this.supertype.add("Legendary");
DynamicManaAbility ability = new DynamicManaAbility(Mana.WhiteMana, new PermanentsOnBattlefieldCount(filter));
DynamicManaAbility ability = new DynamicManaAbility(Mana.WhiteMana(1), new PermanentsOnBattlefieldCount(filter));
this.addAbility(ability);
}

View file

@ -56,7 +56,7 @@ public class TolarianAcademy extends CardImpl {
this.supertype.add("Legendary");
this.expansionSetCode = "USG";
DynamicManaAbility ability = new DynamicManaAbility(Mana.BlueMana, new PermanentsOnBattlefieldCount(filter));
DynamicManaAbility ability = new DynamicManaAbility(Mana.BlueMana(1), new PermanentsOnBattlefieldCount(filter));
this.addAbility(ability);
}

View file

@ -55,7 +55,7 @@ public class SkirgeFamiliar extends CardImpl {
this.addAbility(FlyingAbility.getInstance());
// Discard a card: Add {B} to your mana pool.
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new DiscardCardCost(false)));
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new DiscardCardCost(false)));
}
public SkirgeFamiliar(final SkirgeFamiliar card) {

Some files were not shown because too many files have changed in this diff Show more