From 248b78677cb284f4d4cc11d03ff7064c2e346d63 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Tue, 2 Jan 2024 19:23:16 -0500 Subject: [PATCH] remove unused param from ProwlAbility --- Mage.Sets/src/mage/cards/a/AuntiesSnitch.java | 2 +- Mage.Sets/src/mage/cards/e/EarwigSquad.java | 2 +- Mage.Sets/src/mage/cards/e/EnigmaThief.java | 2 +- Mage.Sets/src/mage/cards/h/HuntingVelociraptor.java | 6 +----- Mage.Sets/src/mage/cards/k/KnowledgeExploitation.java | 2 +- Mage.Sets/src/mage/cards/l/LatchkeyFaerie.java | 2 +- Mage.Sets/src/mage/cards/m/MorselTheft.java | 2 +- Mage.Sets/src/mage/cards/n/NogginWhack.java | 2 +- Mage.Sets/src/mage/cards/n/NotoriousThrong.java | 2 +- Mage.Sets/src/mage/cards/s/StinkdrinkerBandit.java | 2 +- Mage.Sets/src/mage/cards/t/ThievesFortune.java | 2 +- .../src/main/java/mage/abilities/keyword/ProwlAbility.java | 7 +++---- 12 files changed, 14 insertions(+), 19 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java b/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java index ecba5a863d0..670329993b4 100644 --- a/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java +++ b/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java @@ -37,7 +37,7 @@ public final class AuntiesSnitch extends CardImpl { // Auntie's Snitch can't block. this.addAbility(new CantBlockAbility()); // Prowl {1}{B} - this.addAbility(new ProwlAbility(this, "{1}{B}")); + this.addAbility(new ProwlAbility("{1}{B}")); // Whenever a Goblin or Rogue you control deals combat damage to a player, if Auntie's Snitch is in your graveyard, you may return Auntie's Snitch to your hand. this.addAbility(new AuntiesSnitchTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/cards/e/EarwigSquad.java b/Mage.Sets/src/mage/cards/e/EarwigSquad.java index 8af66926dc1..e7995597c2f 100644 --- a/Mage.Sets/src/mage/cards/e/EarwigSquad.java +++ b/Mage.Sets/src/mage/cards/e/EarwigSquad.java @@ -30,7 +30,7 @@ public final class EarwigSquad extends CardImpl { this.toughness = new MageInt(3); // Prowl {2}{B} - this.addAbility(new ProwlAbility(this, "{2}{B}")); + this.addAbility(new ProwlAbility("{2}{B}")); // When Earwig Squad enters the battlefield, if its prowl cost was paid, search target opponent's library for three cards and exile them. Then that player shuffles their library. Ability ability = new ConditionalInterveningIfTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/e/EnigmaThief.java b/Mage.Sets/src/mage/cards/e/EnigmaThief.java index dfa58772a56..f6f0482af51 100644 --- a/Mage.Sets/src/mage/cards/e/EnigmaThief.java +++ b/Mage.Sets/src/mage/cards/e/EnigmaThief.java @@ -35,7 +35,7 @@ public final class EnigmaThief extends CardImpl { this.toughness = new MageInt(5); // Prowl {3}{U} - this.addAbility(new ProwlAbility(this, "{3}{U}")); + this.addAbility(new ProwlAbility("{3}{U}")); // Flying this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/h/HuntingVelociraptor.java b/Mage.Sets/src/mage/cards/h/HuntingVelociraptor.java index 0caed45db44..e2fd71deb62 100644 --- a/Mage.Sets/src/mage/cards/h/HuntingVelociraptor.java +++ b/Mage.Sets/src/mage/cards/h/HuntingVelociraptor.java @@ -4,8 +4,6 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledSpellsEffect; -import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; -import mage.abilities.keyword.ConvokeAbility; import mage.abilities.keyword.ProwlAbility; import mage.constants.SubType; import mage.abilities.keyword.FirstStrikeAbility; @@ -14,9 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.common.FilterArtifactCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.AbilityPredicate; /** * @@ -45,7 +41,7 @@ public final class HuntingVelociraptor extends CardImpl { // Based on Chief Engineer this.addAbility(new SimpleStaticAbility( Zone.BATTLEFIELD, - new GainAbilityControlledSpellsEffect(new ProwlAbility(null, "{2}{R}"), filter) + new GainAbilityControlledSpellsEffect(new ProwlAbility("{2}{R}"), filter) )); } diff --git a/Mage.Sets/src/mage/cards/k/KnowledgeExploitation.java b/Mage.Sets/src/mage/cards/k/KnowledgeExploitation.java index fb793d9e96b..20edcd03308 100644 --- a/Mage.Sets/src/mage/cards/k/KnowledgeExploitation.java +++ b/Mage.Sets/src/mage/cards/k/KnowledgeExploitation.java @@ -28,7 +28,7 @@ public final class KnowledgeExploitation extends CardImpl { this.subtype.add(SubType.ROGUE); // Prowl {3}{U} - this.addAbility(new ProwlAbility(this, "{3}{U}")); + this.addAbility(new ProwlAbility("{3}{U}")); // Search target opponent's library for an instant or sorcery card. // You may cast that card without paying its mana cost. diff --git a/Mage.Sets/src/mage/cards/l/LatchkeyFaerie.java b/Mage.Sets/src/mage/cards/l/LatchkeyFaerie.java index fe6d1c58b32..d9f555af17a 100644 --- a/Mage.Sets/src/mage/cards/l/LatchkeyFaerie.java +++ b/Mage.Sets/src/mage/cards/l/LatchkeyFaerie.java @@ -32,7 +32,7 @@ public final class LatchkeyFaerie extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Prowl {2}{U} - this.addAbility(new ProwlAbility(this, "{2}{U}")); + this.addAbility(new ProwlAbility("{2}{U}")); // When Latchkey Faerie enters the battlefield, if its prowl cost was paid, draw a card. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false); diff --git a/Mage.Sets/src/mage/cards/m/MorselTheft.java b/Mage.Sets/src/mage/cards/m/MorselTheft.java index b7d44d5c208..3ec9b0c9299 100644 --- a/Mage.Sets/src/mage/cards/m/MorselTheft.java +++ b/Mage.Sets/src/mage/cards/m/MorselTheft.java @@ -26,7 +26,7 @@ public final class MorselTheft extends CardImpl { this.subtype.add(SubType.ROGUE); // Prowl {1}{B} - this.addAbility(new ProwlAbility(this, "{1}{B}")); + this.addAbility(new ProwlAbility("{1}{B}")); // Target player loses 3 life and you gain 3 life. If Morsel Theft's prowl cost was paid, draw a card. getSpellAbility().addEffect(new LoseLifeTargetEffect(3)); diff --git a/Mage.Sets/src/mage/cards/n/NogginWhack.java b/Mage.Sets/src/mage/cards/n/NogginWhack.java index 0fe907b49d2..6440246f8b1 100644 --- a/Mage.Sets/src/mage/cards/n/NogginWhack.java +++ b/Mage.Sets/src/mage/cards/n/NogginWhack.java @@ -20,7 +20,7 @@ public final class NogginWhack extends CardImpl { this.subtype.add(SubType.ROGUE); // Prowl {1}{B} - this.addAbility(new ProwlAbility(this, "{1}{B}")); + this.addAbility(new ProwlAbility("{1}{B}")); // Target player reveals three cards from their hand. You choose two of them. That player discards those cards. this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(2, 3)); this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/n/NotoriousThrong.java b/Mage.Sets/src/mage/cards/n/NotoriousThrong.java index cf9616038b5..f7a2f8ab118 100644 --- a/Mage.Sets/src/mage/cards/n/NotoriousThrong.java +++ b/Mage.Sets/src/mage/cards/n/NotoriousThrong.java @@ -31,7 +31,7 @@ public final class NotoriousThrong extends CardImpl { this.subtype.add(SubType.ROGUE); // Prowl {5}{U} - this.addAbility(new ProwlAbility(this, "{5}{U}")); + this.addAbility(new ProwlAbility("{5}{U}")); // create X 1/1 black Faerie Rogue creature tokens with flying, where X is the damage dealt to your opponents this turn. this.getSpellAbility().addEffect(new NotoriousThrongEffect()); diff --git a/Mage.Sets/src/mage/cards/s/StinkdrinkerBandit.java b/Mage.Sets/src/mage/cards/s/StinkdrinkerBandit.java index 1631782334a..1a213fca9f0 100644 --- a/Mage.Sets/src/mage/cards/s/StinkdrinkerBandit.java +++ b/Mage.Sets/src/mage/cards/s/StinkdrinkerBandit.java @@ -39,7 +39,7 @@ public final class StinkdrinkerBandit extends CardImpl { this.toughness = new MageInt(1); // Prowl {1}, {B} (You may cast this for its prowl cost if you dealt combat damage to a player this turn with a Goblin or Rogue.) - this.addAbility(new ProwlAbility(this, "{1}{B}")); + this.addAbility(new ProwlAbility("{1}{B}")); // Whenever a Rogue you control attacks and isn't blocked, it gets +2/+1 until end of turn. this.addAbility(new StinkdrinkerBanditTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/t/ThievesFortune.java b/Mage.Sets/src/mage/cards/t/ThievesFortune.java index 7c1a96d588a..49d03ad88de 100644 --- a/Mage.Sets/src/mage/cards/t/ThievesFortune.java +++ b/Mage.Sets/src/mage/cards/t/ThievesFortune.java @@ -20,7 +20,7 @@ public final class ThievesFortune extends CardImpl { this.subtype.add(SubType.ROGUE); // Prowl {U} - this.addAbility(new ProwlAbility(this, "{U}")); + this.addAbility(new ProwlAbility("{U}")); // Look at the top four cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order. this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect(4, 1, PutCards.HAND, PutCards.BOTTOM_ANY)); diff --git a/Mage/src/main/java/mage/abilities/keyword/ProwlAbility.java b/Mage/src/main/java/mage/abilities/keyword/ProwlAbility.java index 6f07461b717..9856ae3034d 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ProwlAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ProwlAbility.java @@ -4,7 +4,6 @@ import mage.abilities.Ability; import mage.abilities.condition.common.ProwlCondition; import mage.abilities.costs.AlternativeSourceCostsImpl; import mage.abilities.hint.common.ProwlHint; -import mage.cards.Card; import mage.game.Game; import mage.watchers.common.ProwlWatcher; @@ -23,11 +22,11 @@ import mage.watchers.common.ProwlWatcher; public class ProwlAbility extends AlternativeSourceCostsImpl { private static final String PROWL_KEYWORD = "Prowl"; - private static final String reminderText = "You may cast this for its prowl cost if you dealt combat damage to a " + private static final String PROWL_REMINDER = "You may cast this for its prowl cost if you dealt combat damage to a " + "player this turn with a creature that shared a creature type with {this}"; - public ProwlAbility(Card card, String manaString) { - super(PROWL_KEYWORD, reminderText, manaString); + public ProwlAbility(String manaString) { + super(PROWL_KEYWORD, PROWL_REMINDER, manaString); this.setRuleAtTheTop(true); this.addWatcher(new ProwlWatcher()); this.addHint(ProwlHint.instance);