From 147b502a95de27b8a0a6b9110c21149bd4294784 Mon Sep 17 00:00:00 2001 From: Susucre <34709007+Susucre@users.noreply.github.com> Date: Thu, 28 Mar 2024 18:48:46 +0100 Subject: [PATCH] Cleanup unecessary argument for PlotAbility. Will make merging the plot branch a little easier. --- Mage.Sets/src/mage/cards/b/BeastbondOutcaster.java | 2 +- Mage.Sets/src/mage/cards/b/BrimstoneRoundup.java | 2 +- Mage.Sets/src/mage/cards/c/CunningCoyote.java | 2 +- Mage.Sets/src/mage/cards/d/DjinnOfFoolsFall.java | 2 +- Mage.Sets/src/mage/cards/i/IrascibleWolverine.java | 2 +- Mage.Sets/src/mage/cards/l/LoanShark.java | 2 +- Mage.Sets/src/mage/cards/o/OutcasterTrailblazer.java | 2 +- Mage.Sets/src/mage/cards/p/PlanTheHeist.java | 2 +- Mage.Sets/src/mage/cards/s/SlickshotShowOff.java | 2 +- Mage.Sets/src/mage/cards/s/StingerbackTerror.java | 2 +- Mage.Sets/src/mage/cards/u/UnscrupulousContractor.java | 2 +- Mage/src/main/java/mage/abilities/keyword/PlotAbility.java | 2 +- Utils/keywords.txt | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BeastbondOutcaster.java b/Mage.Sets/src/mage/cards/b/BeastbondOutcaster.java index 31fd350bba1..e94e6fa3e56 100644 --- a/Mage.Sets/src/mage/cards/b/BeastbondOutcaster.java +++ b/Mage.Sets/src/mage/cards/b/BeastbondOutcaster.java @@ -35,7 +35,7 @@ public final class BeastbondOutcaster extends CardImpl { ).addHint(FerociousHint.instance)); // Plot {1}{G} - this.addAbility(new PlotAbility(this, "{1}{G}")); + this.addAbility(new PlotAbility("{1}{G}")); } private BeastbondOutcaster(final BeastbondOutcaster card) { diff --git a/Mage.Sets/src/mage/cards/b/BrimstoneRoundup.java b/Mage.Sets/src/mage/cards/b/BrimstoneRoundup.java index f0a2d5e0b22..1a8021e8895 100644 --- a/Mage.Sets/src/mage/cards/b/BrimstoneRoundup.java +++ b/Mage.Sets/src/mage/cards/b/BrimstoneRoundup.java @@ -22,7 +22,7 @@ public final class BrimstoneRoundup extends CardImpl { this.addAbility(new CastSecondSpellTriggeredAbility(new CreateTokenEffect(new MercenaryToken()))); // Plot {2}{R} - this.addAbility(new PlotAbility(this, "{2}{R}")); + this.addAbility(new PlotAbility("{2}{R}")); } private BrimstoneRoundup(final BrimstoneRoundup card) { diff --git a/Mage.Sets/src/mage/cards/c/CunningCoyote.java b/Mage.Sets/src/mage/cards/c/CunningCoyote.java index d270c1c2578..97e1d5fc200 100644 --- a/Mage.Sets/src/mage/cards/c/CunningCoyote.java +++ b/Mage.Sets/src/mage/cards/c/CunningCoyote.java @@ -40,7 +40,7 @@ public final class CunningCoyote extends CardImpl { this.addAbility(ability); // Plot {1}{R} - this.addAbility(new PlotAbility(this, "{1}{R}")); + this.addAbility(new PlotAbility("{1}{R}")); } private CunningCoyote(final CunningCoyote card) { diff --git a/Mage.Sets/src/mage/cards/d/DjinnOfFoolsFall.java b/Mage.Sets/src/mage/cards/d/DjinnOfFoolsFall.java index 1d958b5fa5a..c17e9e66dff 100644 --- a/Mage.Sets/src/mage/cards/d/DjinnOfFoolsFall.java +++ b/Mage.Sets/src/mage/cards/d/DjinnOfFoolsFall.java @@ -26,7 +26,7 @@ public final class DjinnOfFoolsFall extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Plot {3}{U} - this.addAbility(new PlotAbility(this, "{3}{U}")); + this.addAbility(new PlotAbility("{3}{U}")); } private DjinnOfFoolsFall(final DjinnOfFoolsFall card) { diff --git a/Mage.Sets/src/mage/cards/i/IrascibleWolverine.java b/Mage.Sets/src/mage/cards/i/IrascibleWolverine.java index 2d5983e564e..ce1f26af64c 100644 --- a/Mage.Sets/src/mage/cards/i/IrascibleWolverine.java +++ b/Mage.Sets/src/mage/cards/i/IrascibleWolverine.java @@ -28,7 +28,7 @@ public final class IrascibleWolverine extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ExileTopXMayPlayUntilEffect(1, Duration.EndOfTurn))); // Plot {2}{R} - this.addAbility(new PlotAbility(this, "{2}{R}")); + this.addAbility(new PlotAbility("{2}{R}")); } private IrascibleWolverine(final IrascibleWolverine card) { diff --git a/Mage.Sets/src/mage/cards/l/LoanShark.java b/Mage.Sets/src/mage/cards/l/LoanShark.java index 607539083cc..dd1a1b33d73 100644 --- a/Mage.Sets/src/mage/cards/l/LoanShark.java +++ b/Mage.Sets/src/mage/cards/l/LoanShark.java @@ -38,7 +38,7 @@ public final class LoanShark extends CardImpl { ).addHint(StormAbility.getHint())); // Plot {3}{U} - this.addAbility(new PlotAbility(this, "{3}{U}")); + this.addAbility(new PlotAbility("{3}{U}")); } private LoanShark(final LoanShark card) { diff --git a/Mage.Sets/src/mage/cards/o/OutcasterTrailblazer.java b/Mage.Sets/src/mage/cards/o/OutcasterTrailblazer.java index aee3b1ad6d5..fe76848df61 100644 --- a/Mage.Sets/src/mage/cards/o/OutcasterTrailblazer.java +++ b/Mage.Sets/src/mage/cards/o/OutcasterTrailblazer.java @@ -46,7 +46,7 @@ public final class OutcasterTrailblazer extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new DrawCardSourceControllerEffect(1), filter)); // Plot {2}{G} - this.addAbility(new PlotAbility(this, "{2}{G}")); + this.addAbility(new PlotAbility("{2}{G}")); } private OutcasterTrailblazer(final OutcasterTrailblazer card) { diff --git a/Mage.Sets/src/mage/cards/p/PlanTheHeist.java b/Mage.Sets/src/mage/cards/p/PlanTheHeist.java index 944171ff6fc..87f12f38e79 100644 --- a/Mage.Sets/src/mage/cards/p/PlanTheHeist.java +++ b/Mage.Sets/src/mage/cards/p/PlanTheHeist.java @@ -27,7 +27,7 @@ public final class PlanTheHeist extends CardImpl { this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3).concatBy("Then")); // Plot {3}{U} - this.addAbility(new PlotAbility(this, "{3}{U}")); + this.addAbility(new PlotAbility("{3}{U}")); } private PlanTheHeist(final PlanTheHeist card) { diff --git a/Mage.Sets/src/mage/cards/s/SlickshotShowOff.java b/Mage.Sets/src/mage/cards/s/SlickshotShowOff.java index 33950d08a45..979c21fec93 100644 --- a/Mage.Sets/src/mage/cards/s/SlickshotShowOff.java +++ b/Mage.Sets/src/mage/cards/s/SlickshotShowOff.java @@ -41,7 +41,7 @@ public final class SlickshotShowOff extends CardImpl { )); // Plot {1}{R} - this.addAbility(new PlotAbility(this, "{1}{R}")); + this.addAbility(new PlotAbility("{1}{R}")); } private SlickshotShowOff(final SlickshotShowOff card) { diff --git a/Mage.Sets/src/mage/cards/s/StingerbackTerror.java b/Mage.Sets/src/mage/cards/s/StingerbackTerror.java index ee1540cdfe1..8c6be9699be 100644 --- a/Mage.Sets/src/mage/cards/s/StingerbackTerror.java +++ b/Mage.Sets/src/mage/cards/s/StingerbackTerror.java @@ -45,7 +45,7 @@ public final class StingerbackTerror extends CardImpl { ))); // Plot {2}{R} - this.addAbility(new PlotAbility(this, "{2}{R}")); + this.addAbility(new PlotAbility("{2}{R}")); } private StingerbackTerror(final StingerbackTerror card) { diff --git a/Mage.Sets/src/mage/cards/u/UnscrupulousContractor.java b/Mage.Sets/src/mage/cards/u/UnscrupulousContractor.java index 0037edbb847..990f8461acb 100644 --- a/Mage.Sets/src/mage/cards/u/UnscrupulousContractor.java +++ b/Mage.Sets/src/mage/cards/u/UnscrupulousContractor.java @@ -40,7 +40,7 @@ public final class UnscrupulousContractor extends CardImpl { ))); // Plot {2}{B} - this.addAbility(new PlotAbility(this, "{2}{B}")); + this.addAbility(new PlotAbility("{2}{B}")); } private UnscrupulousContractor(final UnscrupulousContractor card) { diff --git a/Mage/src/main/java/mage/abilities/keyword/PlotAbility.java b/Mage/src/main/java/mage/abilities/keyword/PlotAbility.java index b76a1f0a3b2..3281ac820cd 100644 --- a/Mage/src/main/java/mage/abilities/keyword/PlotAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/PlotAbility.java @@ -13,7 +13,7 @@ import mage.constants.Zone; */ public class PlotAbility extends SpecialAction { - public PlotAbility(Card card, String plotCost) { + public PlotAbility(String plotCost) { super(Zone.HAND); this.addCost(new ManaCostsImpl<>(plotCost)); this.setTiming(TimingRule.SORCERY); diff --git a/Utils/keywords.txt b/Utils/keywords.txt index 100b37cb3e3..5b6f4bdd061 100644 --- a/Utils/keywords.txt +++ b/Utils/keywords.txt @@ -95,7 +95,7 @@ Persist|new| Phasing|instance| Plainscycling|cost| Plainswalk|new| -Plot|card, manaString| +Plot|manaString| Poisonous|number| Prototype|card, manaString| Provoke|new|