From b4f3440fbd6e46ce71032d9f7527c363831efff5 Mon Sep 17 00:00:00 2001 From: LoneFox Date: Sun, 28 Jun 2015 10:12:50 +0300 Subject: [PATCH] Move PermanentsTargetOpponentControlsCount from Gideon, Champion of Justice to its own file. Implement card that uses it: Starlight --- .../gatecrash/GideonChampionOfJustice.java | 37 +--------- Mage.Sets/src/mage/sets/portal/Starlight.java | 53 ++++++++++++++ .../mage/sets/seventhedition/Starlight.java | 72 +++++++++++++++++++ ...PermanentsTargetOpponentControlsCount.java | 67 +++++++++++++++++ 4 files changed, 194 insertions(+), 35 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/portal/Starlight.java create mode 100644 Mage.Sets/src/mage/sets/seventhedition/Starlight.java create mode 100644 Mage/src/mage/abilities/dynamicvalue/common/PermanentsTargetOpponentControlsCount.java diff --git a/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java b/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java index 78e4322ff31..ddff7d83638 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java @@ -34,6 +34,7 @@ import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CountersCount; +import mage.abilities.dynamicvalue.common.PermanentsTargetOpponentControlsCount; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PreventAllDamageToSourceEffect; @@ -45,7 +46,6 @@ import mage.cards.CardImpl; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; @@ -68,7 +68,7 @@ public class GideonChampionOfJustice extends CardImpl { // +1: Put a loyalty counter on Gideon, Champion of Justice for each creature target opponent controls. LoyaltyAbility ability1 = new LoyaltyAbility( - new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(0), new PermanentsTargetOpponentControlsCount(), true), 1); + new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(0), new PermanentsTargetOpponentControlsCount(new FilterCreaturePermanent()), true), 1); ability1.addTarget(new TargetOpponent()); this.addAbility(ability1); @@ -92,39 +92,6 @@ public class GideonChampionOfJustice extends CardImpl { } } -class PermanentsTargetOpponentControlsCount implements DynamicValue { - - public PermanentsTargetOpponentControlsCount() { - } - - @Override - public int calculate(Game game, Ability sourceAbility, Effect effect) { - if (sourceAbility.getFirstTarget() != null) { - FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.add(new ControllerIdPredicate(sourceAbility.getFirstTarget())); - int value = game.getBattlefield().count(filter, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game); - return value; - } else { - return 0; - } - } - - @Override - public DynamicValue copy() { - return new PermanentsTargetOpponentControlsCount(); - } - - @Override - public String toString() { - return "X"; - } - - @Override - public String getMessage() { - return "creature target opponent controls"; - } -} - class GideonExileAllOtherPermanentsEffect extends OneShotEffect { public GideonExileAllOtherPermanentsEffect() { diff --git a/Mage.Sets/src/mage/sets/portal/Starlight.java b/Mage.Sets/src/mage/sets/portal/Starlight.java new file mode 100644 index 00000000000..ecdf6f369b5 --- /dev/null +++ b/Mage.Sets/src/mage/sets/portal/Starlight.java @@ -0,0 +1,53 @@ +/* + * 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.portal; + +import java.util.UUID; + +/** + * + * @author LoneFox + + */ +public class Starlight extends mage.sets.seventhedition.Starlight { + + public Starlight(UUID ownerId) { + super(ownerId); + this.cardNumber = 191; + this.expansionSetCode = "POR"; + } + + public Starlight(final Starlight card) { + super(card); + } + + @Override + public Starlight copy() { + return new Starlight(this); + } +} diff --git a/Mage.Sets/src/mage/sets/seventhedition/Starlight.java b/Mage.Sets/src/mage/sets/seventhedition/Starlight.java new file mode 100644 index 00000000000..e5dfe48fd36 --- /dev/null +++ b/Mage.Sets/src/mage/sets/seventhedition/Starlight.java @@ -0,0 +1,72 @@ +/* + * 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.seventhedition; + +import java.util.UUID; +import mage.ObjectColor; +import mage.abilities.dynamicvalue.common.PermanentsTargetOpponentControlsCount; +import mage.abilities.effects.common.GainLifeEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.ColorPredicate; +import mage.target.common.TargetOpponent; + +/** + * + * @author LoneFox + + */ +public class Starlight extends CardImpl { + + + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("black creature"); + + static { + filter.add(new ColorPredicate(ObjectColor.BLACK)); + } + + public Starlight(UUID ownerId) { + super(ownerId, 49, "Starlight", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{W}"); + this.expansionSetCode = "7ED"; + + // You gain 3 life for each black creature target opponent controls. + this.getSpellAbility().addEffect(new GainLifeEffect(new PermanentsTargetOpponentControlsCount(filter, 3))); + this.getSpellAbility().addTarget(new TargetOpponent()); + } + + public Starlight(final Starlight card) { + super(card); + } + + @Override + public Starlight copy() { + return new Starlight(this); + } +} diff --git a/Mage/src/mage/abilities/dynamicvalue/common/PermanentsTargetOpponentControlsCount.java b/Mage/src/mage/abilities/dynamicvalue/common/PermanentsTargetOpponentControlsCount.java new file mode 100644 index 00000000000..f1f7ef9b874 --- /dev/null +++ b/Mage/src/mage/abilities/dynamicvalue/common/PermanentsTargetOpponentControlsCount.java @@ -0,0 +1,67 @@ +package mage.abilities.dynamicvalue.common; + +import mage.abilities.Ability; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.effects.Effect; +import mage.filter.FilterPermanent; +import mage.filter.predicate.permanent.ControllerIdPredicate; +import mage.game.Game; + +/** + * + * @author LoneFox + */ + +public class PermanentsTargetOpponentControlsCount implements DynamicValue { + + private FilterPermanent filter; + private Integer multiplier; + + public PermanentsTargetOpponentControlsCount() { + this(new FilterPermanent(), 1); + } + + public PermanentsTargetOpponentControlsCount(FilterPermanent filter) { + this(filter, 1); + } + + public PermanentsTargetOpponentControlsCount(FilterPermanent filter, Integer multiplier) { + this.filter = filter; + this.multiplier = multiplier; + } + + public PermanentsTargetOpponentControlsCount(final PermanentsTargetOpponentControlsCount dynamicValue) { + this.filter = dynamicValue.filter; + this.multiplier = dynamicValue.multiplier; + } + + @Override + public DynamicValue copy() { + return new PermanentsTargetOpponentControlsCount(this); + } + + @Override + public int calculate(Game game, Ability sourceAbility, Effect effect) { + if(sourceAbility.getFirstTarget() != null) { + filter.add(new ControllerIdPredicate(sourceAbility.getFirstTarget())); + int value = game.getBattlefield().count(filter, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game); + return multiplier * value; + } + else { + return 0; + } + } + + @Override + public String toString() { + if(multiplier != null) { + return multiplier.toString(); + } + return "X"; + } + + @Override + public String getMessage() { + return filter.getMessage() + " target opponent controls"; + } +}