From 30cbdd643d0e94e4ef192a6c69f27ec8042cc899 Mon Sep 17 00:00:00 2001 From: North Date: Mon, 16 Jul 2012 21:41:00 +0300 Subject: [PATCH] [filters] Replaced ControllerId condition in FilterPermanent with Predicate --- .../mage/sets/avacynrestored/Aggravate.java | 3 +- .../championsofkamigawa/FeastOfWorms.java | 5 +- .../YoseiTheMorningStar.java | 9 ++- .../mage/sets/darkascension/SoulSeizer.java | 4 +- .../sets/eventide/AshlingTheExtinguisher.java | 6 +- .../sets/innistrad/GrimgrinCorpseBorn.java | 5 +- .../sets/magic2010/LightwielderPaladin.java | 23 +++++--- .../mage/sets/magic2011/AncientHellkite.java | 10 ++-- .../mage/sets/magic2011/CyclopsGladiator.java | 3 +- .../mage/sets/newphyrexia/ArmWithAEther.java | 7 ++- .../mage/sets/newphyrexia/BlindZealot.java | 8 ++- .../src/mage/sets/worldwake/HammerOfRuin.java | 18 ++++-- Mage/src/mage/filter/FilterPermanent.java | 25 +-------- .../common/FilterPlaneswalkerOrPlayer.java | 15 +++-- .../permanent/ControllerIdPredicate.java | 56 +++++++++++++++++++ 15 files changed, 131 insertions(+), 66 deletions(-) create mode 100644 Mage/src/mage/filter/predicate/permanent/ControllerIdPredicate.java diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java b/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java index b96ffa59351..1afc888b675 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java @@ -38,6 +38,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.RequirementEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -95,7 +96,7 @@ class AggraveteEffect extends OneShotEffect { Player player = game.getPlayer(source.getFirstTarget()); if (player != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.getControllerId().add(player.getId()); + filter.add(new ControllerIdPredicate(player.getId())); List creatures = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getId(), game); for (Permanent creature : creatures) { creature.damage(1, source.getSourceId(), game, true, false); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FeastOfWorms.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FeastOfWorms.java index 48c635ace37..76714689b32 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/FeastOfWorms.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FeastOfWorms.java @@ -39,6 +39,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -98,15 +99,13 @@ class FeastOfWormsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - //Player player = game.getPlayer(source.getControllerId()); Permanent permanent = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD); Player targetPlayer = game.getPlayer(permanent.getControllerId()); if (targetPlayer != null && permanent != null && (permanent.getSupertype().get(0).toString().equals("Legendary"))) { FilterControlledPermanent filter = new FilterControlledPermanent("land to sacrifice"); filter.add(new CardTypePredicate(CardType.LAND)); - filter.getControllerId().add(targetPlayer.getId()); - filter.setNotController(false); + filter.add(new ControllerIdPredicate(targetPlayer.getId())); TargetControlledPermanent target = new TargetControlledPermanent(1, 1, filter, false); if (target.canChoose(targetPlayer.getId(), game)) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java index 296e2891a8f..d7cd342831c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java @@ -40,6 +40,7 @@ import mage.abilities.effects.common.SkipNextPlayerUntapStepEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.filter.FilterPermanent; +import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -85,8 +86,10 @@ public class YoseiTheMorningStar extends CardImpl { class YoseiTheMorningStarTarget extends TargetPermanent { + private static final FilterPermanent filterTemplate = new FilterPermanent("up to five target permanents that player controls that will be tapped"); + public YoseiTheMorningStarTarget() { - super(0, 5, new FilterPermanent("up to five target permanents that player controls that will be tapped"), false); + super(0, 5, filterTemplate, false); } public YoseiTheMorningStarTarget(final YoseiTheMorningStarTarget target) { @@ -97,8 +100,8 @@ public class YoseiTheMorningStar extends CardImpl { public boolean canTarget(UUID controllerId, UUID id, Ability source, Game game) { Player player = game.getPlayer(source.getFirstTarget()); if (player != null) { - filter.getControllerId().clear(); - filter.getControllerId().add(player.getId()); + this.filter = filterTemplate.copy(); + this.filter.add(new ControllerIdPredicate(player.getId())); return super.canTarget(controllerId, id, source, game); } return false; diff --git a/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java b/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java index bdec3448f42..f4ea379c3a5 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java +++ b/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java @@ -40,6 +40,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; @@ -105,7 +106,8 @@ class SoulSeizerTriggeredAbility extends TriggeredAbilityImpl { class AncientHellkiteAbility extends ActivatedAbilityImpl { - private FilterCreaturePermanent filter = new FilterCreaturePermanent("creature defending player controls"); - public AncientHellkiteAbility() { super(Zone.BATTLEFIELD, new DamageTargetEffect(1)); addCost(new AncientHellkiteCost()); - addTarget(new TargetCreaturePermanent(filter)); addManaCost(new ColoredManaCost(ColoredManaSymbol.R)); } public AncientHellkiteAbility(final AncientHellkiteAbility ability) { super(ability); - this.filter = ability.filter; } @Override @@ -100,9 +97,10 @@ class AncientHellkiteAbility extends ActivatedAbilityImpl { UUID defenderId = game.getCombat().getDefendingPlayer(source.getSourceId()); if (defenderId != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent("creature defending player controls"); - filter.getControllerId().add(defenderId); + filter.add(new ControllerIdPredicate(defenderId)); TargetCreaturePermanent target = new TargetCreaturePermanent(filter); Player player = game.getPlayer(source.getControllerId()); if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java index ae9d079c458..2d80cff5f81 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.cards.CardImpl; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; @@ -57,6 +58,7 @@ public class ArmWithAEther extends CardImpl { this.color.setBlue(true); + // Until end of turn, creatures you control gain "Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand." this.getSpellAbility().addEffect(new GainAbilityControlledEffect(new ArmWithAEtherTriggeredAbility(), Duration.EndOfTurn, filter)); } @@ -89,9 +91,10 @@ class ArmWithAEtherTriggeredAbility extends TriggeredAbilityImpl { this.toughness = new MageInt(2); this.addAbility(IntimidateAbility.getInstance()); + // Whenever Blind Zealot deals combat damage to a player, you may sacrifice it. If you do, destroy target creature that player controls. this.addAbility(new BlindZealotTriggeredAbility()); } @@ -106,11 +108,11 @@ class BlindZealotTriggeredAbility extends TriggeredAbilityImpl { super(ownerId, 124, "Hammer of Ruin", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "WWK"; this.subtype.add("Equipment"); + + // Equipped creature gets +2/+0. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + // Whenever equipped creature deals combat damage to a player, you may destroy target Equipment that player controls. this.addAbility(new HammerOfRuinTriggeredAbility()); + // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } @@ -79,9 +84,6 @@ class HammerOfRuinTriggeredAbility extends TriggeredAbilityImpl { protected List>> extraPredicates = new ArrayList>>(); - protected List controllerId = new ArrayList(); - protected boolean notController; public FilterPermanent() { super("permanent"); @@ -53,8 +51,6 @@ public class FilterPermanent extends FilterObject { public FilterPermanent(final FilterPermanent filter) { super(filter); - this.controllerId = new ArrayList(filter.controllerId); - this.notController = filter.notController; this.extraPredicates = new ArrayList>>(extraPredicates); } @@ -62,17 +58,6 @@ public class FilterPermanent extends FilterObject { super(name); } - @Override - public boolean match(Permanent permanent, Game game) { - if (!super.match(permanent, game)) - return notFilter; - - if (controllerId.size() > 0 && controllerId.contains(permanent.getControllerId()) == notController) - return notFilter; - - return !notFilter; - } - public boolean match(Permanent permanent, UUID sourceId, UUID playerId, Game game) { if (!this.match(permanent, game)) return false; @@ -84,14 +69,6 @@ public class FilterPermanent extends FilterObject { extraPredicates.add(predicate); } - public List getControllerId() { - return controllerId; - } - - public void setNotController(boolean notController) { - this.notController = notController; - } - @Override public FilterPermanent copy() { return new FilterPermanent(this); diff --git a/Mage/src/mage/filter/common/FilterPlaneswalkerOrPlayer.java b/Mage/src/mage/filter/common/FilterPlaneswalkerOrPlayer.java index 0e46ee97468..1bb5f97dc17 100644 --- a/Mage/src/mage/filter/common/FilterPlaneswalkerOrPlayer.java +++ b/Mage/src/mage/filter/common/FilterPlaneswalkerOrPlayer.java @@ -28,15 +28,18 @@ package mage.filter.common; +import java.util.ArrayList; +import java.util.Set; +import java.util.UUID; import mage.filter.FilterImpl; import mage.filter.FilterPlayer; +import mage.filter.predicate.Predicate; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import java.util.Set; -import java.util.UUID; - /** * * @author BetaSteward_at_googlemail.com @@ -48,8 +51,12 @@ public class FilterPlaneswalkerOrPlayer extends FilterImpl { public FilterPlaneswalkerOrPlayer(Set defenders) { super("planeswalker or player"); + ArrayList> permanentPredicates = new ArrayList>(); + for (UUID defenderId : defenders) { + permanentPredicates.add(new ControllerIdPredicate(defenderId)); + } planeswalkerFilter = new FilterPlaneswalkerPermanent(); - planeswalkerFilter.getControllerId().addAll(defenders); + planeswalkerFilter.add(Predicates.or(permanentPredicates)); playerFilter = new FilterPlayer(); playerFilter.getPlayerId().addAll(defenders); } diff --git a/Mage/src/mage/filter/predicate/permanent/ControllerIdPredicate.java b/Mage/src/mage/filter/predicate/permanent/ControllerIdPredicate.java new file mode 100644 index 00000000000..23396673644 --- /dev/null +++ b/Mage/src/mage/filter/predicate/permanent/ControllerIdPredicate.java @@ -0,0 +1,56 @@ +/* + * 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.predicate.permanent; + +import java.util.UUID; +import mage.filter.predicate.Predicate; +import mage.game.Game; +import mage.game.permanent.Permanent; + +/** + * + * @author North + */ +public class ControllerIdPredicate implements Predicate { + + private final UUID controllerId; + + public ControllerIdPredicate(UUID controllerId) { + this.controllerId = controllerId; + } + + @Override + public boolean apply(Permanent input, Game game) { + return controllerId.equals(input.getControllerId()); + } + + @Override + public String toString() { + return "ControllerId(" + controllerId + ')'; + } +}