From 662fedfe731af29b6b27b18e89e4de5163317905 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 4 Nov 2023 00:21:23 -0400 Subject: [PATCH] update static filter name --- .../src/mage/cards/a/AcolyteOfAclazotz.java | 2 +- .../src/mage/cards/a/AyaraWidowOfTheRealm.java | 2 +- .../src/mage/cards/b/BartolomeDelPresidio.java | 2 +- .../src/mage/cards/c/CompleatedHuntmaster.java | 2 +- .../src/mage/cards/c/CutthroatCenturion.java | 16 ++++++++++++++-- Mage.Sets/src/mage/cards/j/JunkyardGenius.java | 2 +- .../src/mage/cards/k/KillZoneAcrobat.java | 2 +- Mage.Sets/src/mage/cards/o/OldFlitterfang.java | 2 +- .../src/mage/cards/s/SeraphOfNewPhyrexia.java | 18 +++--------------- Mage.Sets/src/mage/cards/s/StormclawRager.java | 2 +- .../src/mage/cards/t/TarriansSoulcleaver.java | 2 +- Mage.Sets/src/mage/cards/t/Thraxodemon.java | 2 +- .../src/mage/cards/v/VanguardOfTheRose.java | 2 +- .../main/java/mage/filter/StaticFilters.java | 8 ++++---- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AcolyteOfAclazotz.java b/Mage.Sets/src/mage/cards/a/AcolyteOfAclazotz.java index 8cd28e904f2..c035aa1d627 100644 --- a/Mage.Sets/src/mage/cards/a/AcolyteOfAclazotz.java +++ b/Mage.Sets/src/mage/cards/a/AcolyteOfAclazotz.java @@ -30,7 +30,7 @@ public final class AcolyteOfAclazotz extends CardImpl { // {T}, Sacrifice another creature or artifact: Each opponent loses 1 life and you gain 1 life. Ability ability = new SimpleActivatedAbility(new LoseLifeOpponentsEffect(1), new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE_SHORT_TEXT)); + ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT)); ability.addEffect(new GainLifeEffect(1).concatBy("and")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AyaraWidowOfTheRealm.java b/Mage.Sets/src/mage/cards/a/AyaraWidowOfTheRealm.java index b8bda045a3b..078cace2021 100644 --- a/Mage.Sets/src/mage/cards/a/AyaraWidowOfTheRealm.java +++ b/Mage.Sets/src/mage/cards/a/AyaraWidowOfTheRealm.java @@ -48,7 +48,7 @@ public final class AyaraWidowOfTheRealm extends CardImpl { // {T}, Sacrifice another creature or artifact: Ayara, Widow of the Realm deals X damage to target opponent or battle and you gain X life, where X is the sacrificed permanent's mana value. Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(xValue) .setText("{this} deals X damage to target opponent or battle"), new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE_SHORT_TEXT)); + ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT)); ability.addEffect(new GainLifeEffect(xValue).setText("and you gain X life, where X is the sacrificed permanent's mana value")); ability.addTarget(new TargetPermanentOrPlayer(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BartolomeDelPresidio.java b/Mage.Sets/src/mage/cards/b/BartolomeDelPresidio.java index bd5ad0f5997..2b2a1c272be 100644 --- a/Mage.Sets/src/mage/cards/b/BartolomeDelPresidio.java +++ b/Mage.Sets/src/mage/cards/b/BartolomeDelPresidio.java @@ -31,7 +31,7 @@ public final class BartolomeDelPresidio extends CardImpl { // Sacrifice another creature or artifact: Put a +1/+1 counter on Bartolome del Presidio. this.addAbility(new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE_SHORT_TEXT) + new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT) )); } diff --git a/Mage.Sets/src/mage/cards/c/CompleatedHuntmaster.java b/Mage.Sets/src/mage/cards/c/CompleatedHuntmaster.java index 6fd1bfb390a..4426d0393e7 100644 --- a/Mage.Sets/src/mage/cards/c/CompleatedHuntmaster.java +++ b/Mage.Sets/src/mage/cards/c/CompleatedHuntmaster.java @@ -32,7 +32,7 @@ public final class CompleatedHuntmaster extends CardImpl { // {1}, {T}, Sacrifice another creature or artifact: Incubate 3. Ability ability = new SimpleActivatedAbility(new IncubateEffect(3), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE_SHORT_TEXT)); + ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CutthroatCenturion.java b/Mage.Sets/src/mage/cards/c/CutthroatCenturion.java index f90c0405bd6..8c564157af1 100644 --- a/Mage.Sets/src/mage/cards/c/CutthroatCenturion.java +++ b/Mage.Sets/src/mage/cards/c/CutthroatCenturion.java @@ -10,7 +10,9 @@ import mage.constants.CardType; import mage.constants.Duration; 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.mageobject.AnotherPredicate; import java.util.UUID; @@ -19,6 +21,16 @@ import java.util.UUID; */ public final class CutthroatCenturion extends CardImpl { + private static final FilterControlledPermanent filter = new FilterControlledPermanent("another artifact or creature"); + + static { + filter.add(AnotherPredicate.instance); + filter.add(Predicates.or( + CardType.ARTIFACT.getPredicate(), + CardType.CREATURE.getPredicate() + )); + } + public CutthroatCenturion(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}{B}"); @@ -30,7 +42,7 @@ public final class CutthroatCenturion extends CardImpl { // Sacrifice another artifact or creature: Cutthroat Centurion gets +2/+2 until end of turn. Activate only once each turn. this.addAbility(new LimitedTimesPerTurnActivatedAbility( Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), - new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE_SHORT_TEXT) + new SacrificeTargetCost(filter) )); } diff --git a/Mage.Sets/src/mage/cards/j/JunkyardGenius.java b/Mage.Sets/src/mage/cards/j/JunkyardGenius.java index 60c11aba429..463e62883ed 100644 --- a/Mage.Sets/src/mage/cards/j/JunkyardGenius.java +++ b/Mage.Sets/src/mage/cards/j/JunkyardGenius.java @@ -43,7 +43,7 @@ public final class JunkyardGenius extends CardImpl { Ability ability = new SimpleActivatedAbility(new BoostControlledEffect( 1, 1, Duration.EndOfTurn, true ).setText("until end of turn, other creatures you control get +1/+0"), new ManaCostsImpl<>("{1}{B}{R}")); - ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE_SHORT_TEXT)); + ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT)); ability.addEffect(new GainAbilityControlledEffect( new MenaceAbility(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES, true diff --git a/Mage.Sets/src/mage/cards/k/KillZoneAcrobat.java b/Mage.Sets/src/mage/cards/k/KillZoneAcrobat.java index 49b1143b2d7..94c732b7653 100644 --- a/Mage.Sets/src/mage/cards/k/KillZoneAcrobat.java +++ b/Mage.Sets/src/mage/cards/k/KillZoneAcrobat.java @@ -31,7 +31,7 @@ public final class KillZoneAcrobat extends CardImpl { // Whenever Kill-Zone Acrobat attacks, you may sacrifice another creature or artifact. If you do, Kill-Zone Acrobat gains flying until end of turn. this.addAbility(new AttacksTriggeredAbility(new DoIfCostPaid( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), - new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE_SHORT_TEXT) + new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT) ))); } diff --git a/Mage.Sets/src/mage/cards/o/OldFlitterfang.java b/Mage.Sets/src/mage/cards/o/OldFlitterfang.java index 20496892680..3de5bfd9387 100644 --- a/Mage.Sets/src/mage/cards/o/OldFlitterfang.java +++ b/Mage.Sets/src/mage/cards/o/OldFlitterfang.java @@ -46,7 +46,7 @@ public final class OldFlitterfang extends CardImpl { Ability ability = new SimpleActivatedAbility( new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}") ); - ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE_SHORT_TEXT)); + ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SeraphOfNewPhyrexia.java b/Mage.Sets/src/mage/cards/s/SeraphOfNewPhyrexia.java index 50ecf358d0f..971f884563b 100644 --- a/Mage.Sets/src/mage/cards/s/SeraphOfNewPhyrexia.java +++ b/Mage.Sets/src/mage/cards/s/SeraphOfNewPhyrexia.java @@ -11,9 +11,7 @@ import mage.cards.CardSetInfo; 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.StaticFilters; import java.util.UUID; @@ -22,17 +20,6 @@ import java.util.UUID; */ public final class SeraphOfNewPhyrexia extends CardImpl { - private static final FilterControlledPermanent filter - = new FilterControlledPermanent("another creature or artifact"); - - static { - filter.add(AnotherPredicate.instance); - filter.add(Predicates.or( - CardType.CREATURE.getPredicate(), - CardType.ARTIFACT.getPredicate() - )); - } - public SeraphOfNewPhyrexia(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, ""); @@ -49,7 +36,8 @@ public final class SeraphOfNewPhyrexia extends CardImpl { // Whenever Seraph of New Phyrexia attacks, you may sacrifice another creature or artifact. If you do, Seraph of New Phyrexia gets +2/+1 until end of turn. this.addAbility(new AttacksTriggeredAbility(new DoIfCostPaid( - new BoostSourceEffect(2, 1, Duration.EndOfTurn), new SacrificeTargetCost(filter) + new BoostSourceEffect(2, 1, Duration.EndOfTurn), + new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT) ))); } diff --git a/Mage.Sets/src/mage/cards/s/StormclawRager.java b/Mage.Sets/src/mage/cards/s/StormclawRager.java index 2bda2b6bb82..7a73b66fa68 100644 --- a/Mage.Sets/src/mage/cards/s/StormclawRager.java +++ b/Mage.Sets/src/mage/cards/s/StormclawRager.java @@ -33,7 +33,7 @@ public final class StormclawRager extends CardImpl { Ability ability = new ActivateAsSorceryActivatedAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1) ); - ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE_SHORT_TEXT)); + ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT)); ability.addEffect(new DrawCardSourceControllerEffect(1).concatBy("and")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TarriansSoulcleaver.java b/Mage.Sets/src/mage/cards/t/TarriansSoulcleaver.java index de8d8d45d03..d28ad9da931 100644 --- a/Mage.Sets/src/mage/cards/t/TarriansSoulcleaver.java +++ b/Mage.Sets/src/mage/cards/t/TarriansSoulcleaver.java @@ -22,7 +22,7 @@ import java.util.UUID; */ public final class TarriansSoulcleaver extends CardImpl { - public static final FilterPermanent filter = new FilterPermanent("another artifact or creature"); + private static final FilterPermanent filter = new FilterPermanent("another artifact or creature"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/t/Thraxodemon.java b/Mage.Sets/src/mage/cards/t/Thraxodemon.java index 695a9d372c2..fda3015c2e8 100644 --- a/Mage.Sets/src/mage/cards/t/Thraxodemon.java +++ b/Mage.Sets/src/mage/cards/t/Thraxodemon.java @@ -30,7 +30,7 @@ public final class Thraxodemon extends CardImpl { // {3}, {T}, Sacrifice another creature or artifact: Draw a card. Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE_SHORT_TEXT)); + ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VanguardOfTheRose.java b/Mage.Sets/src/mage/cards/v/VanguardOfTheRose.java index 61a14aa484e..8558fdaed66 100644 --- a/Mage.Sets/src/mage/cards/v/VanguardOfTheRose.java +++ b/Mage.Sets/src/mage/cards/v/VanguardOfTheRose.java @@ -35,7 +35,7 @@ public final class VanguardOfTheRose extends CardImpl { new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}") ); - ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE_SHORT_TEXT)); + ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT)); ability.addEffect(new TapSourceEffect().setText("tap it")); this.addAbility(ability); } diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java index a5af3f42c6c..94fbe936dc4 100644 --- a/Mage/src/main/java/mage/filter/StaticFilters.java +++ b/Mage/src/main/java/mage/filter/StaticFilters.java @@ -473,15 +473,15 @@ public final class StaticFilters { FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE.setLockedFilter(true); } - public static final FilterControlledPermanent FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE_SHORT_TEXT = new FilterControlledPermanent("another creature or artifact"); + public static final FilterControlledPermanent FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT = new FilterControlledPermanent("another creature or artifact"); static { - FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE_SHORT_TEXT.add(AnotherPredicate.instance); - FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE_SHORT_TEXT.add(Predicates.or( + FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT.add(AnotherPredicate.instance); + FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT.add(Predicates.or( CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate() )); - FILTER_CONTROLLED_ANOTHER_ARTIFACT_OR_CREATURE_SHORT_TEXT.setLockedFilter(true); + FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT.setLockedFilter(true); } public static final FilterControlledPermanent FILTER_CONTROLLED_PERMANENT_ENCHANTMENT = new FilterControlledEnchantmentPermanent();