From f5ddd77e5b6cbe6f35499bb4616957a85043a48a Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Thu, 12 Jan 2017 09:45:35 -0200 Subject: [PATCH] Move NoAbilityPredicate to MuragandaPetroglyphs file --- .../mage/cards/m/MuragandaPetroglyphs.java | 45 ++++++++++++++++- .../mageobject/NoAbilityPredicate.java | 50 ------------------- 2 files changed, 44 insertions(+), 51 deletions(-) delete mode 100644 Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java diff --git a/Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java b/Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java index d7731449c28..ae27cf86d92 100644 --- a/Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java +++ b/Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java @@ -29,15 +29,21 @@ package mage.cards.m; import java.util.UUID; +import mage.MageObject; +import mage.abilities.Abilities; +import mage.abilities.Ability; +import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; +import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.NoAbilityPredicate; +import mage.filter.predicate.Predicate; +import mage.game.Game; /** * @@ -66,4 +72,41 @@ public class MuragandaPetroglyphs extends CardImpl { public MuragandaPetroglyphs copy() { return new MuragandaPetroglyphs(this); } +} + +class NoAbilityPredicate implements Predicate { + + @Override + public boolean apply(MageObject input, Game game) { + boolean isFaceDown = false; + Abilities abilities; + if (input instanceof Card){ + abilities = ((Card)input).getAbilities(game); + + isFaceDown = ((Card)input).isFaceDown(game); + } else { + abilities = input.getAbilities(); + } + if (isFaceDown) { + for (Ability ability : abilities){ + if(!ability.getSourceId().equals(input.getId())) { + return false; + } + } + return true; + } + + for (Ability ability : abilities){ + if (ability.getClass() != SpellAbility.class){ + + return false; + } + } + return true; + } + + @Override + public String toString() { + return "with no abilities"; + } } \ No newline at end of file diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java deleted file mode 100644 index 83e285132be..00000000000 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java +++ /dev/null @@ -1,50 +0,0 @@ -package mage.filter.predicate.mageobject; - -import mage.MageObject; -import mage.abilities.Abilities; -import mage.abilities.Ability; -import mage.abilities.SpellAbility; -import mage.abilities.keyword.MorphAbility; -import mage.cards.Card; -import mage.filter.predicate.Predicate; -import mage.game.Game; - -/** - * Created by Alexsandro. - */ -public class NoAbilityPredicate implements Predicate { - - @Override - public boolean apply(MageObject input, Game game) { - boolean isFaceDown = false; - Abilities abilities; - if (input instanceof Card){ - abilities = ((Card)input).getAbilities(game); - - isFaceDown = ((Card)input).isFaceDown(game); - } else { - abilities = input.getAbilities(); - } - if (isFaceDown) { - for (Ability ability : abilities){ - if(!ability.getSourceId().equals(input.getId())) { - return false; - } - } - return true; - } - - for (Ability ability : abilities){ - if (ability.getClass() != SpellAbility.class){ - - return false; - } - } - return true; - } - - @Override - public String toString() { - return "with no abilities"; - } -} \ No newline at end of file