diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/VillainousOgre.java b/Mage.Sets/src/mage/sets/championsofkamigawa/VillainousOgre.java index 5073a594caf..afaddb9e275 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/VillainousOgre.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/VillainousOgre.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.abilities.condition.common.ControlsPermanentCondition; import mage.abilities.common.CantBlockAbility; import mage.abilities.costs.mana.ColoredManaCost; -import mage.abilities.decorator.ConditionalActivatedAbility; +import mage.abilities.decorator.ConditionalGainActivatedAbility; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.filter.common.FilterControlledPermanent; @@ -66,7 +66,7 @@ public class VillainousOgre extends CardImpl { this.addAbility(new CantBlockAbility()); // As long as you control a Demon, Villainous Ogre has "{B}: Regenerate Villainous Ogre. - this.addAbility( new ConditionalActivatedAbility( + this.addAbility( new ConditionalGainActivatedAbility( Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.B), diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MulDayaChannelers.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MulDayaChannelers.java index ad2bb1b400c..3731fab780e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MulDayaChannelers.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MulDayaChannelers.java @@ -39,7 +39,7 @@ import mage.cards.CardImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.condition.common.TopLibraryCardTypeCondition; -import mage.abilities.decorator.ConditionalActivatedAbility; +import mage.abilities.decorator.ConditionalGainActivatedAbility; import static mage.abilities.condition.common.TopLibraryCardTypeCondition.CheckType.*; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.AddManaOfAnyColorEffect; @@ -73,7 +73,7 @@ public class MulDayaChannelers extends CardImpl { this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); // As long as the top card of your library is a land card, Mul Daya Channelers has "T: Add two mana of any one color to your mana pool." - ConditionalActivatedAbility ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new TapSourceCost(), new TopLibraryCardTypeCondition(LAND), rule2); + ConditionalGainActivatedAbility ability = new ConditionalGainActivatedAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new TapSourceCost(), new TopLibraryCardTypeCondition(LAND), rule2); ability.addChoice(new ChoiceColor()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java index dd94fbaeb28..78b6c8a8fa2 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java @@ -28,6 +28,7 @@ package mage.sets.scarsofmirrodin; +import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.Constants.Zone; @@ -42,7 +43,6 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; -import java.util.UUID; /** * @@ -66,6 +66,8 @@ public class VedalkenCertarch extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); + + // Metalcraft - {T}: Tap target artifact, creature, or land. Activate this ability only if you control three or more artifacts. Ability ability = new MetalcraftActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage/src/mage/abilities/decorator/ConditionalGainActivatedAbility.java b/Mage/src/mage/abilities/decorator/ConditionalGainActivatedAbility.java new file mode 100644 index 00000000000..74dcfb0cbeb --- /dev/null +++ b/Mage/src/mage/abilities/decorator/ConditionalGainActivatedAbility.java @@ -0,0 +1,103 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.abilities.decorator; + +import java.util.UUID; +import mage.Constants; +import mage.Constants.Zone; +import mage.abilities.ActivatedAbilityImpl; +import mage.abilities.condition.Condition; +import mage.abilities.costs.Cost; +import mage.abilities.costs.Costs; +import mage.abilities.costs.mana.ManaCosts; +import mage.abilities.effects.Effect; +import mage.abilities.effects.Effects; +import mage.game.Game; + +/** + * The card / permanent has the ability only, if the condition is true. + * + * @author LevelX + */ +public class ConditionalGainActivatedAbility extends ActivatedAbilityImpl { + + private Condition condition; + private String staticText = ""; + + private static final Effects emptyEffects = new Effects(); + + public ConditionalGainActivatedAbility(Zone zone, Effect effect, ManaCosts cost, Condition condition, String rule) { + super(zone, effect, cost); + this.condition = condition; + this.staticText = rule; + } + + public ConditionalGainActivatedAbility(Zone zone, Effect effect, Costs costs, Condition condition, String rule) { + super(zone, effect, costs); + this.condition = condition; + this.staticText = rule; + } + + public ConditionalGainActivatedAbility(Zone zone, Effect effect, Cost cost, Condition condition, String rule) { + super(zone, effect, cost); + this.condition = condition; + this.staticText = rule; + } + + public ConditionalGainActivatedAbility(ConditionalGainActivatedAbility ability) { + super(ability); + this.condition = ability.condition; + this.staticText = ability.staticText; + } + + @Override + public Effects getEffects(Game game, Constants.EffectType effectType) { + if (!condition.apply(game, this)) { + return emptyEffects; + } + return super.getEffects(game, effectType); + } + + @Override + public boolean canActivate(UUID playerId, Game game) { + if (!condition.apply(game, this)) { + return false; + } + return super.canActivate(playerId, game); + } + + @Override + public ConditionalGainActivatedAbility copy() { + return new ConditionalGainActivatedAbility(this); + } + + @Override + public String getRule() { + return staticText; + } +}