From dfd2413b89d0750575e572e478ce74edf09a8c9c Mon Sep 17 00:00:00 2001 From: North Date: Tue, 10 Jul 2012 23:44:45 +0300 Subject: [PATCH] [filters] replaced Power and Toughness conditions with Predicates --- .../alarareborn/SpellbreakerBehemoth.java | 4 +-- .../betrayersofkamigawa/TerashisVerdict.java | 4 +-- .../SoratamiMirrorGuard.java | 4 +-- .../src/mage/sets/conflux/BeaconBehemoth.java | 4 +-- .../mage/sets/conflux/VagrantPlowbeasts.java | 4 +-- .../sets/innistrad/SmiteTheMonstrous.java | 9 +++-- .../riseoftheeldrazi/BalaGedScorpion.java | 4 +-- .../sets/riseoftheeldrazi/GoblinTunneler.java | 6 ++-- .../sets/riseoftheeldrazi/KorLineSlinger.java | 4 +-- .../riseoftheeldrazi/PuncturingLight.java | 4 +-- .../sets/shardsofalara/BloodthornTaunter.java | 4 +-- .../mage/sets/shardsofalara/Godtoucher.java | 4 +-- .../shardsofalara/GustriderExuberant.java | 4 +-- .../mage/sets/shardsofalara/Mosstodon.java | 4 +-- .../shardsofalara/RakeclawGargantuan.java | 4 +-- .../shardsofalara/SpearbreakerBehemoth.java | 4 +-- .../src/mage/sets/tenth/CraftyPathmage.java | 4 +-- .../mage/sets/timeshifted/Pendelhaven.java | 10 +++--- .../src/mage/sets/urzassaga/IntrepidHero.java | 4 +-- Mage/src/mage/filter/FilterImpl.java | 18 ---------- Mage/src/mage/filter/FilterObject.java | 34 ------------------- 21 files changed, 44 insertions(+), 97 deletions(-) diff --git a/Mage.Sets/src/mage/sets/alarareborn/SpellbreakerBehemoth.java b/Mage.Sets/src/mage/sets/alarareborn/SpellbreakerBehemoth.java index bb83a5b20f6..c9f1a99d6af 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SpellbreakerBehemoth.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SpellbreakerBehemoth.java @@ -40,6 +40,7 @@ import mage.abilities.effects.common.CantCounterSourceEffect; import mage.cards.CardImpl; import mage.filter.Filter; import mage.filter.FilterSpell; +import mage.filter.predicate.mageobject.PowerPredicate; /** @@ -52,8 +53,7 @@ public class SpellbreakerBehemoth extends CardImpl { static { filter.getCardType().add(CardType.CREATURE); - filter.setPower(4); - filter.setPowerComparison(Filter.ComparisonType.GreaterThan); + filter.add(new PowerPredicate(Filter.ComparisonType.GreaterThan, 4)); } public SpellbreakerBehemoth(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java index 8bab6e54f58..bc9f3809036 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.Filter; import mage.filter.common.FilterAttackingCreature; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetAttackingCreature; /** @@ -45,8 +46,7 @@ public class TerashisVerdict extends CardImpl { private final static FilterAttackingCreature filter = new FilterAttackingCreature("attacking creature with power 3 or less"); static { - filter.setPower(4); - filter.setPowerComparison(Filter.ComparisonType.LessThan); + filter.add(new PowerPredicate(Filter.ComparisonType.LessThan, 4)); } public TerashisVerdict(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorGuard.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorGuard.java index 9a2ac796115..a92d0354db7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorGuard.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorGuard.java @@ -45,6 +45,7 @@ import mage.cards.CardImpl; import mage.filter.Filter; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -59,8 +60,7 @@ public class SoratamiMirrorGuard extends CardImpl { static { filter.getCardType().add(CardType.LAND); filter.setScopeCardType(Filter.ComparisonScope.Any); - filterCreature.setPower(3); - filterCreature.setPowerComparison(Filter.ComparisonType.LessThan); + filterCreature.add(new PowerPredicate(Filter.ComparisonType.LessThan, 3)); } public SoratamiMirrorGuard(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java b/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java index 72236742171..f81fac3750d 100644 --- a/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java +++ b/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java @@ -42,6 +42,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -53,8 +54,7 @@ public class BeaconBehemoth extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 5 or greater"); static { - filter.setPower(4); - filter.setPowerComparison(ComparisonType.GreaterThan); + filter.add(new PowerPredicate(ComparisonType.GreaterThan, 4)); } public BeaconBehemoth (UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java b/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java index d20c7a36595..01642fbf085 100644 --- a/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java +++ b/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -49,8 +50,7 @@ public class VagrantPlowbeasts extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 5 or greater"); static { - filter.setPower(4); - filter.setPowerComparison(ComparisonType.GreaterThan); + filter.add(new PowerPredicate(ComparisonType.GreaterThan, 4)); } public VagrantPlowbeasts(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java b/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java index 695423f2e75..344e57c590a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java +++ b/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java @@ -27,15 +27,15 @@ */ package mage.sets.innistrad; +import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; -import mage.target.TargetPermanent; - -import java.util.UUID; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; +import mage.target.TargetPermanent; /** * @author nantuko @@ -45,8 +45,7 @@ public class SmiteTheMonstrous extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 4 or greater"); static { - filter.setPower(3); - filter.setPowerComparison(Filter.ComparisonType.GreaterThan); + filter.add(new PowerPredicate(Filter.ComparisonType.GreaterThan, 3)); } public SmiteTheMonstrous(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java index 81aec880e40..d277fbe8dd7 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -47,8 +48,7 @@ public class BalaGedScorpion extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 1 or less"); static { - filter.setPower(2); - filter.setPowerComparison(ComparisonType.LessThan); + filter.add(new PowerPredicate(ComparisonType.LessThan, 2)); } public BalaGedScorpion(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java index d3b6440c961..3dc758bfe5c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java @@ -42,6 +42,7 @@ import mage.abilities.keyword.UnblockableAbility; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -50,11 +51,10 @@ import mage.target.common.TargetCreaturePermanent; */ public class GoblinTunneler extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 2 or less"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 2 or less"); static { - filter.setPower(3); - filter.setPowerComparison(ComparisonType.LessThan); + filter.add(new PowerPredicate(ComparisonType.LessThan, 3)); } public GoblinTunneler(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java index b1a541be88a..0910aefea41 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java @@ -39,6 +39,7 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -50,8 +51,7 @@ public class KorLineSlinger extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 3 or less"); static { - filter.setPower(4); - filter.setPowerComparison(ComparisonType.LessThan); + filter.add(new PowerPredicate(ComparisonType.LessThan, 4)); } public KorLineSlinger(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java index 34ba5a799e3..c8e7a8b1d50 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -49,8 +50,7 @@ public class PuncturingLight extends CardImpl { filter.setUseAttacking(true); filter.setBlocking(true); filter.setUseBlocking(true); - filter.setPower(4); - filter.setPowerComparison(ComparisonType.LessThan); + filter.add(new PowerPredicate(ComparisonType.LessThan, 4)); } public PuncturingLight(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java b/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java index be3b8fe4cd7..7a2b5e58913 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java @@ -40,6 +40,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -51,8 +52,7 @@ public class BloodthornTaunter extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 5 or greater"); static { - filter.setPower(4); - filter.setPowerComparison(ComparisonType.GreaterThan); + filter.add(new PowerPredicate(ComparisonType.GreaterThan, 4)); } public BloodthornTaunter(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java b/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java index 216c7bd9315..b452323ffde 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java @@ -41,6 +41,7 @@ import mage.abilities.effects.PreventionEffectImpl; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetCreaturePermanent; @@ -54,8 +55,7 @@ public class Godtoucher extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 5 or greater"); static { - filter.setPower(4); - filter.setPowerComparison(ComparisonType.GreaterThan); + filter.add(new PowerPredicate(ComparisonType.GreaterThan, 4)); } public Godtoucher(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GustriderExuberant.java b/Mage.Sets/src/mage/sets/shardsofalara/GustriderExuberant.java index d3ab75a105a..46044b6cc53 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GustriderExuberant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GustriderExuberant.java @@ -40,6 +40,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; /** * @@ -50,8 +51,7 @@ public class GustriderExuberant extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 5 or greater"); static { - filter.setPower(4); - filter.setPowerComparison(ComparisonType.GreaterThan); + filter.add(new PowerPredicate(ComparisonType.GreaterThan, 4)); } public GustriderExuberant(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java b/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java index cde83b3a8df..d07fde55199 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java @@ -40,6 +40,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -51,8 +52,7 @@ public class Mosstodon extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 5 or greater"); static { - filter.setPower(4); - filter.setPowerComparison(ComparisonType.GreaterThan); + filter.add(new PowerPredicate(ComparisonType.GreaterThan, 4)); } public Mosstodon(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java b/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java index 4d1f7bef1e5..88953a30eb2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java @@ -40,6 +40,7 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -51,8 +52,7 @@ public class RakeclawGargantuan extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 5 or greater"); static { - filter.setPower(4); - filter.setPowerComparison(ComparisonType.GreaterThan); + filter.add(new PowerPredicate(ComparisonType.GreaterThan, 4)); } public RakeclawGargantuan(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java b/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java index 866275a9440..b0e91b382f1 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java @@ -40,6 +40,7 @@ import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -51,8 +52,7 @@ public class SpearbreakerBehemoth extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 5 or greater"); static { - filter.setPower(4); - filter.setPowerComparison(ComparisonType.GreaterThan); + filter.add(new PowerPredicate(ComparisonType.GreaterThan, 4)); } public SpearbreakerBehemoth(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java b/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java index 3955b97d8f4..b2380d43b59 100644 --- a/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java +++ b/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java @@ -41,6 +41,7 @@ import mage.abilities.keyword.UnblockableAbility; import mage.cards.CardImpl; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -52,8 +53,7 @@ public class CraftyPathmage extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 2 or less"); static { - filter.setPower(3); - filter.setPowerComparison(Filter.ComparisonType.LessThan); + filter.add(new PowerPredicate(Filter.ComparisonType.LessThan, 3)); } public CraftyPathmage(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/timeshifted/Pendelhaven.java b/Mage.Sets/src/mage/sets/timeshifted/Pendelhaven.java index 4718db53ff5..c6b870b231f 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Pendelhaven.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Pendelhaven.java @@ -40,6 +40,8 @@ import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; +import mage.filter.predicate.mageobject.ToughnessPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -47,13 +49,11 @@ import mage.target.common.TargetCreaturePermanent; * @author Loki */ public class Pendelhaven extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("1/1 creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("1/1 creature"); static { - filter.setPower(1); - filter.setPowerComparison(Filter.ComparisonType.Equal); - filter.setToughness(1); - filter.setToughnessComparison(Filter.ComparisonType.Equal); + filter.add(new PowerPredicate(Filter.ComparisonType.Equal, 1)); + filter.add(new ToughnessPredicate(Filter.ComparisonType.Equal, 1)); } public Pendelhaven(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java b/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java index ea793a46e46..6de445d50c1 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java +++ b/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java @@ -39,6 +39,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -50,8 +51,7 @@ public class IntrepidHero extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 4 or greater"); static { - filter.setPower(3); - filter.setPowerComparison(Filter.ComparisonType.GreaterThan); + filter.add(new PowerPredicate(Filter.ComparisonType.GreaterThan, 3)); } public IntrepidHero(UUID ownerId) { diff --git a/Mage/src/mage/filter/FilterImpl.java b/Mage/src/mage/filter/FilterImpl.java index 4a11437f2ab..bbbc1662b05 100644 --- a/Mage/src/mage/filter/FilterImpl.java +++ b/Mage/src/mage/filter/FilterImpl.java @@ -61,24 +61,6 @@ public abstract class FilterImpl> implements Filte this.predicates = new LinkedList(filter.predicates); } - protected boolean compareInts(int int1, int int2, ComparisonType type) { - switch (type) { - case Equal: - if (int1 != int2) - return false; - break; - case GreaterThan: - if (int1 <= int2) - return false; - break; - case LessThan: - if (int1 >= int2) - return false; - break; - } - return true; - } - @Override public boolean match(E e, Game game) { for (int i = 0; i < predicates.size(); i++) { diff --git a/Mage/src/mage/filter/FilterObject.java b/Mage/src/mage/filter/FilterObject.java index 6651deeee07..df5b7990fad 100644 --- a/Mage/src/mage/filter/FilterObject.java +++ b/Mage/src/mage/filter/FilterObject.java @@ -64,10 +64,6 @@ public class FilterObject> ex protected List supertype = new ArrayList(); protected ComparisonScope scopeSupertype = ComparisonScope.Any; protected boolean notSupertype; - protected int power; - protected ComparisonType powerComparison; - protected int toughness; - protected ComparisonType toughnessComparison; /** * Indicates that filter shouldn't match the source. @@ -105,10 +101,6 @@ public class FilterObject> ex this.supertype.addAll(filter.supertype); this.scopeSupertype = filter.scopeSupertype; this.notSupertype = filter.notSupertype; - this.power = filter.power; - this.powerComparison = filter.powerComparison; - this.toughness = filter.toughness; - this.toughnessComparison = filter.toughnessComparison; this.another = filter.another; } @@ -175,16 +167,6 @@ public class FilterObject> ex return notFilter; } - if (powerComparison != null) { - if (!compareInts(object.getPower().getValue(), power, powerComparison)) - return notFilter; - } - - if (toughnessComparison != null) { - if (!compareInts(object.getToughness().getValue(), toughness, toughnessComparison)) - return notFilter; - } - return !notFilter; } @@ -252,22 +234,6 @@ public class FilterObject> ex this.notSupertype = notSupertype; } - public void setPower(int power) { - this.power = power; - } - - public void setPowerComparison(ComparisonType powerComparison) { - this.powerComparison = powerComparison; - } - - public void setToughness(int toughness) { - this.toughness = toughness; - } - - public void setToughnessComparison(ComparisonType toughnessComparison) { - this.toughnessComparison = toughnessComparison; - } - public void setUseColor(boolean useColor) { this.useColor = useColor; }