diff --git a/Mage.Sets/src/mage/sets/alarareborn/GloryofWarfare.java b/Mage.Sets/src/mage/sets/alarareborn/GloryofWarfare.java index 8494413658b..bd74daf0d91 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/GloryofWarfare.java +++ b/Mage.Sets/src/mage/sets/alarareborn/GloryofWarfare.java @@ -50,7 +50,6 @@ public class GloryofWarfare extends CardImpl { public GloryofWarfare (UUID ownerId) { super(ownerId, 98, "Glory of Warfare", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{W}"); this.expansionSetCode = "ARB"; - this.subtype.add("Enchantment"); this.color.setRed(true); this.color.setWhite(true); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn), MyTurn.getInstance(), "As long as it's your turn, creatures you control get +2/+0"))); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java index bf6fea66fa5..9b74398914a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java @@ -28,39 +28,34 @@ package mage.sets.mirrodinbesieged; -import java.util.UUID; - -import mage.Constants; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; -import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.DrawCardControllerEffect; -import mage.abilities.effects.common.continious.GainProtectionFromColorTargetEffect; import mage.cards.CardImpl; +import java.util.UUID; + /** - * * @author ayratn */ public class IchorWellspring extends CardImpl { - public IchorWellspring (UUID ownerId) { - super(ownerId, 110, "Ichor Wellspring", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); - this.expansionSetCode = "MBS"; + public IchorWellspring(UUID ownerId) { + super(ownerId, 110, "Ichor Wellspring", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); + this.expansionSetCode = "MBS"; this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1))); this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(1))); - } + } - public IchorWellspring (final IchorWellspring card) { - super(card); - } + public IchorWellspring(final IchorWellspring card) { + super(card); + } - @Override - public IchorWellspring copy() { - return new IchorWellspring(this); - } + @Override + public IchorWellspring copy() { + return new IchorWellspring(this); + } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java new file mode 100644 index 00000000000..ca4b9395ab6 --- /dev/null +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java @@ -0,0 +1,134 @@ +/* + * 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.sets.scarsofmirrodin; + +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.Effect; +import mage.abilities.effects.ReplacementEffectImpl; +import mage.abilities.effects.common.RegenerateTargetEffect; +import mage.cards.CardImpl; +import mage.filter.FilterStackObject; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.permanent.Permanent; +import mage.game.stack.StackObject; +import mage.target.common.TargetCreaturePermanent; + +import java.util.UUID; + +/** + * @author ayratn + */ +public class Asceticism extends CardImpl { + + private static FilterStackObject filter = new FilterStackObject("spells or abilities your opponents control"); + + static { + filter.setTargetController(Constants.TargetController.OPPONENT); + } + + public Asceticism(UUID ownerId) { + super(ownerId, 110, "Asceticism", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}{G}"); + this.expansionSetCode = "SOM"; + this.color.setGreen(true); + this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new AsceticismEffect(filter, Constants.Duration.WhileOnBattlefield))); + Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}{G}")); + ability.addTarget(new TargetCreaturePermanent()); + this.addAbility(ability); + } + + public Asceticism(final Asceticism card) { + super(card); + } + + @Override + public Asceticism copy() { + return new Asceticism(this); + } + +} + +class AsceticismEffect extends ReplacementEffectImpl { + + private FilterStackObject filterSource; + + public AsceticismEffect(FilterStackObject filterSource, Constants.Duration duration) { + super(duration, Constants.Outcome.Benefit); + this.filterSource = filterSource; + } + + public AsceticismEffect(final AsceticismEffect effect) { + super(effect); + this.filterSource = effect.filterSource.copy(); + } + + @Override + public AsceticismEffect copy() { + return new AsceticismEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + return true; + } + + @Override + public boolean replaceEvent(GameEvent event, Ability source, Game game) { + return true; + } + + @Override + public boolean applies(GameEvent event, Ability source, Game game) { + if (event.getType() == GameEvent.EventType.TARGET) { + Permanent permanent = game.getBattlefield().getPermanent(event.getTargetId()); + if (permanent != null && permanent.getControllerId().equals(source.getControllerId()) + && permanent.getCardType().contains(CardType.CREATURE)) { + StackObject sourceObject = game.getStack().getStackObject(event.getSourceId()); + if (sourceObject != null && filterSource.match(sourceObject, source.getControllerId(), game)) { + return true; + } + } + } + return false; + } + + @Override + public String getText(Ability source) { + return "Creatures you control can't be the targets of spells or abilities your opponents control"; + } + +} + diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java new file mode 100644 index 00000000000..3d4841c5f0c --- /dev/null +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java @@ -0,0 +1,65 @@ +/* + * 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.sets.scarsofmirrodin; + +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.continious.GainProtectionFromTypeTargetEffect; +import mage.cards.CardImpl; +import mage.filter.common.FilterArtifactCard; +import mage.target.common.TargetCreaturePermanent; + +import java.util.UUID; + +/** + * @author ayratn + */ +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(Constants.Duration.EndOfTurn, new FilterArtifactCard("artifacts"))); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + } + + public TelJiladDefiance(final TelJiladDefiance card) { + super(card); + } + + @Override + public TelJiladDefiance copy() { + return new TelJiladDefiance(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java new file mode 100644 index 00000000000..05df2d2ba8e --- /dev/null +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java @@ -0,0 +1,67 @@ +/* + * 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.sets.scarsofmirrodin; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.MageInt; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.keyword.ProtectionAbility; +import mage.cards.CardImpl; +import mage.filter.common.FilterArtifactCard; +import mage.filter.common.FilterArtifactPermanent; + +/** + * + * @author ayratn + */ +public class TelJiladFallen extends CardImpl { + + public TelJiladFallen (UUID ownerId) { + super(ownerId, 130, "Tel-Jilad Fallen", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); + 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(new ProtectionAbility(new FilterArtifactCard("artifacts"))); + } + + public TelJiladFallen (final TelJiladFallen card) { + super(card); + } + + @Override + public TelJiladFallen copy() { + return new TelJiladFallen(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java new file mode 100644 index 00000000000..2334f80138e --- /dev/null +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java @@ -0,0 +1,62 @@ +/* + * 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.sets.scarsofmirrodin; + +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.effects.common.continious.BoostPowerToughnessXTargetEffect; +import mage.cards.CardImpl; +import mage.target.common.TargetCreaturePermanent; + +import java.util.UUID; + +/** + * @author ayratn + */ +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 BoostPowerToughnessXTargetEffect(Constants.Duration.EndOfTurn)); + } + + public UntamedMight(final UntamedMight card) { + super(card); + } + + @Override + public UntamedMight copy() { + return new UntamedMight(this); + } + +} diff --git a/Mage/src/mage/abilities/effects/common/RegenerateTargetEffect.java b/Mage/src/mage/abilities/effects/common/RegenerateTargetEffect.java index 53c164bc6cc..0fbfd0999d0 100644 --- a/Mage/src/mage/abilities/effects/common/RegenerateTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/RegenerateTargetEffect.java @@ -94,9 +94,9 @@ public class RegenerateTargetEffect extends ReplacementEffectImpl { + private int amount = -1; + + public BoostPowerToughnessXTargetEffect(Duration duration) { + super(duration, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature); + } + + public BoostPowerToughnessXTargetEffect(final BoostPowerToughnessXTargetEffect effect) { + super(effect); + this.amount = effect.amount; + } + + @Override + public BoostPowerToughnessXTargetEffect copy() { + return new BoostPowerToughnessXTargetEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + int amount = source.getManaCostsToPay().getVariableCosts().get(0).getAmount(); + if (amount == 0) { + return false; + } + Permanent target = game.getPermanent(source.getFirstTarget()); + if (target != null) { + target.addPower(amount); + target.addToughness(amount); + return true; + } + return false; + } + + @Override + public String getText(Ability source) { + StringBuilder sb = new StringBuilder(); + sb.append("Target ").append(source.getTargets().get(0).getTargetName()).append(" gets "); + sb.append(String.format("+X/+X")).append(" ").append(duration.toString()); + return sb.toString(); + } + +} diff --git a/Mage/src/mage/abilities/effects/common/continious/GainProtectionFromTypeTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainProtectionFromTypeTargetEffect.java new file mode 100644 index 00000000000..e817758329d --- /dev/null +++ b/Mage/src/mage/abilities/effects/common/continious/GainProtectionFromTypeTargetEffect.java @@ -0,0 +1,77 @@ +/* + * 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.effects.common.continious; + +import mage.Constants.Duration; +import mage.abilities.Ability; +import mage.abilities.keyword.ProtectionAbility; +import mage.filter.FilterCard; +import mage.game.Game; +import mage.game.permanent.Permanent; + +/** + * + * @author ayratn + */ +public class GainProtectionFromTypeTargetEffect extends GainAbilityTargetEffect { + + private String typeName; + + public GainProtectionFromTypeTargetEffect(Duration duration, FilterCard protectionFrom) { + super(new ProtectionAbility(new FilterCard()), duration); + ((ProtectionAbility)ability).setFilter(protectionFrom); + typeName = protectionFrom.getMessage(); + } + + public GainProtectionFromTypeTargetEffect(final GainProtectionFromTypeTargetEffect effect) { + super(effect); + this.typeName = effect.typeName; + } + + @Override + public GainProtectionFromTypeTargetEffect copy() { + return new GainProtectionFromTypeTargetEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Permanent creature = game.getPermanent(source.getFirstTarget()); + if (creature != null) { + creature.addAbility(ability); + return true; + } + return false; + } + + @Override + public String getText(Ability source) { + return "Target creature gains protection from " + typeName + " " + duration.toString(); + } + +} diff --git a/Mage/src/mage/abilities/keyword/ProtectionAbility.java b/Mage/src/mage/abilities/keyword/ProtectionAbility.java index f1b0df008ce..014f7d78630 100644 --- a/Mage/src/mage/abilities/keyword/ProtectionAbility.java +++ b/Mage/src/mage/abilities/keyword/ProtectionAbility.java @@ -93,4 +93,8 @@ public class ProtectionAbility extends StaticAbility { public Filter getFilter() { return filter; } + + public void setFilter(FilterCard filter) { + this.filter = filter; + } } diff --git a/Mage/src/mage/filter/common/FilterArtifactPermanent.java b/Mage/src/mage/filter/common/FilterArtifactPermanent.java new file mode 100644 index 00000000000..e6fbf11b863 --- /dev/null +++ b/Mage/src/mage/filter/common/FilterArtifactPermanent.java @@ -0,0 +1,120 @@ +/* +* 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.filter.common; + +import mage.Constants.CardType; +import mage.filter.FilterPermanent; +import mage.game.permanent.Permanent; + +/** + * + * @author ayratn + */ +public class FilterArtifactPermanent> extends FilterPermanent> { + + protected static FilterArtifactPermanent defaultFilter = new FilterArtifactPermanent(); + + protected boolean useAttacking; + protected boolean attacking; + protected boolean useBlocking; + protected boolean blocking; + protected boolean useTapped; + protected boolean tapped; + + public FilterArtifactPermanent() { + this("artifact"); + } + + public FilterArtifactPermanent(String name) { + super(name); + cardType.add(CardType.ARTIFACT); + } + + public FilterArtifactPermanent(final FilterArtifactPermanent filter) { + super(filter); + this.useAttacking = filter.useAttacking; + this.attacking = filter.attacking; + this.useBlocking = filter.useBlocking; + this.blocking = filter.blocking; + this.useTapped = filter.useTapped; + this.tapped = filter.tapped; + } + + public static FilterArtifactPermanent getDefault() { + return defaultFilter; + } + + @Override + public boolean match(Permanent permanent) { + if (!super.match(permanent)) + return notFilter; + + if (useAttacking && permanent.isAttacking() != attacking) + return notFilter; + + if (useBlocking && (permanent.getBlocking() > 0) != blocking) + return notFilter; + + if (useTapped && permanent.isTapped() != tapped) + return notFilter; + + return !notFilter; + } + + public void setUseAttacking ( boolean useAttacking ) { + this.useAttacking = useAttacking; + } + + public void setAttacking ( boolean attacking ) { + this.attacking = attacking; + } + + public void setUseBlocking ( boolean useBlocking ) { + this.useBlocking = useBlocking; + } + + public void setBlocking ( boolean blocking ) { + this.blocking = blocking; + } + + public void setUseTapped ( boolean useTapped ) { + this.useTapped = useTapped; + } + + public void setTapped ( boolean tapped ) { + this.tapped = tapped; + } + + @Override + public FilterArtifactPermanent copy() { + if (this == defaultFilter) + return this; + return new FilterArtifactPermanent(this); + } +} diff --git a/Mage/src/mage/target/common/TargetArtifactPermanent.java b/Mage/src/mage/target/common/TargetArtifactPermanent.java new file mode 100644 index 00000000000..4c009519ff7 --- /dev/null +++ b/Mage/src/mage/target/common/TargetArtifactPermanent.java @@ -0,0 +1,70 @@ +/* +* 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.target.common; + +import mage.filter.common.FilterArtifactPermanent; +import mage.filter.common.FilterCreaturePermanent; +import mage.target.TargetPermanent; + +/** + * @author ayratn + */ +public class TargetArtifactPermanent> extends TargetPermanent> { + + public TargetArtifactPermanent() { + this(1, 1, FilterArtifactPermanent.getDefault(), false); + } + + public TargetArtifactPermanent(FilterArtifactPermanent filter) { + this(1, 1, filter, false); + } + + public TargetArtifactPermanent(int numTargets) { + this(numTargets, numTargets, FilterArtifactPermanent.getDefault(), false); + } + + public TargetArtifactPermanent(int minNumTargets, int maxNumTargets) { + this(minNumTargets, maxNumTargets, FilterArtifactPermanent.getDefault(), false); + } + + public TargetArtifactPermanent(int minNumTargets, int maxNumTargets, FilterArtifactPermanent filter, boolean notTarget) { + super(minNumTargets, maxNumTargets, filter, notTarget); + this.targetName = filter.getMessage(); + } + + public TargetArtifactPermanent(final TargetArtifactPermanent target) { + super(target); + } + + @Override + public TargetArtifactPermanent copy() { + return new TargetArtifactPermanent(this); + } + +}