Merge origin/master

This commit is contained in:
LevelX2 2014-03-31 22:29:30 +02:00
commit 2226498576

View file

@ -28,17 +28,17 @@
package mage.sets.planechase; package mage.sets.planechase;
import java.util.UUID; import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.Mana; import mage.Mana;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.effects.common.DynamicManaEffect; import mage.abilities.effects.common.DynamicManaEffect;
import mage.abilities.mana.SimpleManaAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
@ -59,7 +59,7 @@ public class CabalCoffers extends CardImpl<CabalCoffers> {
this.expansionSetCode = "HOP"; this.expansionSetCode = "HOP";
// {2}, {tap}: Add {B} to your mana pool for each Swamp you control. // {2}, {tap}: Add {B} to your mana pool for each Swamp you control.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD,
new DynamicManaEffect(Mana.BlackMana, new PermanentsOnBattlefieldCount(filter)), new DynamicManaEffect(Mana.BlackMana, new PermanentsOnBattlefieldCount(filter)),
new GenericManaCost(2)); new GenericManaCost(2));
ability.addCost(new TapSourceCost()); ability.addCost(new TapSourceCost());