From 37722a58c2fba0ef8adccdb13dce7cdddef5103e Mon Sep 17 00:00:00 2001 From: xenohedron Date: Wed, 29 Nov 2023 20:32:36 -0500 Subject: [PATCH] more watcher cleanup --- Mage.Sets/src/mage/cards/d/DampingSphere.java | 2 +- Mage.Sets/src/mage/cards/e/ErtaisScorn.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheMind.java | 2 +- Mage.Sets/src/mage/cards/r/RevengeStarWars.java | 2 -- Mage.Sets/src/mage/cards/r/RowanScionOfWar.java | 3 +-- Mage.Sets/src/mage/cards/v/VancesBlastingCannons.java | 2 +- .../mage/abilities/common/CastSecondSpellTriggeredAbility.java | 3 +-- .../java/mage/watchers/common/CastSpellLastTurnWatcher.java | 3 +++ Mage/src/main/java/mage/watchers/common/MorbidWatcher.java | 3 +++ .../main/java/mage/watchers/common/PlayerLostLifeWatcher.java | 3 +++ 10 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DampingSphere.java b/Mage.Sets/src/mage/cards/d/DampingSphere.java index 85ec52afbd9..21e9b2a2ad6 100644 --- a/Mage.Sets/src/mage/cards/d/DampingSphere.java +++ b/Mage.Sets/src/mage/cards/d/DampingSphere.java @@ -34,7 +34,7 @@ public final class DampingSphere extends CardImpl { this.addAbility(new SimpleStaticAbility(new DampingSphereReplacementEffect())); // Each spell a player casts costs {1} more to cast for each other spell that player has cast this turn. - this.addAbility(new SimpleStaticAbility(new DampingSphereIncreasementAllEffect()), new CastSpellLastTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new DampingSphereIncreasementAllEffect())); } private DampingSphere(final DampingSphere card) { diff --git a/Mage.Sets/src/mage/cards/e/ErtaisScorn.java b/Mage.Sets/src/mage/cards/e/ErtaisScorn.java index 478f61bf52c..22ff09843b2 100644 --- a/Mage.Sets/src/mage/cards/e/ErtaisScorn.java +++ b/Mage.Sets/src/mage/cards/e/ErtaisScorn.java @@ -32,7 +32,7 @@ public final class ErtaisScorn extends CardImpl { new ManaCostsImpl<>("{U}"), ErtaisScornCondition.instance ) - ).setRuleAtTheTop(true), new CastSpellLastTurnWatcher()); + ).setRuleAtTheTop(true)); // Counter target spell. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheMind.java b/Mage.Sets/src/mage/cards/m/MagusOfTheMind.java index 657582f7874..de973a9816c 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheMind.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheMind.java @@ -37,7 +37,7 @@ public final class MagusOfTheMind extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MagusOfTheMindEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - this.addAbility(ability, new CastSpellLastTurnWatcher()); + this.addAbility(ability); } private MagusOfTheMind(final MagusOfTheMind card) { diff --git a/Mage.Sets/src/mage/cards/r/RevengeStarWars.java b/Mage.Sets/src/mage/cards/r/RevengeStarWars.java index 6434524b848..b13bd4461b0 100644 --- a/Mage.Sets/src/mage/cards/r/RevengeStarWars.java +++ b/Mage.Sets/src/mage/cards/r/RevengeStarWars.java @@ -40,8 +40,6 @@ public final class RevengeStarWars extends CardImpl { this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addTarget(new TargetOpponentsCreaturePermanent()); - this.getSpellAbility().addWatcher(new PlayerLostLifeWatcher()); - } private RevengeStarWars(final RevengeStarWars card) { diff --git a/Mage.Sets/src/mage/cards/r/RowanScionOfWar.java b/Mage.Sets/src/mage/cards/r/RowanScionOfWar.java index 880baa8e242..020ed82407b 100644 --- a/Mage.Sets/src/mage/cards/r/RowanScionOfWar.java +++ b/Mage.Sets/src/mage/cards/r/RowanScionOfWar.java @@ -40,8 +40,7 @@ public final class RowanScionOfWar extends CardImpl { new ActivateAsSorceryActivatedAbility( new RowanScionOfWarEffect(), new TapSourceCost() - ).addHint(ControllerLostLifeCount.getHint()), - new PlayerLostLifeWatcher() + ).addHint(ControllerLostLifeCount.getHint()) ); } diff --git a/Mage.Sets/src/mage/cards/v/VancesBlastingCannons.java b/Mage.Sets/src/mage/cards/v/VancesBlastingCannons.java index 19cefafbc3f..c088e5696f4 100644 --- a/Mage.Sets/src/mage/cards/v/VancesBlastingCannons.java +++ b/Mage.Sets/src/mage/cards/v/VancesBlastingCannons.java @@ -44,7 +44,7 @@ public final class VancesBlastingCannons extends CardImpl { // Whenever you cast your third spell in a turn, transform Vance's Blasting Cannons. this.addAbility(new TransformAbility()); - this.addAbility(new VancesBlastingCannonsFlipTrigger(), new CastSpellLastTurnWatcher()); + this.addAbility(new VancesBlastingCannonsFlipTrigger()); } private VancesBlastingCannons(final VancesBlastingCannons card) { diff --git a/Mage/src/main/java/mage/abilities/common/CastSecondSpellTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/CastSecondSpellTriggeredAbility.java index 59e21abf841..d3918d0dfa6 100644 --- a/Mage/src/main/java/mage/abilities/common/CastSecondSpellTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/CastSecondSpellTriggeredAbility.java @@ -46,7 +46,6 @@ public class CastSecondSpellTriggeredAbility extends TriggeredAbilityImpl { public CastSecondSpellTriggeredAbility(Zone zone, Effect effect, TargetController targetController, boolean optional, SetTargetPointer setTargetPointer) { super(zone, effect, optional); - this.addWatcher(new CastSpellLastTurnWatcher()); if (targetController == TargetController.YOU) { this.addHint(hint); } @@ -147,4 +146,4 @@ enum SpellCastValue implements DynamicValue { public String getMessage() { return ""; } -} \ No newline at end of file +} diff --git a/Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java index 5a6ec9fbecb..399c0af8d23 100644 --- a/Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java @@ -19,6 +19,9 @@ public class CastSpellLastTurnWatcher extends Watcher { private int activePlayerPrevTurnCount = 0; private int activePlayerThisTurnCount = 0; + /** + * Game default watcher + */ public CastSpellLastTurnWatcher() { super(WatcherScope.GAME); } diff --git a/Mage/src/main/java/mage/watchers/common/MorbidWatcher.java b/Mage/src/main/java/mage/watchers/common/MorbidWatcher.java index 7f500cbb596..e3713c14c33 100644 --- a/Mage/src/main/java/mage/watchers/common/MorbidWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/MorbidWatcher.java @@ -13,6 +13,9 @@ import mage.watchers.Watcher; */ public class MorbidWatcher extends Watcher { + /** + * Game default watcher + */ public MorbidWatcher() { super(WatcherScope.GAME); } diff --git a/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java index 9ba85f84b6e..89c03aeda2a 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java @@ -21,6 +21,9 @@ public class PlayerLostLifeWatcher extends Watcher { private final Map amountOfLifeLostThisTurn = new HashMap<>(); private final Map amountOfLifeLostLastTurn = new HashMap<>(); + /** + * Game default watcher + */ public PlayerLostLifeWatcher() { super(WatcherScope.GAME); }