From a673ebffc5ff32d3da411389cdd6a493da35bed2 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Tue, 11 May 2021 09:33:45 -0400 Subject: [PATCH] refactored TappedPredicate to use single enum for both conditions --- Mage.Sets/src/mage/cards/a/AerialAssault.java | 2 +- .../src/mage/cards/a/AkoumFlameseeker.java | 3 +-- .../mage/cards/a/AlibouAncientWitness.java | 2 +- Mage.Sets/src/mage/cards/a/AltarGolem.java | 3 +-- Mage.Sets/src/mage/cards/a/AnaBattlemage.java | 3 +-- .../src/mage/cards/a/AnafenzaTheForemost.java | 2 +- .../src/mage/cards/a/AncestorsProphet.java | 3 +-- Mage.Sets/src/mage/cards/a/AngelicFavor.java | 3 +-- .../src/mage/cards/a/AphettoGrifter.java | 3 +-- .../src/mage/cards/a/ArachnusSpinner.java | 3 +-- .../src/mage/cards/a/ArcadesSabboth.java | 2 +- .../mage/cards/a/AryelKnightOfWindgrace.java | 3 +-- Mage.Sets/src/mage/cards/a/Asphyxiate.java | 3 +-- Mage.Sets/src/mage/cards/a/Assassinate.java | 2 +- .../src/mage/cards/a/AuraOfDominion.java | 3 +-- .../src/mage/cards/a/AzamiLadyOfScrolls.java | 3 +-- Mage.Sets/src/mage/cards/b/Backlash.java | 3 +-- .../mage/cards/b/BalduvianTradingPost.java | 3 +-- Mage.Sets/src/mage/cards/b/BattleScreech.java | 3 +-- .../src/mage/cards/b/BenBenAkkiHermit.java | 3 +-- .../src/mage/cards/b/BenthicExplorers.java | 2 +- Mage.Sets/src/mage/cards/b/Benthicore.java | 3 +-- .../src/mage/cards/b/BetrothedOfFire.java | 3 +-- .../src/mage/cards/b/BirchloreRangers.java | 3 +-- .../src/mage/cards/b/BlackOakOfOdunos.java | 3 +-- Mage.Sets/src/mage/cards/b/Blockbuster.java | 2 +- Mage.Sets/src/mage/cards/b/BloodTribute.java | 3 +-- .../mage/cards/b/Borrowing100000Arrows.java | 2 +- .../src/mage/cards/b/BrandedBrawlers.java | 3 +-- Mage.Sets/src/mage/cards/b/BurdenOfGreed.java | 2 +- .../src/mage/cards/b/BurnAtTheStake.java | 3 +-- Mage.Sets/src/mage/cards/c/CalmingVerse.java | 3 +-- .../src/mage/cards/c/CaptivatingVampire.java | 3 +-- .../src/mage/cards/c/CatapultMaster.java | 3 +-- Mage.Sets/src/mage/cards/c/CatapultSquad.java | 3 +-- .../src/mage/cards/c/ChickenALaKing.java | 3 +-- .../src/mage/cards/c/ChosenOfMarkov.java | 3 +-- Mage.Sets/src/mage/cards/c/CitadelOfPain.java | 3 +-- Mage.Sets/src/mage/cards/c/ClockOfOmens.java | 3 +-- .../src/mage/cards/c/CloudgoatRanger.java | 3 +-- .../src/mage/cards/c/CollectiveEffort.java | 3 +-- .../src/mage/cards/c/CopperhoofVorrac.java | 3 +-- Mage.Sets/src/mage/cards/c/CoralAtoll.java | 3 +-- Mage.Sets/src/mage/cards/c/CoralReef.java | 3 +-- Mage.Sets/src/mage/cards/c/Crackleburr.java | 5 ++--- .../src/mage/cards/c/CracklingPerimeter.java | 3 +-- Mage.Sets/src/mage/cards/c/CrashingBoars.java | 3 +-- .../src/mage/cards/c/CrookclawElder.java | 3 +-- Mage.Sets/src/mage/cards/c/Cryptbreaker.java | 3 +-- .../src/mage/cards/c/CrypticGateway.java | 3 +-- .../src/mage/cards/d/DeadeyeHarpooner.java | 2 +- Mage.Sets/src/mage/cards/d/DeathStroke.java | 2 +- .../src/mage/cards/d/DeathlessAncient.java | 3 +-- .../src/mage/cards/d/DevoutChaplain.java | 3 +-- .../src/mage/cards/d/DevoutInvocation.java | 3 +-- Mage.Sets/src/mage/cards/d/Dichotomancy.java | 2 +- .../src/mage/cards/d/DiversionaryTactics.java | 3 +-- .../src/mage/cards/d/DormantVolcano.java | 3 +-- .../src/mage/cards/d/DovinsDismissal.java | 2 +- .../src/mage/cards/d/DragonscaleGeneral.java | 2 +- Mage.Sets/src/mage/cards/d/DranasChosen.java | 3 +-- Mage.Sets/src/mage/cards/d/DreamTides.java | 2 +- .../src/mage/cards/d/DrownerOfSecrets.java | 3 +-- Mage.Sets/src/mage/cards/d/DuneDiviner.java | 3 +-- .../src/mage/cards/d/DwarvenBloodboiler.java | 3 +-- Mage.Sets/src/mage/cards/e/Earthcraft.java | 3 +-- Mage.Sets/src/mage/cards/e/Earthlore.java | 3 +-- .../src/mage/cards/e/EmbalmersTools.java | 3 +-- Mage.Sets/src/mage/cards/e/EnergyTap.java | 3 +-- .../src/mage/cards/e/EntanglingVines.java | 2 +- Mage.Sets/src/mage/cards/e/Everglades.java | 3 +-- Mage.Sets/src/mage/cards/e/Excoriate.java | 2 +- Mage.Sets/src/mage/cards/e/Expel.java | 2 +- Mage.Sets/src/mage/cards/f/FenStalker.java | 3 +-- Mage.Sets/src/mage/cards/f/FieldSurgeon.java | 3 +-- .../src/mage/cards/g/GalecasterColossus.java | 3 +-- Mage.Sets/src/mage/cards/g/Galestrike.java | 2 +- .../src/mage/cards/g/GallowsAtWillowHill.java | 3 +-- Mage.Sets/src/mage/cards/g/GatewayShade.java | 3 +-- Mage.Sets/src/mage/cards/g/GazeOfJustice.java | 3 +-- .../src/mage/cards/g/GhirapurAetherGrid.java | 3 +-- Mage.Sets/src/mage/cards/g/GiantOyster.java | 2 +- Mage.Sets/src/mage/cards/g/GideonJura.java | 2 +- .../cards/g/GlacianPowerstoneEngineer.java | 3 +-- .../src/mage/cards/g/GlareOfSubdual.java | 2 +- .../src/mage/cards/g/GlimmerdustNap.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinMutant.java | 2 +- .../src/mage/cards/g/GrandArchitect.java | 3 +-- .../src/mage/cards/g/GravespawnSovereign.java | 3 +-- .../src/mage/cards/g/GroveOfTheGuardian.java | 3 +-- .../src/mage/cards/g/GuanYus1000LiMarch.java | 2 +- Mage.Sets/src/mage/cards/g/GuildSummit.java | 3 +-- .../src/mage/cards/h/HairStrungKoto.java | 3 +-- Mage.Sets/src/mage/cards/h/HandOfJustice.java | 3 +-- .../src/mage/cards/h/HarbingerOfTheTides.java | 2 +- .../src/mage/cards/h/HarmonyOfNature.java | 3 +-- Mage.Sets/src/mage/cards/h/HarvestSeason.java | 2 +- .../src/mage/cards/h/HazyHomunculus.java | 3 +-- Mage.Sets/src/mage/cards/h/Hecatomb.java | 3 +-- Mage.Sets/src/mage/cards/h/HeritageDruid.java | 3 +-- .../src/mage/cards/h/HivisOfTheScale.java | 2 +- .../src/mage/cards/h/HoldoutSettlement.java | 3 +-- Mage.Sets/src/mage/cards/h/HollowWarrior.java | 2 +- .../src/mage/cards/h/HonorWornShaku.java | 3 +-- .../src/mage/cards/h/HundredTalonStrike.java | 3 +-- Mage.Sets/src/mage/cards/i/IgnitionTeam.java | 2 +- Mage.Sets/src/mage/cards/i/ImpelledGiant.java | 3 +-- .../src/mage/cards/i/ImpetuousProtege.java | 2 +- .../mage/cards/i/InallaArchmageRitualist.java | 2 +- Mage.Sets/src/mage/cards/i/IronVerdict.java | 2 +- .../src/mage/cards/j/JaddiLifestrider.java | 3 +-- .../src/mage/cards/j/JasperaSentinel.java | 3 +-- Mage.Sets/src/mage/cards/j/JungleBasin.java | 3 +-- Mage.Sets/src/mage/cards/k/Karoo.java | 3 +-- .../src/mage/cards/k/KarplusanGiant.java | 3 +-- .../mage/cards/k/KeeperOfTheNineGales.java | 3 +-- .../src/mage/cards/k/KeldonBattlewagon.java | 3 +-- .../src/mage/cards/k/KeldonBerserker.java | 3 +-- Mage.Sets/src/mage/cards/k/KingsAssassin.java | 2 +- .../src/mage/cards/k/KnotvinePaladin.java | 3 +-- Mage.Sets/src/mage/cards/k/KoskunFalls.java | 3 +-- .../src/mage/cards/k/KrovikanPlague.java | 2 +- .../mage/cards/k/KumenaTyrantOfOrazca.java | 5 ++--- .../src/mage/cards/k/KyrenNegotiations.java | 3 +-- Mage.Sets/src/mage/cards/l/Lashknife.java | 3 +-- .../mage/cards/l/LathrilBladeOfTheElves.java | 4 ++-- Mage.Sets/src/mage/cards/l/LedevChampion.java | 3 +-- Mage.Sets/src/mage/cards/l/LivingTwister.java | 2 +- .../src/mage/cards/l/LlanowarBehemoth.java | 3 +-- Mage.Sets/src/mage/cards/l/LoamDryad.java | 3 +-- Mage.Sets/src/mage/cards/l/LodestoneMyr.java | 3 +-- Mage.Sets/src/mage/cards/l/LotusVale.java | 3 +-- .../src/mage/cards/l/LullmageMentor.java | 3 +-- .../src/mage/cards/m/MagneticMountain.java | 2 +- .../src/mage/cards/m/MalakirSoothsayer.java | 3 +-- Mage.Sets/src/mage/cards/m/ManaCache.java | 3 +-- Mage.Sets/src/mage/cards/m/ManaGeyser.java | 2 +- Mage.Sets/src/mage/cards/m/MaraxusOfKeld.java | 2 +- .../src/mage/cards/m/MarshalingTheTroops.java | 3 +-- Mage.Sets/src/mage/cards/m/MartyrsSoul.java | 2 +- .../src/mage/cards/m/MasterApothecary.java | 3 +-- .../src/mage/cards/m/MasterOfTheWildHunt.java | 3 +-- .../src/mage/cards/m/MerchantsDockhand.java | 3 +-- Mage.Sets/src/mage/cards/m/MoggJailer.java | 2 +- Mage.Sets/src/mage/cards/m/Monsoon.java | 3 +-- .../src/mage/cards/m/MossbridgeTroll.java | 5 ++--- .../src/mage/cards/m/MothdustChangeling.java | 3 +-- Mage.Sets/src/mage/cards/m/Mudslide.java | 2 +- .../src/mage/cards/m/MundasVanguard.java | 3 +-- .../src/mage/cards/m/MurderousCompulsion.java | 2 +- .../src/mage/cards/m/MyrBattlesphere.java | 3 +-- .../src/mage/cards/n/NahiriStormOfStone.java | 2 +- .../src/mage/cards/n/NahiriTheHarbinger.java | 4 ++-- Mage.Sets/src/mage/cards/n/NantukoShaman.java | 2 +- Mage.Sets/src/mage/cards/n/NaturesChosen.java | 2 +- Mage.Sets/src/mage/cards/n/NewBlood.java | 3 +-- Mage.Sets/src/mage/cards/n/NikoAris.java | 2 +- .../src/mage/cards/n/NullmageShepherd.java | 3 +-- .../src/mage/cards/o/OakStreetInnkeeper.java | 2 +- Mage.Sets/src/mage/cards/o/OnduWarCleric.java | 3 +-- Mage.Sets/src/mage/cards/o/Opposition.java | 2 +- Mage.Sets/src/mage/cards/o/Orgg.java | 2 +- Mage.Sets/src/mage/cards/o/OrimsCure.java | 3 +-- Mage.Sets/src/mage/cards/p/Pallimud.java | 2 +- Mage.Sets/src/mage/cards/p/PatronWizard.java | 3 +-- .../mage/cards/p/PersistentPetitioners.java | 3 +-- .../src/mage/cards/p/PlarggDeanOfChaos.java | 14 +++++------- Mage.Sets/src/mage/cards/p/PowerSurge.java | 3 +-- .../src/mage/cards/p/PrismaticStrands.java | 3 +-- .../mage/cards/r/RadiantSerraArchangel.java | 3 +-- Mage.Sets/src/mage/cards/r/RaidingParty.java | 3 +-- Mage.Sets/src/mage/cards/r/RamosianRally.java | 3 +-- .../src/mage/cards/r/RasputinDreamweaver.java | 4 +--- Mage.Sets/src/mage/cards/r/RathiAssassin.java | 2 +- Mage.Sets/src/mage/cards/r/RedcapRaiders.java | 2 +- .../src/mage/cards/r/RegnasSanction.java | 2 +- Mage.Sets/src/mage/cards/r/RighteousFury.java | 2 +- Mage.Sets/src/mage/cards/r/RootKinAlly.java | 3 +-- Mage.Sets/src/mage/cards/r/RowanKenrith.java | 2 +- Mage.Sets/src/mage/cards/r/RoyalAssassin.java | 2 +- .../src/mage/cards/s/SanctuaryLockdown.java | 3 +-- Mage.Sets/src/mage/cards/s/Sandsower.java | 3 +-- .../src/mage/cards/s/SaruliCaretaker.java | 3 +-- Mage.Sets/src/mage/cards/s/ScorchedRuins.java | 3 +-- Mage.Sets/src/mage/cards/s/ScoriaCat.java | 3 +-- Mage.Sets/src/mage/cards/s/SealAway.java | 2 +- .../src/mage/cards/s/SelectForInspection.java | 2 +- .../src/mage/cards/s/SelesnyaEvangel.java | 3 +-- .../src/mage/cards/s/SelkieHedgeMage.java | 2 +- .../src/mage/cards/s/SepharaSkysBlade.java | 3 +-- .../mage/cards/s/SetonKrosanProtector.java | 3 +-- Mage.Sets/src/mage/cards/s/Shacklegeist.java | 3 +-- Mage.Sets/src/mage/cards/s/ShadowStinger.java | 3 +-- .../src/mage/cards/s/SharedDiscovery.java | 3 +-- Mage.Sets/src/mage/cards/s/SheerDrop.java | 2 +- .../src/mage/cards/s/ShieldmageElder.java | 5 ++--- Mage.Sets/src/mage/cards/s/ShimmerDragon.java | 3 +-- Mage.Sets/src/mage/cards/s/SiegeStriker.java | 3 +-- Mage.Sets/src/mage/cards/s/SigilTracer.java | 3 +-- Mage.Sets/src/mage/cards/s/SivvisValor.java | 3 +-- .../src/mage/cards/s/SkirkFireMarshal.java | 3 +-- .../src/mage/cards/s/SkirsdagHighPriest.java | 3 +-- Mage.Sets/src/mage/cards/s/SkyHussar.java | 2 +- .../src/mage/cards/s/SoldeviExcavations.java | 3 +-- Mage.Sets/src/mage/cards/s/SoldeviGolem.java | 2 +- .../src/mage/cards/s/SpawnbinderMage.java | 3 +-- .../src/mage/cards/s/SpellweaverDuo.java | 2 +- Mage.Sets/src/mage/cards/s/SpiritFlare.java | 3 +-- .../src/mage/cards/s/SpringleafDrum.java | 3 +-- Mage.Sets/src/mage/cards/s/SpurGrappler.java | 3 +-- .../src/mage/cards/s/SpurredWolverine.java | 3 +-- .../src/mage/cards/s/StalkingAssassin.java | 2 +- Mage.Sets/src/mage/cards/s/SteamCatapult.java | 2 +- Mage.Sets/src/mage/cards/s/StoneCatapult.java | 2 +- .../src/mage/cards/s/StoneforgeAcolyte.java | 3 +-- .../src/mage/cards/s/StoneshakerShaman.java | 3 +-- .../src/mage/cards/s/SummaryJudgment.java | 2 +- .../src/mage/cards/s/SummonTheSchool.java | 3 +-- Mage.Sets/src/mage/cards/s/SunblastAngel.java | 2 +- Mage.Sets/src/mage/cards/s/SupplyCaravan.java | 2 +- .../src/mage/cards/s/SupremeInquisitor.java | 3 +-- .../mage/cards/s/SureFootedInfiltrator.java | 3 +-- .../src/mage/cards/s/SurrakarBanisher.java | 2 +- .../src/mage/cards/s/SurvivorsEncampment.java | 3 +-- Mage.Sets/src/mage/cards/s/SwallowWhole.java | 5 ++--- .../src/mage/cards/s/SwiftReckoning.java | 2 +- Mage.Sets/src/mage/cards/s/SwiftResponse.java | 2 +- .../src/mage/cards/s/SwordOfTheParuns.java | 5 ++--- .../src/mage/cards/s/SymbioticDeployment.java | 3 +-- Mage.Sets/src/mage/cards/t/TakeVengeance.java | 2 +- .../src/mage/cards/t/TamiyoTheMoonSage.java | 2 +- Mage.Sets/src/mage/cards/t/TangleWire.java | 2 +- Mage.Sets/src/mage/cards/t/Telethopter.java | 3 +-- Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java | 2 +- Mage.Sets/src/mage/cards/t/TheAkroanWar.java | 2 +- Mage.Sets/src/mage/cards/t/TheBigIdea.java | 3 +-- Mage.Sets/src/mage/cards/t/TheftOfDreams.java | 2 +- Mage.Sets/src/mage/cards/t/ThelonsCurse.java | 2 +- Mage.Sets/src/mage/cards/t/ThousandWinds.java | 2 +- .../mage/cards/t/ThroneOfTheGodPharaoh.java | 2 +- Mage.Sets/src/mage/cards/t/TimeOfIce.java | 2 +- Mage.Sets/src/mage/cards/t/ToilToRenown.java | 2 +- Mage.Sets/src/mage/cards/t/TopanAscetic.java | 3 +-- Mage.Sets/src/mage/cards/t/TourachsGate.java | 3 +-- .../src/mage/cards/t/TownGossipmonger.java | 3 +-- .../src/mage/cards/t/TradewindRider.java | 3 +-- Mage.Sets/src/mage/cards/t/TraitorsRoar.java | 3 +-- Mage.Sets/src/mage/cards/t/Turnabout.java | 5 ++--- Mage.Sets/src/mage/cards/u/UktabiKong.java | 3 +-- Mage.Sets/src/mage/cards/u/UnerringSling.java | 3 +-- Mage.Sets/src/mage/cards/u/UrgeToFeed.java | 3 +-- .../mage/cards/u/UrzaLordHighArtificer.java | 3 +-- Mage.Sets/src/mage/cards/v/Vengeance.java | 2 +- .../src/mage/cards/v/VeteranBrawlers.java | 3 +-- .../src/mage/cards/v/VeteranWarleader.java | 3 +-- Mage.Sets/src/mage/cards/v/VeteransVoice.java | 2 +- .../src/mage/cards/v/VintaraSnapper.java | 3 +-- .../src/mage/cards/v/VodalianWarMachine.java | 3 +-- .../src/mage/cards/v/VoiceOfTheWoods.java | 3 +-- .../src/mage/cards/v/VolrathsGardens.java | 3 +-- .../src/mage/cards/w/WaitingInTheWeeds.java | 3 +-- .../src/mage/cards/w/WaterspoutDjinn.java | 3 +-- .../src/mage/cards/w/WeightOfConscience.java | 3 +-- .../src/mage/cards/w/WellOfDiscovery.java | 3 +-- Mage.Sets/src/mage/cards/w/WellOfLife.java | 3 +-- .../mage/cards/w/WellgabberApothecary.java | 2 +- Mage.Sets/src/mage/cards/w/WhirlerRogue.java | 10 ++++----- Mage.Sets/src/mage/cards/w/WoodElemental.java | 3 +-- Mage.Sets/src/mage/cards/z/ZadasCommando.java | 3 +-- .../src/mage/cards/z/ZahidDjinnOfTheLamp.java | 3 +-- .../src/mage/cards/z/ZombieTrailblazer.java | 3 +-- .../src/mage/cards/z/ZulaportChainmage.java | 3 +-- .../effects/common/UntapLandsEffect.java | 2 +- .../abilities/keyword/ConspireAbility.java | 3 +-- .../abilities/keyword/ConvokeAbility.java | 4 ++-- .../mage/abilities/keyword/CrewAbility.java | 3 +-- .../abilities/keyword/ImproviseAbility.java | 3 +-- .../common/FilterCreatureForAttack.java | 2 +- .../common/FilterCreatureForCombat.java | 3 +-- .../filter/common/FilterUntappedCreature.java | 3 +-- .../predicate/permanent/TappedPredicate.java | 11 +++++++--- .../permanent/UntappedPredicate.java | 22 ------------------- 282 files changed, 307 insertions(+), 513 deletions(-) delete mode 100644 Mage/src/main/java/mage/filter/predicate/permanent/UntappedPredicate.java diff --git a/Mage.Sets/src/mage/cards/a/AerialAssault.java b/Mage.Sets/src/mage/cards/a/AerialAssault.java index f540e9c7cda..479d18ebff2 100644 --- a/Mage.Sets/src/mage/cards/a/AerialAssault.java +++ b/Mage.Sets/src/mage/cards/a/AerialAssault.java @@ -28,7 +28,7 @@ public final class AerialAssault extends CardImpl { = new FilterControlledCreaturePermanent("creature you control with flying"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); filter2.add(new AbilityPredicate(FlyingAbility.class)); } diff --git a/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java b/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java index 2ceebf5b206..c9ee7ddb576 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java +++ b/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.players.Player; @@ -29,7 +28,7 @@ public final class AkoumFlameseeker extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public AkoumFlameseeker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AlibouAncientWitness.java b/Mage.Sets/src/mage/cards/a/AlibouAncientWitness.java index f118c1717d1..1472c6cade6 100644 --- a/Mage.Sets/src/mage/cards/a/AlibouAncientWitness.java +++ b/Mage.Sets/src/mage/cards/a/AlibouAncientWitness.java @@ -67,7 +67,7 @@ class AlibouAncientWitnessEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterControlledArtifactPermanent(); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } private static final Hint hint = new ValueHint( diff --git a/Mage.Sets/src/mage/cards/a/AltarGolem.java b/Mage.Sets/src/mage/cards/a/AltarGolem.java index 10e372cb473..19c2551868a 100644 --- a/Mage.Sets/src/mage/cards/a/AltarGolem.java +++ b/Mage.Sets/src/mage/cards/a/AltarGolem.java @@ -20,7 +20,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -34,7 +33,7 @@ public final class AltarGolem extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public AltarGolem(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AnaBattlemage.java b/Mage.Sets/src/mage/cards/a/AnaBattlemage.java index 56b6d55f698..e5ac753b760 100644 --- a/Mage.Sets/src/mage/cards/a/AnaBattlemage.java +++ b/Mage.Sets/src/mage/cards/a/AnaBattlemage.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -33,7 +32,7 @@ public final class AnaBattlemage extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public AnaBattlemage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java b/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java index 84ae8cc0f94..e6b339500c0 100644 --- a/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java +++ b/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java @@ -34,7 +34,7 @@ public final class AnafenzaTheForemost extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public AnafenzaTheForemost(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AncestorsProphet.java b/Mage.Sets/src/mage/cards/a/AncestorsProphet.java index 08fc9f2b325..f26cf210874 100644 --- a/Mage.Sets/src/mage/cards/a/AncestorsProphet.java +++ b/Mage.Sets/src/mage/cards/a/AncestorsProphet.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class AncestorsProphet extends CardImpl { static { filter.add(SubType.CLERIC.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public AncestorsProphet(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AngelicFavor.java b/Mage.Sets/src/mage/cards/a/AngelicFavor.java index e93749e6ebe..c02cbf69eaf 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicFavor.java +++ b/Mage.Sets/src/mage/cards/a/AngelicFavor.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.TurnPhase; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.token.AngelToken; @@ -37,7 +36,7 @@ public final class AngelicFavor extends CardImpl { private static final FilterControlledCreaturePermanent untappedCreatureYouControl = new FilterControlledCreaturePermanent("untapped creature you control"); static { - untappedCreatureYouControl.add(Predicates.not(TappedPredicate.instance)); + untappedCreatureYouControl.add(TappedPredicate.UNTAPPED); } public AngelicFavor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AphettoGrifter.java b/Mage.Sets/src/mage/cards/a/AphettoGrifter.java index 0a3b474851c..13c84b30177 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoGrifter.java +++ b/Mage.Sets/src/mage/cards/a/AphettoGrifter.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -27,7 +26,7 @@ public final class AphettoGrifter extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Wizards you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.WIZARD.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java b/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java index 73798802e1c..661bd4aea3a 100644 --- a/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java +++ b/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -38,7 +37,7 @@ public final class ArachnusSpinner extends CardImpl { static { filter.add(SubType.SPIDER.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public ArachnusSpinner(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java index 8fdad0b9010..0a595113b8c 100644 --- a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java +++ b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java @@ -28,7 +28,7 @@ public final class ArcadesSabboth extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(Predicates.not(AttackingPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java b/Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java index a41fdc96e75..2b6be379b12 100644 --- a/Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java +++ b/Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java @@ -22,7 +22,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.PowerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -79,7 +78,7 @@ class AryelTapXTargetCost extends VariableCostImpl { static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Knights you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.KNIGHT.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/a/Asphyxiate.java b/Mage.Sets/src/mage/cards/a/Asphyxiate.java index 802cf3fb24b..adf83884a2a 100644 --- a/Mage.Sets/src/mage/cards/a/Asphyxiate.java +++ b/Mage.Sets/src/mage/cards/a/Asphyxiate.java @@ -7,7 +7,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetCreaturePermanent; @@ -20,7 +19,7 @@ public final class Asphyxiate extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public Asphyxiate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/Assassinate.java b/Mage.Sets/src/mage/cards/a/Assassinate.java index 75b0df38382..63c1d2eca44 100644 --- a/Mage.Sets/src/mage/cards/a/Assassinate.java +++ b/Mage.Sets/src/mage/cards/a/Assassinate.java @@ -20,7 +20,7 @@ public final class Assassinate extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public Assassinate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AuraOfDominion.java b/Mage.Sets/src/mage/cards/a/AuraOfDominion.java index 0ed3699e87a..1da2a8c12bf 100644 --- a/Mage.Sets/src/mage/cards/a/AuraOfDominion.java +++ b/Mage.Sets/src/mage/cards/a/AuraOfDominion.java @@ -17,7 +17,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -31,7 +30,7 @@ public final class AuraOfDominion extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } diff --git a/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java b/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java index 9bfc96e6244..8b94a0bbc5c 100644 --- a/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java +++ b/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class AzamiLadyOfScrolls extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Wizard you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.WIZARD.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/b/Backlash.java b/Mage.Sets/src/mage/cards/b/Backlash.java index 4608dbc3eb3..e038c659602 100644 --- a/Mage.Sets/src/mage/cards/b/Backlash.java +++ b/Mage.Sets/src/mage/cards/b/Backlash.java @@ -7,7 +7,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -24,7 +23,7 @@ public final class Backlash extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public Backlash(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java b/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java index 3d845e12db3..f93ca32a852 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java @@ -18,7 +18,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetAttackingCreature; import mage.target.common.TargetControlledPermanent; @@ -33,7 +32,7 @@ public final class BalduvianTradingPost extends CardImpl { static { filter.add(SubType.MOUNTAIN.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public BalduvianTradingPost(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BattleScreech.java b/Mage.Sets/src/mage/cards/b/BattleScreech.java index e26199ce4a1..3922c90a5c1 100644 --- a/Mage.Sets/src/mage/cards/b/BattleScreech.java +++ b/Mage.Sets/src/mage/cards/b/BattleScreech.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TimingRule; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.BirdToken; @@ -27,7 +26,7 @@ public final class BattleScreech extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.WHITE)); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public BattleScreech(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java b/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java index bc4d3bb29f5..ff0822480a7 100644 --- a/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java +++ b/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetAttackingCreature; @@ -29,7 +28,7 @@ public final class BenBenAkkiHermit extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("untapped Mountain you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.MOUNTAIN.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/b/BenthicExplorers.java b/Mage.Sets/src/mage/cards/b/BenthicExplorers.java index 9414e96e3de..3ce7b04ff6b 100644 --- a/Mage.Sets/src/mage/cards/b/BenthicExplorers.java +++ b/Mage.Sets/src/mage/cards/b/BenthicExplorers.java @@ -36,7 +36,7 @@ public final class BenthicExplorers extends CardImpl { static { filter.add(TargetController.OPPONENT.getControllerPredicate()); - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public BenthicExplorers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/Benthicore.java b/Mage.Sets/src/mage/cards/b/Benthicore.java index 4164ebd93ec..7f9763a7040 100644 --- a/Mage.Sets/src/mage/cards/b/Benthicore.java +++ b/Mage.Sets/src/mage/cards/b/Benthicore.java @@ -18,7 +18,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.MerfolkWizardToken; import mage.target.common.TargetControlledPermanent; @@ -32,7 +31,7 @@ public final class Benthicore extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.MERFOLK.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/b/BetrothedOfFire.java b/Mage.Sets/src/mage/cards/b/BetrothedOfFire.java index a402404f032..7495bac24cf 100644 --- a/Mage.Sets/src/mage/cards/b/BetrothedOfFire.java +++ b/Mage.Sets/src/mage/cards/b/BetrothedOfFire.java @@ -16,7 +16,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -32,7 +31,7 @@ public final class BetrothedOfFire extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledCreaturePermanent("an untapped creature"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public BetrothedOfFire(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BirchloreRangers.java b/Mage.Sets/src/mage/cards/b/BirchloreRangers.java index c37d3038688..f71f76d1076 100644 --- a/Mage.Sets/src/mage/cards/b/BirchloreRangers.java +++ b/Mage.Sets/src/mage/cards/b/BirchloreRangers.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.target.common.TargetControlledCreaturePermanent; @@ -38,7 +37,7 @@ public final class BirchloreRangers extends CardImpl { // Tap two untapped Elves you control: Add one mana of any color. FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Elves you control"); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.ELF.getPredicate()); this.addAbility(new SimpleManaAbility( Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java b/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java index 4c2ed32b4a2..d60c60efac3 100644 --- a/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java +++ b/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -31,7 +30,7 @@ public final class BlackOakOfOdunos extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public BlackOakOfOdunos(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/Blockbuster.java b/Mage.Sets/src/mage/cards/b/Blockbuster.java index 72a28b55629..b442f8d9e49 100644 --- a/Mage.Sets/src/mage/cards/b/Blockbuster.java +++ b/Mage.Sets/src/mage/cards/b/Blockbuster.java @@ -23,7 +23,7 @@ public final class Blockbuster extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public Blockbuster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BloodTribute.java b/Mage.Sets/src/mage/cards/b/BloodTribute.java index c259a2198c1..d0dee861e18 100644 --- a/Mage.Sets/src/mage/cards/b/BloodTribute.java +++ b/Mage.Sets/src/mage/cards/b/BloodTribute.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.TextPartSubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -36,7 +35,7 @@ public final class BloodTribute extends CardImpl { TextPartSubType textPartVampire = (TextPartSubType) addTextPart(new TextPartSubType(SubType.VAMPIRE)); FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an untapped Vampire you control"); filter.add(new TextPartSubtypePredicate(textPartVampire)); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); this.addAbility(new KickerAbility(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true)))); // Target opponent loses half their life, rounded up. diff --git a/Mage.Sets/src/mage/cards/b/Borrowing100000Arrows.java b/Mage.Sets/src/mage/cards/b/Borrowing100000Arrows.java index 2cba84b91cb..815623ebc9d 100644 --- a/Mage.Sets/src/mage/cards/b/Borrowing100000Arrows.java +++ b/Mage.Sets/src/mage/cards/b/Borrowing100000Arrows.java @@ -62,7 +62,7 @@ class Borrowing100000ArrowsEffect extends OneShotEffect { Player opponent = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (opponent != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); filter.add(new ControllerIdPredicate(opponent.getId())); return new DrawCardSourceControllerEffect(game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game)).apply(game, source); } diff --git a/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java b/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java index 39a75665a1c..cdc3063fbd0 100644 --- a/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java +++ b/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -29,7 +28,7 @@ public final class BrandedBrawlers extends CardImpl { static final private FilterLandPermanent filter = new FilterLandPermanent("an untapped land"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } static final private String rule = "{this} can't block if you control an untapped land"; diff --git a/Mage.Sets/src/mage/cards/b/BurdenOfGreed.java b/Mage.Sets/src/mage/cards/b/BurdenOfGreed.java index d38e6c05438..d9221e0c6fa 100644 --- a/Mage.Sets/src/mage/cards/b/BurdenOfGreed.java +++ b/Mage.Sets/src/mage/cards/b/BurdenOfGreed.java @@ -48,7 +48,7 @@ class BurdenOfGreedCount implements DynamicValue { return 0; } FilterArtifactPermanent filter = new FilterArtifactPermanent(); - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); filter.add(new ControllerIdPredicate(sourceAbility.getFirstTarget())); return game.getBattlefield().count(filter, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game); } diff --git a/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java b/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java index 15439c529d0..40da7518f9b 100644 --- a/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java +++ b/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -26,7 +25,7 @@ public final class BurnAtTheStake extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public BurnAtTheStake(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CalmingVerse.java b/Mage.Sets/src/mage/cards/c/CalmingVerse.java index 1b097fb569c..04653e31979 100644 --- a/Mage.Sets/src/mage/cards/c/CalmingVerse.java +++ b/Mage.Sets/src/mage/cards/c/CalmingVerse.java @@ -12,7 +12,6 @@ import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledEnchantmentPermanent; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -48,7 +47,7 @@ class CalmingVerseEffect extends OneShotEffect { static { untappedLandFilter.add(CardType.LAND.getPredicate()); - untappedLandFilter.add(Predicates.not(TappedPredicate.instance)); + untappedLandFilter.add(TappedPredicate.UNTAPPED); } private static final FilterEnchantmentPermanent opponentEnchantmentsFilter = new FilterEnchantmentPermanent("enchantments you don't control"); diff --git a/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java b/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java index 2bbb7870143..24b59ffcae1 100644 --- a/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java +++ b/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -33,7 +32,7 @@ public final class CaptivatingVampire extends CardImpl { static { filter1.add(SubType.VAMPIRE.getPredicate()); filter2.add(SubType.VAMPIRE.getPredicate()); - filter2.add(Predicates.not(TappedPredicate.instance)); + filter2.add(TappedPredicate.UNTAPPED); } public CaptivatingVampire(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CatapultMaster.java b/Mage.Sets/src/mage/cards/c/CatapultMaster.java index b3f53f767a4..a6cef771cb2 100644 --- a/Mage.Sets/src/mage/cards/c/CatapultMaster.java +++ b/Mage.Sets/src/mage/cards/c/CatapultMaster.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class CatapultMaster extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Soldiers you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.SOLDIER.getPredicate()); } public CatapultMaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CatapultSquad.java b/Mage.Sets/src/mage/cards/c/CatapultSquad.java index 132d60a1ff0..e9c75b770f7 100644 --- a/Mage.Sets/src/mage/cards/c/CatapultSquad.java +++ b/Mage.Sets/src/mage/cards/c/CatapultSquad.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class CatapultSquad extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Soldiers you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.SOLDIER.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/ChickenALaKing.java b/Mage.Sets/src/mage/cards/c/ChickenALaKing.java index d73a27115df..a953eed669b 100644 --- a/Mage.Sets/src/mage/cards/c/ChickenALaKing.java +++ b/Mage.Sets/src/mage/cards/c/ChickenALaKing.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -31,7 +30,7 @@ public final class ChickenALaKing extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Bird you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.BIRD.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java b/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java index 86e0cae7d5b..43a0143df8b 100644 --- a/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java +++ b/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -27,7 +26,7 @@ public final class ChosenOfMarkov extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Vampire you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.VAMPIRE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/CitadelOfPain.java b/Mage.Sets/src/mage/cards/c/CitadelOfPain.java index f208a8f51af..6d852863603 100644 --- a/Mage.Sets/src/mage/cards/c/CitadelOfPain.java +++ b/Mage.Sets/src/mage/cards/c/CitadelOfPain.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -55,7 +54,7 @@ class CitadelOfPainEffect extends OneShotEffect { } static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public CitadelOfPainEffect() { diff --git a/Mage.Sets/src/mage/cards/c/ClockOfOmens.java b/Mage.Sets/src/mage/cards/c/ClockOfOmens.java index fdb94c27957..02b1f77f739 100644 --- a/Mage.Sets/src/mage/cards/c/ClockOfOmens.java +++ b/Mage.Sets/src/mage/cards/c/ClockOfOmens.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetArtifactPermanent; import mage.target.common.TargetControlledPermanent; @@ -25,7 +24,7 @@ public final class ClockOfOmens extends CardImpl { static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public ClockOfOmens(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java b/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java index 7c5e922029a..c85a8fd9cca 100644 --- a/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java +++ b/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.KithkinSoldierToken; import mage.target.common.TargetControlledPermanent; @@ -32,7 +31,7 @@ public final class CloudgoatRanger extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Kithkin you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.KITHKIN.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/CollectiveEffort.java b/Mage.Sets/src/mage/cards/c/CollectiveEffort.java index 6fc0501aa63..c5462be3fde 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveEffort.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveEffort.java @@ -19,7 +19,6 @@ import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.PowerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -43,7 +42,7 @@ public final class CollectiveEffort extends CardImpl { private static final FilterPlayer filterPlayer = new FilterPlayer("player whose creatures get +1/+1 counters"); static { - filterUntapped.add(Predicates.not(TappedPredicate.instance)); + filterUntapped.add(TappedPredicate.UNTAPPED); filterDestroyCreature.add(new PowerPredicate(ComparisonType.MORE_THAN, 3)); } diff --git a/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java b/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java index c0ba2e1174e..5c7fea0eca0 100644 --- a/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java +++ b/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -27,7 +26,7 @@ public final class CopperhoofVorrac extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("untapped permanent your opponents control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(TargetController.OPPONENT.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/CoralAtoll.java b/Mage.Sets/src/mage/cards/c/CoralAtoll.java index 297f93af115..a6c10b1d91b 100644 --- a/Mage.Sets/src/mage/cards/c/CoralAtoll.java +++ b/Mage.Sets/src/mage/cards/c/CoralAtoll.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class CoralAtoll extends CardImpl { static { filter.add(SubType.ISLAND.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public CoralAtoll(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CoralReef.java b/Mage.Sets/src/mage/cards/c/CoralReef.java index 914f215c201..556b1b99e98 100644 --- a/Mage.Sets/src/mage/cards/c/CoralReef.java +++ b/Mage.Sets/src/mage/cards/c/CoralReef.java @@ -21,7 +21,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -39,7 +38,7 @@ public final class CoralReef extends CardImpl { static { islandFilter.add(SubType.ISLAND.getPredicate()); - untappedBlueCreatureFilter.add(Predicates.not(TappedPredicate.instance)); + untappedBlueCreatureFilter.add(TappedPredicate.UNTAPPED); untappedBlueCreatureFilter.add(new ColorPredicate(ObjectColor.BLUE)); } diff --git a/Mage.Sets/src/mage/cards/c/Crackleburr.java b/Mage.Sets/src/mage/cards/c/Crackleburr.java index 7b5229cf329..7b19db74d84 100644 --- a/Mage.Sets/src/mage/cards/c/Crackleburr.java +++ b/Mage.Sets/src/mage/cards/c/Crackleburr.java @@ -19,7 +19,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -38,10 +37,10 @@ public final class Crackleburr extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.RED)); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter2.add(new ColorPredicate(ObjectColor.BLUE)); - filter2.add(TappedPredicate.instance); + filter2.add(TappedPredicate.TAPPED); } public Crackleburr(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java b/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java index d044baefbf0..379e123bdcd 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java +++ b/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class CracklingPerimeter extends CardImpl { static { filter.add(SubType.GATE.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public CracklingPerimeter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CrashingBoars.java b/Mage.Sets/src/mage/cards/c/CrashingBoars.java index 047048c29ee..1c3597ed16c 100644 --- a/Mage.Sets/src/mage/cards/c/CrashingBoars.java +++ b/Mage.Sets/src/mage/cards/c/CrashingBoars.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.SetTargetPointer; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.players.Player; @@ -53,7 +52,7 @@ class CrashingBoarsEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } CrashingBoarsEffect() { diff --git a/Mage.Sets/src/mage/cards/c/CrookclawElder.java b/Mage.Sets/src/mage/cards/c/CrookclawElder.java index 6b2a76e8537..a1a954a50ab 100644 --- a/Mage.Sets/src/mage/cards/c/CrookclawElder.java +++ b/Mage.Sets/src/mage/cards/c/CrookclawElder.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicate; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -31,7 +30,7 @@ public final class CrookclawElder extends CardImpl { = new FilterControlledCreaturePermanent(SubType.BIRD, "untapped Birds you control"); private static final FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent(SubType.WIZARD, "untapped Wizards you control"); - private static final Predicate pred = Predicates.not(TappedPredicate.instance); + private static final Predicate pred = TappedPredicate.UNTAPPED; static { filter.add(pred); diff --git a/Mage.Sets/src/mage/cards/c/Cryptbreaker.java b/Mage.Sets/src/mage/cards/c/Cryptbreaker.java index 4e1c6cb7a5a..df72726b7ab 100644 --- a/Mage.Sets/src/mage/cards/c/Cryptbreaker.java +++ b/Mage.Sets/src/mage/cards/c/Cryptbreaker.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetControlledCreaturePermanent; @@ -32,7 +31,7 @@ public final class Cryptbreaker extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Zombies you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.ZOMBIE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/CrypticGateway.java b/Mage.Sets/src/mage/cards/c/CrypticGateway.java index d2be0296b1d..28396688e11 100644 --- a/Mage.Sets/src/mage/cards/c/CrypticGateway.java +++ b/Mage.Sets/src/mage/cards/c/CrypticGateway.java @@ -15,7 +15,6 @@ import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicate; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -53,7 +52,7 @@ class CrypticGatewayCost extends CostImpl { = new FilterControlledCreaturePermanent("untapped creatures you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } private final TargetControlledPermanent target = new TargetControlledPermanent(2, filter); diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java b/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java index 77635e87c0e..05ea3661bb7 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java @@ -27,7 +27,7 @@ public final class DeadeyeHarpooner extends CardImpl { private static final FilterOpponentsCreaturePermanent filter = new FilterOpponentsCreaturePermanent("tapped creature an opponent controls"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public DeadeyeHarpooner(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeathStroke.java b/Mage.Sets/src/mage/cards/d/DeathStroke.java index ed1c2518ae4..53a57c1b803 100644 --- a/Mage.Sets/src/mage/cards/d/DeathStroke.java +++ b/Mage.Sets/src/mage/cards/d/DeathStroke.java @@ -19,7 +19,7 @@ public final class DeathStroke extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public DeathStroke(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeathlessAncient.java b/Mage.Sets/src/mage/cards/d/DeathlessAncient.java index de94ff93db6..5fef5185699 100644 --- a/Mage.Sets/src/mage/cards/d/DeathlessAncient.java +++ b/Mage.Sets/src/mage/cards/d/DeathlessAncient.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class DeathlessAncient extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Vampires you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.VAMPIRE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/d/DevoutChaplain.java b/Mage.Sets/src/mage/cards/d/DevoutChaplain.java index dbf9e657560..359f3de6ce5 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutChaplain.java +++ b/Mage.Sets/src/mage/cards/d/DevoutChaplain.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class DevoutChaplain extends CardImpl { private static final FilterControlledPermanent humanFilter = new FilterControlledPermanent("untapped Human you control"); static { - humanFilter.add(Predicates.not(TappedPredicate.instance)); + humanFilter.add(TappedPredicate.UNTAPPED); humanFilter.add(SubType.HUMAN.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/d/DevoutInvocation.java b/Mage.Sets/src/mage/cards/d/DevoutInvocation.java index 8e1e0e3772c..f08faaa041d 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutInvocation.java +++ b/Mage.Sets/src/mage/cards/d/DevoutInvocation.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.token.AngelToken; @@ -48,7 +47,7 @@ class DevoutInvocationEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public DevoutInvocationEffect() { diff --git a/Mage.Sets/src/mage/cards/d/Dichotomancy.java b/Mage.Sets/src/mage/cards/d/Dichotomancy.java index 984dd333073..b1f8556a554 100644 --- a/Mage.Sets/src/mage/cards/d/Dichotomancy.java +++ b/Mage.Sets/src/mage/cards/d/Dichotomancy.java @@ -53,7 +53,7 @@ class DichotomancyEffect extends OneShotEffect { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } DichotomancyEffect() { diff --git a/Mage.Sets/src/mage/cards/d/DiversionaryTactics.java b/Mage.Sets/src/mage/cards/d/DiversionaryTactics.java index fef1a8b8d08..7755f2097e0 100644 --- a/Mage.Sets/src/mage/cards/d/DiversionaryTactics.java +++ b/Mage.Sets/src/mage/cards/d/DiversionaryTactics.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -24,7 +23,7 @@ public final class DiversionaryTactics extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public DiversionaryTactics(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DormantVolcano.java b/Mage.Sets/src/mage/cards/d/DormantVolcano.java index 5f920be94f5..74ab593b16d 100644 --- a/Mage.Sets/src/mage/cards/d/DormantVolcano.java +++ b/Mage.Sets/src/mage/cards/d/DormantVolcano.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class DormantVolcano extends CardImpl { static { filter.add(SubType.MOUNTAIN.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public DormantVolcano(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DovinsDismissal.java b/Mage.Sets/src/mage/cards/d/DovinsDismissal.java index 598029d98b5..c1cdb8d67a4 100644 --- a/Mage.Sets/src/mage/cards/d/DovinsDismissal.java +++ b/Mage.Sets/src/mage/cards/d/DovinsDismissal.java @@ -24,7 +24,7 @@ public final class DovinsDismissal extends CardImpl { static { filter.add(new NamePredicate("Dovin, Architect of Law")); - filter2.add(TappedPredicate.instance); + filter2.add(TappedPredicate.TAPPED); } public DovinsDismissal(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java b/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java index f91e8de81c4..ae7cca50d59 100644 --- a/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java +++ b/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java @@ -23,7 +23,7 @@ public final class DragonscaleGeneral extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creatures you control"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); filter.add(TargetController.YOU.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/d/DranasChosen.java b/Mage.Sets/src/mage/cards/d/DranasChosen.java index c9b7464f983..1e1ec1258f5 100644 --- a/Mage.Sets/src/mage/cards/d/DranasChosen.java +++ b/Mage.Sets/src/mage/cards/d/DranasChosen.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetControlledPermanent; @@ -30,7 +29,7 @@ public final class DranasChosen extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public DranasChosen(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DreamTides.java b/Mage.Sets/src/mage/cards/d/DreamTides.java index e7353d1ad21..9a0dab7cfa0 100644 --- a/Mage.Sets/src/mage/cards/d/DreamTides.java +++ b/Mage.Sets/src/mage/cards/d/DreamTides.java @@ -55,7 +55,7 @@ class DreamTidesEffect extends OneShotEffect { static { filter.add(Predicates.not(new ColorPredicate(ObjectColor.GREEN))); - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } DreamTidesEffect() { diff --git a/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java b/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java index cd3431d0143..c40c050e7f3 100644 --- a/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java +++ b/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; @@ -28,7 +27,7 @@ public final class DrownerOfSecrets extends CardImpl { static { filter.add(SubType.MERFOLK.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public DrownerOfSecrets(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DuneDiviner.java b/Mage.Sets/src/mage/cards/d/DuneDiviner.java index b761f7c35a0..63457736700 100644 --- a/Mage.Sets/src/mage/cards/d/DuneDiviner.java +++ b/Mage.Sets/src/mage/cards/d/DuneDiviner.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -28,7 +27,7 @@ public final class DuneDiviner extends CardImpl { static { filter.add(SubType.DESERT.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public DuneDiviner(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java b/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java index 33ede9ce7a4..25d0abcd280 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class DwarvenBloodboiler extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an untapped Dwarf you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.DWARF.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/e/Earthcraft.java b/Mage.Sets/src/mage/cards/e/Earthcraft.java index 9d3957f240a..5085f457bea 100644 --- a/Mage.Sets/src/mage/cards/e/Earthcraft.java +++ b/Mage.Sets/src/mage/cards/e/Earthcraft.java @@ -13,7 +13,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -27,7 +26,7 @@ public final class Earthcraft extends CardImpl { private static final FilterControlledPermanent filterLand = new FilterControlledPermanent("basic land"); static { - filterCreature.add(Predicates.not(TappedPredicate.instance)); + filterCreature.add(TappedPredicate.UNTAPPED); filterLand.add(CardType.LAND.getPredicate()); filterLand.add(SuperType.BASIC.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/e/Earthlore.java b/Mage.Sets/src/mage/cards/e/Earthlore.java index aa25c0542bf..9b348f87e07 100644 --- a/Mage.Sets/src/mage/cards/e/Earthlore.java +++ b/Mage.Sets/src/mage/cards/e/Earthlore.java @@ -20,7 +20,6 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterBlockingCreature; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -41,7 +40,7 @@ public final class Earthlore extends CardImpl { private static final FilterPermanent filterUntapped = new FilterPermanent("enchanted land is untapped"); static { - filterUntapped.add(Predicates.not(TappedPredicate.instance)); + filterUntapped.add(TappedPredicate.UNTAPPED); } public Earthlore(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EmbalmersTools.java b/Mage.Sets/src/mage/cards/e/EmbalmersTools.java index 80e45a47fca..b9eed1188f6 100644 --- a/Mage.Sets/src/mage/cards/e/EmbalmersTools.java +++ b/Mage.Sets/src/mage/cards/e/EmbalmersTools.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.players.Player; @@ -31,7 +30,7 @@ public final class EmbalmersTools extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Zombie you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.ZOMBIE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/e/EnergyTap.java b/Mage.Sets/src/mage/cards/e/EnergyTap.java index 45bba2076fc..7457245fffb 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyTap.java +++ b/Mage.Sets/src/mage/cards/e/EnergyTap.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -25,7 +24,7 @@ public final class EnergyTap extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public EnergyTap(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EntanglingVines.java b/Mage.Sets/src/mage/cards/e/EntanglingVines.java index d0ec09b484a..2253c0d4d0c 100644 --- a/Mage.Sets/src/mage/cards/e/EntanglingVines.java +++ b/Mage.Sets/src/mage/cards/e/EntanglingVines.java @@ -26,7 +26,7 @@ public final class EntanglingVines extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public EntanglingVines(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/Everglades.java b/Mage.Sets/src/mage/cards/e/Everglades.java index 57b96a0bb86..b9a58aa3a56 100644 --- a/Mage.Sets/src/mage/cards/e/Everglades.java +++ b/Mage.Sets/src/mage/cards/e/Everglades.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class Everglades extends CardImpl { static { filter.add(SubType.SWAMP.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public Everglades(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/Excoriate.java b/Mage.Sets/src/mage/cards/e/Excoriate.java index ccc01d4d4d0..38be8444c5e 100644 --- a/Mage.Sets/src/mage/cards/e/Excoriate.java +++ b/Mage.Sets/src/mage/cards/e/Excoriate.java @@ -19,7 +19,7 @@ public final class Excoriate extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public Excoriate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/Expel.java b/Mage.Sets/src/mage/cards/e/Expel.java index 2170007b3c6..e46db9158d3 100644 --- a/Mage.Sets/src/mage/cards/e/Expel.java +++ b/Mage.Sets/src/mage/cards/e/Expel.java @@ -19,7 +19,7 @@ public final class Expel extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public Expel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FenStalker.java b/Mage.Sets/src/mage/cards/f/FenStalker.java index 5fecaac408e..5a14921e8d5 100644 --- a/Mage.Sets/src/mage/cards/f/FenStalker.java +++ b/Mage.Sets/src/mage/cards/f/FenStalker.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -28,7 +27,7 @@ public final class FenStalker extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent(); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public FenStalker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FieldSurgeon.java b/Mage.Sets/src/mage/cards/f/FieldSurgeon.java index d749ce1307d..9e6d7f3d2b3 100644 --- a/Mage.Sets/src/mage/cards/f/FieldSurgeon.java +++ b/Mage.Sets/src/mage/cards/f/FieldSurgeon.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class FieldSurgeon extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public FieldSurgeon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GalecasterColossus.java b/Mage.Sets/src/mage/cards/g/GalecasterColossus.java index 86c8556cf4c..9d909401eb4 100644 --- a/Mage.Sets/src/mage/cards/g/GalecasterColossus.java +++ b/Mage.Sets/src/mage/cards/g/GalecasterColossus.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetNonlandPermanent; @@ -32,7 +31,7 @@ public final class GalecasterColossus extends CardImpl { static { filter.add(TargetController.NOT_YOU.getControllerPredicate()); filter2.add(SubType.WIZARD.getPredicate()); - filter2.add(Predicates.not(TappedPredicate.instance)); + filter2.add(TappedPredicate.UNTAPPED); } public GalecasterColossus(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/Galestrike.java b/Mage.Sets/src/mage/cards/g/Galestrike.java index 259da2a9023..5f13ac29061 100644 --- a/Mage.Sets/src/mage/cards/g/Galestrike.java +++ b/Mage.Sets/src/mage/cards/g/Galestrike.java @@ -20,7 +20,7 @@ public final class Galestrike extends CardImpl { private static FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public Galestrike(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java b/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java index 2a65d54cb49..d11f49e7743 100644 --- a/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java +++ b/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java @@ -16,7 +16,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -34,7 +33,7 @@ public final class GallowsAtWillowHill extends CardImpl { private static final FilterControlledPermanent humanFilter = new FilterControlledPermanent("untapped Human you control"); static { - humanFilter.add(Predicates.not(TappedPredicate.instance)); + humanFilter.add(TappedPredicate.UNTAPPED); humanFilter.add(SubType.HUMAN.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/g/GatewayShade.java b/Mage.Sets/src/mage/cards/g/GatewayShade.java index 794717065d9..5112bcf88db 100644 --- a/Mage.Sets/src/mage/cards/g/GatewayShade.java +++ b/Mage.Sets/src/mage/cards/g/GatewayShade.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -27,7 +26,7 @@ public final class GatewayShade extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("untapped Gate you control"); static { filter.add(SubType.GATE.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public GatewayShade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GazeOfJustice.java b/Mage.Sets/src/mage/cards/g/GazeOfJustice.java index d23c2d1338a..d7b02929bdf 100644 --- a/Mage.Sets/src/mage/cards/g/GazeOfJustice.java +++ b/Mage.Sets/src/mage/cards/g/GazeOfJustice.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TimingRule; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -28,7 +27,7 @@ public final class GazeOfJustice extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.WHITE)); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public GazeOfJustice(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java b/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java index 43a13b3835a..72b144e16bb 100644 --- a/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java +++ b/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetAnyTarget; @@ -25,7 +24,7 @@ public final class GhirapurAetherGrid extends CardImpl { static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public GhirapurAetherGrid(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GiantOyster.java b/Mage.Sets/src/mage/cards/g/GiantOyster.java index 18a03b4c653..0488945f867 100644 --- a/Mage.Sets/src/mage/cards/g/GiantOyster.java +++ b/Mage.Sets/src/mage/cards/g/GiantOyster.java @@ -37,7 +37,7 @@ public final class GiantOyster extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public GiantOyster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GideonJura.java b/Mage.Sets/src/mage/cards/g/GideonJura.java index 52e9f78c691..335e547b331 100644 --- a/Mage.Sets/src/mage/cards/g/GideonJura.java +++ b/Mage.Sets/src/mage/cards/g/GideonJura.java @@ -31,7 +31,7 @@ public final class GideonJura extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public GideonJura(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GlacianPowerstoneEngineer.java b/Mage.Sets/src/mage/cards/g/GlacianPowerstoneEngineer.java index 6b2ba652d8b..77d82373899 100644 --- a/Mage.Sets/src/mage/cards/g/GlacianPowerstoneEngineer.java +++ b/Mage.Sets/src/mage/cards/g/GlacianPowerstoneEngineer.java @@ -14,7 +14,6 @@ import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.players.Player; @@ -111,7 +110,7 @@ class GlacianPowerstoneEngineerCost extends VariableCostImpl { = new FilterControlledArtifactPermanent("untapped artifacts you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } GlacianPowerstoneEngineerCost() { diff --git a/Mage.Sets/src/mage/cards/g/GlareOfSubdual.java b/Mage.Sets/src/mage/cards/g/GlareOfSubdual.java index e48e00227fc..2c74cb05d6b 100644 --- a/Mage.Sets/src/mage/cards/g/GlareOfSubdual.java +++ b/Mage.Sets/src/mage/cards/g/GlareOfSubdual.java @@ -27,7 +27,7 @@ public final class GlareOfSubdual extends CardImpl { private static final FilterPermanent filterTarget = new FilterPermanent("artifact or creature"); static { - filterCost.add(Predicates.not(TappedPredicate.instance)); + filterCost.add(TappedPredicate.UNTAPPED); filterTarget.add(Predicates.or( CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate())); diff --git a/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java b/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java index a664f942441..a89eec4a2b6 100644 --- a/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java +++ b/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java @@ -26,7 +26,7 @@ public final class GlimmerdustNap extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public GlimmerdustNap(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinMutant.java b/Mage.Sets/src/mage/cards/g/GoblinMutant.java index a86d4b84c4f..9aeb0f48f24 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMutant.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMutant.java @@ -30,7 +30,7 @@ public final class GoblinMutant extends CardImpl { static final private FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creatures with power 3 or greater"); static { - filter.add(Predicates.and(new PowerPredicate(ComparisonType.MORE_THAN, 2), Predicates.not(TappedPredicate.instance))); + filter.add(Predicates.and(new PowerPredicate(ComparisonType.MORE_THAN, 2), TappedPredicate.UNTAPPED)); filter2.add(new PowerPredicate(ComparisonType.MORE_THAN, 2)); } diff --git a/Mage.Sets/src/mage/cards/g/GrandArchitect.java b/Mage.Sets/src/mage/cards/g/GrandArchitect.java index 6104115723b..0a8978c6991 100644 --- a/Mage.Sets/src/mage/cards/g/GrandArchitect.java +++ b/Mage.Sets/src/mage/cards/g/GrandArchitect.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -59,7 +58,7 @@ public final class GrandArchitect extends CardImpl { // Tap an untapped blue creature you control: Add {C}{C}. Spend this mana only to cast artifact spells or activate abilities of artifacts. FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped blue creature"); filter.add(new ColorPredicate(ObjectColor.BLUE)); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); this.addAbility(new GrandArchitectManaAbility(filter)); } diff --git a/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java b/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java index 9346c7d2378..f750a528bd3 100644 --- a/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java +++ b/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetControlledCreaturePermanent; @@ -29,7 +28,7 @@ public final class GravespawnSovereign extends CardImpl { static { filter.add(SubType.ZOMBIE.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public GravespawnSovereign(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java b/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java index 8675cff8fb6..9980d750836 100644 --- a/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java +++ b/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.GreenAndWhiteElementalToken; import mage.target.common.TargetControlledCreaturePermanent; @@ -29,7 +28,7 @@ public final class GroveOfTheGuardian extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public GroveOfTheGuardian(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GuanYus1000LiMarch.java b/Mage.Sets/src/mage/cards/g/GuanYus1000LiMarch.java index 50735035eb9..2c3a991e980 100644 --- a/Mage.Sets/src/mage/cards/g/GuanYus1000LiMarch.java +++ b/Mage.Sets/src/mage/cards/g/GuanYus1000LiMarch.java @@ -18,7 +18,7 @@ public final class GuanYus1000LiMarch extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creatures"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public GuanYus1000LiMarch(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GuildSummit.java b/Mage.Sets/src/mage/cards/g/GuildSummit.java index 08b5365a6c1..d3b79f90809 100644 --- a/Mage.Sets/src/mage/cards/g/GuildSummit.java +++ b/Mage.Sets/src/mage/cards/g/GuildSummit.java @@ -12,7 +12,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -63,7 +62,7 @@ class GuildSummitEffect extends OneShotEffect { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.GATE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/h/HairStrungKoto.java b/Mage.Sets/src/mage/cards/h/HairStrungKoto.java index 461113571c5..f775610cf6a 100644 --- a/Mage.Sets/src/mage/cards/h/HairStrungKoto.java +++ b/Mage.Sets/src/mage/cards/h/HairStrungKoto.java @@ -38,7 +38,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetControlledCreaturePermanent; @@ -52,7 +51,7 @@ public final class HairStrungKoto extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public HairStrungKoto (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HandOfJustice.java b/Mage.Sets/src/mage/cards/h/HandOfJustice.java index 6797eb09627..fe642b84c75 100644 --- a/Mage.Sets/src/mage/cards/h/HandOfJustice.java +++ b/Mage.Sets/src/mage/cards/h/HandOfJustice.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -31,7 +30,7 @@ public final class HandOfJustice extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.WHITE)); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public HandOfJustice(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HarbingerOfTheTides.java b/Mage.Sets/src/mage/cards/h/HarbingerOfTheTides.java index d0e9449f4c5..3f6d28d94fa 100644 --- a/Mage.Sets/src/mage/cards/h/HarbingerOfTheTides.java +++ b/Mage.Sets/src/mage/cards/h/HarbingerOfTheTides.java @@ -26,7 +26,7 @@ public final class HarbingerOfTheTides extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature an opponent controls"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); filter.add(TargetController.OPPONENT.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/h/HarmonyOfNature.java b/Mage.Sets/src/mage/cards/h/HarmonyOfNature.java index 1f415d97a67..eeb45455b29 100644 --- a/Mage.Sets/src/mage/cards/h/HarmonyOfNature.java +++ b/Mage.Sets/src/mage/cards/h/HarmonyOfNature.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.players.Player; @@ -48,7 +47,7 @@ class HarmonyOfNatureEffect extends OneShotEffect { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public HarmonyOfNatureEffect() { diff --git a/Mage.Sets/src/mage/cards/h/HarvestSeason.java b/Mage.Sets/src/mage/cards/h/HarvestSeason.java index 1c56015d4b8..f02072af0c5 100644 --- a/Mage.Sets/src/mage/cards/h/HarvestSeason.java +++ b/Mage.Sets/src/mage/cards/h/HarvestSeason.java @@ -49,7 +49,7 @@ class HarvestSeasonEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("tapped creature you control"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } HarvestSeasonEffect() { diff --git a/Mage.Sets/src/mage/cards/h/HazyHomunculus.java b/Mage.Sets/src/mage/cards/h/HazyHomunculus.java index e08229367af..c8c9964fff8 100644 --- a/Mage.Sets/src/mage/cards/h/HazyHomunculus.java +++ b/Mage.Sets/src/mage/cards/h/HazyHomunculus.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -27,7 +26,7 @@ public final class HazyHomunculus extends CardImpl { private static final FilterPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public HazyHomunculus(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/Hecatomb.java b/Mage.Sets/src/mage/cards/h/Hecatomb.java index 26ae57acec4..57473ed4d2f 100644 --- a/Mage.Sets/src/mage/cards/h/Hecatomb.java +++ b/Mage.Sets/src/mage/cards/h/Hecatomb.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; @@ -31,7 +30,7 @@ public final class Hecatomb extends CardImpl { static { filter.add(SubType.SWAMP.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public Hecatomb(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeritageDruid.java b/Mage.Sets/src/mage/cards/h/HeritageDruid.java index fd81142d3b3..7f60c77c1a2 100644 --- a/Mage.Sets/src/mage/cards/h/HeritageDruid.java +++ b/Mage.Sets/src/mage/cards/h/HeritageDruid.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.target.common.TargetControlledPermanent; @@ -36,7 +35,7 @@ public final class HeritageDruid extends CardImpl { // Tap three untapped Elves you control: Add {G}{G}{G}. FilterControlledPermanent filter = new FilterControlledPermanent("untapped Elves you control"); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.ELF.getPredicate()); this.addAbility(new SimpleManaAbility( Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java b/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java index 405e24885ea..07c11c9ebbb 100644 --- a/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java +++ b/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java @@ -35,7 +35,7 @@ public final class HivisOfTheScale extends CardImpl { private static final String rule = "Gain control of target Dragon for as long as you control Hivis and Hivis remains tapped."; static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); filter.add(TargetController.YOU.getControllerPredicate()); filterDragon.add(SubType.DRAGON.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/h/HoldoutSettlement.java b/Mage.Sets/src/mage/cards/h/HoldoutSettlement.java index 23087a70c38..e61e22f1312 100644 --- a/Mage.Sets/src/mage/cards/h/HoldoutSettlement.java +++ b/Mage.Sets/src/mage/cards/h/HoldoutSettlement.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -23,7 +22,7 @@ public final class HoldoutSettlement extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public HoldoutSettlement(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HollowWarrior.java b/Mage.Sets/src/mage/cards/h/HollowWarrior.java index 00d0ca8fefd..e46dc84a8f4 100644 --- a/Mage.Sets/src/mage/cards/h/HollowWarrior.java +++ b/Mage.Sets/src/mage/cards/h/HollowWarrior.java @@ -57,7 +57,7 @@ class HollowWarriorCostToAttackBlockEffect extends PayCostToAttackBlockEffectImp static { filter.add(Predicates.not(AttackingPredicate.instance)); filter.add(Predicates.not(BlockingPredicate.instance)); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } HollowWarriorCostToAttackBlockEffect() { diff --git a/Mage.Sets/src/mage/cards/h/HonorWornShaku.java b/Mage.Sets/src/mage/cards/h/HonorWornShaku.java index 408a30bf8a1..7cd73f4862c 100644 --- a/Mage.Sets/src/mage/cards/h/HonorWornShaku.java +++ b/Mage.Sets/src/mage/cards/h/HonorWornShaku.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class HonorWornShaku extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped legendary permanent"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SuperType.LEGENDARY.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/h/HundredTalonStrike.java b/Mage.Sets/src/mage/cards/h/HundredTalonStrike.java index 247d68670ae..c756439f73a 100644 --- a/Mage.Sets/src/mage/cards/h/HundredTalonStrike.java +++ b/Mage.Sets/src/mage/cards/h/HundredTalonStrike.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -30,7 +29,7 @@ public final class HundredTalonStrike extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped white creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(new ColorPredicate(ObjectColor.WHITE)); } diff --git a/Mage.Sets/src/mage/cards/i/IgnitionTeam.java b/Mage.Sets/src/mage/cards/i/IgnitionTeam.java index cae5aed0f52..7714d69baa2 100644 --- a/Mage.Sets/src/mage/cards/i/IgnitionTeam.java +++ b/Mage.Sets/src/mage/cards/i/IgnitionTeam.java @@ -71,7 +71,7 @@ class TappedLandsCount implements DynamicValue { public int calculate(Game game, Ability sourceAbility, Effect effect) { if (sourceAbility != null) { FilterLandPermanent filter = new FilterLandPermanent("tapped lands on the battlefield"); - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); return game.getBattlefield().count(filter, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game); } return 0; diff --git a/Mage.Sets/src/mage/cards/i/ImpelledGiant.java b/Mage.Sets/src/mage/cards/i/ImpelledGiant.java index e7ce36bad96..a6d6885dd09 100644 --- a/Mage.Sets/src/mage/cards/i/ImpelledGiant.java +++ b/Mage.Sets/src/mage/cards/i/ImpelledGiant.java @@ -19,7 +19,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; @@ -37,7 +36,7 @@ public final class ImpelledGiant extends CardImpl { static final private FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an untapped red creature you control other than Impelled Giant"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(new ColorPredicate(ObjectColor.RED)); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/i/ImpetuousProtege.java b/Mage.Sets/src/mage/cards/i/ImpetuousProtege.java index ffc56757550..5a33ae46571 100644 --- a/Mage.Sets/src/mage/cards/i/ImpetuousProtege.java +++ b/Mage.Sets/src/mage/cards/i/ImpetuousProtege.java @@ -56,7 +56,7 @@ class ImpetuousProtegeEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); filter.add(TargetController.OPPONENT.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java index e0c00bf4580..61f0cc1a3ae 100644 --- a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java +++ b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java @@ -51,7 +51,7 @@ public final class InallaArchmageRitualist extends CardImpl { filter.add(Predicates.not(TokenPredicate.instance)); filter.add(AnotherPredicate.instance); filter2.add(SubType.WIZARD.getPredicate()); - filter2.add(Predicates.not(TappedPredicate.instance)); + filter2.add(TappedPredicate.UNTAPPED); } public InallaArchmageRitualist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IronVerdict.java b/Mage.Sets/src/mage/cards/i/IronVerdict.java index 17f0895acf4..fdd9b57cc1e 100644 --- a/Mage.Sets/src/mage/cards/i/IronVerdict.java +++ b/Mage.Sets/src/mage/cards/i/IronVerdict.java @@ -20,7 +20,7 @@ public final class IronVerdict extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public IronVerdict(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JaddiLifestrider.java b/Mage.Sets/src/mage/cards/j/JaddiLifestrider.java index 6fb85085aa5..9a361e3ca1e 100644 --- a/Mage.Sets/src/mage/cards/j/JaddiLifestrider.java +++ b/Mage.Sets/src/mage/cards/j/JaddiLifestrider.java @@ -11,7 +11,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -52,7 +51,7 @@ class JaddiLifestriderEffect extends OneShotEffect { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public JaddiLifestriderEffect() { diff --git a/Mage.Sets/src/mage/cards/j/JasperaSentinel.java b/Mage.Sets/src/mage/cards/j/JasperaSentinel.java index 9207f860278..3e6f97cf6e3 100644 --- a/Mage.Sets/src/mage/cards/j/JasperaSentinel.java +++ b/Mage.Sets/src/mage/cards/j/JasperaSentinel.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -25,7 +24,7 @@ public final class JasperaSentinel extends CardImpl { = new FilterControlledCreaturePermanent("an untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public JasperaSentinel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JungleBasin.java b/Mage.Sets/src/mage/cards/j/JungleBasin.java index 5b7796457a8..a3c98fa9139 100644 --- a/Mage.Sets/src/mage/cards/j/JungleBasin.java +++ b/Mage.Sets/src/mage/cards/j/JungleBasin.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class JungleBasin extends CardImpl { static { filter.add(SubType.FOREST.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public JungleBasin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/Karoo.java b/Mage.Sets/src/mage/cards/k/Karoo.java index 5f5d7f879e7..a809b0d877e 100644 --- a/Mage.Sets/src/mage/cards/k/Karoo.java +++ b/Mage.Sets/src/mage/cards/k/Karoo.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class Karoo extends CardImpl { static { filter.add(SubType.PLAINS.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public Karoo(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KarplusanGiant.java b/Mage.Sets/src/mage/cards/k/KarplusanGiant.java index a1e6c44fbae..23201e590d8 100644 --- a/Mage.Sets/src/mage/cards/k/KarplusanGiant.java +++ b/Mage.Sets/src/mage/cards/k/KarplusanGiant.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SuperType; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class KarplusanGiant extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("untapped snow land you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SuperType.SNOW.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfTheNineGales.java b/Mage.Sets/src/mage/cards/k/KeeperOfTheNineGales.java index 8751950e8f1..ed60924f333 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfTheNineGales.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfTheNineGales.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class KeeperOfTheNineGales extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Birds you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.BIRD.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/k/KeldonBattlewagon.java b/Mage.Sets/src/mage/cards/k/KeldonBattlewagon.java index 1b3be987eed..862d3bebf5b 100644 --- a/Mage.Sets/src/mage/cards/k/KeldonBattlewagon.java +++ b/Mage.Sets/src/mage/cards/k/KeldonBattlewagon.java @@ -23,7 +23,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -39,7 +38,7 @@ public final class KeldonBattlewagon extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public KeldonBattlewagon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KeldonBerserker.java b/Mage.Sets/src/mage/cards/k/KeldonBerserker.java index 00b58352381..59237df12a6 100644 --- a/Mage.Sets/src/mage/cards/k/KeldonBerserker.java +++ b/Mage.Sets/src/mage/cards/k/KeldonBerserker.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -26,7 +25,7 @@ public final class KeldonBerserker extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("untapped lands"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public KeldonBerserker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KingsAssassin.java b/Mage.Sets/src/mage/cards/k/KingsAssassin.java index 04c4f036c1b..cda86b5d362 100644 --- a/Mage.Sets/src/mage/cards/k/KingsAssassin.java +++ b/Mage.Sets/src/mage/cards/k/KingsAssassin.java @@ -26,7 +26,7 @@ public final class KingsAssassin extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public KingsAssassin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KnotvinePaladin.java b/Mage.Sets/src/mage/cards/k/KnotvinePaladin.java index 9bb115d097e..6cfbdc131b5 100644 --- a/Mage.Sets/src/mage/cards/k/KnotvinePaladin.java +++ b/Mage.Sets/src/mage/cards/k/KnotvinePaladin.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -23,7 +22,7 @@ public final class KnotvinePaladin extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } diff --git a/Mage.Sets/src/mage/cards/k/KoskunFalls.java b/Mage.Sets/src/mage/cards/k/KoskunFalls.java index e91b55598d3..7aba0942c4b 100644 --- a/Mage.Sets/src/mage/cards/k/KoskunFalls.java +++ b/Mage.Sets/src/mage/cards/k/KoskunFalls.java @@ -16,7 +16,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -29,7 +28,7 @@ public final class KoskunFalls extends CardImpl { private static final FilterControlledCreaturePermanent filterCreature = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filterCreature.add(Predicates.not(TappedPredicate.instance)); + filterCreature.add(TappedPredicate.UNTAPPED); } public KoskunFalls(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KrovikanPlague.java b/Mage.Sets/src/mage/cards/k/KrovikanPlague.java index 3e08f9e9390..75eca64929b 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanPlague.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanPlague.java @@ -45,7 +45,7 @@ public final class KrovikanPlague extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("enchanted creature is untapped"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public KrovikanPlague(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java b/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java index f6f5d5dc354..421dd596ae0 100644 --- a/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java +++ b/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java @@ -17,7 +17,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -35,10 +34,10 @@ public final class KumenaTyrantOfOrazca extends CardImpl { static { filterAnotherNotTapped.add(AnotherPredicate.instance); filterAnotherNotTapped.add(SubType.MERFOLK.getPredicate()); - filterAnotherNotTapped.add(Predicates.not(TappedPredicate.instance)); + filterAnotherNotTapped.add(TappedPredicate.UNTAPPED); filterNotTapped.add(SubType.MERFOLK.getPredicate()); - filterNotTapped.add(Predicates.not(TappedPredicate.instance)); + filterNotTapped.add(TappedPredicate.UNTAPPED); filterAll.add(SubType.MERFOLK.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/k/KyrenNegotiations.java b/Mage.Sets/src/mage/cards/k/KyrenNegotiations.java index 338861f4e5f..75555b8d98b 100644 --- a/Mage.Sets/src/mage/cards/k/KyrenNegotiations.java +++ b/Mage.Sets/src/mage/cards/k/KyrenNegotiations.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetPlayerOrPlaneswalker; @@ -24,7 +23,7 @@ public final class KyrenNegotiations extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public KyrenNegotiations(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/Lashknife.java b/Mage.Sets/src/mage/cards/l/Lashknife.java index 20eb975a60d..1cf1d1b4fef 100644 --- a/Mage.Sets/src/mage/cards/l/Lashknife.java +++ b/Mage.Sets/src/mage/cards/l/Lashknife.java @@ -22,7 +22,6 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -37,7 +36,7 @@ public final class Lashknife extends CardImpl { static { plainsFilter.add(SubType.PLAINS.getPredicate()); - creatureFilter.add(Predicates.not(TappedPredicate.instance)); + creatureFilter.add(TappedPredicate.UNTAPPED); } public Lashknife(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LathrilBladeOfTheElves.java b/Mage.Sets/src/mage/cards/l/LathrilBladeOfTheElves.java index db2a2e8102d..b959655d1a8 100644 --- a/Mage.Sets/src/mage/cards/l/LathrilBladeOfTheElves.java +++ b/Mage.Sets/src/mage/cards/l/LathrilBladeOfTheElves.java @@ -18,7 +18,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.UntappedPredicate; +import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.token.ElfWarriorToken; import mage.target.common.TargetControlledPermanent; @@ -34,7 +34,7 @@ public final class LathrilBladeOfTheElves extends CardImpl { = new FilterControlledPermanent(SubType.ELF, "untapped Elves you control"); static { - filter.add(UntappedPredicate.instance); + filter.add(TappedPredicate.UNTAPPED); } public LathrilBladeOfTheElves(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LedevChampion.java b/Mage.Sets/src/mage/cards/l/LedevChampion.java index fe48cfdb0e0..4f90d1b3557 100644 --- a/Mage.Sets/src/mage/cards/l/LedevChampion.java +++ b/Mage.Sets/src/mage/cards/l/LedevChampion.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -63,7 +62,7 @@ class LedevChampionEffect extends OneShotEffect { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public LedevChampionEffect() { diff --git a/Mage.Sets/src/mage/cards/l/LivingTwister.java b/Mage.Sets/src/mage/cards/l/LivingTwister.java index 0d6edad99a1..83779f7deb9 100644 --- a/Mage.Sets/src/mage/cards/l/LivingTwister.java +++ b/Mage.Sets/src/mage/cards/l/LivingTwister.java @@ -29,7 +29,7 @@ public final class LivingTwister extends CardImpl { = new FilterControlledLandPermanent("tapped land you control"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public LivingTwister(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LlanowarBehemoth.java b/Mage.Sets/src/mage/cards/l/LlanowarBehemoth.java index cbe58cc679a..2b80dab9d07 100644 --- a/Mage.Sets/src/mage/cards/l/LlanowarBehemoth.java +++ b/Mage.Sets/src/mage/cards/l/LlanowarBehemoth.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -25,7 +24,7 @@ public final class LlanowarBehemoth extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public LlanowarBehemoth(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LoamDryad.java b/Mage.Sets/src/mage/cards/l/LoamDryad.java index ea799dfb0e5..510ba342a9e 100644 --- a/Mage.Sets/src/mage/cards/l/LoamDryad.java +++ b/Mage.Sets/src/mage/cards/l/LoamDryad.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -24,7 +23,7 @@ public final class LoamDryad extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public LoamDryad(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LodestoneMyr.java b/Mage.Sets/src/mage/cards/l/LodestoneMyr.java index c6415207eef..4e17792b012 100644 --- a/Mage.Sets/src/mage/cards/l/LodestoneMyr.java +++ b/Mage.Sets/src/mage/cards/l/LodestoneMyr.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class LodestoneMyr extends CardImpl { private static final FilterControlledArtifactPermanent filter = new FilterControlledArtifactPermanent("untapped artifact you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public LodestoneMyr(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LotusVale.java b/Mage.Sets/src/mage/cards/l/LotusVale.java index b0f9e9573d2..7f8201ce334 100644 --- a/Mage.Sets/src/mage/cards/l/LotusVale.java +++ b/Mage.Sets/src/mage/cards/l/LotusVale.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class LotusVale extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("two untapped lands"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public LotusVale(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LullmageMentor.java b/Mage.Sets/src/mage/cards/l/LullmageMentor.java index cf622db12f1..8bde38976d9 100644 --- a/Mage.Sets/src/mage/cards/l/LullmageMentor.java +++ b/Mage.Sets/src/mage/cards/l/LullmageMentor.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.MerfolkToken; import mage.target.TargetSpell; @@ -31,7 +30,7 @@ public final class LullmageMentor extends CardImpl { static { filter.add(SubType.MERFOLK.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public LullmageMentor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MagneticMountain.java b/Mage.Sets/src/mage/cards/m/MagneticMountain.java index f71e0d76bc1..0287a7b0b63 100644 --- a/Mage.Sets/src/mage/cards/m/MagneticMountain.java +++ b/Mage.Sets/src/mage/cards/m/MagneticMountain.java @@ -61,7 +61,7 @@ class MagneticMountainEffect extends OneShotEffect { static { filter2.add(new ColorPredicate(ObjectColor.BLUE)); - filter2.add(TappedPredicate.instance); + filter2.add(TappedPredicate.TAPPED); } MagneticMountainEffect() { diff --git a/Mage.Sets/src/mage/cards/m/MalakirSoothsayer.java b/Mage.Sets/src/mage/cards/m/MalakirSoothsayer.java index 9c83b63a8aa..184bdfc754a 100644 --- a/Mage.Sets/src/mage/cards/m/MalakirSoothsayer.java +++ b/Mage.Sets/src/mage/cards/m/MalakirSoothsayer.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -30,7 +29,7 @@ public final class MalakirSoothsayer extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public MalakirSoothsayer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/ManaCache.java b/Mage.Sets/src/mage/cards/m/ManaCache.java index 9b119c130ee..1485868e377 100644 --- a/Mage.Sets/src/mage/cards/m/ManaCache.java +++ b/Mage.Sets/src/mage/cards/m/ManaCache.java @@ -18,7 +18,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -59,7 +58,7 @@ class ManaCacheEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterControlledLandPermanent(); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public ManaCacheEffect() { diff --git a/Mage.Sets/src/mage/cards/m/ManaGeyser.java b/Mage.Sets/src/mage/cards/m/ManaGeyser.java index 2d295317ed5..558c698d0f5 100644 --- a/Mage.Sets/src/mage/cards/m/ManaGeyser.java +++ b/Mage.Sets/src/mage/cards/m/ManaGeyser.java @@ -20,7 +20,7 @@ public final class ManaGeyser extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("tapped land your opponents control"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ManaGeyser(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MaraxusOfKeld.java b/Mage.Sets/src/mage/cards/m/MaraxusOfKeld.java index 3f0953dc542..79d7be25a64 100644 --- a/Mage.Sets/src/mage/cards/m/MaraxusOfKeld.java +++ b/Mage.Sets/src/mage/cards/m/MaraxusOfKeld.java @@ -26,7 +26,7 @@ public final class MaraxusOfKeld extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped artifacts, creatures, and lands you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(Predicates.or( CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate(), diff --git a/Mage.Sets/src/mage/cards/m/MarshalingTheTroops.java b/Mage.Sets/src/mage/cards/m/MarshalingTheTroops.java index 0edc79555f8..14ab154bc40 100644 --- a/Mage.Sets/src/mage/cards/m/MarshalingTheTroops.java +++ b/Mage.Sets/src/mage/cards/m/MarshalingTheTroops.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.players.Player; @@ -48,7 +47,7 @@ class MarshalingTheTroopsEffect extends OneShotEffect { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public MarshalingTheTroopsEffect() { diff --git a/Mage.Sets/src/mage/cards/m/MartyrsSoul.java b/Mage.Sets/src/mage/cards/m/MartyrsSoul.java index ff3dddc1844..1653142dca4 100644 --- a/Mage.Sets/src/mage/cards/m/MartyrsSoul.java +++ b/Mage.Sets/src/mage/cards/m/MartyrsSoul.java @@ -27,7 +27,7 @@ public final class MartyrsSoul extends CardImpl { private static final FilterPermanent filter = new FilterControlledLandPermanent(); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } private static final Condition condition diff --git a/Mage.Sets/src/mage/cards/m/MasterApothecary.java b/Mage.Sets/src/mage/cards/m/MasterApothecary.java index 94c698bf307..89a5c0329c8 100644 --- a/Mage.Sets/src/mage/cards/m/MasterApothecary.java +++ b/Mage.Sets/src/mage/cards/m/MasterApothecary.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetAnyTarget; @@ -29,7 +28,7 @@ public final class MasterApothecary extends CardImpl { static { filter.add(SubType.CLERIC.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public MasterApothecary(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java b/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java index 1832733aca8..89b938321ed 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent.EventType; @@ -67,7 +66,7 @@ class MasterOfTheWildHuntEffect extends OneShotEffect { static { filter.add(SubType.WOLF.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public MasterOfTheWildHuntEffect() { diff --git a/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java b/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java index b0619c789dd..0cc38eac763 100644 --- a/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java +++ b/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java @@ -23,7 +23,6 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledArtifactPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.players.Player; @@ -115,7 +114,7 @@ class TapXTargetCost extends VariableCostImpl { static final FilterControlledArtifactPermanent filter = new FilterControlledArtifactPermanent("untapped artifacts you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public TapXTargetCost() { diff --git a/Mage.Sets/src/mage/cards/m/MoggJailer.java b/Mage.Sets/src/mage/cards/m/MoggJailer.java index 5d0a77e55c2..7bc7b29fe23 100644 --- a/Mage.Sets/src/mage/cards/m/MoggJailer.java +++ b/Mage.Sets/src/mage/cards/m/MoggJailer.java @@ -25,7 +25,7 @@ public final class MoggJailer extends CardImpl { static final private FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature with power 2 or less"); static { - filter.add(Predicates.and(new PowerPredicate(ComparisonType.FEWER_THAN, 2), Predicates.not(TappedPredicate.instance))); + filter.add(Predicates.and(new PowerPredicate(ComparisonType.FEWER_THAN, 2), TappedPredicate.UNTAPPED)); } public MoggJailer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/Monsoon.java b/Mage.Sets/src/mage/cards/m/Monsoon.java index f158d87aea1..6fb18acf902 100644 --- a/Mage.Sets/src/mage/cards/m/Monsoon.java +++ b/Mage.Sets/src/mage/cards/m/Monsoon.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -49,7 +48,7 @@ class MonsoonEffect extends OneShotEffect { static { filter.add(SubType.ISLAND.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public MonsoonEffect() { diff --git a/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java b/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java index 7bd2ea12799..028d0f8ad19 100644 --- a/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java +++ b/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -31,7 +30,7 @@ public final class MossbridgeTroll extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public MossbridgeTroll(UUID ownerId, CardSetInfo setInfo) { @@ -105,7 +104,7 @@ class MossbridgeTrollCost extends CostImpl { static { filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public MossbridgeTrollCost() { diff --git a/Mage.Sets/src/mage/cards/m/MothdustChangeling.java b/Mage.Sets/src/mage/cards/m/MothdustChangeling.java index 846c3aac5cd..5199d9bba10 100644 --- a/Mage.Sets/src/mage/cards/m/MothdustChangeling.java +++ b/Mage.Sets/src/mage/cards/m/MothdustChangeling.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -27,7 +26,7 @@ public final class MothdustChangeling extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public MothdustChangeling(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/Mudslide.java b/Mage.Sets/src/mage/cards/m/Mudslide.java index 20bdfda59b6..7e890bdd832 100644 --- a/Mage.Sets/src/mage/cards/m/Mudslide.java +++ b/Mage.Sets/src/mage/cards/m/Mudslide.java @@ -61,7 +61,7 @@ class MudslideEffect extends OneShotEffect { static { filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } MudslideEffect() { diff --git a/Mage.Sets/src/mage/cards/m/MundasVanguard.java b/Mage.Sets/src/mage/cards/m/MundasVanguard.java index 3a2960df94b..e2975f71c72 100644 --- a/Mage.Sets/src/mage/cards/m/MundasVanguard.java +++ b/Mage.Sets/src/mage/cards/m/MundasVanguard.java @@ -17,7 +17,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -31,7 +30,7 @@ public final class MundasVanguard extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public MundasVanguard(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MurderousCompulsion.java b/Mage.Sets/src/mage/cards/m/MurderousCompulsion.java index 33f74b1ee86..4b40f78d4c7 100644 --- a/Mage.Sets/src/mage/cards/m/MurderousCompulsion.java +++ b/Mage.Sets/src/mage/cards/m/MurderousCompulsion.java @@ -21,7 +21,7 @@ public final class MurderousCompulsion extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public MurderousCompulsion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java b/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java index a1cf617fc81..810f982095a 100644 --- a/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java +++ b/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java @@ -20,7 +20,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -104,7 +103,7 @@ class MyrBattlesphereEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Myr you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.MYR.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/n/NahiriStormOfStone.java b/Mage.Sets/src/mage/cards/n/NahiriStormOfStone.java index 9e362825951..ace6fe386a6 100644 --- a/Mage.Sets/src/mage/cards/n/NahiriStormOfStone.java +++ b/Mage.Sets/src/mage/cards/n/NahiriStormOfStone.java @@ -36,7 +36,7 @@ public final class NahiriStormOfStone extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public NahiriStormOfStone(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NahiriTheHarbinger.java b/Mage.Sets/src/mage/cards/n/NahiriTheHarbinger.java index 4e7ed4e0029..934edb37f7a 100644 --- a/Mage.Sets/src/mage/cards/n/NahiriTheHarbinger.java +++ b/Mage.Sets/src/mage/cards/n/NahiriTheHarbinger.java @@ -47,9 +47,9 @@ public final class NahiriTheHarbinger extends CardImpl { static { filter.add(Predicates.or(CardType.ENCHANTMENT.getPredicate(), (Predicates.and(CardType.ARTIFACT.getPredicate(), - TappedPredicate.instance)), + TappedPredicate.TAPPED)), (Predicates.and(CardType.CREATURE.getPredicate(), - TappedPredicate.instance)))); + TappedPredicate.TAPPED)))); } public NahiriTheHarbinger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NantukoShaman.java b/Mage.Sets/src/mage/cards/n/NantukoShaman.java index 13317b0a2d0..b250f5bbc6c 100644 --- a/Mage.Sets/src/mage/cards/n/NantukoShaman.java +++ b/Mage.Sets/src/mage/cards/n/NantukoShaman.java @@ -26,7 +26,7 @@ public final class NantukoShaman extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public NantukoShaman(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NaturesChosen.java b/Mage.Sets/src/mage/cards/n/NaturesChosen.java index ddd8b2866a9..c64adac97a2 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesChosen.java +++ b/Mage.Sets/src/mage/cards/n/NaturesChosen.java @@ -47,7 +47,7 @@ public final class NaturesChosen extends CardImpl { static { filterWhiteUntappedCreature.add(new ColorPredicate(ObjectColor.WHITE)); - filterWhiteUntappedCreature.add(Predicates.not(TappedPredicate.instance)); + filterWhiteUntappedCreature.add(TappedPredicate.UNTAPPED); } public NaturesChosen(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NewBlood.java b/Mage.Sets/src/mage/cards/n/NewBlood.java index aa218d4a891..e4c75ebc8b0 100644 --- a/Mage.Sets/src/mage/cards/n/NewBlood.java +++ b/Mage.Sets/src/mage/cards/n/NewBlood.java @@ -17,7 +17,6 @@ import mage.choices.Choice; import mage.choices.ChoiceCreatureType; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.TextPartSubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -39,7 +38,7 @@ public final class NewBlood extends CardImpl { TextPartSubType textPartVampire = (TextPartSubType) addTextPart(new TextPartSubType(SubType.VAMPIRE)); FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an untapped Vampire you control"); filter.add(new TextPartSubtypePredicate(textPartVampire)); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); // As an additional cost to cast New Blood, tap an untapped Vampire you control. this.getSpellAbility().addCost(new TapTargetCost( new TargetControlledCreaturePermanent(1, 1, filter, true))); diff --git a/Mage.Sets/src/mage/cards/n/NikoAris.java b/Mage.Sets/src/mage/cards/n/NikoAris.java index 8e529fec322..e8947090cf7 100644 --- a/Mage.Sets/src/mage/cards/n/NikoAris.java +++ b/Mage.Sets/src/mage/cards/n/NikoAris.java @@ -43,7 +43,7 @@ public final class NikoAris extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } private static final DynamicValue xValue = new MultipliedValue(CardsDrawnThisTurnDynamicValue.instance, 2); diff --git a/Mage.Sets/src/mage/cards/n/NullmageShepherd.java b/Mage.Sets/src/mage/cards/n/NullmageShepherd.java index 642fcf4e228..aa23eb3db3c 100644 --- a/Mage.Sets/src/mage/cards/n/NullmageShepherd.java +++ b/Mage.Sets/src/mage/cards/n/NullmageShepherd.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -28,7 +27,7 @@ public final class NullmageShepherd extends CardImpl { private static final FilterControlledCreaturePermanent filterCost = new FilterControlledCreaturePermanent("untapped creatures you control"); static { - filterCost.add(Predicates.not(TappedPredicate.instance)); + filterCost.add(TappedPredicate.UNTAPPED); } public NullmageShepherd(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java b/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java index bfef7cb1f04..e4884d88f54 100644 --- a/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java +++ b/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java @@ -27,7 +27,7 @@ public final class OakStreetInnkeeper extends CardImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("tapped creatures you control"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public OakStreetInnkeeper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OnduWarCleric.java b/Mage.Sets/src/mage/cards/o/OnduWarCleric.java index 61bcaf31964..216a35f8fef 100644 --- a/Mage.Sets/src/mage/cards/o/OnduWarCleric.java +++ b/Mage.Sets/src/mage/cards/o/OnduWarCleric.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class OnduWarCleric extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public OnduWarCleric(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/Opposition.java b/Mage.Sets/src/mage/cards/o/Opposition.java index 2015d0b0fb0..304cda8f240 100644 --- a/Mage.Sets/src/mage/cards/o/Opposition.java +++ b/Mage.Sets/src/mage/cards/o/Opposition.java @@ -35,7 +35,7 @@ public final class Opposition extends CardImpl { private static final FilterControlledCreaturePermanent untappedcreatureyoucontrol = new FilterControlledCreaturePermanent("untapped creature you control"); static { - untappedcreatureyoucontrol.add(Predicates.not(TappedPredicate.instance)); + untappedcreatureyoucontrol.add(TappedPredicate.UNTAPPED); } public Opposition(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/Orgg.java b/Mage.Sets/src/mage/cards/o/Orgg.java index d81d0595ee2..b4fb3b71b5b 100644 --- a/Mage.Sets/src/mage/cards/o/Orgg.java +++ b/Mage.Sets/src/mage/cards/o/Orgg.java @@ -29,7 +29,7 @@ public final class Orgg extends CardImpl { static final private FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creatures with power 3 or greater"); static { - filter.add(Predicates.and(new PowerPredicate(ComparisonType.MORE_THAN, 2), Predicates.not(TappedPredicate.instance))); + filter.add(Predicates.and(new PowerPredicate(ComparisonType.MORE_THAN, 2), TappedPredicate.UNTAPPED)); filter2.add(new PowerPredicate(ComparisonType.MORE_THAN, 2)); } public Orgg(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OrimsCure.java b/Mage.Sets/src/mage/cards/o/OrimsCure.java index 0eb3bc28943..f80db4d4042 100644 --- a/Mage.Sets/src/mage/cards/o/OrimsCure.java +++ b/Mage.Sets/src/mage/cards/o/OrimsCure.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetAnyTarget; @@ -30,7 +29,7 @@ public final class OrimsCure extends CardImpl { static { filter.add(SubType.PLAINS.getPredicate()); - filterCreature.add(Predicates.not(TappedPredicate.instance)); + filterCreature.add(TappedPredicate.UNTAPPED); } public OrimsCure(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/Pallimud.java b/Mage.Sets/src/mage/cards/p/Pallimud.java index 6257995c942..011105c3570 100644 --- a/Mage.Sets/src/mage/cards/p/Pallimud.java +++ b/Mage.Sets/src/mage/cards/p/Pallimud.java @@ -61,7 +61,7 @@ class AnathemancerCount implements DynamicValue { Player chosenPlayer = game.getPlayer(playerId); if (chosenPlayer != null) { FilterLandPermanent filter = new FilterLandPermanent("tapped lands the chosen player controls"); - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); filter.add(new ControllerIdPredicate(playerId)); return game.getBattlefield().count(filter, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game); } diff --git a/Mage.Sets/src/mage/cards/p/PatronWizard.java b/Mage.Sets/src/mage/cards/p/PatronWizard.java index 17e4cefa654..3ea451315d3 100644 --- a/Mage.Sets/src/mage/cards/p/PatronWizard.java +++ b/Mage.Sets/src/mage/cards/p/PatronWizard.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetSpell; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class PatronWizard extends CardImpl { static { filter.add(SubType.WIZARD.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public PatronWizard(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PersistentPetitioners.java b/Mage.Sets/src/mage/cards/p/PersistentPetitioners.java index 91861e50a02..07f4d004a00 100644 --- a/Mage.Sets/src/mage/cards/p/PersistentPetitioners.java +++ b/Mage.Sets/src/mage/cards/p/PersistentPetitioners.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class PersistentPetitioners extends CardImpl { = new FilterControlledPermanent("untapped Advisors you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.ADVISOR.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/p/PlarggDeanOfChaos.java b/Mage.Sets/src/mage/cards/p/PlarggDeanOfChaos.java index 9dad935a3ff..0468eceb134 100644 --- a/Mage.Sets/src/mage/cards/p/PlarggDeanOfChaos.java +++ b/Mage.Sets/src/mage/cards/p/PlarggDeanOfChaos.java @@ -22,7 +22,6 @@ import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.TappedPredicate; -import mage.filter.predicate.permanent.UntappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -31,7 +30,6 @@ import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; /** - * * @author htrajan */ public final class PlarggDeanOfChaos extends ModalDoubleFacesCard { @@ -40,10 +38,10 @@ public final class PlarggDeanOfChaos extends ModalDoubleFacesCard { private static final FilterCreaturePermanent untappedFilter = new FilterCreaturePermanent("untapped creatures you control"); static { - tappedFilter.add(TappedPredicate.instance); + tappedFilter.add(TappedPredicate.TAPPED); tappedFilter.add(TargetController.YOU.getControllerPredicate()); - untappedFilter.add(UntappedPredicate.instance); + untappedFilter.add(TappedPredicate.UNTAPPED); untappedFilter.add(TargetController.YOU.getControllerPredicate()); } @@ -76,15 +74,15 @@ public final class PlarggDeanOfChaos extends ModalDoubleFacesCard { // Other tapped creatures you control get +1/+0. this.getRightHalfCard().addAbility(new SimpleStaticAbility(new BoostAllEffect( - StaticValue.get(1), StaticValue.get(0), Duration.WhileOnBattlefield, tappedFilter, true))); + StaticValue.get(1), StaticValue.get(0), Duration.WhileOnBattlefield, tappedFilter, true))); // Other untapped creatures you control get +0/+1. this.getRightHalfCard().addAbility(new SimpleStaticAbility(new BoostAllEffect( - StaticValue.get(0), StaticValue.get(1), Duration.WhileOnBattlefield, untappedFilter, true))); + StaticValue.get(0), StaticValue.get(1), Duration.WhileOnBattlefield, untappedFilter, true))); // Whenever you attack, untap each creature you control, then tap any number of creatures you control. AttacksWithCreaturesTriggeredAbility augustaAbility = new AttacksWithCreaturesTriggeredAbility( - new UntapAllControllerEffect(StaticFilters.FILTER_PERMANENT_CREATURES, "untap each creature you control"), 0); + new UntapAllControllerEffect(StaticFilters.FILTER_PERMANENT_CREATURES, "untap each creature you control"), 0); augustaAbility.addEffect(new AugustaDeanOfOrderEffect().concatBy(", then")); this.getRightHalfCard().addAbility(augustaAbility); } @@ -154,7 +152,7 @@ class AugustaDeanOfOrderEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(UntappedPredicate.instance); + filter.add(TappedPredicate.UNTAPPED); } public AugustaDeanOfOrderEffect() { diff --git a/Mage.Sets/src/mage/cards/p/PowerSurge.java b/Mage.Sets/src/mage/cards/p/PowerSurge.java index 7772b048368..45652e501dc 100644 --- a/Mage.Sets/src/mage/cards/p/PowerSurge.java +++ b/Mage.Sets/src/mage/cards/p/PowerSurge.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -80,7 +79,7 @@ class PowerSurgeWatcher extends Watcher { private static final FilterPermanent filter = new FilterControlledLandPermanent(); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } private int untappedLandCount; diff --git a/Mage.Sets/src/mage/cards/p/PrismaticStrands.java b/Mage.Sets/src/mage/cards/p/PrismaticStrands.java index fa7530e69c3..ac8e713ca25 100644 --- a/Mage.Sets/src/mage/cards/p/PrismaticStrands.java +++ b/Mage.Sets/src/mage/cards/p/PrismaticStrands.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.TimingRule; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -34,7 +33,7 @@ public final class PrismaticStrands extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped white creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(new ColorPredicate(ObjectColor.WHITE)); } diff --git a/Mage.Sets/src/mage/cards/r/RadiantSerraArchangel.java b/Mage.Sets/src/mage/cards/r/RadiantSerraArchangel.java index 1731130be23..d4918aa257a 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantSerraArchangel.java +++ b/Mage.Sets/src/mage/cards/r/RadiantSerraArchangel.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; @@ -31,7 +30,7 @@ public final class RadiantSerraArchangel extends CardImpl { = new FilterControlledCreaturePermanent("another untapped creature you control with flying"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(AnotherPredicate.instance); filter.add(new AbilityPredicate(FlyingAbility.class)); } diff --git a/Mage.Sets/src/mage/cards/r/RaidingParty.java b/Mage.Sets/src/mage/cards/r/RaidingParty.java index cf3a67ce80c..60b23191a5e 100644 --- a/Mage.Sets/src/mage/cards/r/RaidingParty.java +++ b/Mage.Sets/src/mage/cards/r/RaidingParty.java @@ -22,7 +22,6 @@ import mage.filter.FilterObject; import mage.filter.FilterStackObject; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -72,7 +71,7 @@ class RaidingPartyEffect extends OneShotEffect { private static final FilterPermanent filter2 = new FilterPermanent("Plains"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(new ColorPredicate(ObjectColor.WHITE)); filter2.add(SubType.PLAINS.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianRally.java b/Mage.Sets/src/mage/cards/r/RamosianRally.java index b839ccb6b62..805cfda6a1d 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianRally.java +++ b/Mage.Sets/src/mage/cards/r/RamosianRally.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -28,7 +27,7 @@ public final class RamosianRally extends CardImpl { static { plainsFilter.add(SubType.PLAINS.getPredicate()); - creatureFilter.add(Predicates.not(TappedPredicate.instance)); + creatureFilter.add(TappedPredicate.UNTAPPED); } public RamosianRally(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java b/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java index acd8f92f852..feeb57ca43d 100644 --- a/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java +++ b/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java @@ -23,11 +23,9 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.watchers.Watcher; /** @@ -101,7 +99,7 @@ class RasputinDreamweaverStartedUntappedWatcher extends Watcher { private static final FilterPermanent filter = new FilterPermanent("Untapped permanents"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } private final Set startedUntapped = new HashSet<>(0); diff --git a/Mage.Sets/src/mage/cards/r/RathiAssassin.java b/Mage.Sets/src/mage/cards/r/RathiAssassin.java index 266d6c55468..ee1abc2834c 100644 --- a/Mage.Sets/src/mage/cards/r/RathiAssassin.java +++ b/Mage.Sets/src/mage/cards/r/RathiAssassin.java @@ -38,7 +38,7 @@ public final class RathiAssassin extends CardImpl { static { filter.add(SubType.MERCENARY.getPredicate()); filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); - destroyFilter.add(TappedPredicate.instance); + destroyFilter.add(TappedPredicate.TAPPED); destroyFilter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); } diff --git a/Mage.Sets/src/mage/cards/r/RedcapRaiders.java b/Mage.Sets/src/mage/cards/r/RedcapRaiders.java index cb765f07a2c..76e4e51ff4e 100644 --- a/Mage.Sets/src/mage/cards/r/RedcapRaiders.java +++ b/Mage.Sets/src/mage/cards/r/RedcapRaiders.java @@ -29,7 +29,7 @@ public final class RedcapRaiders extends CardImpl { = new FilterControlledCreaturePermanent("an untapped non-Human creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/r/RegnasSanction.java b/Mage.Sets/src/mage/cards/r/RegnasSanction.java index 34cbb518e33..5a2d859f27d 100644 --- a/Mage.Sets/src/mage/cards/r/RegnasSanction.java +++ b/Mage.Sets/src/mage/cards/r/RegnasSanction.java @@ -76,7 +76,7 @@ class RegnasSanctionEffect extends OneShotEffect { FilterCreaturePermanent filterToTap = new FilterCreaturePermanent(); for (Player player : choice.getFoes()) { FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature you control"); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(new ControllerIdPredicate(player.getId())); TargetPermanent target = new TargetPermanent(1, 1, filter, true); if (player.choose(Outcome.Benefit, target, source.getSourceId(), game)) { diff --git a/Mage.Sets/src/mage/cards/r/RighteousFury.java b/Mage.Sets/src/mage/cards/r/RighteousFury.java index bceb5d729df..4cf5c10736e 100644 --- a/Mage.Sets/src/mage/cards/r/RighteousFury.java +++ b/Mage.Sets/src/mage/cards/r/RighteousFury.java @@ -60,7 +60,7 @@ class RighteousFuryEffect extends OneShotEffect { if (controller != null) { int destroyedCreature = 0; FilterCreaturePermanent filter = new FilterCreaturePermanent("all tapped creatures"); - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); for(Permanent creature: game.getState().getBattlefield().getActivePermanents(filter, controller.getId(), game)) { if (creature.destroy(source, game, false)) { destroyedCreature++; diff --git a/Mage.Sets/src/mage/cards/r/RootKinAlly.java b/Mage.Sets/src/mage/cards/r/RootKinAlly.java index df34c0c59c8..00a8d441f54 100644 --- a/Mage.Sets/src/mage/cards/r/RootKinAlly.java +++ b/Mage.Sets/src/mage/cards/r/RootKinAlly.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -26,7 +25,7 @@ public final class RootKinAlly extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public RootKinAlly(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RowanKenrith.java b/Mage.Sets/src/mage/cards/r/RowanKenrith.java index 219e44fae00..45ec313fe47 100644 --- a/Mage.Sets/src/mage/cards/r/RowanKenrith.java +++ b/Mage.Sets/src/mage/cards/r/RowanKenrith.java @@ -127,7 +127,7 @@ class RowanKenrithDamageEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); filter.add(new ControllerIdPredicate(source.getFirstTarget())); return new DamageAllEffect(3, filter).apply(game, source); } diff --git a/Mage.Sets/src/mage/cards/r/RoyalAssassin.java b/Mage.Sets/src/mage/cards/r/RoyalAssassin.java index 95e0fe2433c..1f4f5c9eab9 100644 --- a/Mage.Sets/src/mage/cards/r/RoyalAssassin.java +++ b/Mage.Sets/src/mage/cards/r/RoyalAssassin.java @@ -26,7 +26,7 @@ public final class RoyalAssassin extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public RoyalAssassin(UUID ownerId, CardSetInfo setInfo){ diff --git a/Mage.Sets/src/mage/cards/s/SanctuaryLockdown.java b/Mage.Sets/src/mage/cards/s/SanctuaryLockdown.java index 25c84a9b9ca..7648d499b81 100644 --- a/Mage.Sets/src/mage/cards/s/SanctuaryLockdown.java +++ b/Mage.Sets/src/mage/cards/s/SanctuaryLockdown.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetOpponentsCreaturePermanent; @@ -32,7 +31,7 @@ public final class SanctuaryLockdown extends CardImpl { = new FilterControlledPermanent(SubType.HUMAN, "untapped Humans you control"); static { - filter2.add(Predicates.not(TappedPredicate.instance)); + filter2.add(TappedPredicate.UNTAPPED); } public SanctuaryLockdown(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/Sandsower.java b/Mage.Sets/src/mage/cards/s/Sandsower.java index 604ef4435be..b3eae1e704b 100644 --- a/Mage.Sets/src/mage/cards/s/Sandsower.java +++ b/Mage.Sets/src/mage/cards/s/Sandsower.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class Sandsower extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public Sandsower(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SaruliCaretaker.java b/Mage.Sets/src/mage/cards/s/SaruliCaretaker.java index 41e1e31fdf9..54ac2516a63 100644 --- a/Mage.Sets/src/mage/cards/s/SaruliCaretaker.java +++ b/Mage.Sets/src/mage/cards/s/SaruliCaretaker.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -25,7 +24,7 @@ public final class SaruliCaretaker extends CardImpl { = new FilterControlledCreaturePermanent("an untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public SaruliCaretaker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScorchedRuins.java b/Mage.Sets/src/mage/cards/s/ScorchedRuins.java index 2fc70183dcc..62135ec682a 100644 --- a/Mage.Sets/src/mage/cards/s/ScorchedRuins.java +++ b/Mage.Sets/src/mage/cards/s/ScorchedRuins.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -24,7 +23,7 @@ public final class ScorchedRuins extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("two untapped lands"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public ScorchedRuins(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScoriaCat.java b/Mage.Sets/src/mage/cards/s/ScoriaCat.java index 066905cae82..d590cc447cd 100644 --- a/Mage.Sets/src/mage/cards/s/ScoriaCat.java +++ b/Mage.Sets/src/mage/cards/s/ScoriaCat.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -27,7 +26,7 @@ public final class ScoriaCat extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent(); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public ScoriaCat(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SealAway.java b/Mage.Sets/src/mage/cards/s/SealAway.java index 5e076014689..7ae42e9ab01 100644 --- a/Mage.Sets/src/mage/cards/s/SealAway.java +++ b/Mage.Sets/src/mage/cards/s/SealAway.java @@ -26,7 +26,7 @@ public final class SealAway extends CardImpl { static { filter.add(TargetController.OPPONENT.getControllerPredicate()); - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public SealAway(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SelectForInspection.java b/Mage.Sets/src/mage/cards/s/SelectForInspection.java index d0b9b832762..d5d7e8a0a81 100644 --- a/Mage.Sets/src/mage/cards/s/SelectForInspection.java +++ b/Mage.Sets/src/mage/cards/s/SelectForInspection.java @@ -20,7 +20,7 @@ public final class SelectForInspection extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public SelectForInspection(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java b/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java index 484ae3fb1e8..d3c25cb4dec 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetControlledCreaturePermanent; @@ -29,7 +28,7 @@ public final class SelesnyaEvangel extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public SelesnyaEvangel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SelkieHedgeMage.java b/Mage.Sets/src/mage/cards/s/SelkieHedgeMage.java index 5f8ef5f06ae..d7c51a81983 100644 --- a/Mage.Sets/src/mage/cards/s/SelkieHedgeMage.java +++ b/Mage.Sets/src/mage/cards/s/SelkieHedgeMage.java @@ -31,7 +31,7 @@ public final class SelkieHedgeMage extends CardImpl { static { filter.add(SubType.FOREST.getPredicate()); filter2.add(SubType.ISLAND.getPredicate()); - filter3.add(TappedPredicate.instance); + filter3.add(TappedPredicate.TAPPED); } private static final String rule1 = "When {this} enters the battlefield, if you control two or more Forests, you may gain 3 life."; diff --git a/Mage.Sets/src/mage/cards/s/SepharaSkysBlade.java b/Mage.Sets/src/mage/cards/s/SepharaSkysBlade.java index b47773991f3..4cfa788db41 100644 --- a/Mage.Sets/src/mage/cards/s/SepharaSkysBlade.java +++ b/Mage.Sets/src/mage/cards/s/SepharaSkysBlade.java @@ -19,7 +19,6 @@ import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -39,7 +38,7 @@ public final class SepharaSkysBlade extends CardImpl { static { filter.add(new AbilityPredicate(FlyingAbility.class)); filter2.add(new AbilityPredicate(FlyingAbility.class)); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public SepharaSkysBlade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java b/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java index 647983fb211..6567bd0e992 100644 --- a/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java +++ b/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java @@ -18,7 +18,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.target.common.TargetControlledCreaturePermanent; @@ -40,7 +39,7 @@ public final class SetonKrosanProtector extends CardImpl { // Tap an untapped Druid you control: Add {G}. FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Druid you control"); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.DRUID.getPredicate()); this.addAbility(new SimpleManaAbility( Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/s/Shacklegeist.java b/Mage.Sets/src/mage/cards/s/Shacklegeist.java index d5a633beca6..da5ee5384b3 100644 --- a/Mage.Sets/src/mage/cards/s/Shacklegeist.java +++ b/Mage.Sets/src/mage/cards/s/Shacklegeist.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class Shacklegeist extends CardImpl { = new FilterControlledPermanent("untapped Spirits you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.SPIRIT.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/ShadowStinger.java b/Mage.Sets/src/mage/cards/s/ShadowStinger.java index 124b92e78b6..a3b66c6d661 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowStinger.java +++ b/Mage.Sets/src/mage/cards/s/ShadowStinger.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -36,7 +35,7 @@ public final class ShadowStinger extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public ShadowStinger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SharedDiscovery.java b/Mage.Sets/src/mage/cards/s/SharedDiscovery.java index 934adc5e767..c3d2d72d5d7 100644 --- a/Mage.Sets/src/mage/cards/s/SharedDiscovery.java +++ b/Mage.Sets/src/mage/cards/s/SharedDiscovery.java @@ -8,7 +8,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -21,7 +20,7 @@ public final class SharedDiscovery extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public SharedDiscovery(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SheerDrop.java b/Mage.Sets/src/mage/cards/s/SheerDrop.java index 434930811c7..105adfa8300 100644 --- a/Mage.Sets/src/mage/cards/s/SheerDrop.java +++ b/Mage.Sets/src/mage/cards/s/SheerDrop.java @@ -20,7 +20,7 @@ public final class SheerDrop extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public SheerDrop(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShieldmageElder.java b/Mage.Sets/src/mage/cards/s/ShieldmageElder.java index 8817ba42a53..e5b489fe4c6 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldmageElder.java +++ b/Mage.Sets/src/mage/cards/s/ShieldmageElder.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetSpell; import mage.target.common.TargetControlledPermanent; @@ -29,13 +28,13 @@ public final class ShieldmageElder extends CardImpl { private static final FilterControlledPermanent filter1 = new FilterControlledPermanent("untapped Clerics you control"); static { - filter1.add(Predicates.not(TappedPredicate.instance)); + filter1.add(TappedPredicate.UNTAPPED); filter1.add(SubType.CLERIC.getPredicate()); } private static final FilterControlledPermanent filter2 = new FilterControlledPermanent("untapped Wizards you control"); static { - filter2.add(Predicates.not(TappedPredicate.instance)); + filter2.add(TappedPredicate.UNTAPPED); filter2.add(SubType.WIZARD.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/ShimmerDragon.java b/Mage.Sets/src/mage/cards/s/ShimmerDragon.java index b4c81df30b6..8847c72505c 100644 --- a/Mage.Sets/src/mage/cards/s/ShimmerDragon.java +++ b/Mage.Sets/src/mage/cards/s/ShimmerDragon.java @@ -20,7 +20,6 @@ import mage.constants.SubType; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -38,7 +37,7 @@ public final class ShimmerDragon extends CardImpl { = new FilterControlledArtifactPermanent("untapped artifacts you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public ShimmerDragon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SiegeStriker.java b/Mage.Sets/src/mage/cards/s/SiegeStriker.java index cf656950219..9d6aabe710e 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeStriker.java +++ b/Mage.Sets/src/mage/cards/s/SiegeStriker.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -57,7 +56,7 @@ class SiegeStrikerEffect extends OneShotEffect { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public SiegeStrikerEffect() { diff --git a/Mage.Sets/src/mage/cards/s/SigilTracer.java b/Mage.Sets/src/mage/cards/s/SigilTracer.java index 49e0222c416..95deaf09e58 100644 --- a/Mage.Sets/src/mage/cards/s/SigilTracer.java +++ b/Mage.Sets/src/mage/cards/s/SigilTracer.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetSpell; import mage.target.common.TargetControlledCreaturePermanent; @@ -28,7 +27,7 @@ public final class SigilTracer extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Wizards you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.WIZARD.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/SivvisValor.java b/Mage.Sets/src/mage/cards/s/SivvisValor.java index 71eb4e01c3d..1a1e4a00444 100644 --- a/Mage.Sets/src/mage/cards/s/SivvisValor.java +++ b/Mage.Sets/src/mage/cards/s/SivvisValor.java @@ -21,7 +21,6 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -37,7 +36,7 @@ public final class SivvisValor extends CardImpl { static { filter.add(SubType.PLAINS.getPredicate()); - filterCreature.add(Predicates.not(TappedPredicate.instance)); + filterCreature.add(TappedPredicate.UNTAPPED); } public SivvisValor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java b/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java index 240a5c0bc67..1b79152605a 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java +++ b/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -28,7 +27,7 @@ public final class SkirkFireMarshal extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Goblins you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.GOBLIN.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/SkirsdagHighPriest.java b/Mage.Sets/src/mage/cards/s/SkirsdagHighPriest.java index b7ad41a6713..cc7caeeff9e 100644 --- a/Mage.Sets/src/mage/cards/s/SkirsdagHighPriest.java +++ b/Mage.Sets/src/mage/cards/s/SkirsdagHighPriest.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.DemonToken; import mage.target.common.TargetControlledCreaturePermanent; @@ -30,7 +29,7 @@ public final class SkirsdagHighPriest extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public SkirsdagHighPriest(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkyHussar.java b/Mage.Sets/src/mage/cards/s/SkyHussar.java index fd3d4997f75..296144143f6 100644 --- a/Mage.Sets/src/mage/cards/s/SkyHussar.java +++ b/Mage.Sets/src/mage/cards/s/SkyHussar.java @@ -29,7 +29,7 @@ public final class SkyHussar extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped white and/or blue creatures you control"); static { filter.add(Predicates.or(new ColorPredicate(ObjectColor.WHITE), new ColorPredicate(ObjectColor.BLUE))); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public SkyHussar(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java b/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java index 8ad09bc81dd..ed27fc895cc 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java @@ -18,7 +18,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -32,7 +31,7 @@ public final class SoldeviExcavations extends CardImpl { static { filter.add(SubType.ISLAND.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public SoldeviExcavations(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SoldeviGolem.java b/Mage.Sets/src/mage/cards/s/SoldeviGolem.java index 5d387710a25..fe86dbbb88d 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviGolem.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviGolem.java @@ -29,7 +29,7 @@ public final class SoldeviGolem extends CardImpl { static { filter.add(TargetController.OPPONENT.getControllerPredicate()); - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public SoldeviGolem(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpawnbinderMage.java b/Mage.Sets/src/mage/cards/s/SpawnbinderMage.java index 0343c2c1e83..ab4528c0115 100644 --- a/Mage.Sets/src/mage/cards/s/SpawnbinderMage.java +++ b/Mage.Sets/src/mage/cards/s/SpawnbinderMage.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class SpawnbinderMage extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public SpawnbinderMage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpellweaverDuo.java b/Mage.Sets/src/mage/cards/s/SpellweaverDuo.java index 4f0c5215735..56d4e05bd79 100644 --- a/Mage.Sets/src/mage/cards/s/SpellweaverDuo.java +++ b/Mage.Sets/src/mage/cards/s/SpellweaverDuo.java @@ -24,7 +24,7 @@ public final class SpellweaverDuo extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public SpellweaverDuo(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpiritFlare.java b/Mage.Sets/src/mage/cards/s/SpiritFlare.java index 660fecf0ce6..a45cf540d5e 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritFlare.java +++ b/Mage.Sets/src/mage/cards/s/SpiritFlare.java @@ -14,7 +14,6 @@ import mage.constants.TimingRule; import mage.filter.FilterPermanent; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -33,7 +32,7 @@ public final class SpiritFlare extends CardImpl { = new FilterAttackingOrBlockingCreature("attacking or blocking creature an opponent controls"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter2.add(TargetController.OPPONENT.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/SpringleafDrum.java b/Mage.Sets/src/mage/cards/s/SpringleafDrum.java index 169ffa7f0a0..9a19176ec54 100644 --- a/Mage.Sets/src/mage/cards/s/SpringleafDrum.java +++ b/Mage.Sets/src/mage/cards/s/SpringleafDrum.java @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -21,7 +20,7 @@ public final class SpringleafDrum extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public SpringleafDrum(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpurGrappler.java b/Mage.Sets/src/mage/cards/s/SpurGrappler.java index 24f79aa2b7d..64b056d522b 100644 --- a/Mage.Sets/src/mage/cards/s/SpurGrappler.java +++ b/Mage.Sets/src/mage/cards/s/SpurGrappler.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -27,7 +26,7 @@ public final class SpurGrappler extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent(); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public SpurGrappler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpurredWolverine.java b/Mage.Sets/src/mage/cards/s/SpurredWolverine.java index 551796cafbe..baecbfdb590 100644 --- a/Mage.Sets/src/mage/cards/s/SpurredWolverine.java +++ b/Mage.Sets/src/mage/cards/s/SpurredWolverine.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +28,7 @@ public final class SpurredWolverine extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Beasts you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.BEAST.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/StalkingAssassin.java b/Mage.Sets/src/mage/cards/s/StalkingAssassin.java index 734712a6e78..7f1cdbf52fe 100644 --- a/Mage.Sets/src/mage/cards/s/StalkingAssassin.java +++ b/Mage.Sets/src/mage/cards/s/StalkingAssassin.java @@ -28,7 +28,7 @@ public final class StalkingAssassin extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public StalkingAssassin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SteamCatapult.java b/Mage.Sets/src/mage/cards/s/SteamCatapult.java index 6d33e410887..f9a2a9244fa 100644 --- a/Mage.Sets/src/mage/cards/s/SteamCatapult.java +++ b/Mage.Sets/src/mage/cards/s/SteamCatapult.java @@ -26,7 +26,7 @@ public final class SteamCatapult extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public SteamCatapult(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StoneCatapult.java b/Mage.Sets/src/mage/cards/s/StoneCatapult.java index 04707653ce3..b0ba155ccf9 100644 --- a/Mage.Sets/src/mage/cards/s/StoneCatapult.java +++ b/Mage.Sets/src/mage/cards/s/StoneCatapult.java @@ -29,7 +29,7 @@ public final class StoneCatapult extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped nonblack creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); } diff --git a/Mage.Sets/src/mage/cards/s/StoneforgeAcolyte.java b/Mage.Sets/src/mage/cards/s/StoneforgeAcolyte.java index 323649254a9..3b5ae227335 100644 --- a/Mage.Sets/src/mage/cards/s/StoneforgeAcolyte.java +++ b/Mage.Sets/src/mage/cards/s/StoneforgeAcolyte.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -32,7 +31,7 @@ public final class StoneforgeAcolyte extends CardImpl { static { filterAlly.add(SubType.ALLY.getPredicate()); - filterAlly.add(Predicates.not(TappedPredicate.instance)); + filterAlly.add(TappedPredicate.UNTAPPED); filterEquipment.add(SubType.EQUIPMENT.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/StoneshakerShaman.java b/Mage.Sets/src/mage/cards/s/StoneshakerShaman.java index b47d30bc4e4..2e0f9569a67 100644 --- a/Mage.Sets/src/mage/cards/s/StoneshakerShaman.java +++ b/Mage.Sets/src/mage/cards/s/StoneshakerShaman.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -23,7 +22,7 @@ public final class StoneshakerShaman extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("untapped land"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public StoneshakerShaman(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SummaryJudgment.java b/Mage.Sets/src/mage/cards/s/SummaryJudgment.java index e00c8cc65a5..615f1d9159e 100644 --- a/Mage.Sets/src/mage/cards/s/SummaryJudgment.java +++ b/Mage.Sets/src/mage/cards/s/SummaryJudgment.java @@ -24,7 +24,7 @@ public final class SummaryJudgment extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public SummaryJudgment(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SummonTheSchool.java b/Mage.Sets/src/mage/cards/s/SummonTheSchool.java index 47ceb366c56..274ff5d580f 100644 --- a/Mage.Sets/src/mage/cards/s/SummonTheSchool.java +++ b/Mage.Sets/src/mage/cards/s/SummonTheSchool.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.MerfolkWizardToken; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class SummonTheSchool extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.MERFOLK.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/SunblastAngel.java b/Mage.Sets/src/mage/cards/s/SunblastAngel.java index a089f3485d3..8c4bb671a88 100644 --- a/Mage.Sets/src/mage/cards/s/SunblastAngel.java +++ b/Mage.Sets/src/mage/cards/s/SunblastAngel.java @@ -24,7 +24,7 @@ public final class SunblastAngel extends CardImpl { private static final FilterPermanent tappedFilter = new FilterCreaturePermanent("tapped creatures"); static { - tappedFilter.add(TappedPredicate.instance); + tappedFilter.add(TappedPredicate.TAPPED); } public SunblastAngel (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SupplyCaravan.java b/Mage.Sets/src/mage/cards/s/SupplyCaravan.java index 274f5bd5b22..010e845e317 100644 --- a/Mage.Sets/src/mage/cards/s/SupplyCaravan.java +++ b/Mage.Sets/src/mage/cards/s/SupplyCaravan.java @@ -25,7 +25,7 @@ public final class SupplyCaravan extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public SupplyCaravan(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SupremeInquisitor.java b/Mage.Sets/src/mage/cards/s/SupremeInquisitor.java index a3bbf50e788..dfc0ff0b2bf 100644 --- a/Mage.Sets/src/mage/cards/s/SupremeInquisitor.java +++ b/Mage.Sets/src/mage/cards/s/SupremeInquisitor.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.players.Player; @@ -35,7 +34,7 @@ public final class SupremeInquisitor extends CardImpl { static { filter.add(SubType.WIZARD.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public SupremeInquisitor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SureFootedInfiltrator.java b/Mage.Sets/src/mage/cards/s/SureFootedInfiltrator.java index f9d93c4b5b9..65ebf3a20a9 100644 --- a/Mage.Sets/src/mage/cards/s/SureFootedInfiltrator.java +++ b/Mage.Sets/src/mage/cards/s/SureFootedInfiltrator.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class SureFootedInfiltrator extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public SureFootedInfiltrator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SurrakarBanisher.java b/Mage.Sets/src/mage/cards/s/SurrakarBanisher.java index f9004ef93ff..0b049c9f53e 100644 --- a/Mage.Sets/src/mage/cards/s/SurrakarBanisher.java +++ b/Mage.Sets/src/mage/cards/s/SurrakarBanisher.java @@ -23,7 +23,7 @@ public final class SurrakarBanisher extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public SurrakarBanisher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SurvivorsEncampment.java b/Mage.Sets/src/mage/cards/s/SurvivorsEncampment.java index a1d8f48beba..be3c57ab521 100644 --- a/Mage.Sets/src/mage/cards/s/SurvivorsEncampment.java +++ b/Mage.Sets/src/mage/cards/s/SurvivorsEncampment.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -24,7 +23,7 @@ public final class SurvivorsEncampment extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public SurvivorsEncampment(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SwallowWhole.java b/Mage.Sets/src/mage/cards/s/SwallowWhole.java index ec2abfd61f1..f7468e50482 100644 --- a/Mage.Sets/src/mage/cards/s/SwallowWhole.java +++ b/Mage.Sets/src/mage/cards/s/SwallowWhole.java @@ -13,7 +13,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -34,8 +33,8 @@ public final class SwallowWhole extends CardImpl { = new FilterCreaturePermanent("tapped creature"); static { - filter.add(Predicates.not(TappedPredicate.instance)); - filter2.add(TappedPredicate.instance); + filter.add(TappedPredicate.UNTAPPED); + filter2.add(TappedPredicate.TAPPED); } public SwallowWhole(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SwiftReckoning.java b/Mage.Sets/src/mage/cards/s/SwiftReckoning.java index e2aec0906b4..c02acce70e5 100644 --- a/Mage.Sets/src/mage/cards/s/SwiftReckoning.java +++ b/Mage.Sets/src/mage/cards/s/SwiftReckoning.java @@ -26,7 +26,7 @@ public final class SwiftReckoning extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public SwiftReckoning(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SwiftResponse.java b/Mage.Sets/src/mage/cards/s/SwiftResponse.java index 6e34b4e6a73..38d2782851d 100644 --- a/Mage.Sets/src/mage/cards/s/SwiftResponse.java +++ b/Mage.Sets/src/mage/cards/s/SwiftResponse.java @@ -19,7 +19,7 @@ public final class SwiftResponse extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public SwiftResponse(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java b/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java index 148f3e64e86..e769a7331b4 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java @@ -22,7 +22,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -37,8 +36,8 @@ public final class SwordOfTheParuns extends CardImpl { private static final FilterCreaturePermanent filterTapped = new FilterCreaturePermanent(); private static final FilterCreaturePermanent filterUntapped = new FilterCreaturePermanent(); static { - filterTapped.add(TappedPredicate.instance); - filterUntapped.add(Predicates.not(TappedPredicate.instance)); + filterTapped.add(TappedPredicate.TAPPED); + filterUntapped.add(TappedPredicate.UNTAPPED); } public SwordOfTheParuns(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SymbioticDeployment.java b/Mage.Sets/src/mage/cards/s/SymbioticDeployment.java index 91349da2823..7cecb89eb9e 100644 --- a/Mage.Sets/src/mage/cards/s/SymbioticDeployment.java +++ b/Mage.Sets/src/mage/cards/s/SymbioticDeployment.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -27,7 +26,7 @@ public final class SymbioticDeployment extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public SymbioticDeployment(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TakeVengeance.java b/Mage.Sets/src/mage/cards/t/TakeVengeance.java index 88a6f3a7688..53eb232659f 100644 --- a/Mage.Sets/src/mage/cards/t/TakeVengeance.java +++ b/Mage.Sets/src/mage/cards/t/TakeVengeance.java @@ -18,7 +18,7 @@ public final class TakeVengeance extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public TakeVengeance(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TamiyoTheMoonSage.java b/Mage.Sets/src/mage/cards/t/TamiyoTheMoonSage.java index 16dfb221d7f..21f45aff983 100644 --- a/Mage.Sets/src/mage/cards/t/TamiyoTheMoonSage.java +++ b/Mage.Sets/src/mage/cards/t/TamiyoTheMoonSage.java @@ -68,7 +68,7 @@ class TappedCreaturesControlledByTargetCount implements DynamicValue { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } @Override diff --git a/Mage.Sets/src/mage/cards/t/TangleWire.java b/Mage.Sets/src/mage/cards/t/TangleWire.java index 25fb9636cf9..d5cbdeb846e 100644 --- a/Mage.Sets/src/mage/cards/t/TangleWire.java +++ b/Mage.Sets/src/mage/cards/t/TangleWire.java @@ -50,7 +50,7 @@ class TangleWireEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped artifact, creature, or land they control"); static{ - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(Predicates.or( CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate(), diff --git a/Mage.Sets/src/mage/cards/t/Telethopter.java b/Mage.Sets/src/mage/cards/t/Telethopter.java index add8831152b..3ab16844e89 100644 --- a/Mage.Sets/src/mage/cards/t/Telethopter.java +++ b/Mage.Sets/src/mage/cards/t/Telethopter.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -26,7 +25,7 @@ public final class Telethopter extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public Telethopter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java b/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java index 13747560b01..1ef56a097c8 100644 --- a/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java +++ b/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java @@ -34,7 +34,7 @@ public final class TetsuoUmezawa extends CardImpl { static { creatureFilter.add(Predicates.or( - TappedPredicate.instance, + TappedPredicate.TAPPED, BlockingPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/t/TheAkroanWar.java b/Mage.Sets/src/mage/cards/t/TheAkroanWar.java index 865c1c869f7..de9a2af57b8 100644 --- a/Mage.Sets/src/mage/cards/t/TheAkroanWar.java +++ b/Mage.Sets/src/mage/cards/t/TheAkroanWar.java @@ -76,7 +76,7 @@ class TheAkroanWarEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterCreaturePermanent(); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } TheAkroanWarEffect() { diff --git a/Mage.Sets/src/mage/cards/t/TheBigIdea.java b/Mage.Sets/src/mage/cards/t/TheBigIdea.java index b9a05f545b0..8efb1900d88 100644 --- a/Mage.Sets/src/mage/cards/t/TheBigIdea.java +++ b/Mage.Sets/src/mage/cards/t/TheBigIdea.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -32,7 +31,7 @@ public final class TheBigIdea extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(SubType.BRAINIAC, "Brainiac creatures"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public TheBigIdea(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TheftOfDreams.java b/Mage.Sets/src/mage/cards/t/TheftOfDreams.java index 400538b0927..144436f83f7 100644 --- a/Mage.Sets/src/mage/cards/t/TheftOfDreams.java +++ b/Mage.Sets/src/mage/cards/t/TheftOfDreams.java @@ -61,7 +61,7 @@ class TheftOfDreamsEffect extends OneShotEffect { Player opponent = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (opponent != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); filter.add(new ControllerIdPredicate(opponent.getId())); return new DrawCardSourceControllerEffect(game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game)).apply(game, source); } diff --git a/Mage.Sets/src/mage/cards/t/ThelonsCurse.java b/Mage.Sets/src/mage/cards/t/ThelonsCurse.java index 9eda6489366..efc5fcb36cc 100644 --- a/Mage.Sets/src/mage/cards/t/ThelonsCurse.java +++ b/Mage.Sets/src/mage/cards/t/ThelonsCurse.java @@ -64,7 +64,7 @@ class ThelonsCurseEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("tapped blue creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); filter.add(new ColorPredicate(ObjectColor.BLUE)); } diff --git a/Mage.Sets/src/mage/cards/t/ThousandWinds.java b/Mage.Sets/src/mage/cards/t/ThousandWinds.java index 6d1fc4f2d4d..38ec8ab347c 100644 --- a/Mage.Sets/src/mage/cards/t/ThousandWinds.java +++ b/Mage.Sets/src/mage/cards/t/ThousandWinds.java @@ -26,7 +26,7 @@ public final class ThousandWinds extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public ThousandWinds(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThroneOfTheGodPharaoh.java b/Mage.Sets/src/mage/cards/t/ThroneOfTheGodPharaoh.java index 55037f645d8..ce50e35c10f 100644 --- a/Mage.Sets/src/mage/cards/t/ThroneOfTheGodPharaoh.java +++ b/Mage.Sets/src/mage/cards/t/ThroneOfTheGodPharaoh.java @@ -23,7 +23,7 @@ public final class ThroneOfTheGodPharaoh extends CardImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter); diff --git a/Mage.Sets/src/mage/cards/t/TimeOfIce.java b/Mage.Sets/src/mage/cards/t/TimeOfIce.java index 8fa161410a0..2cbbd58b6fc 100644 --- a/Mage.Sets/src/mage/cards/t/TimeOfIce.java +++ b/Mage.Sets/src/mage/cards/t/TimeOfIce.java @@ -37,7 +37,7 @@ public final class TimeOfIce extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creatures"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public TimeOfIce(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ToilToRenown.java b/Mage.Sets/src/mage/cards/t/ToilToRenown.java index 74031f01581..91405992320 100644 --- a/Mage.Sets/src/mage/cards/t/ToilToRenown.java +++ b/Mage.Sets/src/mage/cards/t/ToilToRenown.java @@ -21,7 +21,7 @@ public final class ToilToRenown extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("tapped artifact, creature, and land you control"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); filter.add(Predicates.or( CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate(), diff --git a/Mage.Sets/src/mage/cards/t/TopanAscetic.java b/Mage.Sets/src/mage/cards/t/TopanAscetic.java index ffa7f382822..c7634e66880 100644 --- a/Mage.Sets/src/mage/cards/t/TopanAscetic.java +++ b/Mage.Sets/src/mage/cards/t/TopanAscetic.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -25,7 +24,7 @@ public final class TopanAscetic extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static{ - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } diff --git a/Mage.Sets/src/mage/cards/t/TourachsGate.java b/Mage.Sets/src/mage/cards/t/TourachsGate.java index 8f050e58288..73afa693671 100644 --- a/Mage.Sets/src/mage/cards/t/TourachsGate.java +++ b/Mage.Sets/src/mage/cards/t/TourachsGate.java @@ -28,7 +28,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -50,7 +49,7 @@ public final class TourachsGate extends CardImpl { private static final FilterPermanent filterUntapped = new FilterPermanent("enchanted land is untapped"); static { - filterUntapped.add(Predicates.not(TappedPredicate.instance)); + filterUntapped.add(TappedPredicate.UNTAPPED); } private static final FilterCreaturePermanent filterAttackingCreatures = new FilterCreaturePermanent("attacking creatures you control"); diff --git a/Mage.Sets/src/mage/cards/t/TownGossipmonger.java b/Mage.Sets/src/mage/cards/t/TownGossipmonger.java index 7377ba1fbec..672fac061f8 100644 --- a/Mage.Sets/src/mage/cards/t/TownGossipmonger.java +++ b/Mage.Sets/src/mage/cards/t/TownGossipmonger.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -28,7 +27,7 @@ public final class TownGossipmonger extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public TownGossipmonger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TradewindRider.java b/Mage.Sets/src/mage/cards/t/TradewindRider.java index 74a6dbde2bc..889f601c219 100644 --- a/Mage.Sets/src/mage/cards/t/TradewindRider.java +++ b/Mage.Sets/src/mage/cards/t/TradewindRider.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -28,7 +27,7 @@ public final class TradewindRider extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public TradewindRider(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TraitorsRoar.java b/Mage.Sets/src/mage/cards/t/TraitorsRoar.java index 01050c10449..387646e7765 100644 --- a/Mage.Sets/src/mage/cards/t/TraitorsRoar.java +++ b/Mage.Sets/src/mage/cards/t/TraitorsRoar.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -25,7 +24,7 @@ public final class TraitorsRoar extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public TraitorsRoar(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/Turnabout.java b/Mage.Sets/src/mage/cards/t/Turnabout.java index 9d61017129a..5dfa7e82790 100644 --- a/Mage.Sets/src/mage/cards/t/Turnabout.java +++ b/Mage.Sets/src/mage/cards/t/Turnabout.java @@ -10,7 +10,6 @@ import mage.choices.ChoiceImpl; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -109,14 +108,14 @@ class TurnaboutEffect extends OneShotEffect { filter.add(type.getPredicate()); if (choiceImpl.getChoice().equals("Untap")) { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { if (permanent.isControlledBy(target)) { permanent.untap(game); } } } else { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { if (permanent.isControlledBy(target)) { permanent.tap(source, game); diff --git a/Mage.Sets/src/mage/cards/u/UktabiKong.java b/Mage.Sets/src/mage/cards/u/UktabiKong.java index a2c4c968363..5953090a89b 100644 --- a/Mage.Sets/src/mage/cards/u/UktabiKong.java +++ b/Mage.Sets/src/mage/cards/u/UktabiKong.java @@ -17,7 +17,6 @@ import mage.constants.Zone; import mage.game.permanent.token.UktabiKongApeToken; import mage.filter.common.FilterArtifactPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -30,7 +29,7 @@ public final class UktabiKong extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Apes you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.APE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/u/UnerringSling.java b/Mage.Sets/src/mage/cards/u/UnerringSling.java index 1133255b064..9f41e7985c8 100644 --- a/Mage.Sets/src/mage/cards/u/UnerringSling.java +++ b/Mage.Sets/src/mage/cards/u/UnerringSling.java @@ -15,7 +15,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -37,7 +36,7 @@ public final class UnerringSling extends CardImpl { = new FilterAttackingOrBlockingCreature("attacking or blocking creature with flying"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter2.add(new AbilityPredicate(FlyingAbility.class)); } diff --git a/Mage.Sets/src/mage/cards/u/UrgeToFeed.java b/Mage.Sets/src/mage/cards/u/UrgeToFeed.java index 692d623cb84..5633f662d04 100644 --- a/Mage.Sets/src/mage/cards/u/UrgeToFeed.java +++ b/Mage.Sets/src/mage/cards/u/UrgeToFeed.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -48,7 +47,7 @@ class UrgeToFeedEffect extends OneShotEffect { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.VAMPIRE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/u/UrzaLordHighArtificer.java b/Mage.Sets/src/mage/cards/u/UrzaLordHighArtificer.java index 7918713fdd5..d757419474c 100644 --- a/Mage.Sets/src/mage/cards/u/UrzaLordHighArtificer.java +++ b/Mage.Sets/src/mage/cards/u/UrzaLordHighArtificer.java @@ -21,7 +21,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.token.KarnConstructToken; @@ -53,7 +52,7 @@ public final class UrzaLordHighArtificer extends CardImpl { // Tap an untapped artifact you control: Add {U}. FilterControlledPermanent filter = new FilterControlledArtifactPermanent("untapped artifact you control"); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); this.addAbility(new SimpleManaAbility( Zone.BATTLEFIELD, new UrzaLordHighArtificerManaEffect(filter), diff --git a/Mage.Sets/src/mage/cards/v/Vengeance.java b/Mage.Sets/src/mage/cards/v/Vengeance.java index bc8c102e275..b2c7b6185c2 100644 --- a/Mage.Sets/src/mage/cards/v/Vengeance.java +++ b/Mage.Sets/src/mage/cards/v/Vengeance.java @@ -18,7 +18,7 @@ public final class Vengeance extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } public Vengeance(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java b/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java index dcc62bc4524..8e44127cd11 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java +++ b/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -29,7 +28,7 @@ public final class VeteranBrawlers extends CardImpl { static final private FilterLandPermanent filter = new FilterLandPermanent("an untapped land"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } static final private String rule = "{this} can't block if you control an untapped land"; diff --git a/Mage.Sets/src/mage/cards/v/VeteranWarleader.java b/Mage.Sets/src/mage/cards/v/VeteranWarleader.java index 778c9361504..c359c93b8af 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranWarleader.java +++ b/Mage.Sets/src/mage/cards/v/VeteranWarleader.java @@ -21,7 +21,6 @@ import mage.choices.Choice; import mage.choices.ChoiceImpl; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -42,7 +41,7 @@ public final class VeteranWarleader extends CardImpl { static { filter.add(AnotherPredicate.instance); filter.add(SubType.ALLY.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public VeteranWarleader(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VeteransVoice.java b/Mage.Sets/src/mage/cards/v/VeteransVoice.java index 0bd7e4225ec..8c909a52702 100644 --- a/Mage.Sets/src/mage/cards/v/VeteransVoice.java +++ b/Mage.Sets/src/mage/cards/v/VeteransVoice.java @@ -35,7 +35,7 @@ public final class VeteransVoice extends CardImpl { private static final FilterCreaturePermanent filterUntapped = new FilterCreaturePermanent("enchanted creature is untapped"); static { - filterUntapped.add(Predicates.not(TappedPredicate.instance)); + filterUntapped.add(TappedPredicate.UNTAPPED); } public VeteransVoice(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VintaraSnapper.java b/Mage.Sets/src/mage/cards/v/VintaraSnapper.java index 56e9bbe3dd6..68ed24186a2 100644 --- a/Mage.Sets/src/mage/cards/v/VintaraSnapper.java +++ b/Mage.Sets/src/mage/cards/v/VintaraSnapper.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -28,7 +27,7 @@ public final class VintaraSnapper extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent(); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public VintaraSnapper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VodalianWarMachine.java b/Mage.Sets/src/mage/cards/v/VodalianWarMachine.java index 46bbe766892..f178d60313a 100644 --- a/Mage.Sets/src/mage/cards/v/VodalianWarMachine.java +++ b/Mage.Sets/src/mage/cards/v/VodalianWarMachine.java @@ -27,7 +27,6 @@ import mage.constants.WatcherScope; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -46,7 +45,7 @@ public final class VodalianWarMachine extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Merfolk you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.MERFOLK.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java b/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java index 1c168afeeb7..5eaab92ca64 100644 --- a/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java +++ b/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.VoiceOfTheWoodsElementalToken; import mage.target.common.TargetControlledPermanent; @@ -27,7 +26,7 @@ public final class VoiceOfTheWoods extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Elves you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.ELF.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/v/VolrathsGardens.java b/Mage.Sets/src/mage/cards/v/VolrathsGardens.java index 4ae9660de14..47171e957e4 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsGardens.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsGardens.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -25,7 +24,7 @@ public final class VolrathsGardens extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public VolrathsGardens(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WaitingInTheWeeds.java b/Mage.Sets/src/mage/cards/w/WaitingInTheWeeds.java index afff9e7455a..27a2db0549f 100644 --- a/Mage.Sets/src/mage/cards/w/WaitingInTheWeeds.java +++ b/Mage.Sets/src/mage/cards/w/WaitingInTheWeeds.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.token.Token; @@ -46,7 +45,7 @@ class WaitingInTheWeedsEffect extends OneShotEffect { static { filter.add(SubType.FOREST.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public WaitingInTheWeedsEffect() { diff --git a/Mage.Sets/src/mage/cards/w/WaterspoutDjinn.java b/Mage.Sets/src/mage/cards/w/WaterspoutDjinn.java index 1053ddc12be..e8d6043bfe8 100644 --- a/Mage.Sets/src/mage/cards/w/WaterspoutDjinn.java +++ b/Mage.Sets/src/mage/cards/w/WaterspoutDjinn.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -27,7 +26,7 @@ public final class WaterspoutDjinn extends CardImpl { static{ filter.add(SubType.ISLAND.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public WaterspoutDjinn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WeightOfConscience.java b/Mage.Sets/src/mage/cards/w/WeightOfConscience.java index c8fae8d52f5..ec39a5d89ae 100644 --- a/Mage.Sets/src/mage/cards/w/WeightOfConscience.java +++ b/Mage.Sets/src/mage/cards/w/WeightOfConscience.java @@ -15,7 +15,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicate; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SharesCreatureTypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -102,7 +101,7 @@ class WeightOfConscienceTarget extends TargetControlledCreaturePermanent { private static final FilterControlledCreaturePermanent filterUntapped = new FilterControlledCreaturePermanent("untapped creatures you control that share a creature type"); static { - filterUntapped.add(Predicates.not(TappedPredicate.instance)); + filterUntapped.add(TappedPredicate.UNTAPPED); filterUntapped.add(WeightOfConsciencePredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/w/WellOfDiscovery.java b/Mage.Sets/src/mage/cards/w/WellOfDiscovery.java index 96a6b7da61d..743bbba2e25 100644 --- a/Mage.Sets/src/mage/cards/w/WellOfDiscovery.java +++ b/Mage.Sets/src/mage/cards/w/WellOfDiscovery.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -24,7 +23,7 @@ public final class WellOfDiscovery extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent(); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public WellOfDiscovery(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WellOfLife.java b/Mage.Sets/src/mage/cards/w/WellOfLife.java index bf64f74f7cd..2636b8b9d9a 100644 --- a/Mage.Sets/src/mage/cards/w/WellOfLife.java +++ b/Mage.Sets/src/mage/cards/w/WellOfLife.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -24,7 +23,7 @@ public final class WellOfLife extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent(); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public WellOfLife(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java b/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java index a69f4a780fd..957b1d5d096 100644 --- a/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java +++ b/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java @@ -26,7 +26,7 @@ public final class WellgabberApothecary extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("target tapped Merfolk or Kithkin creature this turn"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); filter.add(Predicates.or(SubType.MERFOLK.getPredicate(), SubType.KITHKIN.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/w/WhirlerRogue.java b/Mage.Sets/src/mage/cards/w/WhirlerRogue.java index 38671f431d9..eb8f4c0bc21 100644 --- a/Mage.Sets/src/mage/cards/w/WhirlerRogue.java +++ b/Mage.Sets/src/mage/cards/w/WhirlerRogue.java @@ -1,7 +1,6 @@ package mage.cards.w; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -16,13 +15,14 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.UntappedPredicate; +import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.ThopterColorlessToken; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author fireshoes */ public final class WhirlerRogue extends CardImpl { @@ -30,12 +30,12 @@ public final class WhirlerRogue extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped artifacts you control"); static { - filter.add(UntappedPredicate.instance); + filter.add(TappedPredicate.UNTAPPED); filter.add(CardType.ARTIFACT.getPredicate()); } public WhirlerRogue(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.ROGUE); this.subtype.add(SubType.ARTIFICER); diff --git a/Mage.Sets/src/mage/cards/w/WoodElemental.java b/Mage.Sets/src/mage/cards/w/WoodElemental.java index ed966af5d51..610f4ee01d9 100644 --- a/Mage.Sets/src/mage/cards/w/WoodElemental.java +++ b/Mage.Sets/src/mage/cards/w/WoodElemental.java @@ -19,7 +19,6 @@ import mage.constants.Outcome; import mage.constants.SubLayer; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -61,7 +60,7 @@ class WoodElementalEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Forests you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(SubType.FOREST.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/z/ZadasCommando.java b/Mage.Sets/src/mage/cards/z/ZadasCommando.java index 4c6e6387220..9b287129bc2 100644 --- a/Mage.Sets/src/mage/cards/z/ZadasCommando.java +++ b/Mage.Sets/src/mage/cards/z/ZadasCommando.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetOpponentOrPlaneswalker; @@ -31,7 +30,7 @@ public final class ZadasCommando extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public ZadasCommando(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/z/ZahidDjinnOfTheLamp.java b/Mage.Sets/src/mage/cards/z/ZahidDjinnOfTheLamp.java index bc2085f4db4..0509f1dce25 100644 --- a/Mage.Sets/src/mage/cards/z/ZahidDjinnOfTheLamp.java +++ b/Mage.Sets/src/mage/cards/z/ZahidDjinnOfTheLamp.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterControlledArtifactPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -35,7 +34,7 @@ public final class ZahidDjinnOfTheLamp extends CardImpl { AlternativeCostSourceAbility alternativeCostSourceAbility = new AlternativeCostSourceAbility(new ManaCostsImpl("{3}{U}"), null, "You may pay {3}{U} and tap an untapped artifact you control rather than pay this spell's mana cost."); FilterControlledArtifactPermanent filter = new FilterControlledArtifactPermanent("untapped artifact you control"); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); alternativeCostSourceAbility.addCost(new TapTargetCost(new TargetControlledPermanent(filter))); this.addAbility(alternativeCostSourceAbility); diff --git a/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java b/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java index 808c97ee4fe..db99684fcc7 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java +++ b/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -33,7 +32,7 @@ public final class ZombieTrailblazer extends CardImpl { static { filter.add(SubType.ZOMBIE.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public ZombieTrailblazer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/z/ZulaportChainmage.java b/Mage.Sets/src/mage/cards/z/ZulaportChainmage.java index be1322eafae..624f3c75e66 100644 --- a/Mage.Sets/src/mage/cards/z/ZulaportChainmage.java +++ b/Mage.Sets/src/mage/cards/z/ZulaportChainmage.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetOpponent; @@ -29,7 +28,7 @@ public final class ZulaportChainmage extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } public ZulaportChainmage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java index c5a4cb6f283..f920dc06a9e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java @@ -20,7 +20,7 @@ public class UntapLandsEffect extends OneShotEffect { private static final FilterLandPermanent filter = new FilterLandPermanent("land(s) to untap"); static { - filter.add(TappedPredicate.instance); + filter.add(TappedPredicate.TAPPED); } private final int amount; private final boolean upTo; diff --git a/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java b/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java index 4da2477b775..87a45f5b43c 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SharesColorWithSourcePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -52,7 +51,7 @@ public class ConspireAbility extends StaticAbility implements OptionalAdditional protected static final String CONSPIRE_ACTIVATION_KEY = "ConspireActivation"; static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); filter.add(new SharesColorWithSourcePredicate()); filter.add(CardType.CREATURE.getPredicate()); } diff --git a/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java b/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java index b5728d69b6c..4f94a333e41 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java @@ -73,7 +73,7 @@ public class ConvokeAbility extends SimpleStaticAbility implements AlternateMana private static final FilterControlledCreaturePermanent filterUntapped = new FilterControlledCreaturePermanent(); static { - filterUntapped.add(Predicates.not(TappedPredicate.instance)); + filterUntapped.add(TappedPredicate.UNTAPPED); } public ConvokeAbility() { @@ -112,7 +112,7 @@ public class ConvokeAbility extends SimpleStaticAbility implements AlternateMana // create filter for possible creatures to tap FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); if (unpaid.getMana().getGeneric() == 0) { List colorPredicates = new ArrayList<>(); if (unpaid.getMana().getBlack() > 0) { diff --git a/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java b/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java index 04133a0ddb1..5f0ba42fdd3 100644 --- a/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -61,7 +60,7 @@ class CrewCost extends CostImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(Predicates.not(TappedPredicate.instance)); + filter.add(TappedPredicate.UNTAPPED); } private final int value; diff --git a/Mage/src/main/java/mage/abilities/keyword/ImproviseAbility.java b/Mage/src/main/java/mage/abilities/keyword/ImproviseAbility.java index a235a56340d..daf36fc7c7f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ImproviseAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ImproviseAbility.java @@ -17,7 +17,6 @@ import mage.constants.ManaType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -48,7 +47,7 @@ public class ImproviseAbility extends SimpleStaticAbility implements AlternateMa private static final FilterControlledArtifactPermanent filterUntapped = new FilterControlledArtifactPermanent("untapped artifact you control"); static { - filterUntapped.add(Predicates.not(TappedPredicate.instance)); + filterUntapped.add(TappedPredicate.UNTAPPED); } private static final DynamicValue untappedCount = new PermanentsOnBattlefieldCount(filterUntapped); diff --git a/Mage/src/main/java/mage/filter/common/FilterCreatureForAttack.java b/Mage/src/main/java/mage/filter/common/FilterCreatureForAttack.java index 68b75d79265..8b390a9344a 100644 --- a/Mage/src/main/java/mage/filter/common/FilterCreatureForAttack.java +++ b/Mage/src/main/java/mage/filter/common/FilterCreatureForAttack.java @@ -27,7 +27,7 @@ public class FilterCreatureForAttack extends FilterCreaturePermanent { super(name); this.add(Predicates.not(AttackingPredicate.instance)); this.add(Predicates.not(BlockingPredicate.instance)); - this.add(Predicates.not(TappedPredicate.instance)); + this.add(TappedPredicate.UNTAPPED); this.add(Predicates.not(new AbilityPredicate(DefenderAbility.class))); this.add(new CanTapPredicate()); } diff --git a/Mage/src/main/java/mage/filter/common/FilterCreatureForCombat.java b/Mage/src/main/java/mage/filter/common/FilterCreatureForCombat.java index dc94c1fa324..90a0a7b9a1e 100644 --- a/Mage/src/main/java/mage/filter/common/FilterCreatureForCombat.java +++ b/Mage/src/main/java/mage/filter/common/FilterCreatureForCombat.java @@ -2,7 +2,6 @@ package mage.filter.common; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -18,7 +17,7 @@ public class FilterCreatureForCombat extends FilterCreatureForCombatBase { public FilterCreatureForCombat(String name) { super(name); - this.add(Predicates.not(TappedPredicate.instance)); + this.add(TappedPredicate.UNTAPPED); } public FilterCreatureForCombat(final FilterCreatureForCombat filter) { diff --git a/Mage/src/main/java/mage/filter/common/FilterUntappedCreature.java b/Mage/src/main/java/mage/filter/common/FilterUntappedCreature.java index ebf7c43da1d..0c6c9fda1e0 100644 --- a/Mage/src/main/java/mage/filter/common/FilterUntappedCreature.java +++ b/Mage/src/main/java/mage/filter/common/FilterUntappedCreature.java @@ -2,7 +2,6 @@ package mage.filter.common; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -17,7 +16,7 @@ public class FilterUntappedCreature extends FilterCreaturePermanent { public FilterUntappedCreature(String name) { super(name); - this.add(Predicates.not(TappedPredicate.instance)); + this.add(TappedPredicate.UNTAPPED); } public FilterUntappedCreature(final FilterUntappedCreature filter) { diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/TappedPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/TappedPredicate.java index 2b4d720d9c9..554b2ab618a 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/TappedPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/TappedPredicate.java @@ -1,4 +1,3 @@ - package mage.filter.predicate.permanent; import mage.filter.predicate.Predicate; @@ -9,11 +8,17 @@ import mage.game.permanent.Permanent; * @author North */ public enum TappedPredicate implements Predicate { - instance; + TAPPED(true), UNTAPPED(false); + + private final boolean value; + + TappedPredicate(boolean value) { + this.value = value; + } @Override public boolean apply(Permanent input, Game game) { - return input.isTapped(); + return input.isTapped() == value; } @Override diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/UntappedPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/UntappedPredicate.java deleted file mode 100644 index e06811fe729..00000000000 --- a/Mage/src/main/java/mage/filter/predicate/permanent/UntappedPredicate.java +++ /dev/null @@ -1,22 +0,0 @@ -package mage.filter.predicate.permanent; - -import mage.filter.predicate.Predicate; -import mage.game.Game; -import mage.game.permanent.Permanent; - -/** - * @author TheElk801 - */ -public enum UntappedPredicate implements Predicate { - instance; - - @Override - public boolean apply(Permanent input, Game game) { - return !input.isTapped(); - } - - @Override - public String toString() { - return "Untapped"; - } -}