From 632573fc3e8ff6ec70f4ca7439fe67965b2e4100 Mon Sep 17 00:00:00 2001 From: betasteward Date: Sun, 1 Mar 2015 21:17:23 -0500 Subject: [PATCH] moved Watchers to Ability and moved Counters to CardState --- Mage.Common/src/mage/view/CardView.java | 17 ++- Mage.Common/src/mage/view/GameView.java | 2 +- Mage.Common/src/mage/view/PermanentView.java | 2 +- .../mage/sets/alarareborn/MaelstromNexus.java | 3 +- .../sets/alarareborn/PredatoryAdvantage.java | 3 +- .../alarareborn/UnscytheKillerOfKings.java | 3 +- .../mage/sets/avacynrestored/Aggravate.java | 2 +- .../sets/avacynrestored/CavernOfSouls.java | 3 +- .../sets/avacynrestored/PillarOfFlame.java | 1 + .../betrayersofkamigawa/GoblinCohort.java | 3 +- .../betrayersofkamigawa/KumanosBlessing.java | 4 +- .../bornofthegods/EpharaGodOfThePolis.java | 4 +- .../bornofthegods/SpiritOfTheLabyrinth.java | 3 +- .../championsofkamigawa/AshenSkinZubera.java | 3 +- .../BoseijuWhoSheltersAll.java | 3 +- .../DrippingTongueZubera.java | 3 +- .../championsofkamigawa/EmberFistZubera.java | 3 +- .../FloatingDreamZubera.java | 3 +- .../championsofkamigawa/Frostwielder.java | 3 +- .../HallOfTheBanditLord.java | 4 +- .../KumanoMasterYamabushi.java | 3 +- .../championsofkamigawa/KumanosPupils.java | 3 +- .../MyojinOfCleansingFire.java | 2 +- .../MyojinOfInfiniteRage.java | 2 +- .../championsofkamigawa/MyojinOfLifesWeb.java | 2 +- .../MyojinOfNightsReach.java | 2 +- .../MyojinOfSeeingWinds.java | 2 +- .../championsofkamigawa/SiftThroughSands.java | 2 +- .../SilentChantZubera.java | 3 +- .../championsofkamigawa/YamabushisFlame.java | 2 + .../championsofkamigawa/YamabushisStorm.java | 1 + .../mage/sets/coldsnap/FuryOfTheHorde.java | 2 +- .../mage/sets/coldsnap/LightningStorm.java | 2 +- .../src/mage/sets/commander/CourtHussar.java | 3 +- .../sets/commander/KaradorGhostChieftain.java | 3 +- .../sets/commander2013/AzoriusHerald.java | 3 +- .../mage/sets/commander2013/FellShepherd.java | 3 +- .../commander2013/JelevaNephaliasScourge.java | 3 +- .../mage/sets/commander2013/OpalPalace.java | 3 +- .../commander2014/AngelOfTheDireHour.java | 3 +- .../commander2014/BreachingLeviathan.java | 3 +- .../sets/commander2014/ContainmentPriest.java | 3 +- .../sets/commander2014/ImpactResonance.java | 2 +- .../sets/commander2014/SpoilsOfBlood.java | 2 +- .../sets/darkascension/DungeonGeists.java | 3 +- .../src/mage/sets/darksteel/Flamebreak.java | 2 +- .../mage/sets/dissension/CryptChampion.java | 3 +- .../mage/sets/dissension/PatagiaViper.java | 3 +- .../sets/divinevsdemonic/ReiverDemon.java | 3 +- .../mage/sets/dragonsmaze/NotionThief.java | 3 +- .../sets/dragonsmaze/RestoreThePeace.java | 2 +- .../sets/dragonsmaze/ScionOfVituGhazi.java | 4 +- .../src/mage/sets/eventide/BatwingBrume.java | 2 +- .../mage/sets/eventide/CankerousThirst.java | 2 +- .../src/mage/sets/eventide/DreamThief.java | 3 +- .../mage/sets/eventide/GroundlingPouncer.java | 3 +- .../mage/sets/eventide/HotheadedGiant.java | 3 +- .../mage/sets/eventide/InvertTheSkies.java | 2 +- .../src/mage/sets/eventide/Moonhold.java | 2 +- .../src/mage/sets/eventide/SoulReap.java | 2 +- .../mage/sets/eventide/TalarasBattalion.java | 3 +- .../mage/sets/eventide/UnnervingAssault.java | 2 +- .../mage/sets/eventide/WavesOfAggression.java | 2 +- .../fatereforged/SoulfireGrandMaster.java | 3 +- .../mage/sets/fifthedition/SylvanLibrary.java | 4 +- .../mage/sets/fourthedition/SirensCall.java | 2 +- .../sets/futuresight/PatriciansScorn.java | 3 +- .../mage/sets/futuresight/RiverOfTears.java | 6 +- .../mage/sets/futuresight/ScoutsWarning.java | 2 +- .../src/mage/sets/gatecrash/AureliasFury.java | 2 +- .../sets/gatecrash/ExecutionersSwing.java | 2 +- .../sets/gatecrash/IncursionSpecialist.java | 3 +- .../src/mage/sets/guildpact/Quicken.java | 2 +- .../sets/guildpact/TinStreetHooligan.java | 3 +- .../src/mage/sets/iceage/TinderWall.java | 5 +- .../mage/sets/innistrad/CivilizedScholar.java | 3 +- .../mage/sets/khansoftarkir/ArrowStorm.java | 2 +- .../khansoftarkir/BellowingSaddlebrute.java | 3 +- .../khansoftarkir/BloodsoakedChampion.java | 3 +- .../sets/khansoftarkir/HowlOfTheHorde.java | 2 +- .../sets/khansoftarkir/MarduHeartPiercer.java | 3 +- .../sets/khansoftarkir/MarduHordechief.java | 5 +- .../sets/khansoftarkir/MarduSkullhunter.java | 3 +- .../sets/khansoftarkir/MarduWarshrieker.java | 4 +- .../sets/khansoftarkir/TimelyHordemate.java | 3 +- .../sets/khansoftarkir/WarNameAspirant.java | 4 +- .../mage/sets/khansoftarkir/WingmateRoc.java | 4 +- .../sets/legends/ChainsOfMephistopheles.java | 3 +- .../src/mage/sets/limitedalpha/Berserk.java | 5 +- .../mage/sets/limitedalpha/Disintegrate.java | 7 +- .../src/mage/sets/lorwyn/SpinerockKnoll.java | 3 +- .../mage/sets/lorwyn/WindbriskHeights.java | 4 +- .../mage/sets/magic2011/AngelicArbiter.java | 3 +- .../src/mage/sets/magic2013/FaithsReward.java | 2 +- .../mage/sets/magic2014/AngelicAccord.java | 3 +- .../src/mage/sets/magic2014/GrimReturn.java | 2 +- .../mage/sets/magic2014/SavageSummoning.java | 2 +- .../mage/sets/magic2014/TidebinderMage.java | 3 +- .../mage/sets/magic2014/VoraciousWurm.java | 4 +- .../mage/sets/magic2015/FirstResponse.java | 4 +- .../mage/sets/magic2015/GeneratorServant.java | 3 +- .../src/mage/sets/magic2015/TheChainVeil.java | 3 +- .../mage/sets/mirage/AsmiraHolyAvenger.java | 3 +- .../src/mage/sets/mirrodin/SecondSunrise.java | 2 +- .../sets/mirrodinbesieged/RedSunsZenith.java | 2 +- .../mage/sets/modernmasters/Epochrasite.java | 5 +- .../sets/modernmasters/RiftElemental.java | 14 +- .../mage/sets/modernmasters/Riftsweeper.java | 2 +- .../sets/newphyrexia/CathedralMembrane.java | 3 +- .../src/mage/sets/newphyrexia/FreshMeat.java | 2 +- .../sets/returntoravnica/AvengingArrow.java | 2 +- .../riseoftheeldrazi/CastThroughTime.java | 3 +- .../mage/sets/riseoftheeldrazi/Vengevine.java | 3 +- .../sets/riseoftheeldrazi/WorldAtWar.java | 4 +- .../sets/saviorsofkamigawa/InameAsOne.java | 3 +- .../saviorsofkamigawa/KuonOgreAscendant.java | 4 +- .../sets/scarsofmirrodin/FleshAllergy.java | 2 +- .../sets/scarsofmirrodin/MoltenPsyche.java | 2 +- .../sets/scarsofmirrodin/TunnelIgnus.java | 4 +- .../seventhedition/RelentlessAssault.java | 2 +- .../sets/shadowmoor/DawnglowInfusion.java | 2 +- .../mage/sets/shadowmoor/DreamSalvage.java | 2 +- .../src/mage/sets/shadowmoor/Firespout.java | 2 +- .../mage/sets/shadowmoor/ManaReflection.java | 3 +- .../mage/sets/shadowmoor/RepelIntruders.java | 2 +- .../src/mage/sets/shadowmoor/RiversGrasp.java | 2 +- .../sets/shadowmoor/TwilightShepherd.java | 3 +- .../shardsofalara/EtherswornCanonist.java | 3 +- .../mage/sets/shardsofalara/MagmaSpray.java | 2 + .../mage/sets/shardsofalara/Skeletonize.java | 2 +- .../sets/sorinvstibalt/TorrentOfSouls.java | 2 +- .../src/mage/sets/tempest/MoggConscripts.java | 3 +- Mage.Sets/src/mage/sets/tenth/Incinerate.java | 2 +- .../mage/sets/tenth/PhageTheUntouchable.java | 3 +- .../src/mage/sets/theros/AngerOfTheGods.java | 2 + .../src/mage/sets/theros/RageOfPurphoros.java | 2 +- .../mage/sets/theros/ShipbreakerKraken.java | 3 +- .../src/mage/sets/theros/TritonTactics.java | 2 +- .../mage/sets/timespiral/ChronatogTotem.java | 3 +- .../mage/sets/timespiral/GreaterGargadon.java | 2 +- .../sets/timespiral/JayaBallardTaskMage.java | 3 +- .../src/mage/sets/torment/Overmaster.java | 2 +- .../src/mage/sets/worldwake/Groundswell.java | 2 +- .../sets/worldwake/MysteriesOfTheDeep.java | 2 +- .../mage/sets/worldwake/PermafrostTrap.java | 2 +- .../mage/sets/worldwake/RefractionTrap.java | 2 +- .../mage/sets/worldwake/RestForTheWeary.java | 2 +- .../src/mage/sets/worldwake/RicochetTrap.java | 2 +- .../src/mage/sets/worldwake/SearingBlaze.java | 2 +- .../src/mage/sets/worldwake/TombHex.java | 2 +- .../src/mage/sets/zendikar/ArchiveTrap.java | 3 +- .../mage/sets/zendikar/ArchmageAscension.java | 3 +- .../mage/sets/zendikar/BalothCageTrap.java | 2 +- .../src/mage/sets/zendikar/CobraTrap.java | 2 +- Mage.Sets/src/mage/sets/zendikar/Gomazoa.java | 3 +- .../src/mage/sets/zendikar/InfernoTrap.java | 2 +- .../src/mage/sets/zendikar/LavaballTrap.java | 2 +- .../mage/sets/zendikar/LullmageMentor.java | 3 +- .../src/mage/sets/zendikar/MindbreakTrap.java | 2 +- .../mage/sets/zendikar/NeedlebiteTrap.java | 2 +- .../src/mage/sets/zendikar/RavenousTrap.java | 2 +- .../src/mage/sets/zendikar/RuneflareTrap.java | 2 +- .../src/mage/sets/zendikar/SummoningTrap.java | 2 +- .../src/mage/sets/zendikar/WhiplashTrap.java | 2 +- .../cards/abilities/keywords/CascadeTest.java | 73 +++++++++ .../test/cards/watchers/AggravateTest.java | 61 ++++++++ .../cards/watchers/AzoriusHeraldTest.java | 55 +++++++ .../mage/test/cards/watchers/BoseijuTest.java | 60 ++++++++ .../test/cards/watchers/DiesExiledTest.java | 141 ++++++++++++++++++ .../watchers/EpharaGodOfThePolisTest.java | 53 +++++++ .../test/cards/watchers/FellShepherdTest.java | 46 ++++++ .../cards/watchers/FuryOfTheHordeTest.java | 78 ++++++++++ .../test/cards/watchers/GoblinCohortTest.java | 53 +++++++ .../watchers/HallOfTheBanditLordTest.java | 55 +++++++ .../watchers/KaradorGhostChieftainTest.java | 74 +++++++++ .../test/cards/watchers/OvermasterTest.java | 66 ++++++++ .../cards/watchers/SiftThroughSandsTest.java | 82 ++++++++++ .../watchers/SpiritOfTheLabyrinthTest.java | 37 +++++ .../test/cards/watchers/TunnelIgnusTest.java | 38 +++++ .../watchers/UnscytheKillerOfKingsTest.java | 66 ++++++++ .../mage/test/cards/watchers/ZuberasTest.java | 70 +++++++++ Mage/src/mage/abilities/Ability.java | 4 + Mage/src/mage/abilities/AbilityImpl.java | 36 +++++ .../mage/abilities/TriggeredAbilities.java | 17 ++- .../common/SourceHasCounterCondition.java | 4 +- .../condition/common/SuspendedCondition.java | 2 +- .../common/ControllerGotLifeCount.java | 4 +- .../counter/RemoveCounterSourceEffect.java | 4 +- .../counter/RemoveCounterTargetEffect.java | 4 +- .../DealtDamageToCreatureBySourceDies.java | 1 - .../abilities/keyword/MiracleAbility.java | 2 +- .../mage/abilities/keyword/ProwlAbility.java | 2 +- .../abilities/keyword/SuspendAbility.java | 2 +- Mage/src/mage/cards/Card.java | 4 +- Mage/src/mage/cards/CardImpl.java | 37 ++--- Mage/src/mage/cards/SplitCard.java | 9 -- .../predicate/permanent/CounterPredicate.java | 2 +- Mage/src/mage/game/CardState.java | 64 ++++++++ Mage/src/mage/game/GameState.java | 39 ++++- Mage/src/mage/game/permanent/Permanent.java | 3 + .../mage/game/permanent/PermanentCard.java | 2 - .../mage/game/permanent/PermanentImpl.java | 21 +++ Mage/src/mage/game/stack/Spell.java | 12 +- Mage/src/mage/game/stack/StackAbility.java | 11 ++ 204 files changed, 1516 insertions(+), 347 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/AggravateTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/AzoriusHeraldTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/BoseijuTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/DiesExiledTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/EpharaGodOfThePolisTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/FellShepherdTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/FuryOfTheHordeTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/GoblinCohortTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/HallOfTheBanditLordTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/KaradorGhostChieftainTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/OvermasterTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/SiftThroughSandsTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/SpiritOfTheLabyrinthTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/TunnelIgnusTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/UnscytheKillerOfKingsTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/watchers/ZuberasTest.java create mode 100644 Mage/src/mage/game/CardState.java diff --git a/Mage.Common/src/mage/view/CardView.java b/Mage.Common/src/mage/view/CardView.java index 3de576a563a..61012447fb3 100644 --- a/Mage.Common/src/mage/view/CardView.java +++ b/Mage.Common/src/mage/view/CardView.java @@ -50,6 +50,7 @@ import mage.target.Targets; import java.util.ArrayList; import java.util.List; import java.util.UUID; +import mage.game.Game; /** * @author BetaSteward_at_googlemail.com @@ -116,21 +117,27 @@ public class CardView extends SimpleCardView { protected boolean canAttack; public CardView(Card card) { - this(card, null, false); + this(card, null, null, false); } public CardView(Card card, UUID cardId) { - this(card, null, false); + this(card, null, null, false); + this.id = cardId; + } + + public CardView(Card card, Game game, UUID cardId) { + this(card, game, null, false); this.id = cardId; } /** * * @param card + * @param game * @param cardId * @param controlled is the card view created for the card controller - used for morph / face down cards to know which player may see information for the card */ - public CardView(Card card, UUID cardId, boolean controlled) { + public CardView(Card card, Game game, UUID cardId, boolean controlled) { super(card.getId(), card.getExpansionSetCode(), card.getCardNumber(), card.isFaceDown(), card.getUsesVariousArt(), card.getTokenSetCode()); this.morphCard = card.isMorphCard(); // no information available for face down cards as long it's not a controlled face down morph card @@ -241,9 +248,9 @@ public class CardView extends SimpleCardView { this.rarity = card.getRarity(); this.isToken = false; } - if (card.getCounters() != null && !card.getCounters().isEmpty()) { + if (game != null && card.getCounters(game) != null && !card.getCounters(game).isEmpty()) { counters = new ArrayList<>(); - for (Counter counter: card.getCounters().values()) { + for (Counter counter: card.getCounters(game).values()) { counters.add(new CounterView(counter)); } } diff --git a/Mage.Common/src/mage/view/GameView.java b/Mage.Common/src/mage/view/GameView.java index bd6203a9ee6..02adfe140d5 100644 --- a/Mage.Common/src/mage/view/GameView.java +++ b/Mage.Common/src/mage/view/GameView.java @@ -136,7 +136,7 @@ public class GameView implements Serializable { } else { // Spell - stack.put(stackObject.getId(), new CardView((Spell)stackObject, null, stackObject.getControllerId().equals(createdForPlayerId))); + stack.put(stackObject.getId(), new CardView((Spell)stackObject, game, null, stackObject.getControllerId().equals(createdForPlayerId))); checkPaid(stackObject.getId(), (Spell)stackObject); } //stackOrder.add(stackObject.getId()); diff --git a/Mage.Common/src/mage/view/PermanentView.java b/Mage.Common/src/mage/view/PermanentView.java index 80451c02503..dfc3c49b89f 100644 --- a/Mage.Common/src/mage/view/PermanentView.java +++ b/Mage.Common/src/mage/view/PermanentView.java @@ -62,7 +62,7 @@ public class PermanentView extends CardView { private final boolean attachedToPermanent; public PermanentView(Permanent permanent, Card card, UUID createdForPlayerId, Game game) { - super(permanent, null, permanent.getControllerId().equals(createdForPlayerId)); + super(permanent, game, null, permanent.getControllerId().equals(createdForPlayerId)); this.controlled = permanent.getControllerId().equals(createdForPlayerId); this.rules = permanent.getRules(); this.tapped = permanent.isTapped(); diff --git a/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java b/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java index 4577cf84e1c..26c7043aec0 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java @@ -63,8 +63,7 @@ public class MaelstromNexus extends CardImpl { // The first spell you cast each turn has cascade. - this.addAbility(new MaelstromNexusTriggeredAbility()); - this.addWatcher(new FirstSpellCastThisTurnWatcher()); + this.addAbility(new MaelstromNexusTriggeredAbility(), new FirstSpellCastThisTurnWatcher()); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java b/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java index 8e366c2bd1d..db1ac697415 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java +++ b/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java @@ -61,8 +61,7 @@ public class PredatoryAdvantage extends CardImpl { // At the beginning of each opponent's end step, if that player didn't cast a creature spell this turn, put a 2/2 green Lizard creature token onto the battlefield. - this.addWatcher(new CastCreatureWatcher()); - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new LizardToken()), TargetController.OPPONENT, new DidNotCastCreatureCondition(), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new LizardToken()), TargetController.OPPONENT, new DidNotCastCreatureCondition(), false), new CastCreatureWatcher()); } public PredatoryAdvantage(final PredatoryAdvantage card) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java b/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java index f023f51eecf..593f2f6caf6 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java +++ b/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java @@ -79,8 +79,7 @@ public class UnscytheKillerOfKings extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // Whenever a creature dealt damage by equipped creature this turn dies, you may exile that card. If you do, put a 2/2 black Zombie creature token onto the battlefield. - this.addAbility(new UnscytheKillerOfKingsTriggeredAbility(new UnscytheEffect())); - this.addWatcher(new EquippedDidDamageWatcher()); + this.addAbility(new UnscytheKillerOfKingsTriggeredAbility(new UnscytheEffect()), new EquippedDidDamageWatcher()); // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), new TargetControlledCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java b/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java index 39f7d99f5e8..8cc82ddd44b 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java @@ -62,7 +62,7 @@ public class Aggravate extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // Each creature dealt damage this way attacks this turn if able. this.getSpellAbility().addEffect(new AggravateRequirementEffect()); - this.addWatcher(new DamagedByWatcher()); + this.getSpellAbility().addWatcher(new DamagedByWatcher()); } public Aggravate(final Aggravate card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java b/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java index 6a58f6f827c..ab7cb2ff74f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java @@ -79,8 +79,7 @@ public class CavernOfSouls extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {T}: Add one mana of any color to your mana pool. Spend this mana only to cast a creature spell of the chosen type, and that spell can't be countered. - this.addAbility(new ConditionalAnyColorManaAbility(1, new CavernOfSoulsManaBuilder())); - this.addWatcher(new CavernOfSoulsWatcher()); + this.addAbility(new ConditionalAnyColorManaAbility(1, new CavernOfSoulsManaBuilder()), new CavernOfSoulsWatcher()); this.addAbility(new SimpleStaticAbility(Zone.ALL, new CavernOfSoulsCantCounterEffect())); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java b/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java index e78afa5963e..c406072413d 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java @@ -62,6 +62,7 @@ public class PillarOfFlame extends CardImpl { this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // If a creature dealt damage this way would die this turn, exile it instead. this.getSpellAbility().addEffect(new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn)); + this.getSpellAbility().addWatcher(new DamagedByWatcher()); } public PillarOfFlame(final PillarOfFlame card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoblinCohort.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoblinCohort.java index ee8fa8cfcc4..0020b71fe7d 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoblinCohort.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoblinCohort.java @@ -63,8 +63,7 @@ public class GoblinCohort extends CardImpl { this.toughness = new MageInt(2); // Goblin Cohort can't attack unless you've cast a creature spell this turn. - this.addWatcher(new PlayerCastCreatureWatcher()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GoblinCohortEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GoblinCohortEffect()), new PlayerCastCreatureWatcher()); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java index f34d4711a08..440717fb7c6 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java @@ -77,8 +77,8 @@ public class KumanosBlessing extends CardImpl { this.addAbility(ability); // If a creature dealt damage by enchanted creature this turn would die, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KumanosBlessingEffect())); - this.addWatcher(new DamagedByEnchantedWatcher()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KumanosBlessingEffect()), new DamagedByEnchantedWatcher()); + } public KumanosBlessing(final KumanosBlessing card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/EpharaGodOfThePolis.java b/Mage.Sets/src/mage/sets/bornofthegods/EpharaGodOfThePolis.java index 3164e82d0fe..638e15f8af7 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/EpharaGodOfThePolis.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/EpharaGodOfThePolis.java @@ -78,8 +78,8 @@ public class EpharaGodOfThePolis extends CardImpl { this.addAbility(new ConditionalTriggeredAbility( new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), TargetController.ANY, false), HadAnotherCreatureEnterTheBattlefieldCondition.getInstance(), - "At the beginning of each upkeep, if you had another creature enter the battlefield under your control last turn, draw a card.")); - this.addWatcher(new CreatureEnteredBattlefieldLastTurnWatcher()); + "At the beginning of each upkeep, if you had another creature enter the battlefield under your control last turn, draw a card."), + new CreatureEnteredBattlefieldLastTurnWatcher()); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java b/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java index 8e76586676a..6ef2615db91 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java @@ -60,8 +60,7 @@ public class SpiritOfTheLabyrinth extends CardImpl { this.toughness = new MageInt(1); // Each player can't draw more than one card each turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpiritOfTheLabyrinthEffect())); - this.addWatcher(new SpiritOfTheLabyrinthWatcher()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpiritOfTheLabyrinthEffect()), new SpiritOfTheLabyrinthWatcher()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java index 7e1a8cce88c..007987b6a2a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java @@ -54,8 +54,7 @@ public class AshenSkinZubera extends CardImpl { this.toughness = new MageInt(2); Ability ability = new DiesTriggeredAbility(new DiscardTargetEffect(new ZuberasDiedDynamicValue())); ability.addTarget(new TargetOpponent()); - this.addAbility(ability); - this.addWatcher(new ZuberasDiedWatcher()); + this.addAbility(ability, new ZuberasDiedWatcher()); } public AshenSkinZubera(final AshenSkinZubera card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BoseijuWhoSheltersAll.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BoseijuWhoSheltersAll.java index fccbae3399a..0106881bacc 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BoseijuWhoSheltersAll.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BoseijuWhoSheltersAll.java @@ -75,8 +75,7 @@ public class BoseijuWhoSheltersAll extends CardImpl { ability.getEffects().get(0).setText("Add {1} to your mana pool. If that mana is spent on an instant or sorcery spell, that spell can't be countered by spells or abilities"); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoseijuWhoSheltersAllCantCounterEffect())); - this.addWatcher(new BoseijuWhoSheltersAllWatcher()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoseijuWhoSheltersAllCantCounterEffect()), new BoseijuWhoSheltersAllWatcher()); } public BoseijuWhoSheltersAll(final BoseijuWhoSheltersAll card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java index a3fa0cf25eb..bb22a0a3ff2 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java @@ -51,8 +51,7 @@ public class DrippingTongueZubera extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SpiritToken(), new ZuberasDiedDynamicValue()), false)); - this.addWatcher(new ZuberasDiedWatcher()); + this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SpiritToken(), new ZuberasDiedDynamicValue()), false), new ZuberasDiedWatcher()); } public DrippingTongueZubera (final DrippingTongueZubera card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java index e69b26c4c59..7478c844f2f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java @@ -55,8 +55,7 @@ public class EmberFistZubera extends CardImpl { this.toughness = new MageInt(2); Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(new ZuberasDiedDynamicValue())); ability.addTarget(new TargetCreatureOrPlayer()); - this.addAbility(ability); - this.addWatcher(new ZuberasDiedWatcher()); + this.addAbility(ability, new ZuberasDiedWatcher()); } public EmberFistZubera (final EmberFistZubera card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java index 025131fdc53..d5df6a4a5bf 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java @@ -60,8 +60,7 @@ public class FloatingDreamZubera extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(new ZuberasDiedDynamicValue()))); - this.addWatcher(new ZuberasDiedWatcher()); + this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(new ZuberasDiedDynamicValue())), new ZuberasDiedWatcher()); } public FloatingDreamZubera(final FloatingDreamZubera card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Frostwielder.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Frostwielder.java index 875ee4a044e..bc3c33da535 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Frostwielder.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Frostwielder.java @@ -42,6 +42,7 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import mage.watchers.common.DamagedByWatcher; /** * @author LevelX @@ -62,7 +63,7 @@ public class Frostwielder extends CardImpl { ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); // If a creature dealt damage by Frostwielder this turn would die, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HallOfTheBanditLord.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HallOfTheBanditLord.java index 9adb6f82e8e..e1c677e5385 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HallOfTheBanditLord.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HallOfTheBanditLord.java @@ -77,9 +77,7 @@ public class HallOfTheBanditLord extends CardImpl { effect.setText("Add {1} to your mana pool. If that mana is spent on a creature spell, it gains haste"); Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); ability.addCost(new PayLifeCost(3)); - this.addAbility(ability); - - this.addWatcher(new HallOfTheBanditLordWatcher(ability)); + this.addAbility(ability, new HallOfTheBanditLordWatcher(ability)); } public HallOfTheBanditLord(final HallOfTheBanditLord card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KumanoMasterYamabushi.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KumanoMasterYamabushi.java index 2066dbe12fb..1a79d2e802a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KumanoMasterYamabushi.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KumanoMasterYamabushi.java @@ -44,6 +44,7 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import mage.watchers.common.DamagedByWatcher; /** * @author LevelX @@ -65,7 +66,7 @@ public class KumanoMasterYamabushi extends CardImpl { ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); // If a creature dealt damage by Kumano this turn would die, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KumanosPupils.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KumanosPupils.java index 5fc1e349a0c..33bd9a6e64c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KumanosPupils.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KumanosPupils.java @@ -37,6 +37,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.constants.Zone; +import mage.watchers.common.DamagedByWatcher; /** * @author LevelX @@ -53,7 +54,7 @@ public class KumanosPupils extends CardImpl { this.toughness = new MageInt(3); // If a creature dealt damage by Kumano's Pupils this turn would die, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher()); } public KumanosPupils(final KumanosPupils card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfCleansingFire.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfCleansingFire.java index 6564065483d..6122b46af5c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfCleansingFire.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfCleansingFire.java @@ -72,7 +72,7 @@ public class MyojinOfCleansingFire extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(6); - this.addWatcher(new CastFromHandWatcher()); + this.getSpellAbility().addWatcher(new CastFromHandWatcher()); // Myojin of Cleansing Fire enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java index 3a07bc0b21b..9c36ba1ce92 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java @@ -68,7 +68,7 @@ public class MyojinOfInfiniteRage extends CardImpl { this.power = new MageInt(7); this.toughness = new MageInt(4); - this.addWatcher(new CastFromHandWatcher()); + this.getSpellAbility().addWatcher(new CastFromHandWatcher()); // Myojin of Infinite Rage enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfLifesWeb.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfLifesWeb.java index 87f6211e315..d69c8927f52 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfLifesWeb.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfLifesWeb.java @@ -73,7 +73,7 @@ public class MyojinOfLifesWeb extends CardImpl { this.power = new MageInt(8); this.toughness = new MageInt(8); - this.addWatcher(new CastFromHandWatcher()); + this.getSpellAbility().addWatcher(new CastFromHandWatcher()); // Myojin of Life's Web enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfNightsReach.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfNightsReach.java index bd545a53432..aa521f14bd0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfNightsReach.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfNightsReach.java @@ -66,7 +66,7 @@ public class MyojinOfNightsReach extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(2); - this.addWatcher(new CastFromHandWatcher()); + this.getSpellAbility().addWatcher(new CastFromHandWatcher()); // Myojin of Night's Reach enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfSeeingWinds.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfSeeingWinds.java index f9f81b2bd28..d70bc58ba31 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfSeeingWinds.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfSeeingWinds.java @@ -71,7 +71,7 @@ public class MyojinOfSeeingWinds extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addWatcher(new CastFromHandWatcher()); + this.getSpellAbility().addWatcher(new CastFromHandWatcher()); // Myojin of Seeing Winds enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SiftThroughSands.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SiftThroughSands.java index 410ad49d6aa..f6050c8ffd5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SiftThroughSands.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SiftThroughSands.java @@ -74,7 +74,7 @@ public class SiftThroughSands extends CardImpl { this.getSpellAbility().addEffect(effect); // If you've cast a spell named Peer Through Depths and a spell named Reach Through Mists this turn, you may search your library for a card named The Unspeakable, put it onto the battlefield, then shuffle your library. this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false, true), new SiftThroughSandsCondition(), rule)); - this.addWatcher(new SiftThroughSandsWatcher()); + this.getSpellAbility().addWatcher(new SiftThroughSandsWatcher()); } public SiftThroughSands(final SiftThroughSands card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java index 3fe88b5ad73..ef1d951c6cf 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java @@ -56,8 +56,7 @@ public class SilentChantZubera extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); Ability ability = new DiesTriggeredAbility(new GainLifeEffect(new SilentChantZuberaDynamicValue())); - this.addAbility(ability); - this.addWatcher(new ZuberasDiedWatcher()); + this.addAbility(ability, new ZuberasDiedWatcher()); } public SilentChantZubera (final SilentChantZubera card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisFlame.java b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisFlame.java index 5d51d1e5344..800169ca290 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisFlame.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisFlame.java @@ -37,6 +37,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.target.common.TargetCreatureOrPlayer; +import mage.watchers.common.DamagedByWatcher; /** * @@ -55,6 +56,7 @@ public class YamabushisFlame extends CardImpl { // If a creature dealt damage this way would die this turn, exile it instead. this.getSpellAbility().addEffect(new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn)); + this.getSpellAbility().addWatcher(new DamagedByWatcher()); } public YamabushisFlame(final YamabushisFlame card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java index e271fcedbb3..d7bc5475aa6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java @@ -63,6 +63,7 @@ public class YamabushisStorm extends CardImpl { this.getSpellAbility().addEffect(new DamageAllEffect(1, new FilterCreaturePermanent())); // If a creature dealt damage this way would die this turn, exile it instead. this.getSpellAbility().addEffect(new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn)); + this.getSpellAbility().addWatcher(new DamagedByWatcher()); } public YamabushisStorm(final YamabushisStorm card) { diff --git a/Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java b/Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java index 6210b029408..05e298500b4 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java +++ b/Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java @@ -75,7 +75,7 @@ public class FuryOfTheHorde extends CardImpl { // Untap all creatures that attacked this turn. After this main phase, there is an additional combat phase followed by an additional main phase. this.getSpellAbility().addEffect(new FuryOfTheHordeUntapEffect()); this.getSpellAbility().addEffect(new FuryOfTheHordeAddPhasesEffect()); - this.addWatcher(new AttackedThisTurnWatcher()); + this.getSpellAbility().addWatcher(new AttackedThisTurnWatcher()); } diff --git a/Mage.Sets/src/mage/sets/coldsnap/LightningStorm.java b/Mage.Sets/src/mage/sets/coldsnap/LightningStorm.java index 7f52c687939..f537e0031be 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/LightningStorm.java +++ b/Mage.Sets/src/mage/sets/coldsnap/LightningStorm.java @@ -100,7 +100,7 @@ class LightningStormCountCondition implements DynamicValue { public int calculate(Game game, Ability sourceAbility, Effect effect) { Spell spell = game.getStack().getSpell(sourceAbility.getSourceId()); if (spell != null) { - return spell.getCounters().getCount(counter) + 3; + return spell.getCounters(game).getCount(counter) + 3; } return 0; } diff --git a/Mage.Sets/src/mage/sets/commander/CourtHussar.java b/Mage.Sets/src/mage/sets/commander/CourtHussar.java index a3bf1cb6d04..0da7e0960ce 100644 --- a/Mage.Sets/src/mage/sets/commander/CourtHussar.java +++ b/Mage.Sets/src/mage/sets/commander/CourtHussar.java @@ -66,8 +66,7 @@ public class CourtHussar extends CardImpl { new LookLibraryAndPickControllerEffect(new StaticValue(3), false, new StaticValue(1), new FilterCard(), Zone.LIBRARY, false, false), false)); // When Court Hussar enters the battlefield, sacrifice it unless {W} was spent to cast it. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceUnlessConditionEffect(new ManaWasSpentCondition(ColoredManaSymbol.W)), false)); - this.addWatcher(new ManaSpentToCastWatcher()); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceUnlessConditionEffect(new ManaWasSpentCondition(ColoredManaSymbol.W)), false), new ManaSpentToCastWatcher()); } public CourtHussar(final CourtHussar card) { diff --git a/Mage.Sets/src/mage/sets/commander/KaradorGhostChieftain.java b/Mage.Sets/src/mage/sets/commander/KaradorGhostChieftain.java index 8144d887a8e..742bec871bb 100644 --- a/Mage.Sets/src/mage/sets/commander/KaradorGhostChieftain.java +++ b/Mage.Sets/src/mage/sets/commander/KaradorGhostChieftain.java @@ -82,8 +82,7 @@ public class KaradorGhostChieftain extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.STACK, new KaradorGhostChieftainCostReductionEffect())); // During each of your turns, you may cast one creature card from your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KaradorGhostChieftainContinuousEffect())); - this.addWatcher(new KaradorGhostChieftainWatcher()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KaradorGhostChieftainContinuousEffect()), new KaradorGhostChieftainWatcher()); } public KaradorGhostChieftain(final KaradorGhostChieftain card) { diff --git a/Mage.Sets/src/mage/sets/commander2013/AzoriusHerald.java b/Mage.Sets/src/mage/sets/commander2013/AzoriusHerald.java index 0a852fa10f6..20226aef318 100644 --- a/Mage.Sets/src/mage/sets/commander2013/AzoriusHerald.java +++ b/Mage.Sets/src/mage/sets/commander2013/AzoriusHerald.java @@ -60,8 +60,7 @@ public class AzoriusHerald extends CardImpl { // When Azorius Herald enters the battlefield, you gain 4 life. this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(4))); // When Azorius Herald enters the battlefield, sacrifice it unless {U} was spent to cast it. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceUnlessConditionEffect(new ManaWasSpentCondition(ColoredManaSymbol.U)), false)); - this.addWatcher(new ManaSpentToCastWatcher()); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceUnlessConditionEffect(new ManaWasSpentCondition(ColoredManaSymbol.U)), false), new ManaSpentToCastWatcher()); } public AzoriusHerald(final AzoriusHerald card) { diff --git a/Mage.Sets/src/mage/sets/commander2013/FellShepherd.java b/Mage.Sets/src/mage/sets/commander2013/FellShepherd.java index 9dde2f1e310..c99ab4a9779 100644 --- a/Mage.Sets/src/mage/sets/commander2013/FellShepherd.java +++ b/Mage.Sets/src/mage/sets/commander2013/FellShepherd.java @@ -78,8 +78,7 @@ public class FellShepherd extends CardImpl { this.toughness = new MageInt(6); // Whenever Fell Shepherd deals combat damage to a player, you may return to your hand all creature cards that were put into your graveyard from the battlefield this turn. - this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new FellShepherdEffect(), true)); - this.addWatcher(new FellShepherdWatcher()); + this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new FellShepherdEffect(), true), new FellShepherdWatcher()); // {B}, Sacrifice another creature: Target creature gets -2/-2 until end of turn. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2,-2, Duration.EndOfTurn), new ManaCostsImpl("{B}")); diff --git a/Mage.Sets/src/mage/sets/commander2013/JelevaNephaliasScourge.java b/Mage.Sets/src/mage/sets/commander2013/JelevaNephaliasScourge.java index 32b8642bee6..fb2afa2871a 100644 --- a/Mage.Sets/src/mage/sets/commander2013/JelevaNephaliasScourge.java +++ b/Mage.Sets/src/mage/sets/commander2013/JelevaNephaliasScourge.java @@ -76,8 +76,7 @@ public class JelevaNephaliasScourge extends CardImpl { // When Jeleva, Nephalia's Scourge enters the battlefield, each player exiles the top X cards of his or her library, where X is the amount of mana spent to cast Jeleva. this.addAbility(new EntersBattlefieldTriggeredAbility(new JelevaNephaliasScourgeEffect(), false)); // Whenever Jeleva attacks, you may cast an instant or sorcery card exiled with it without paying its mana cost. - this.addAbility(new AttacksTriggeredAbility(new JelevaNephaliasCastEffect(), false)); - this.addWatcher(new JelevaNephaliasWatcher()); + this.addAbility(new AttacksTriggeredAbility(new JelevaNephaliasCastEffect(), false), new JelevaNephaliasWatcher()); } diff --git a/Mage.Sets/src/mage/sets/commander2013/OpalPalace.java b/Mage.Sets/src/mage/sets/commander2013/OpalPalace.java index 3fc632ea513..739b8749bdc 100644 --- a/Mage.Sets/src/mage/sets/commander2013/OpalPalace.java +++ b/Mage.Sets/src/mage/sets/commander2013/OpalPalace.java @@ -75,13 +75,12 @@ public class OpalPalace extends CardImpl { // {1}, {tap}: Add to your mana pool one mana of any color in your commander's color identity. If you spend this mana to cast your commander, it enters the battlefield with a number of +1/+1 counters on it equal to the number of times it's been cast from the command zone this game. Ability ability = new CommanderColorIdentityManaAbility(new GenericManaCost(1)); ability.addCost(new TapSourceCost()); - this.addAbility(ability); + this.addAbility(ability, new OpalPalaceWatcher()); ability = new SimpleStaticAbility(Zone.ALL, new OpalPalaceEntersBattlefieldEffect()); ability.setRuleVisible(false); this.addAbility(ability); - this.addWatcher(new OpalPalaceWatcher()); } public OpalPalace(final OpalPalace card) { diff --git a/Mage.Sets/src/mage/sets/commander2014/AngelOfTheDireHour.java b/Mage.Sets/src/mage/sets/commander2014/AngelOfTheDireHour.java index e28c8532144..470ffa048ee 100644 --- a/Mage.Sets/src/mage/sets/commander2014/AngelOfTheDireHour.java +++ b/Mage.Sets/src/mage/sets/commander2014/AngelOfTheDireHour.java @@ -65,8 +65,7 @@ public class AngelOfTheDireHour extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility( new ConditionalOneShotEffect(new ExileAllEffect(new FilterAttackingCreature("attacking creatures")), new CastFromHandCondition(), " if you cast it from your hand, exile all attacking creatures")); - this.addAbility(ability); - this.addWatcher(new CastFromHandWatcher()); + this.addAbility(ability, new CastFromHandWatcher()); } public AngelOfTheDireHour(final AngelOfTheDireHour card) { diff --git a/Mage.Sets/src/mage/sets/commander2014/BreachingLeviathan.java b/Mage.Sets/src/mage/sets/commander2014/BreachingLeviathan.java index 50a3ef6c83b..8823ae47ccb 100644 --- a/Mage.Sets/src/mage/sets/commander2014/BreachingLeviathan.java +++ b/Mage.Sets/src/mage/sets/commander2014/BreachingLeviathan.java @@ -68,8 +68,7 @@ public class BreachingLeviathan extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility( new ConditionalOneShotEffect(new BreachingLeviathanEffect(), new CastFromHandCondition(), "if you cast it from your hand, tap all nonblue creatures. Those creatures don't untap during their controllers' next untap steps")); - this.addAbility(ability); - this.addWatcher(new CastFromHandWatcher()); + this.addAbility(ability, new CastFromHandWatcher()); } public BreachingLeviathan(final BreachingLeviathan card) { diff --git a/Mage.Sets/src/mage/sets/commander2014/ContainmentPriest.java b/Mage.Sets/src/mage/sets/commander2014/ContainmentPriest.java index 119ebc74eb5..4066ad9af4d 100644 --- a/Mage.Sets/src/mage/sets/commander2014/ContainmentPriest.java +++ b/Mage.Sets/src/mage/sets/commander2014/ContainmentPriest.java @@ -72,8 +72,7 @@ public class ContainmentPriest extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // If a nontoken creature would enter the battlefield and it wasn't cast, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ContainmentPriestReplacementEffect())); - this.addWatcher(new CreatureCastWatcher()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ContainmentPriestReplacementEffect()), new CreatureCastWatcher()); } public ContainmentPriest(final ContainmentPriest card) { diff --git a/Mage.Sets/src/mage/sets/commander2014/ImpactResonance.java b/Mage.Sets/src/mage/sets/commander2014/ImpactResonance.java index 02264ea8032..b43d4b9de5d 100644 --- a/Mage.Sets/src/mage/sets/commander2014/ImpactResonance.java +++ b/Mage.Sets/src/mage/sets/commander2014/ImpactResonance.java @@ -62,7 +62,7 @@ public class ImpactResonance extends CardImpl { effect.setText("{this} deals X damage divided as you choose among any number of target creatures, where X is the greatest amount of damage dealt by a source to a permanent or player this turn"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetCreaturePermanentAmount(xValue)); - this.addWatcher(new GreatestAmountOfDamageWatcher()); + this.getSpellAbility().addWatcher(new GreatestAmountOfDamageWatcher()); } public ImpactResonance(final ImpactResonance card) { diff --git a/Mage.Sets/src/mage/sets/commander2014/SpoilsOfBlood.java b/Mage.Sets/src/mage/sets/commander2014/SpoilsOfBlood.java index d74c42ee96c..bdbc1cb3a4d 100644 --- a/Mage.Sets/src/mage/sets/commander2014/SpoilsOfBlood.java +++ b/Mage.Sets/src/mage/sets/commander2014/SpoilsOfBlood.java @@ -61,7 +61,7 @@ public class SpoilsOfBlood extends CardImpl { // Put an X/X black Horror creature token onto the battlefield, where X is the number of creatures that died this turn. this.getSpellAbility().addEffect(new SpoilsOfBloodEffect()); - this.addWatcher(new CreaturesDiedThisTurnWatcher()); + this.getSpellAbility().addWatcher(new CreaturesDiedThisTurnWatcher()); } public SpoilsOfBlood(final SpoilsOfBlood card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java b/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java index 65bef466025..573e3043158 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java +++ b/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java @@ -81,9 +81,8 @@ public class DungeonGeists extends CardImpl { ability.addEffect(new DungeonGeistsEffect()); Target target = new TargetCreaturePermanent(filter); ability.addTarget(target); - this.addAbility(ability); + this.addAbility(ability, new DungeonGeistsWatcher()); // watcher needed to send normal events to Dungeon Geists ReplacementEffect - this.addWatcher(new DungeonGeistsWatcher()); } public DungeonGeists(final DungeonGeists card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/Flamebreak.java b/Mage.Sets/src/mage/sets/darksteel/Flamebreak.java index 8728b230be0..5d61f0e9768 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Flamebreak.java +++ b/Mage.Sets/src/mage/sets/darksteel/Flamebreak.java @@ -67,7 +67,7 @@ public class Flamebreak extends CardImpl { // Flamebreak deals 3 damage to each creature without flying and each player. Creatures dealt damage this way can't be regenerated this turn. this.getSpellAbility().addEffect(new DamageEverythingEffect(new StaticValue(3), filter1)); this.getSpellAbility().addEffect(new FlamebreakCantRegenerateEffect()); - this.addWatcher(new DamagedByWatcher()); + this.getSpellAbility().addWatcher(new DamagedByWatcher()); } public Flamebreak(final Flamebreak card) { diff --git a/Mage.Sets/src/mage/sets/dissension/CryptChampion.java b/Mage.Sets/src/mage/sets/dissension/CryptChampion.java index 0462c2cd705..f596d796793 100644 --- a/Mage.Sets/src/mage/sets/dissension/CryptChampion.java +++ b/Mage.Sets/src/mage/sets/dissension/CryptChampion.java @@ -75,8 +75,7 @@ public class CryptChampion extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CryptChampionEffect())); // When Crypt Champion enters the battlefield, sacrifice it unless {R} was spent to cast it. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceUnlessConditionEffect(new ManaWasSpentCondition(ColoredManaSymbol.R)), false)); - this.addWatcher(new ManaSpentToCastWatcher()); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceUnlessConditionEffect(new ManaWasSpentCondition(ColoredManaSymbol.R)), false), new ManaSpentToCastWatcher()); } public CryptChampion(final CryptChampion card) { diff --git a/Mage.Sets/src/mage/sets/dissension/PatagiaViper.java b/Mage.Sets/src/mage/sets/dissension/PatagiaViper.java index 5c492ed8472..c707b3b4102 100644 --- a/Mage.Sets/src/mage/sets/dissension/PatagiaViper.java +++ b/Mage.Sets/src/mage/sets/dissension/PatagiaViper.java @@ -63,8 +63,7 @@ public class PatagiaViper extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PatagiaViperSnakeToken(), 2), false)); // When Patagia Viper enters the battlefield, sacrifice it unless {U} was spent to cast it. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceUnlessConditionEffect(new ManaWasSpentCondition(ColoredManaSymbol.U)), false)); - this.addWatcher(new ManaSpentToCastWatcher()); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceUnlessConditionEffect(new ManaWasSpentCondition(ColoredManaSymbol.U)), false), new ManaSpentToCastWatcher()); } public PatagiaViper(final PatagiaViper card) { diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/ReiverDemon.java b/Mage.Sets/src/mage/sets/divinevsdemonic/ReiverDemon.java index e090fcabcd8..92b37c9990c 100644 --- a/Mage.Sets/src/mage/sets/divinevsdemonic/ReiverDemon.java +++ b/Mage.Sets/src/mage/sets/divinevsdemonic/ReiverDemon.java @@ -72,8 +72,7 @@ public class ReiverDemon extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility( new ConditionalOneShotEffect(new DestroyAllEffect(filter), new CastFromHandCondition(), "if you cast it from your hand, destroy all nonartifact, nonblack creatures. They can't be regenerated")); - this.addAbility(ability); - this.addWatcher(new CastFromHandWatcher()); + this.addAbility(ability, new CastFromHandWatcher()); } public ReiverDemon(final ReiverDemon card) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/NotionThief.java b/Mage.Sets/src/mage/sets/dragonsmaze/NotionThief.java index 90c9864da2c..cba8b75fec1 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/NotionThief.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/NotionThief.java @@ -65,8 +65,7 @@ public class NotionThief extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // If an opponent would draw a card except the first one he or she draws in each of his or her draw steps, instead that player skips that draw and you draw a card. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NotionThiefReplacementEffect())); - this.addWatcher(new CardsDrawnDuringDrawStepWatcher()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NotionThiefReplacementEffect()), new CardsDrawnDuringDrawStepWatcher()); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RestoreThePeace.java b/Mage.Sets/src/mage/sets/dragonsmaze/RestoreThePeace.java index 40a0815cfa2..8121038d6e9 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RestoreThePeace.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RestoreThePeace.java @@ -54,7 +54,7 @@ public class RestoreThePeace extends CardImpl { // Return each creature that dealt damage this turn to its owner's hand. this.getSpellAbility().addEffect(new RestoreThePeaceEffect()); - this.addWatcher(new SourceDidDamageWatcher()); + this.getSpellAbility().addWatcher(new SourceDidDamageWatcher()); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java b/Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java index 879068e0942..6020c6b811d 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java @@ -59,14 +59,12 @@ public class ScionOfVituGhazi extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addWatcher(new CastFromHandWatcher()); - // When Scion of Vitu-Ghazi enters the battlefield, if you cast it from your hand, put a 1/1 white Bird creature token with flying onto the battlefield, then populate. Ability ability = new EntersBattlefieldTriggeredAbility( new ConditionalOneShotEffect(new CreateTokenEffect(new BirdToken()), new CastFromHandCondition(), "if you cast it from your hand, put a 1/1 white Bird creature token with flying onto the battlefield,")); ability.addEffect(new PopulateEffect("then")); - this.addAbility(ability); + this.addAbility(ability, new CastFromHandWatcher()); } public ScionOfVituGhazi (final ScionOfVituGhazi card) { diff --git a/Mage.Sets/src/mage/sets/eventide/BatwingBrume.java b/Mage.Sets/src/mage/sets/eventide/BatwingBrume.java index 1d2cf21e633..ef6380c78f6 100644 --- a/Mage.Sets/src/mage/sets/eventide/BatwingBrume.java +++ b/Mage.Sets/src/mage/sets/eventide/BatwingBrume.java @@ -70,7 +70,7 @@ public class BatwingBrume extends CardImpl { new BatwingBrumeEffect(), new ManaWasSpentCondition(ColoredManaSymbol.B), "Each player loses 1 life for each attacking creature he or she controls if {B} was spent to cast {this}")); this.addInfo("Info1", "(Do both if {W}{B} was spent.)"); - this.addWatcher(new ManaSpentToCastWatcher()); + this.getSpellAbility().addWatcher(new ManaSpentToCastWatcher()); } diff --git a/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java b/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java index 26e06b9f84e..aefee598300 100644 --- a/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java +++ b/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java @@ -66,7 +66,7 @@ public class CankerousThirst extends CardImpl { "If {G} was spent to cast {this}, you may have target creature get +3/+3 until end of turn")); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.addInfo("Info1", "(Do both if {B}{G} was spent.)"); - this.addWatcher(new ManaSpentToCastWatcher()); + this.getSpellAbility().addWatcher(new ManaSpentToCastWatcher()); } public CankerousThirst(final CankerousThirst card) { diff --git a/Mage.Sets/src/mage/sets/eventide/DreamThief.java b/Mage.Sets/src/mage/sets/eventide/DreamThief.java index 2d751f261c4..7c36af41584 100644 --- a/Mage.Sets/src/mage/sets/eventide/DreamThief.java +++ b/Mage.Sets/src/mage/sets/eventide/DreamThief.java @@ -70,8 +70,7 @@ public class DreamThief extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Dream Thief enters the battlefield, draw a card if you've cast another blue spell this turn. - this.addAbility(new EntersBattlefieldTriggeredAbility(new ConditionalOneShotEffect(new DrawCardSourceControllerEffect(1), new CastBlueSpellThisTurnCondition(), rule))); - this.addWatcher(new DreamThiefWatcher(this.getId())); + this.addAbility(new EntersBattlefieldTriggeredAbility(new ConditionalOneShotEffect(new DrawCardSourceControllerEffect(1), new CastBlueSpellThisTurnCondition(), rule)), new DreamThiefWatcher(this.getId())); } diff --git a/Mage.Sets/src/mage/sets/eventide/GroundlingPouncer.java b/Mage.Sets/src/mage/sets/eventide/GroundlingPouncer.java index e92e11b6156..820325fcffe 100644 --- a/Mage.Sets/src/mage/sets/eventide/GroundlingPouncer.java +++ b/Mage.Sets/src/mage/sets/eventide/GroundlingPouncer.java @@ -79,8 +79,7 @@ public class GroundlingPouncer extends CardImpl { Effect effect2 = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn, false, true); Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{G/U}"), condition, rule); ability.addEffect(effect2); - this.addAbility(ability); - this.addWatcher(new ActivatedAbilityUsedThisTurnWatcher()); + this.addAbility(ability, new ActivatedAbilityUsedThisTurnWatcher()); } diff --git a/Mage.Sets/src/mage/sets/eventide/HotheadedGiant.java b/Mage.Sets/src/mage/sets/eventide/HotheadedGiant.java index 3c9305b46d0..0c239c7c81e 100644 --- a/Mage.Sets/src/mage/sets/eventide/HotheadedGiant.java +++ b/Mage.Sets/src/mage/sets/eventide/HotheadedGiant.java @@ -71,8 +71,7 @@ public class HotheadedGiant extends CardImpl { // Hotheaded Giant enters the battlefield with two -1/-1 counters on it unless you've cast another red spell this turn. Condition condition = new CastRedSpellThisTurnCondition(); - this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.M1M1.createInstance(2)), new InvertCondition(condition), ""), "with two -1/-1 counters on it unless you've cast another red spell this turn")); - this.addWatcher(new HotHeadedGiantWatcher(this.getId())); + this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.M1M1.createInstance(2)), new InvertCondition(condition), ""), "with two -1/-1 counters on it unless you've cast another red spell this turn"), new HotHeadedGiantWatcher(this.getId())); } diff --git a/Mage.Sets/src/mage/sets/eventide/InvertTheSkies.java b/Mage.Sets/src/mage/sets/eventide/InvertTheSkies.java index c3e4db7546a..3a7878016ea 100644 --- a/Mage.Sets/src/mage/sets/eventide/InvertTheSkies.java +++ b/Mage.Sets/src/mage/sets/eventide/InvertTheSkies.java @@ -73,7 +73,7 @@ public class InvertTheSkies extends CardImpl { new LockedInCondition(new ManaWasSpentCondition(ColoredManaSymbol.U)), "and creatures you control gain flying until end of turn if {U} was spent to cast it")); this.addInfo("Info1", "(Do both if {G}{U} was spent.)"); - this.addWatcher(new ManaSpentToCastWatcher()); + this.getSpellAbility().addWatcher(new ManaSpentToCastWatcher()); } public InvertTheSkies(final InvertTheSkies card) { diff --git a/Mage.Sets/src/mage/sets/eventide/Moonhold.java b/Mage.Sets/src/mage/sets/eventide/Moonhold.java index 4279bb178e8..1f5294f3c83 100644 --- a/Mage.Sets/src/mage/sets/eventide/Moonhold.java +++ b/Mage.Sets/src/mage/sets/eventide/Moonhold.java @@ -73,7 +73,7 @@ public class Moonhold extends CardImpl { new LockedInCondition(new ManaWasSpentCondition(ColoredManaSymbol.W)))); this.getSpellAbility().addTarget(new TargetPlayer()); this.addInfo("Info1", "(Do both if {R}{W} was spent.)"); - this.addWatcher(new ManaSpentToCastWatcher()); + this.getSpellAbility().addWatcher(new ManaSpentToCastWatcher()); } public Moonhold(final Moonhold card) { diff --git a/Mage.Sets/src/mage/sets/eventide/SoulReap.java b/Mage.Sets/src/mage/sets/eventide/SoulReap.java index a8ca79abf52..33a34b5ce3c 100644 --- a/Mage.Sets/src/mage/sets/eventide/SoulReap.java +++ b/Mage.Sets/src/mage/sets/eventide/SoulReap.java @@ -78,7 +78,7 @@ public class SoulReap extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new SoulReapEffect(), new CastBlackSpellThisTurnCondition(), rule)); - this.addWatcher(new SoulReapWatcher(this.getId())); + this.getSpellAbility().addWatcher(new SoulReapWatcher(this.getId())); } diff --git a/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java b/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java index d533eaf4b01..70c382e1075 100644 --- a/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java +++ b/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java @@ -71,8 +71,7 @@ public class TalarasBattalion extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Cast Talara's Battalion only if you've cast another green spell this turn. - this.addAbility(new SimpleStaticAbility(Zone.ALL, new TalarasBattalionEffect())); - this.addWatcher(new TalarasBattalionWatcher(this.getId())); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new TalarasBattalionEffect()), new TalarasBattalionWatcher(this.getId())); } diff --git a/Mage.Sets/src/mage/sets/eventide/UnnervingAssault.java b/Mage.Sets/src/mage/sets/eventide/UnnervingAssault.java index 7b13336ef5c..164d5a042fb 100644 --- a/Mage.Sets/src/mage/sets/eventide/UnnervingAssault.java +++ b/Mage.Sets/src/mage/sets/eventide/UnnervingAssault.java @@ -72,7 +72,7 @@ public class UnnervingAssault extends CardImpl { new BoostAllEffect(1, 0, Duration.EndOfTurn, filter2, false), new ManaWasSpentCondition(ColoredManaSymbol.R), " and creatures you control get +1/0 until end of turn if {R} was spent to cast it")); this.addInfo("Info1", "(Do both if {U}{R} was spent.)"); - this.addWatcher(new ManaSpentToCastWatcher()); + this.getSpellAbility().addWatcher(new ManaSpentToCastWatcher()); } diff --git a/Mage.Sets/src/mage/sets/eventide/WavesOfAggression.java b/Mage.Sets/src/mage/sets/eventide/WavesOfAggression.java index d146ecd8b2d..8e1380b2827 100644 --- a/Mage.Sets/src/mage/sets/eventide/WavesOfAggression.java +++ b/Mage.Sets/src/mage/sets/eventide/WavesOfAggression.java @@ -62,7 +62,7 @@ public class WavesOfAggression extends CardImpl { this.color.setWhite(true); // Untap all creatures that attacked this turn. After this main phase, there is an additional combat phase followed by an additional main phase. - this.addWatcher(new AttackedThisTurnWatcher()); + this.getSpellAbility().addWatcher(new AttackedThisTurnWatcher()); this.getSpellAbility().addEffect(new WavesOfAggressionUntapEffect()); this.getSpellAbility().addEffect(new WavesOfAggressionAddPhasesEffect()); // Retrace diff --git a/Mage.Sets/src/mage/sets/fatereforged/SoulfireGrandMaster.java b/Mage.Sets/src/mage/sets/fatereforged/SoulfireGrandMaster.java index 1d7bfdb4ee2..92b5ccb2087 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/SoulfireGrandMaster.java +++ b/Mage.Sets/src/mage/sets/fatereforged/SoulfireGrandMaster.java @@ -92,8 +92,7 @@ public class SoulfireGrandMaster extends CardImpl { // Instant and sorcery spells you control have lifelink. Effect effect = new GainAbilitySpellsEffect(LifelinkAbility.getInstance(), filter); effect.setText("Instant and sorcery spells you control have lifelink"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); - this.addWatcher(new SoulfireGrandMasterLeavesStackWatcher()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect), new SoulfireGrandMasterLeavesStackWatcher()); // {2}{U/R}{U/R}: The next time you cast an instant or sorcery spell from your hand this turn, put that card into your hand instead of your graveyard as it resolves. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoulfireGrandMasterCastFromHandReplacementEffect(), new ManaCostsImpl("{2}{U/R}{U/R}"))); diff --git a/Mage.Sets/src/mage/sets/fifthedition/SylvanLibrary.java b/Mage.Sets/src/mage/sets/fifthedition/SylvanLibrary.java index cfc591a8566..6beb7cf0317 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/SylvanLibrary.java +++ b/Mage.Sets/src/mage/sets/fifthedition/SylvanLibrary.java @@ -64,9 +64,7 @@ public class SylvanLibrary extends CardImpl { this.color.setGreen(true); // At the beginning of your draw step, you may draw two additional cards. If you do, choose two cards in your hand drawn this turn. For each of those cards, pay 4 life or put the card on top of your library. - this.addAbility(new BeginningOfDrawTriggeredAbility(new SylvanLibraryEffect(), TargetController.YOU, true)); - - this.addWatcher(new CardsDrawnThisTurnWatcher()); + this.addAbility(new BeginningOfDrawTriggeredAbility(new SylvanLibraryEffect(), TargetController.YOU, true), new CardsDrawnThisTurnWatcher()); } diff --git a/Mage.Sets/src/mage/sets/fourthedition/SirensCall.java b/Mage.Sets/src/mage/sets/fourthedition/SirensCall.java index 9c90f8fab86..8ce7034cc59 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/SirensCall.java +++ b/Mage.Sets/src/mage/sets/fourthedition/SirensCall.java @@ -69,7 +69,7 @@ public class SirensCall extends CardImpl { // At the beginning of the next end step, destroy all non-Wall creatures that player controls that didn't attack this turn. Ignore this effect for each creature the player didn't control continuously since the beginning of the turn. this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new SirensCallDestroyEffect()))); - this.addWatcher(new AttackedThisTurnWatcher()); + this.getSpellAbility().addWatcher(new AttackedThisTurnWatcher()); } public SirensCall(final SirensCall card) { diff --git a/Mage.Sets/src/mage/sets/futuresight/PatriciansScorn.java b/Mage.Sets/src/mage/sets/futuresight/PatriciansScorn.java index 4bcaa61aa4e..bdb7be230ca 100644 --- a/Mage.Sets/src/mage/sets/futuresight/PatriciansScorn.java +++ b/Mage.Sets/src/mage/sets/futuresight/PatriciansScorn.java @@ -59,8 +59,7 @@ public class PatriciansScorn extends CardImpl { this.color.setWhite(true); // If you've cast another white spell this turn, you may cast Patrician's Scorn without paying its mana cost. - this.addAbility(new AlternativeCostSourceAbility(new CastWhiteSpellThisTurnCondition())); - this.addWatcher(new PatriciansScornWatcher()); + this.addAbility(new AlternativeCostSourceAbility(new CastWhiteSpellThisTurnCondition()), new PatriciansScornWatcher()); // Destroy all enchantments. this.getSpellAbility().addEffect(new DestroyAllEffect(new FilterEnchantmentPermanent())); } diff --git a/Mage.Sets/src/mage/sets/futuresight/RiverOfTears.java b/Mage.Sets/src/mage/sets/futuresight/RiverOfTears.java index 0ccc49fdc9b..7ba8ddb7251 100644 --- a/Mage.Sets/src/mage/sets/futuresight/RiverOfTears.java +++ b/Mage.Sets/src/mage/sets/futuresight/RiverOfTears.java @@ -56,10 +56,8 @@ public class RiverOfTears extends CardImpl { new BasicManaEffect(Mana.BlueMana), LandfallCondition.getInstance(), "Add {U} to your mana pool. If you played a land this turn, add {B} to your mana pool instead"), - new TapSourceCost())); - - - this.addWatcher(new LandfallWatcher()); + new TapSourceCost()), + new LandfallWatcher()); } public RiverOfTears(final RiverOfTears card) { diff --git a/Mage.Sets/src/mage/sets/futuresight/ScoutsWarning.java b/Mage.Sets/src/mage/sets/futuresight/ScoutsWarning.java index e88f4401292..22155b2292f 100644 --- a/Mage.Sets/src/mage/sets/futuresight/ScoutsWarning.java +++ b/Mage.Sets/src/mage/sets/futuresight/ScoutsWarning.java @@ -60,7 +60,7 @@ public class ScoutsWarning extends CardImpl { // The next creature card you play this turn can be played as though it had flash. this.getSpellAbility().addEffect(new ScoutsWarningAsThoughEffect()); - this.addWatcher(new ScoutsWarningWatcher()); + this.getSpellAbility().addWatcher(new ScoutsWarningWatcher()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java b/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java index fb6726fa711..994edc96f19 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java @@ -96,7 +96,7 @@ public class AureliasFury extends CardImpl { this.getSpellAbility().addEffect(new DamageMultiEffect(xValue)); this.getSpellAbility().addEffect(new AureliasFuryEffect()); this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(xValue)); - this.addWatcher(new AureliasFuryDamagedByWatcher()); + this.getSpellAbility().addWatcher(new AureliasFuryDamagedByWatcher()); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java b/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java index c02249b33d8..0149fc1d036 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java @@ -60,7 +60,7 @@ public class ExecutionersSwing extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(-5,-5, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanentThatDealtDamageThisTurn()); - this.addWatcher(new SourceDidDamageWatcher()); + this.getSpellAbility().addWatcher(new SourceDidDamageWatcher()); } public ExecutionersSwing(final ExecutionersSwing card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java b/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java index 3f20f8c88ae..4bd963b2838 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java +++ b/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java @@ -57,8 +57,7 @@ public class IncursionSpecialist extends CardImpl { this.toughness = new MageInt(3); // Whenever you cast your second spell each turn, Incursion Specialist gets +2/+0 until end of turn and is unblockable this turn. - this.addAbility(new IncursionTriggeredAbility()); - this.addWatcher(new IncursionWatcher()); + this.addAbility(new IncursionTriggeredAbility(), new IncursionWatcher()); } public IncursionSpecialist(final IncursionSpecialist card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/Quicken.java b/Mage.Sets/src/mage/sets/guildpact/Quicken.java index 9d5728e6a1d..58de31799a8 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Quicken.java +++ b/Mage.Sets/src/mage/sets/guildpact/Quicken.java @@ -61,7 +61,7 @@ public class Quicken extends CardImpl { // The next sorcery card you cast this turn can be cast as though it had flash. this.getSpellAbility().addEffect(new QuickenAsThoughEffect()); - this.addWatcher(new QuickenWatcher()); + this.getSpellAbility().addWatcher(new QuickenWatcher()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/guildpact/TinStreetHooligan.java b/Mage.Sets/src/mage/sets/guildpact/TinStreetHooligan.java index 1ac034abfd3..62bd685a8ab 100644 --- a/Mage.Sets/src/mage/sets/guildpact/TinStreetHooligan.java +++ b/Mage.Sets/src/mage/sets/guildpact/TinStreetHooligan.java @@ -61,8 +61,7 @@ public class TinStreetHooligan extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility(new ConditionalOneShotEffect(new DestroyTargetEffect(), new ManaWasSpentCondition(ColoredManaSymbol.G), "if {G} was spent to cast {this}, destroy target artifact"), false); ability.addTarget(new TargetArtifactPermanent()); - this.addAbility(ability); - this.addWatcher(new ManaSpentToCastWatcher()); + this.addAbility(ability, new ManaSpentToCastWatcher()); } public TinStreetHooligan(final TinStreetHooligan card) { diff --git a/Mage.Sets/src/mage/sets/iceage/TinderWall.java b/Mage.Sets/src/mage/sets/iceage/TinderWall.java index bfeed21e545..45da4fc5702 100644 --- a/Mage.Sets/src/mage/sets/iceage/TinderWall.java +++ b/Mage.Sets/src/mage/sets/iceage/TinderWall.java @@ -80,10 +80,7 @@ public class TinderWall extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new SacrificeSourceCost()); - this.addAbility(ability); - - - this.addWatcher(new BlockedByWatcher()); + this.addAbility(ability, new BlockedByWatcher()); } public TinderWall(final TinderWall card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java b/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java index 6db7fe8cee4..e96f3b66911 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java +++ b/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java @@ -67,8 +67,7 @@ public class CivilizedScholar extends CardImpl { // {tap}: Draw a card, then discard a card. If a creature card is discarded this way, untap Civilized Scholar, then transform it. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CivilizedScholarEffect(), new TapSourceCost())); - this.addAbility(new TransformAbility()); - this.addWatcher(new HomicidalBruteWatcher()); + this.addAbility(new TransformAbility(), new HomicidalBruteWatcher()); } public CivilizedScholar(final CivilizedScholar card) { diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/ArrowStorm.java b/Mage.Sets/src/mage/sets/khansoftarkir/ArrowStorm.java index 34b47877600..85ab14724f9 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/ArrowStorm.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/ArrowStorm.java @@ -61,7 +61,7 @@ public class ArrowStorm extends CardImpl { new DamageTargetEffect(5, false), RaidCondition.getInstance(), "

Raid - If you attacked with a creature this turn, instead {this} deals 5 damage to that creature or player and the damage can't be prevented")); - this.addWatcher(new PlayerAttackedWatcher()); + this.getSpellAbility().addWatcher(new PlayerAttackedWatcher()); } public ArrowStorm(final ArrowStorm card) { diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/BellowingSaddlebrute.java b/Mage.Sets/src/mage/sets/khansoftarkir/BellowingSaddlebrute.java index f1e4a4d002b..cd27fae968f 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/BellowingSaddlebrute.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/BellowingSaddlebrute.java @@ -60,8 +60,7 @@ public class BellowingSaddlebrute extends CardImpl { new EntersBattlefieldTriggeredAbility(new LoseLifeSourceControllerEffect(4)), new InvertCondition(RaidCondition.getInstance()), "Raid - When {this} enters the battlefield, you lose 4 life unless you attacked with a creature this turn" - )); - this.addWatcher(new PlayerAttackedWatcher()); + ), new PlayerAttackedWatcher()); } public BellowingSaddlebrute(final BellowingSaddlebrute card) { diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/BloodsoakedChampion.java b/Mage.Sets/src/mage/sets/khansoftarkir/BloodsoakedChampion.java index 62f34f52b16..80932c85023 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/BloodsoakedChampion.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/BloodsoakedChampion.java @@ -67,8 +67,7 @@ public class BloodsoakedChampion extends CardImpl { new ManaCostsImpl<>("{1}{B}"), RaidCondition.getInstance(), "Raid - {1}{B}: Return {this} from your graveyard to the battlefield. Activate this ability only if you attacked with a creature this turn"); - this.addAbility(ability); - this.addWatcher(new PlayerAttackedWatcher()); + this.addAbility(ability, new PlayerAttackedWatcher()); } public BloodsoakedChampion(final BloodsoakedChampion card) { diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/HowlOfTheHorde.java b/Mage.Sets/src/mage/sets/khansoftarkir/HowlOfTheHorde.java index ce82fdf96d6..f2c46a92407 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/HowlOfTheHorde.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/HowlOfTheHorde.java @@ -63,7 +63,7 @@ public class HowlOfTheHorde extends CardImpl { // Raid - If you attacked with a creature this turn, when you cast your next instant or sorcery spell this turn, copy that spell an additional time. You may choose new targets for the copy. this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new CreateDelayedTriggeredAbilityEffect(new HowlOfTheHordeDelayedTriggeredAbility()), RaidCondition.getInstance(), "

Raid - If you attacked with a creature this turn, when you cast your next instant or sorcery spell this turn, copy that spell an additional time. You may choose new targets for the copy.")); - this.addWatcher(new PlayerAttackedWatcher()); + this.getSpellAbility().addWatcher(new PlayerAttackedWatcher()); } public HowlOfTheHorde(final HowlOfTheHorde card) { diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MarduHeartPiercer.java b/Mage.Sets/src/mage/sets/khansoftarkir/MarduHeartPiercer.java index f5c2ce8da7d..0756a81e815 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MarduHeartPiercer.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MarduHeartPiercer.java @@ -60,8 +60,7 @@ public class MarduHeartPiercer extends CardImpl { Ability ability = new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2)), RaidCondition.getInstance(), "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, {this} deals 2 damage to target creature or player.", false); ability.addTarget(new TargetCreatureOrPlayer()); - this.addAbility(ability); - this.addWatcher(new PlayerAttackedWatcher()); + this.addAbility(ability, new PlayerAttackedWatcher()); } public MarduHeartPiercer(final MarduHeartPiercer card) { diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MarduHordechief.java b/Mage.Sets/src/mage/sets/khansoftarkir/MarduHordechief.java index 1b06ea71c6f..5ce88e4d532 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MarduHordechief.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MarduHordechief.java @@ -57,9 +57,8 @@ public class MarduHordechief extends CardImpl { // Raid - When Mardu Hordechief enters the battlefield, if you attacked with a creature this turn, put a 1/1 white Warrior creature token onto the battlefield this.addAbility(new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new MarduHordechiefToken())), RaidCondition.getInstance(), - "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, put a 1/1 white Warrior creature token onto the battlefield.", false)); - - this.addWatcher(new PlayerAttackedWatcher()); + "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, put a 1/1 white Warrior creature token onto the battlefield.", false), + new PlayerAttackedWatcher()); } public MarduHordechief(final MarduHordechief card) { diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MarduSkullhunter.java b/Mage.Sets/src/mage/sets/khansoftarkir/MarduSkullhunter.java index e4681d1d23f..f8efd6d7449 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MarduSkullhunter.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MarduSkullhunter.java @@ -64,8 +64,7 @@ public class MarduSkullhunter extends CardImpl { Ability ability = new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(1)), RaidCondition.getInstance(), "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, target opponent discards a card.", false); ability.addTarget(new TargetOpponent()); - this.addAbility(ability); - this.addWatcher(new PlayerAttackedWatcher()); + this.addAbility(ability, new PlayerAttackedWatcher()); } public MarduSkullhunter(final MarduSkullhunter card) { diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MarduWarshrieker.java b/Mage.Sets/src/mage/sets/khansoftarkir/MarduWarshrieker.java index 38ee5baae0a..1fbdd4bc6ec 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MarduWarshrieker.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MarduWarshrieker.java @@ -57,8 +57,8 @@ public class MarduWarshrieker extends CardImpl { // Raid - When Mardu Warshrieker enters the battlefield, if you attacked with a creature this turn, add {R}{W}{B} to your mana pool. this.addAbility(new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new AddManaToManaPoolSourceControllerEffect(new Mana(1,0,0,1,1,0,0))), RaidCondition.getInstance(), - "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, add {R}{W}{B} to your mana pool.", false)); - this.addWatcher(new PlayerAttackedWatcher()); + "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, add {R}{W}{B} to your mana pool.", false), + new PlayerAttackedWatcher()); } public MarduWarshrieker(final MarduWarshrieker card) { diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/TimelyHordemate.java b/Mage.Sets/src/mage/sets/khansoftarkir/TimelyHordemate.java index 8fe65e58db8..e0f0de85368 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/TimelyHordemate.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/TimelyHordemate.java @@ -69,8 +69,7 @@ public class TimelyHordemate extends CardImpl { Ability ability = new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect()), RaidCondition.getInstance(), "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.", false); ability.addTarget(new TargetCardInYourGraveyard(filter)); - this.addAbility(ability); - this.addWatcher(new PlayerAttackedWatcher()); + this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/WarNameAspirant.java b/Mage.Sets/src/mage/sets/khansoftarkir/WarNameAspirant.java index af213b941d3..e9c1fd2e716 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/WarNameAspirant.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/WarNameAspirant.java @@ -71,8 +71,8 @@ public class WarNameAspirant extends CardImpl { RaidCondition.getInstance(), true, "Raid - {this} enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn", - "{this} enters the battlefield with a +1/+1 counter")); - this.addWatcher(new PlayerAttackedWatcher()); + "{this} enters the battlefield with a +1/+1 counter"), + new PlayerAttackedWatcher()); // War-Name Aspirant can't be blocked by creatures with power 1 or less. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesSourceEffect(filter, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/WingmateRoc.java b/Mage.Sets/src/mage/sets/khansoftarkir/WingmateRoc.java index 322b75255fb..9549713ab45 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/WingmateRoc.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/WingmateRoc.java @@ -64,8 +64,8 @@ public class WingmateRoc extends CardImpl { // Raid - When Wingmate Roc enters the battlefield, if you attacked with a creature this turn, put a 3/4 white Bird creature token with flying onto the battlefield. this.addAbility(new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WingmateRocToken())), RaidCondition.getInstance(), - "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, put a 3/4 white Bird creature token with flying onto the battlefield.", false)); - this.addWatcher(new PlayerAttackedWatcher()); + "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, put a 3/4 white Bird creature token with flying onto the battlefield.", false), + new PlayerAttackedWatcher()); // Whenever Wingmate Roc attacks, you gain 1 life for each attacking creature. Effect effect = new GainLifeEffect(new AttackingCreatureCount()); diff --git a/Mage.Sets/src/mage/sets/legends/ChainsOfMephistopheles.java b/Mage.Sets/src/mage/sets/legends/ChainsOfMephistopheles.java index 3144f10e59d..aefc9db49a8 100644 --- a/Mage.Sets/src/mage/sets/legends/ChainsOfMephistopheles.java +++ b/Mage.Sets/src/mage/sets/legends/ChainsOfMephistopheles.java @@ -60,8 +60,7 @@ public class ChainsOfMephistopheles extends CardImpl { this.color.setBlack(true); // If a player would draw a card except the first one he or she draws in his or her draw step each turn, that player discards a card instead. If the player discards a card this way, he or she draws a card. If the player doesn't discard a card this way, he or she puts the top card of his or her library into his or her graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ChainsOfMephistophelesReplacementEffect())); - this.addWatcher(new CardsDrawnDuringDrawStepWatcher()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ChainsOfMephistophelesReplacementEffect()), new CardsDrawnDuringDrawStepWatcher()); } public ChainsOfMephistopheles(final ChainsOfMephistopheles card) { diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Berserk.java b/Mage.Sets/src/mage/sets/limitedalpha/Berserk.java index 2d50d593dbd..c59b8bb7eb5 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Berserk.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Berserk.java @@ -68,8 +68,7 @@ public class Berserk extends CardImpl { this.color.setGreen(true); // Cast Berserk only before the combat damage step. (Zone = all because it can be at least graveyard or hand) - this.addAbility(new SimpleStaticAbility(Zone.ALL, new BerserkReplacementEffect())); - this.addWatcher(new CombatDamageStepStartedWatcher()); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new BerserkReplacementEffect()), new CombatDamageStepStartedWatcher()); // Target creature gains trample and gets +X/+0 until end of turn, where X is its power. // At the beginning of the next end step, destroy that creature if it attacked this turn. @@ -81,7 +80,7 @@ public class Berserk extends CardImpl { this.getSpellAbility().addEffect(effect); this.getSpellAbility().addEffect(new BerserkDestroyEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.addWatcher(new AttackedThisTurnWatcher()); + this.getSpellAbility().addWatcher(new AttackedThisTurnWatcher()); } diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Disintegrate.java b/Mage.Sets/src/mage/sets/limitedalpha/Disintegrate.java index ccd8986eea6..72488f9803d 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Disintegrate.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Disintegrate.java @@ -29,21 +29,17 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.Effect; -import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.replacement.DealtDamageToCreatureBySourceDies; import mage.abilities.effects.common.ruleModifying.CantRegenerateTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.Outcome; import mage.constants.Rarity; -import mage.game.Game; -import mage.game.events.GameEvent; import mage.target.common.TargetCreatureOrPlayer; +import mage.watchers.common.DamagedByWatcher; /** * @@ -64,6 +60,7 @@ public class Disintegrate extends CardImpl { effect.setText("If the creature would die this turn, exile it instead"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addWatcher(new DamagedByWatcher()); } public Disintegrate(final Disintegrate card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/SpinerockKnoll.java b/Mage.Sets/src/mage/sets/lorwyn/SpinerockKnoll.java index de86c9954d2..b4579162792 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SpinerockKnoll.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SpinerockKnoll.java @@ -73,8 +73,7 @@ public class SpinerockKnoll extends CardImpl { new ColoredManaCost(ColoredManaSymbol.R), new SpinerockKnollCondition()); ability.addCost(new TapSourceCost()); - this.addAbility(ability); - this.addWatcher(new SpinerockKnollWatcher()); + this.addAbility(ability, new SpinerockKnollWatcher()); } public SpinerockKnoll(final SpinerockKnoll card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/WindbriskHeights.java b/Mage.Sets/src/mage/sets/lorwyn/WindbriskHeights.java index c84430d3e21..da4e1a83b5a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WindbriskHeights.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WindbriskHeights.java @@ -61,9 +61,7 @@ public class WindbriskHeights extends CardImpl { Ability ability = new ActivateIfConditionActivatedAbility( Zone.BATTLEFIELD, new HideawayPlayEffect(), new ManaCostsImpl("{W}"), WindbriskHeightsAttackersCondition.getInstance()); ability.addCost(new TapSourceCost()); - this.addAbility(ability); - - this.addWatcher(new PlayerAttackedWatcher()); + this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java index 735e1ca7695..8212488674b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java +++ b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java @@ -72,8 +72,7 @@ public class AngelicArbiter extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AngelicArbiterCantAttackTargetEffect(Duration.WhileOnBattlefield))); // Each opponent who attacked with a creature this turn can't cast spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AngelicArbiterEffect2())); - this.addWatcher(new AngelicArbiterWatcher2()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AngelicArbiterEffect2()), new AngelicArbiterWatcher2()); } public AngelicArbiter(final AngelicArbiter card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java b/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java index 4c401fd5c05..c40581bf663 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java +++ b/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java @@ -54,7 +54,7 @@ public class FaithsReward extends CardImpl { // Return to the battlefield all permanent cards in your graveyard that were put there from the battlefield this turn. this.getSpellAbility().addEffect(new FaithsRewardEffect()); - this.addWatcher(new FaithsRewardWatcher()); + this.getSpellAbility().addWatcher(new FaithsRewardWatcher()); } public FaithsReward(final FaithsReward card) { diff --git a/Mage.Sets/src/mage/sets/magic2014/AngelicAccord.java b/Mage.Sets/src/mage/sets/magic2014/AngelicAccord.java index f7d1ba7717d..8df4cbc6f36 100644 --- a/Mage.Sets/src/mage/sets/magic2014/AngelicAccord.java +++ b/Mage.Sets/src/mage/sets/magic2014/AngelicAccord.java @@ -55,8 +55,7 @@ public class AngelicAccord extends CardImpl { this.color.setWhite(true); // At the beginning of each end step, if you gained 4 or more life this turn, put a 4/4 white Angel creature token with flying onto the battlefield. - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new AngelToken()), TargetController.ANY, new YouGainedLifeCondition(Condition.ComparisonType.GreaterThan, 3), false)); - this.addWatcher(new PlayerGainedLifeWatcher()); + this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new AngelToken()), TargetController.ANY, new YouGainedLifeCondition(Condition.ComparisonType.GreaterThan, 3), false), new PlayerGainedLifeWatcher()); } public AngelicAccord(final AngelicAccord card) { diff --git a/Mage.Sets/src/mage/sets/magic2014/GrimReturn.java b/Mage.Sets/src/mage/sets/magic2014/GrimReturn.java index 9ab3bbf70ae..efc2d5604ab 100644 --- a/Mage.Sets/src/mage/sets/magic2014/GrimReturn.java +++ b/Mage.Sets/src/mage/sets/magic2014/GrimReturn.java @@ -63,7 +63,7 @@ public class GrimReturn extends CardImpl { effect.setText("Choose target creature card in a graveyard that was put there from the battlefield this turn. Put that card onto the battlefield under your control"); this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); this.getSpellAbility().addTarget(new TargetCardInGraveyard(new FilterCreatureCard(textFilter))); - this.addWatcher(new CardsPutIntoGraveyardWatcher()); + this.getSpellAbility().addWatcher(new CardsPutIntoGraveyardWatcher()); } public GrimReturn(final GrimReturn card) { diff --git a/Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java b/Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java index b80573d13c1..b6f26783e9e 100644 --- a/Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java +++ b/Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java @@ -76,7 +76,7 @@ public class SavageSummoning extends CardImpl { this.getSpellAbility().addEffect(new SavageSummoningAsThoughEffect()); this.getSpellAbility().addEffect(new SavageSummoningCantCounterEffect()); this.getSpellAbility().addEffect(new SavageSummoningEntersBattlefieldEffect()); - this.addWatcher(new SavageSummoningWatcher()); + this.getSpellAbility().addWatcher(new SavageSummoningWatcher()); } diff --git a/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java b/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java index 5d790d22e61..608a2d225c8 100644 --- a/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java +++ b/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java @@ -83,8 +83,7 @@ public class TidebinderMage extends CardImpl { ability.addEffect(new TidebinderMageEffect()); Target target = new TargetCreaturePermanent(filter); ability.addTarget(target); - this.addAbility(ability); - this.addWatcher(new TidebinderMageWatcher()); + this.addAbility(ability, new TidebinderMageWatcher()); } diff --git a/Mage.Sets/src/mage/sets/magic2014/VoraciousWurm.java b/Mage.Sets/src/mage/sets/magic2014/VoraciousWurm.java index 3167a3b5737..c2c98377caf 100644 --- a/Mage.Sets/src/mage/sets/magic2014/VoraciousWurm.java +++ b/Mage.Sets/src/mage/sets/magic2014/VoraciousWurm.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; import mage.counters.CounterType; +import mage.watchers.common.PlayerGainedLifeWatcher; /** * @@ -54,7 +55,8 @@ public class VoraciousWurm extends CardImpl { // Voracious Wurm enters the battlefield with X +1/+1 counters on it, where X is the amount of life you've gained this turn. this.addAbility(new EntersBattlefieldAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance(0), ControllerGotLifeCount.getInstance(this), true))); + new AddCountersSourceEffect(CounterType.P1P1.createInstance(0), ControllerGotLifeCount.getInstance(), true)), + new PlayerGainedLifeWatcher()); } public VoraciousWurm(final VoraciousWurm card) { diff --git a/Mage.Sets/src/mage/sets/magic2015/FirstResponse.java b/Mage.Sets/src/mage/sets/magic2015/FirstResponse.java index 5f11aefc9a2..57c2a3cefe6 100644 --- a/Mage.Sets/src/mage/sets/magic2015/FirstResponse.java +++ b/Mage.Sets/src/mage/sets/magic2015/FirstResponse.java @@ -54,9 +54,7 @@ public class FirstResponse extends CardImpl { this.color.setWhite(true); // At the beginning of each upkeep, if you lost life last turn, put a 1/1 white Soldier creature token onto the battlefield. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new FirstResponseEffect(), TargetController.ANY, false)); - - this.addWatcher(new PlayerLostLifeWatcher()); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new FirstResponseEffect(), TargetController.ANY, false), new PlayerLostLifeWatcher()); } diff --git a/Mage.Sets/src/mage/sets/magic2015/GeneratorServant.java b/Mage.Sets/src/mage/sets/magic2015/GeneratorServant.java index e47437bf5db..d25998010ec 100644 --- a/Mage.Sets/src/mage/sets/magic2015/GeneratorServant.java +++ b/Mage.Sets/src/mage/sets/magic2015/GeneratorServant.java @@ -79,8 +79,7 @@ public class GeneratorServant extends CardImpl { ability.getEffects().get(0).setText("Add {2} to your mana pool. If that mana is spent on a creature spell, it gains haste until end of turn."); this.addAbility(ability); - this.addWatcher(new GeneratorServantWatcher()); - this.addAbility(new SimpleStaticAbility(Zone.ALL, new GeneratorServantHasteEffect())); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new GeneratorServantHasteEffect()), new GeneratorServantWatcher()); } public GeneratorServant(final GeneratorServant card) { diff --git a/Mage.Sets/src/mage/sets/magic2015/TheChainVeil.java b/Mage.Sets/src/mage/sets/magic2015/TheChainVeil.java index 02e8912dbb1..069d940f978 100644 --- a/Mage.Sets/src/mage/sets/magic2015/TheChainVeil.java +++ b/Mage.Sets/src/mage/sets/magic2015/TheChainVeil.java @@ -66,8 +66,7 @@ public class TheChainVeil extends CardImpl { this.supertype.add("Legendary"); // At the beginning of your end step, if you didn't activate a loyalty ability of a planeswalker this turn, you lose 2 life. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new TheChainVeilTriggeredEffect(), TargetController.YOU, false)); - this.addWatcher(new ActivatedLoyaltyAbilityWatcher()); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new TheChainVeilTriggeredEffect(), TargetController.YOU, false), new ActivatedLoyaltyAbilityWatcher()); // {4}, {T}: For each planeswalker you control, you may activate one of its loyalty abilities once this turn as though none of its loyalty abilities had been activated this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TheChainVeilIncreaseLoyaltyUseEffect(), diff --git a/Mage.Sets/src/mage/sets/mirage/AsmiraHolyAvenger.java b/Mage.Sets/src/mage/sets/mirage/AsmiraHolyAvenger.java index 99ff6bbea57..82e7c8f7bed 100644 --- a/Mage.Sets/src/mage/sets/mirage/AsmiraHolyAvenger.java +++ b/Mage.Sets/src/mage/sets/mirage/AsmiraHolyAvenger.java @@ -70,8 +70,7 @@ public class AsmiraHolyAvenger extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // At the beginning of each end step, put a +1/+1 counter on Asmira, Holy Avenger for each creature put into your graveyard from the battlefield this turn. - this.addWatcher(new AsmiraHolyAvengerWatcher()); - this.addAbility(new BeginningOfEndStepTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(0), new AsmiraHolyAvengerDynamicValue(), true), TargetController.ANY, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(0), new AsmiraHolyAvengerDynamicValue(), true), TargetController.ANY, false), new AsmiraHolyAvengerWatcher()); } public AsmiraHolyAvenger(final AsmiraHolyAvenger card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java b/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java index 06389159a51..9f293f791de 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java @@ -54,7 +54,7 @@ public class SecondSunrise extends CardImpl { // Each player returns to the battlefield all artifact, creature, enchantment, and land cards in his or her graveyard that were put there from the battlefield this turn. this.getSpellAbility().addEffect(new SecondSunriseEffect()); - this.addWatcher(new SecondSunriseWatcher()); + this.getSpellAbility().addWatcher(new SecondSunriseWatcher()); } public SecondSunrise(final SecondSunrise card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/RedSunsZenith.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/RedSunsZenith.java index 654ad5caa02..8902296827a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/RedSunsZenith.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/RedSunsZenith.java @@ -54,7 +54,7 @@ public class RedSunsZenith extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addEffect(new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn)); this.getSpellAbility().addEffect(ShuffleSpellEffect.getInstance()); - this.addWatcher(new DamagedByWatcher()); + this.getSpellAbility().addWatcher(new DamagedByWatcher()); } public RedSunsZenith(final RedSunsZenith card) { diff --git a/Mage.Sets/src/mage/sets/modernmasters/Epochrasite.java b/Mage.Sets/src/mage/sets/modernmasters/Epochrasite.java index 5d2066df8a3..335aaa10ad0 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/Epochrasite.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Epochrasite.java @@ -60,13 +60,12 @@ public class Epochrasite extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addWatcher(new CastFromHandWatcher()); - // Epochrasite enters the battlefield with three +1/+1 counters on it if you didn't cast it from your hand. this.addAbility(new EntersBattlefieldAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), new InvertCondition(new CastFromHandCondition()), true, - "{this} enters the battlefield with three +1/+1 counters on it if you didn't cast it from your hand","")); + "{this} enters the battlefield with three +1/+1 counters on it if you didn't cast it from your hand",""), + new CastFromHandWatcher()); // When Epochrasite dies, exile it with three time counters on it and it gains suspend. Ability ability = new DiesTriggeredAbility(new ExileSourceEffect()); diff --git a/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java b/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java index 0c97786fbea..99a2b265f93 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java +++ b/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java @@ -150,16 +150,16 @@ class RemoveCounterFromCardCost extends CostImpl { for (UUID targetId: (List)target.getTargets()) { Card card = game.getCard(targetId); if (card != null) { - if (card.getCounters().size() > 0 && (counterTypeToRemove == null || card.getCounters().containsKey(counterTypeToRemove))) { + if (card.getCounters(game).size() > 0 && (counterTypeToRemove == null || card.getCounters(game).containsKey(counterTypeToRemove))) { String counterName = null; if (counterTypeToRemove != null) { counterName = counterTypeToRemove.getName(); } else { - if (card.getCounters().size() > 1 && counterTypeToRemove == null) { + if (card.getCounters(game).size() > 1 && counterTypeToRemove == null) { Choice choice = new ChoiceImpl(true); Set choices = new HashSet(); - for (Counter counter : card.getCounters().values()) { - if (card.getCounters().getCount(counter.getName()) > 0) { + for (Counter counter : card.getCounters(game).values()) { + if (card.getCounters(game).getCount(counter.getName()) > 0) { choices.add(counter.getName()); } } @@ -168,7 +168,7 @@ class RemoveCounterFromCardCost extends CostImpl { controller.choose(Outcome.UnboostCreature, choice, game); counterName = choice.getChoice(); } else { - for (Counter counter : card.getCounters().values()) { + for (Counter counter : card.getCounters(game).values()) { if (counter.getCount() > 0) { counterName = counter.getName(); } @@ -177,8 +177,8 @@ class RemoveCounterFromCardCost extends CostImpl { } if (counterName != null) { card.removeCounters(counterName, 1, game); - if (card.getCounters().getCount(counterName) == 0 ){ - card.getCounters().removeCounter(counterName); + if (card.getCounters(game).getCount(counterName) == 0 ){ + card.getCounters(game).removeCounter(counterName); } this.paid = true; game.informPlayers(new StringBuilder(controller.getName()).append(" removes a ").append(counterName).append(" counter from ").append(card.getName()).toString()); diff --git a/Mage.Sets/src/mage/sets/modernmasters/Riftsweeper.java b/Mage.Sets/src/mage/sets/modernmasters/Riftsweeper.java index 8e54a022d97..1e0a8933ef9 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/Riftsweeper.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Riftsweeper.java @@ -103,7 +103,7 @@ class RiftsweeperEffect extends OneShotEffect { Card card = game.getCard(targetPointer.getFirst(game, source)); if (card != null) { // remove exiting suspend counters - card.getCounters().clear(); + card.getCounters(game).clear(); // move to exile card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true); game.getPlayer(card.getOwnerId()).shuffleLibrary(game); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java b/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java index f0adc7beb34..6b9ded4e10b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java @@ -62,8 +62,7 @@ public class CathedralMembrane extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // When Cathedral Membrane dies during combat, it deals 6 damage to each creature it blocked this combat. - this.addWatcher(new CathedralMembraneWatcher()); - this.addAbility(new CathedralMembraneAbility()); + this.addAbility(new CathedralMembraneAbility(), new CathedralMembraneWatcher()); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java b/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java index 661d5a01f72..6c352248ab1 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java @@ -59,7 +59,7 @@ public class FreshMeat extends CardImpl { this.color.setGreen(true); - this.addWatcher(new FreshMeatWatcher()); + this.getSpellAbility().addWatcher(new FreshMeatWatcher()); this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken(), new FreshMeatDynamicValue())); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java b/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java index 4a035e105e9..2f1b7f9fb74 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java @@ -56,7 +56,7 @@ public class AvengingArrow extends CardImpl { // Destroy target creature that dealt damage this turn. this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new AvengingArrowTarget()); - this.addWatcher(new SourceDidDamageWatcher()); + this.getSpellAbility().addWatcher(new SourceDidDamageWatcher()); } public AvengingArrow(final AvengingArrow card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CastThroughTime.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CastThroughTime.java index 872e73aac48..6de6995cc95 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CastThroughTime.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CastThroughTime.java @@ -68,8 +68,7 @@ public class CastThroughTime extends CardImpl { // Instant and sorcery spells you control have rebound. // (Exile the spell as it resolves if you cast it from your hand. At the beginning of your next upkeep, you may cast that card from exile without paying its mana cost.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainReboundEffect())); - this.addWatcher(new LeavesBattlefieldWatcher()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainReboundEffect()), new LeavesBattlefieldWatcher()); } public CastThroughTime(final CastThroughTime card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java index 864aeeb3dab..9271f85b1e9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java @@ -59,8 +59,7 @@ public class Vengevine extends CardImpl { this.toughness = new MageInt(3); this.addAbility(HasteAbility.getInstance()); - this.addAbility(new VengevineAbility()); - this.addWatcher(new VengevineWatcher()); + this.addAbility(new VengevineAbility(), new VengevineWatcher()); } public Vengevine(final Vengevine card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java index 4cd12718831..97cf8ffc2de 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java @@ -61,9 +61,7 @@ public class WorldAtWar extends CardImpl { this.getSpellAbility().addEffect(new WorldAtWarEffect()); // Rebound - this.addAbility(new ReboundAbility()); - - this.addWatcher(new AttackedThisTurnWatcher()); + this.addAbility(new ReboundAbility(), new AttackedThisTurnWatcher()); } public WorldAtWar(final WorldAtWar card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InameAsOne.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InameAsOne.java index c48a4509917..79a257de5d2 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InameAsOne.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InameAsOne.java @@ -76,8 +76,7 @@ public class InameAsOne extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility( new ConditionalOneShotEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 1, filter), false), new CastFromHandCondition())); - this.addAbility(ability); - this.addWatcher(new CastFromHandWatcher()); + this.addAbility(ability, new CastFromHandWatcher()); // When Iname as One dies, you may exile it. If you do, return target Spirit permanent card from your graveyard to the battlefield. ability = new DiesTriggeredAbility(new InameAsOneEffect(), false); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KuonOgreAscendant.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KuonOgreAscendant.java index eeb8bc91b2c..37b87fb708d 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KuonOgreAscendant.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KuonOgreAscendant.java @@ -70,8 +70,8 @@ public class KuonOgreAscendant extends CardImpl { Zone.BATTLEFIELD, new FlipSourceEffect(new KuonsEssenceToken()), TargetController.ANY, - new KuonOgreAscendantCondition(), false)); - this.addWatcher(new CreaturesDiedWatcher()); + new KuonOgreAscendantCondition(), false), + new CreaturesDiedWatcher()); } public KuonOgreAscendant(final KuonOgreAscendant card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java index 17337cb995f..d62b747d66b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java @@ -65,7 +65,7 @@ public class FleshAllergy extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new FleshAllergyEffect()); - this.addWatcher(new FleshAllergyWatcher()); + this.getSpellAbility().addWatcher(new FleshAllergyWatcher()); } public FleshAllergy (final FleshAllergy card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java index f3a7c906f55..244cf5be5a0 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java @@ -60,7 +60,7 @@ public class MoltenPsyche extends CardImpl { // Each player shuffles the cards from his or her hand into his or her library, then draws that many cards. // Metalcraft - If you control three or more artifacts, Molten Psyche deals damage to each opponent equal to the number of cards that player has drawn this turn. this.getSpellAbility().addEffect(new MoltenPsycheEffect()); - this.addWatcher(new MoltenPsycheWatcher()); + this.getSpellAbility().addWatcher(new MoltenPsycheWatcher()); } public MoltenPsyche(final MoltenPsyche card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java index dbe5bd751f1..56265845a21 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java @@ -61,8 +61,8 @@ public class TunnelIgnus extends CardImpl { this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addWatcher(new TunnelIgnusWatcher()); - this.addAbility(new TunnelIgnusTriggeredAbility()); + + this.addAbility(new TunnelIgnusTriggeredAbility(), new TunnelIgnusWatcher()); } public TunnelIgnus(final TunnelIgnus card) { diff --git a/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java b/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java index 034f48f18be..96516b21b99 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java +++ b/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java @@ -58,7 +58,7 @@ public class RelentlessAssault extends CardImpl { this.color.setRed(true); // Untap all creatures that attacked this turn. After this main phase, there is an additional combat phase followed by an additional main phase. - this.addWatcher(new AttackedThisTurnWatcher()); + this.getSpellAbility().addWatcher(new AttackedThisTurnWatcher()); this.getSpellAbility().addEffect(new RelentlessAssaultUntapEffect()); this.getSpellAbility().addEffect(new RelentlessAssaultAddPhasesEffect()); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DawnglowInfusion.java b/Mage.Sets/src/mage/sets/shadowmoor/DawnglowInfusion.java index eab04ec0ffa..27723c73509 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DawnglowInfusion.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DawnglowInfusion.java @@ -63,7 +63,7 @@ public class DawnglowInfusion extends CardImpl { new GainLifeEffect(xValue), new ManaWasSpentCondition(ColoredManaSymbol.W), " And X life if {W} was spent to cast it")); this.addInfo("Info1", "(Do both if {G}{W} was spent.)"); - this.addWatcher(new ManaSpentToCastWatcher()); + this.getSpellAbility().addWatcher(new ManaSpentToCastWatcher()); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DreamSalvage.java b/Mage.Sets/src/mage/sets/shadowmoor/DreamSalvage.java index 89efee118f2..0b1d64a61e8 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DreamSalvage.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DreamSalvage.java @@ -60,7 +60,7 @@ public class DreamSalvage extends CardImpl { // Draw cards equal to the number of cards target opponent discarded this turn. this.getSpellAbility().addEffect(new DreamSalvageEffect()); this.getSpellAbility().addTarget(new TargetOpponent()); - this.addWatcher(new CardsDiscardedThisTurnWatcher()); + this.getSpellAbility().addWatcher(new CardsDiscardedThisTurnWatcher()); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Firespout.java b/Mage.Sets/src/mage/sets/shadowmoor/Firespout.java index 2fca287e7dd..61d128aeb59 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Firespout.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Firespout.java @@ -69,7 +69,7 @@ public class Firespout extends CardImpl { new DamageAllEffect(3, filter2), new ManaWasSpentCondition(ColoredManaSymbol.G), " And 3 damage to each creature with flying if {G} was spent to cast it")); this.addInfo("Info1", "(Do both if {R}{G} was spent.)"); - this.addWatcher(new ManaSpentToCastWatcher()); + this.getSpellAbility().addWatcher(new ManaSpentToCastWatcher()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ManaReflection.java b/Mage.Sets/src/mage/sets/shadowmoor/ManaReflection.java index 52a3efc1f76..9557f72a9f1 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ManaReflection.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ManaReflection.java @@ -57,8 +57,7 @@ public class ManaReflection extends CardImpl { this.color.setGreen(true); // If you tap a permanent for mana, it produces twice as much of that mana instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ManaReflectionReplacementEffect())); - this.addWatcher(new PermanentTappedForManaWatcher()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ManaReflectionReplacementEffect()), new PermanentTappedForManaWatcher()); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RepelIntruders.java b/Mage.Sets/src/mage/sets/shadowmoor/RepelIntruders.java index a3d86d4bcd3..3eaec05a997 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RepelIntruders.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RepelIntruders.java @@ -65,7 +65,7 @@ public class RepelIntruders extends CardImpl { new ManaWasSpentCondition(ColoredManaSymbol.U), " Counter up to one target creature spell if {U} was spent to cast {this}")); this.getSpellAbility().addTarget(target); this.addInfo("Info1", "(Do both if {W}{U} was spent.)"); - this.addWatcher(new ManaSpentToCastWatcher()); + this.getSpellAbility().addWatcher(new ManaSpentToCastWatcher()); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RiversGrasp.java b/Mage.Sets/src/mage/sets/shadowmoor/RiversGrasp.java index 5fa05293835..408316bce89 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RiversGrasp.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RiversGrasp.java @@ -75,7 +75,7 @@ public class RiversGrasp extends CardImpl { this.getSpellAbility().addTarget(targetPlayer); this.addInfo("Info1", "(Do both if {U}{B} was spent.)"); - this.addWatcher(new ManaSpentToCastWatcher()); + this.getSpellAbility().addWatcher(new ManaSpentToCastWatcher()); } public RiversGrasp(final RiversGrasp card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java b/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java index e3a58b7a2ec..81b4ee53ed8 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java @@ -68,8 +68,7 @@ public class TwilightShepherd extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // When Twilight Shepherd enters the battlefield, return to your hand all cards in your graveyard that were put there from the battlefield this turn. - this.addWatcher(new CardsPutIntoGraveyardWatcher()); - this.addAbility(new EntersBattlefieldTriggeredAbility(new TwilightShepherdEffect(), false)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new TwilightShepherdEffect(), false), new CardsPutIntoGraveyardWatcher()); // Persist this.addAbility(new PersistAbility()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java b/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java index e3e773bbacd..c2276900057 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java @@ -63,8 +63,7 @@ public class EtherswornCanonist extends CardImpl { this.toughness = new MageInt(2); // Each player who has cast a nonartifact spell this turn can't cast additional nonartifact spells. - this.addWatcher(new EtherswornCanonistWatcher()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EtherswornCanonistReplacementEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EtherswornCanonistReplacementEffect()), new EtherswornCanonistWatcher()); } public EtherswornCanonist(final EtherswornCanonist card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java b/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java index 7ebf97d7791..09ef47f242b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java @@ -36,6 +36,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.target.common.TargetCreaturePermanent; +import mage.watchers.common.DamagedByWatcher; /** * @@ -56,6 +57,7 @@ public class MagmaSpray extends CardImpl { Effect effect = new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn); effect.setText("If that creature would die this turn, exile it instead"); this.getSpellAbility().addEffect(effect); + this.getSpellAbility().addWatcher(new DamagedByWatcher()); } public MagmaSpray(final MagmaSpray card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java b/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java index 792addde23f..f33a546bb80 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java @@ -69,7 +69,7 @@ public class Skeletonize extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // When a creature dealt damage this way dies this turn, put a 1/1 black Skeleton creature token onto the battlefield with "{B}: Regenerate this creature." this.getSpellAbility().addEffect(new SkeletonizeEffect()); - this.addWatcher(new DamagedByWatcher()); + this.getSpellAbility().addWatcher(new DamagedByWatcher()); } public Skeletonize(final Skeletonize card) { diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/TorrentOfSouls.java b/Mage.Sets/src/mage/sets/sorinvstibalt/TorrentOfSouls.java index a192ee01133..44d09194bfc 100644 --- a/Mage.Sets/src/mage/sets/sorinvstibalt/TorrentOfSouls.java +++ b/Mage.Sets/src/mage/sets/sorinvstibalt/TorrentOfSouls.java @@ -77,7 +77,7 @@ public class TorrentOfSouls extends CardImpl { this.getSpellAbility().addTarget(targetPlayer); this.addInfo("Info1", "(Do both if {B}{R} was spent.)"); - this.addWatcher(new ManaSpentToCastWatcher()); + this.getSpellAbility().addWatcher(new ManaSpentToCastWatcher()); } diff --git a/Mage.Sets/src/mage/sets/tempest/MoggConscripts.java b/Mage.Sets/src/mage/sets/tempest/MoggConscripts.java index f0a64dc8de4..41636036084 100644 --- a/Mage.Sets/src/mage/sets/tempest/MoggConscripts.java +++ b/Mage.Sets/src/mage/sets/tempest/MoggConscripts.java @@ -62,8 +62,7 @@ public class MoggConscripts extends CardImpl { this.toughness = new MageInt(2); // Mogg Conscripts can't attack unless you've cast a creature spell this turn. - this.addWatcher(new PlayerCastCreatureWatcher()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MoggConscriptsEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MoggConscriptsEffect()), new PlayerCastCreatureWatcher()); } public MoggConscripts(final MoggConscripts card) { diff --git a/Mage.Sets/src/mage/sets/tenth/Incinerate.java b/Mage.Sets/src/mage/sets/tenth/Incinerate.java index ceef626402d..1ac18556be8 100644 --- a/Mage.Sets/src/mage/sets/tenth/Incinerate.java +++ b/Mage.Sets/src/mage/sets/tenth/Incinerate.java @@ -57,7 +57,7 @@ public class Incinerate extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new IncinerateEffect()); - this.addWatcher(new DamagedByWatcher()); + this.getSpellAbility().addWatcher(new DamagedByWatcher()); } public Incinerate(final Incinerate card) { diff --git a/Mage.Sets/src/mage/sets/tenth/PhageTheUntouchable.java b/Mage.Sets/src/mage/sets/tenth/PhageTheUntouchable.java index ad41b8cc139..88e1629a13b 100644 --- a/Mage.Sets/src/mage/sets/tenth/PhageTheUntouchable.java +++ b/Mage.Sets/src/mage/sets/tenth/PhageTheUntouchable.java @@ -65,8 +65,7 @@ public class PhageTheUntouchable extends CardImpl { new EntersBattlefieldTriggeredAbility(new LoseGameSourceControllerEffect(), false), new InvertCondition(new CastFromHandCondition()), "When {this} enters the battlefield, if you didn't cast it from your hand, you lose the game" - )); - this.addWatcher(new CastFromHandWatcher()); + ), new CastFromHandWatcher()); // Whenever Phage deals combat damage to a creature, destroy that creature. It can't be regenerated. this.addAbility(new DealsCombatDamageToACreatureTriggeredAbility(new DestroyTargetEffect(true), false, true)); diff --git a/Mage.Sets/src/mage/sets/theros/AngerOfTheGods.java b/Mage.Sets/src/mage/sets/theros/AngerOfTheGods.java index b7704bcb6b5..5c2a208ea0a 100644 --- a/Mage.Sets/src/mage/sets/theros/AngerOfTheGods.java +++ b/Mage.Sets/src/mage/sets/theros/AngerOfTheGods.java @@ -35,6 +35,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.filter.common.FilterCreaturePermanent; +import mage.watchers.common.DamagedByWatcher; /** * @@ -53,6 +54,7 @@ public class AngerOfTheGods extends CardImpl { //If a creature dealt damage this way would die this turn, exile it instead. this.getSpellAbility().addEffect(new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn)); + this.getSpellAbility().addWatcher(new DamagedByWatcher()); } public AngerOfTheGods(final AngerOfTheGods card) { diff --git a/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java b/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java index 66afe5c6b4e..b328085bad0 100644 --- a/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java +++ b/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java @@ -56,7 +56,7 @@ public class RageOfPurphoros extends CardImpl { this.getSpellAbility().addEffect(new CantRegenerateTargetEffect(Duration.EndOfTurn, "It")); this.getSpellAbility().addEffect(new ScryEffect(1)); - this.addWatcher(new DamagedByWatcher()); + this.getSpellAbility().addWatcher(new DamagedByWatcher()); } public RageOfPurphoros(final RageOfPurphoros card) { diff --git a/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java b/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java index a62a31ad8b0..2d64b00c329 100644 --- a/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java +++ b/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java @@ -70,8 +70,7 @@ public class ShipbreakerKraken extends CardImpl { Ability ability = new BecomesMonstrousSourceTriggeredAbility(new TapTargetEffect()); ability.addTarget(new TargetCreaturePermanent(0,4)); ability.addEffect(new ShipbreakerKrakenReplacementEffect()); - this.addAbility(ability); - this.addWatcher(new ShipbreakerKrakenWatcher()); + this.addAbility(ability, new ShipbreakerKrakenWatcher()); } public ShipbreakerKraken(final ShipbreakerKraken card) { diff --git a/Mage.Sets/src/mage/sets/theros/TritonTactics.java b/Mage.Sets/src/mage/sets/theros/TritonTactics.java index 7ec540333c3..adc48470e27 100644 --- a/Mage.Sets/src/mage/sets/theros/TritonTactics.java +++ b/Mage.Sets/src/mage/sets/theros/TritonTactics.java @@ -77,7 +77,7 @@ public class TritonTactics extends CardImpl { this.getSpellAbility().addEffect(new TritonTacticsUntapTargetEffect()); this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new TritonTacticsTriggeredAbility())); - this.addWatcher(new BlockedCreaturesWatcher()); + this.getSpellAbility().addWatcher(new BlockedCreaturesWatcher()); } diff --git a/Mage.Sets/src/mage/sets/timespiral/ChronatogTotem.java b/Mage.Sets/src/mage/sets/timespiral/ChronatogTotem.java index a56594d2b3d..49a036eee2f 100644 --- a/Mage.Sets/src/mage/sets/timespiral/ChronatogTotem.java +++ b/Mage.Sets/src/mage/sets/timespiral/ChronatogTotem.java @@ -81,8 +81,7 @@ public class ChronatogTotem extends CardImpl { new ChronatogTotemCondition(), "{0}: {this} gets +3/+3 until end of turn. You skip your next turn. Activate this ability only once each turn and only if {this} is a creature"); ability.addEffect(new SkipNextTurnSourceEffect()); - this.addAbility(ability); - this.addWatcher(new ActivatedAbilityUsedThisTurnWatcher()); + this.addAbility(ability, new ActivatedAbilityUsedThisTurnWatcher()); } public ChronatogTotem(final ChronatogTotem card) { diff --git a/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java b/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java index 5efc1b49a7b..317a6273a74 100644 --- a/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java +++ b/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java @@ -104,7 +104,7 @@ class GreaterGargadonAbility extends ActivatedAbilityImpl { @Override public boolean canActivate(UUID playerId, Game game) { Card card = game.getCard(this.getSourceId()); - if(super.canActivate(playerId, game) && card != null && card.getCounters().getCount(CounterType.TIME) > 0){ + if(super.canActivate(playerId, game) && card != null && card.getCounters(game).getCount(CounterType.TIME) > 0){ return true; } return false; diff --git a/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java b/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java index fb12b3fedfe..e63d811fbca 100644 --- a/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java +++ b/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java @@ -90,8 +90,7 @@ public class JayaBallardTaskMage extends CardImpl { ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addEffect(new CantRegenerateEffect()); - this.addAbility(ability); - this.addWatcher(new DamagedByWatcher()); + this.addAbility(ability, new DamagedByWatcher()); // {5}{R}{R}, {tap}, Discard a card: Jaya Ballard deals 6 damage to each creature and each player. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(6), new ManaCostsImpl("{5}{R}{R}")); diff --git a/Mage.Sets/src/mage/sets/torment/Overmaster.java b/Mage.Sets/src/mage/sets/torment/Overmaster.java index f92d64de40d..46a3a2a61ce 100644 --- a/Mage.Sets/src/mage/sets/torment/Overmaster.java +++ b/Mage.Sets/src/mage/sets/torment/Overmaster.java @@ -58,7 +58,7 @@ public class Overmaster extends CardImpl { // The next instant or sorcery spell you cast this turn can't be countered by spells or abilities. this.getSpellAbility().addEffect(new OvermasterEffect()); - this.addWatcher(new OvermasterWatcher()); + this.getSpellAbility().addWatcher(new OvermasterWatcher()); // Draw a card. Effect effect = new DrawCardSourceControllerEffect(1); diff --git a/Mage.Sets/src/mage/sets/worldwake/Groundswell.java b/Mage.Sets/src/mage/sets/worldwake/Groundswell.java index 4e1f387359c..6bff573e174 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Groundswell.java +++ b/Mage.Sets/src/mage/sets/worldwake/Groundswell.java @@ -59,7 +59,7 @@ public class Groundswell extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GroundswellEffect(Duration.EndOfTurn)); - this.addWatcher(new LandfallWatcher()); + this.getSpellAbility().addWatcher(new LandfallWatcher()); } public Groundswell(final Groundswell card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/MysteriesOfTheDeep.java b/Mage.Sets/src/mage/sets/worldwake/MysteriesOfTheDeep.java index 8d24949481e..c1297bdb4b2 100644 --- a/Mage.Sets/src/mage/sets/worldwake/MysteriesOfTheDeep.java +++ b/Mage.Sets/src/mage/sets/worldwake/MysteriesOfTheDeep.java @@ -50,7 +50,7 @@ public class MysteriesOfTheDeep extends CardImpl { // Draw two cards. // Landfall - If you had a land enter the battlefield under your control this turn, draw three cards instead. - this.addWatcher(new LandfallWatcher()); + this.getSpellAbility().addWatcher(new LandfallWatcher()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DrawCardSourceControllerEffect(3), new DrawCardSourceControllerEffect(2), LandfallCondition.getInstance(), "Draw 2 cards. Landfall - If you had a land enter the battlefield under your control this turn, draw three cards instead")); } diff --git a/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java b/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java index 85225c6658e..fdabe4a2e0e 100644 --- a/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java @@ -67,7 +67,7 @@ public class PermafrostTrap extends CardImpl { this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new PermafrostTrapEffect()); - this.addWatcher(new PermafrostTrapWatcher()); + this.getSpellAbility().addWatcher(new PermafrostTrapWatcher()); } public PermafrostTrap(final PermafrostTrap card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java b/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java index 1f447395b96..c169fb0906a 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java @@ -70,7 +70,7 @@ public class RefractionTrap extends CardImpl { this.getSpellAbility().addTarget(new TargetSource()); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); - this.addWatcher(new RefractionTrapWatcher()); + this.getSpellAbility().addWatcher(new RefractionTrapWatcher()); } public RefractionTrap(final RefractionTrap card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java b/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java index de447844887..89345c036e1 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java +++ b/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java @@ -51,7 +51,7 @@ public class RestForTheWeary extends CardImpl { // Target player gains 4 life. // Landfall - If you had a land enter the battlefield under your control this turn, that player gains 8 life instead. - this.addWatcher(new LandfallWatcher()); + this.getSpellAbility().addWatcher(new LandfallWatcher()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new GainLifeTargetEffect(8), new GainLifeTargetEffect(4), LandfallCondition.getInstance(), "Target player gains 4 life.
Landfall - If you had a land enter the battlefield under your control this turn, that player gains 8 life instead")); this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java b/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java index 583b1534cdd..3dfe8b14603 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java @@ -73,7 +73,7 @@ public class RicochetTrap extends CardImpl { this.getSpellAbility().addEffect(new ChooseNewTargetsTargetEffect(true, true)); this.getSpellAbility().addTarget(new TargetSpell(filter)); - this.addWatcher(new RicochetTrapWatcher()); + this.getSpellAbility().addWatcher(new RicochetTrapWatcher()); } public RicochetTrap(final RicochetTrap card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java index c0bf9c26677..6f6f606532a 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java +++ b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java @@ -65,7 +65,7 @@ public class SearingBlaze extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addTarget(new SearingBlazeTarget()); this.getSpellAbility().addEffect(new SearingBlazeEffect()); - this.addWatcher(new LandfallWatcher()); + this.getSpellAbility().addWatcher(new LandfallWatcher()); } public SearingBlaze(final SearingBlaze card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/TombHex.java b/Mage.Sets/src/mage/sets/worldwake/TombHex.java index 8e56e332e16..68a318a48ed 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TombHex.java +++ b/Mage.Sets/src/mage/sets/worldwake/TombHex.java @@ -54,7 +54,7 @@ public class TombHex extends CardImpl { // Target creature gets -2/-2 until end of turn. // Landfall - If you had a land enter the battlefield under your control this turn, that creature gets -4/-4 until end of turn instead. - this.addWatcher(new LandfallWatcher()); + this.getSpellAbility().addWatcher(new LandfallWatcher()); this.getSpellAbility().addEffect(new ConditionalContinousEffect(new BoostTargetEffect(-4, -4, Duration.EndOfTurn), new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new LockedInCondition(LandfallCondition.getInstance()), "Target creature gets -2/-2 until end of turn. Landfall - If you had a land enter the battlefield under your control this turn, that creature gets -4/-4 until end of turn instead")); diff --git a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java index df87f8e4d60..9b8e24f3c96 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java @@ -60,8 +60,7 @@ public class ArchiveTrap extends CardImpl { this.color.setBlue(true); // If an opponent searched his or her library this turn, you may pay {0} rather than pay Archive Trap's mana cost. - this.addAbility(new AlternativeCostSourceAbility(new GenericManaCost(0), OpponentSearchesLibCondition.getInstance())); - this.addWatcher(new ArchiveTrapWatcher()); + this.addAbility(new AlternativeCostSourceAbility(new GenericManaCost(0), OpponentSearchesLibCondition.getInstance()), new ArchiveTrapWatcher()); // Target opponent puts the top thirteen cards of his or her library into his or her graveyard. this.getSpellAbility().addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java b/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java index 7270d36c9bc..b1133fa496f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java @@ -59,8 +59,7 @@ public class ArchmageAscension extends CardImpl { this.color.setBlue(true); // At the beginning of each end step, if you drew two or more cards this turn, you may put a quest counter on Archmage Ascension. - this.addAbility(new ArchmageAscensionTriggeredAbility()); - this.addWatcher(new CardsDrawnControllerWatcher()); + this.addAbility(new ArchmageAscensionTriggeredAbility(), new CardsDrawnControllerWatcher()); // As long as Archmage Ascension has six or more quest counters on it, if you would draw a card, you may instead search your library for a card, put that card into your hand, then shuffle your library. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArchmageAscensionReplacementEffect())); diff --git a/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java b/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java index d2e0699346a..3a36a09599a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java @@ -60,7 +60,7 @@ public class BalothCageTrap extends CardImpl { // If an opponent had an artifact enter the battlefield under his or her control this turn, you may pay {1}{G} rather than pay Baloth Cage Trap's mana cost. this.getSpellAbility().addAlternativeCost(new BalothCageTrapAlternativeCost()); - this.addWatcher(new BalothCageTrapWatcher()); + this.getSpellAbility().addWatcher(new BalothCageTrapWatcher()); // Put a 4/4 green Beast creature token onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastGreenToken())); diff --git a/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java b/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java index 00f7c04027a..fa224904334 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java @@ -63,7 +63,7 @@ public class CobraTrap extends CardImpl { // If a noncreature permanent under your control was destroyed this turn by a spell or ability an opponent controlled, you may pay {G} rather than pay Cobra Trap's mana cost. this.getSpellAbility().addAlternativeCost( new CobraTrapAlternativeCost()); - this.addWatcher(new CobraTrapWatcher()); + this.getSpellAbility().addWatcher(new CobraTrapWatcher()); // Put four 1/1 green Snake creature tokens onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new SnakeToken(), 4)); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java b/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java index 9e11761f5bc..31c14fb894b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java +++ b/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java @@ -71,8 +71,7 @@ public class Gomazoa extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {tap}: Put Gomazoa and each creature it's blocking on top of their owners' libraries, then those players shuffle their libraries. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GomazoaEffect(), new TapSourceCost())); - this.addWatcher(new BlockedByWatcher()); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GomazoaEffect(), new TapSourceCost()), new BlockedByWatcher()); } diff --git a/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java b/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java index e494a9f9c52..821a34bfdb9 100644 --- a/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java @@ -58,7 +58,7 @@ public class InfernoTrap extends CardImpl { // If you've been dealt damage by two or more creatures this turn, you may pay {R} rather than pay Inferno Trap's mana cost. this.getSpellAbility().addAlternativeCost(new InfernoTrapAlternativeCost()); - this.addWatcher(new ControllerDamagedByCreatureWatcher()); + this.getSpellAbility().addWatcher(new ControllerDamagedByCreatureWatcher()); // Inferno Trap deals 4 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); diff --git a/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java b/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java index 96737265ec1..9630fa052e5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java @@ -62,7 +62,7 @@ public class LavaballTrap extends CardImpl { // If an opponent had two or more lands enter the battlefield under his or her control this turn, you may pay {3}{R}{R} rather than pay Lavaball Trap's mana cost. this.getSpellAbility().addAlternativeCost(new LavaballTrapAlternativeCost()); - this.addWatcher(new LavaballTrapWatcher()); + this.getSpellAbility().addWatcher(new LavaballTrapWatcher()); // Destroy two target lands. Lavaball Trap deals 4 damage to each creature. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java b/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java index aa5c2c714c8..ec4f11a5d1a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java +++ b/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java @@ -79,8 +79,7 @@ public class LullmageMentor extends CardImpl { this.toughness = new MageInt(2); // Whenever a spell or ability you control counters a spell, you may put a 1/1 blue Merfolk creature token onto the battlefield. - this.addAbility(new LullmageMentorTriggeredAbility()); - this.addWatcher(new CastedSpellsWithSpellTarget()); + this.addAbility(new LullmageMentorTriggeredAbility(), new CastedSpellsWithSpellTarget()); // Tap seven untapped Merfolk you control: Counter target spell. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(7, 7, filter, true))); ability.addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java b/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java index a1deb161b8a..9942326adf8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java @@ -68,7 +68,7 @@ public class MindbreakTrap extends CardImpl { // If an opponent cast three or more spells this turn, you may pay {0} rather than pay Mindbreak Trap's mana cost. this.getSpellAbility().addAlternativeCost( new MindbreakTrapAlternativeCost()); - this.addWatcher(new MindbreakTrapWatcher()); + this.getSpellAbility().addWatcher(new MindbreakTrapWatcher()); // Exile any number of target spells. this.getSpellAbility().addTarget(new TargetSpell(0, Integer.MAX_VALUE, filter)); this.getSpellAbility().addEffect(new MindbreakEffect()); diff --git a/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java b/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java index 861eef51997..84cd7367564 100644 --- a/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java @@ -58,7 +58,7 @@ public class NeedlebiteTrap extends CardImpl { // If an opponent gained life this turn, you may pay {B} rather than pay Needlebite Trap's mana cost. this.getSpellAbility().addAlternativeCost( new NeedlebiteTrapAlternativeCost()); - this.addWatcher(new PlayerGainedLifeWatcher()); + this.getSpellAbility().addWatcher(new PlayerGainedLifeWatcher()); // Target player loses 5 life and you gain 5 life. this.getSpellAbility().addEffect(new LoseLifeTargetEffect(5)); diff --git a/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java b/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java index 1a690766e22..120edcf6c68 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java @@ -61,7 +61,7 @@ public class RavenousTrap extends CardImpl { // If an opponent had three or more cards put into his or her graveyard from anywhere this turn, you may pay {0} rather than pay Ravenous Trap's mana cost. this.getSpellAbility().addAlternativeCost( new RavenousTrapAlternativeCost()); - this.addWatcher(new CardsPutIntoGraveyardWatcher()); + this.getSpellAbility().addWatcher(new CardsPutIntoGraveyardWatcher()); // Exile all cards from target player's graveyard. this.getSpellAbility().addEffect(new ExileGraveyardAllTargetPlayerEffect()); diff --git a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java index 68deafa62a4..71621ce4083 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java @@ -60,7 +60,7 @@ public class RuneflareTrap extends CardImpl { // If an opponent drew three or more cards this turn, you may pay {R} rather than pay Runeflare Trap's mana cost. this.getSpellAbility().addAlternativeCost(new RuneflareTrapAlternativeCost()); - this.addWatcher(new CardsDrawnOpponentWatcher()); + this.getSpellAbility().addWatcher(new CardsDrawnOpponentWatcher()); // Runeflare Trap deals damage to target player equal to the number of cards in that player's hand. this.getSpellAbility().addEffect(new DamageTargetEffect(new TargetPlayerCardsInHandCount())); diff --git a/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java b/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java index e92f984f9cc..c5319ca860b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java @@ -71,7 +71,7 @@ public class SummoningTrap extends CardImpl { // Summoning Trap's mana cost. this.getSpellAbility().addAlternativeCost( new SummoningTrapAlternativeCost()); - this.addWatcher(new SummoningTrapWatcher()); + this.getSpellAbility().addWatcher(new SummoningTrapWatcher()); // Look at the top seven cards of your library. You may put a creature // card from among them onto the battlefield. Put the rest on the bottom // of your library in any order. diff --git a/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java b/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java index 15bb414d30e..7a7d6c91712 100644 --- a/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java @@ -60,7 +60,7 @@ public class WhiplashTrap extends CardImpl { // If an opponent had two or more creatures enter the battlefield under his or her control this turn, you may pay {U} rather than pay Whiplash Trap's mana cost. this.getSpellAbility().addAlternativeCost(new WhiplashAlternativeCost()); - this.addWatcher(new WhiplashTrapWatcher()); + this.getSpellAbility().addWatcher(new WhiplashTrapWatcher()); // Return two target creatures to their owners' hands. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java new file mode 100644 index 00000000000..afdc4d69538 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java @@ -0,0 +1,73 @@ +package org.mage.test.cards.abilities.keywords; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class CascadeTest extends CardTestPlayerBase { + + /* + * Maelstrom Nexus {WUBRG} + * Enchantment + * The first spell you cast each turn has cascade. (When you cast your first + * spell, exile cards from the top of your library until you exile a nonland + * card that costs less. You may cast it without paying its mana cost. Put + * the exiled cards on the bottom in a random order.) + * + * Predatory Advantage {3RG} + * Enchantment + * At the beginning of each opponent's end step, if that player didn't cast + * a creature spell this turn, put a 2/2 green Lizard creature token onto + * the battlefield. + */ + + // test that Predatory Advantage gains Cascade when cast + @Test + public void testGainsCascade() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.BATTLEFIELD, playerA, "Maelstrom Nexus"); + addCard(Zone.HAND, playerA, "Predatory Advantage"); + addCard(Zone.LIBRARY, playerA, "Sejiri Merfolk"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Predatory Advantage"); + + setStopAt(2, PhaseStep.END_TURN); + execute(); + + assertPermanentCount(playerA, "Predatory Advantage", 1); + assertPermanentCount(playerA, "Sejiri Merfolk", 1); + assertPermanentCount(playerA, "Lizard", 1); + + } + + // test that 2nd spell cast (Nacatl Outlander) does not gain Cascade + @Test + public void testLosesCascade() { + skipInitShuffling(); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 5); + addCard(Zone.BATTLEFIELD, playerA, "Maelstrom Nexus"); + addCard(Zone.HAND, playerA, "Predatory Advantage"); + addCard(Zone.HAND, playerA, "Nacatl Outlander"); + addCard(Zone.LIBRARY, playerA, "Arbor Elf"); + addCard(Zone.LIBRARY, playerA, "Sejiri Merfolk"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Predatory Advantage"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Nacatl Outlander"); + + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertPermanentCount(playerA, "Predatory Advantage", 1); + assertPermanentCount(playerA, "Sejiri Merfolk", 1); + assertPermanentCount(playerA, "Nacatl Outlander", 1); + assertPermanentCount(playerA, "Arbor Elf", 0); + + } +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/AggravateTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/AggravateTest.java new file mode 100644 index 00000000000..ecc5c05bdb0 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/AggravateTest.java @@ -0,0 +1,61 @@ +package org.mage.test.cards.watchers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class AggravateTest extends CardTestPlayerBase { + /* + * Aggravate + * Instant, 3RR (5) + * Aggravate deals 1 damage to each creature target player controls. Each + * creature dealt damage this way attacks this turn if able. + * + */ + + // test that creatures damaged by Aggravate attack + @Test + public void testDamagedCreaturesAttack() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerB, "Goblin Roughrider"); + addCard(Zone.HAND, playerA, "Aggravate"); + + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Aggravate", playerB); + + setStopAt(2, PhaseStep.DECLARE_BLOCKERS); + execute(); + + assertAttacking("Craw Wurm", true); + assertAttacking("Goblin Roughrider", true); + + } + + // test that creatures not damaged by Aggravate don't attack + @Test + public void testUndamagedCreaturesDontAttack() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerB, "Goblin Roughrider"); + addCard(Zone.HAND, playerA, "Aggravate"); + addCard(Zone.HAND, playerB, "Raging Goblin"); + + castSpell(2, PhaseStep.UPKEEP, playerA, "Aggravate", playerB); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Raging Goblin"); + + setStopAt(2, PhaseStep.DECLARE_BLOCKERS); + execute(); + + assertAttacking("Craw Wurm", true); + assertAttacking("Goblin Roughrider", true); + assertAttacking("Raging Goblin", false); + + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/AzoriusHeraldTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/AzoriusHeraldTest.java new file mode 100644 index 00000000000..2791389e3ae --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/AzoriusHeraldTest.java @@ -0,0 +1,55 @@ +package org.mage.test.cards.watchers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ + +public class AzoriusHeraldTest extends CardTestPlayerBase { + + /* + * Azorius Herald + * Creature — Spirit 2/1, 2W (3) + * Azorius Herald can't be blocked. + * When Azorius Herald enters the battlefield, you gain 4 life. + * When Azorius Herald enters the battlefield, sacrifice it unless {U} was spent to cast it. + * + */ + + // When Azorius Herald enters the battlefield, sacrifice it unless {U} was spent to cast it. + @Test + public void testBlueManaWasPaid() { + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.BATTLEFIELD, playerA, "Island"); + addCard(Zone.HAND, playerA, "Azorius Herald"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Azorius Herald"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerA, "Azorius Herald", 1); + + } + + @Test + public void testNoBlueManaWasPaid() { + addCard(Zone.BATTLEFIELD, playerA, "Plains", 3); + addCard(Zone.HAND, playerA, "Azorius Herald"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Azorius Herald"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerA, "Azorius Herald", 0); + assertGraveyardCount(playerA, "Azorius Herald", 1); + + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/BoseijuTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/BoseijuTest.java new file mode 100644 index 00000000000..63340f54f37 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/BoseijuTest.java @@ -0,0 +1,60 @@ +package org.mage.test.cards.watchers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class BoseijuTest extends CardTestPlayerBase { + /* + * Boseiju, Who Shelters All + * Legendary Land + * Boseiju, Who Shelters All enters the battlefield tapped. + * {T}, Pay 2 life: Add {1} to your mana pool. If that mana is spent on an + * instant or sorcery spell, that spell can't be countered by spells or abilities. + * + */ + + // test that instants and soceries can't be countered when Boseiju mana is used + @Test + public void testCantCounter() { + addCard(Zone.BATTLEFIELD, playerA, "Island", 6); + addCard(Zone.BATTLEFIELD, playerA, "Boseiju, Who Shelters All"); + addCard(Zone.HAND, playerA, "Brilliant Plan"); + addCard(Zone.HAND, playerA, "Counterspell"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Brilliant Plan"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Counterspell", "Brilliant Plan"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + this.assertHandCount(playerA, 3); + this.assertGraveyardCount(playerA, "Counterspell", 1); + + } + + // test that instants and soceries can be countered when Boseiju mana is not used + @Test + public void testCanCounter() { + addCard(Zone.BATTLEFIELD, playerA, "Island", 6); + addCard(Zone.BATTLEFIELD, playerA, "Boseiju, Who Shelters All"); + addCard(Zone.HAND, playerA, "Mental Note"); + addCard(Zone.HAND, playerA, "Counterspell"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mental Note"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Counterspell", "Mental Note"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + this.assertHandCount(playerA, 0); + this.assertGraveyardCount(playerA, 2); + + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/DiesExiledTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/DiesExiledTest.java new file mode 100644 index 00000000000..a3c53d22beb --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/DiesExiledTest.java @@ -0,0 +1,141 @@ +package org.mage.test.cards.watchers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class DiesExiledTest extends CardTestPlayerBase { + /* + * Kumano's Blessing + * Enchantment — Aura, 2R (3) + * Flash + * Enchant creature + * If a creature dealt damage by enchanted creature this turn would die, exile it instead. + * + */ + + // test that when creature damaged by enchanted creature dies it is exiled + @Test + public void testKumanosBlessing() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.HAND, playerA, "Kumano's Blessing"); + addCard(Zone.BATTLEFIELD, playerA, "Prodigal Pyromancer"); + addCard(Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Kumano's Blessing", "Prodigal Pyromancer"); + activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{T}: {source} deals 1 damage to target creature or player.", "Sejiri Merfolk"); + + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertPermanentCount(playerB, "Sejiri Merfolk", 0); + assertExileCount("Sejiri Merfolk", 1); + + } + + /* + * Frostwielder + * Creature — Human Shaman 1/2, 2RR (4) + * {T}: Frostwielder deals 1 damage to target creature or player. + * If a creature dealt damage by Frostwielder this turn would die, exile it instead. + * + */ + + // test that when creature damaged by Frostwielder dies it is exiled + @Test + public void testFrostwielder() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.BATTLEFIELD, playerA, "Frostwielder"); + addCard(Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); + + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: {source} deals 1 damage to target creature or player.", "Sejiri Merfolk"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerB, "Sejiri Merfolk", 0); + assertExileCount("Sejiri Merfolk", 1); + + } + + /* + * Kumano, Master Yamabushi + * Legendary Creature — Human Shaman 4/4, 3RR (5) + * {1}{R}: Kumano, Master Yamabushi deals 1 damage to target creature or player. + * If a creature dealt damage by Kumano this turn would die, exile it instead. + * + */ + + // test that when creature damaged by Kumano, Master Yamabushi dies it is exiled + @Test + public void testKumanoMasterYamabushi() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.BATTLEFIELD, playerA, "Kumano, Master Yamabushi"); + addCard(Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); + + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{1}{R}: {source} deals 1 damage to target creature or player.", "Sejiri Merfolk"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerB, "Sejiri Merfolk", 0); + assertExileCount("Sejiri Merfolk", 1); + + } + + /* + * Yamabushi's Flame + * Instant, 2R (3) + * Yamabushi's Flame deals 3 damage to target creature or player. If a + * creature dealt damage this way would die this turn, exile it instead. + * + */ + + // test that when creature damaged by Yamabushi's Flame dies it is exiled + @Test + public void testYamabushisFlame() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.HAND, playerA, "Yamabushi's Flame"); + addCard(Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Yamabushi's Flame", "Sejiri Merfolk"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerB, "Sejiri Merfolk", 0); + assertExileCount("Sejiri Merfolk", 1); + + } + + /* + * Yamabushi's Storm + * Sorcery, 1R (2) + * Yamabushi's Storm deals 1 damage to each creature. If a creature dealt + * damage this way would die this turn, exile it instead. + * + */ + + // test that when creatures damaged by Yamabushi's Storm die they are exiled + @Test + public void testYamabushisStorm() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.HAND, playerA, "Yamabushi's Storm"); + addCard(Zone.BATTLEFIELD, playerB, "Sejiri Merfolk", 2); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Yamabushi's Storm"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerB, "Sejiri Merfolk", 0); + assertExileCount("Sejiri Merfolk", 2); + + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/EpharaGodOfThePolisTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/EpharaGodOfThePolisTest.java new file mode 100644 index 00000000000..24c886f8d0f --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/EpharaGodOfThePolisTest.java @@ -0,0 +1,53 @@ +package org.mage.test.cards.watchers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class EpharaGodOfThePolisTest extends CardTestPlayerBase { + /* + * Ephara, God of the Polis + * Legendary Enchantment Creature — God 6/5, 2WU (4) + * Indestructible + * As long as your devotion to white and blue is less than seven, Ephara + * isn't a creature. + * At the beginning of each upkeep, if you had another creature enter the + * battlefield under your control last turn, draw a card. + * + */ + + // test that an extra card is drawn + @Test + public void testDrawCard() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerA, "Ephara, God of the Polis"); + addCard(Zone.HAND, playerA, "Goblin Roughrider"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin Roughrider"); + + setStopAt(3, PhaseStep.UPKEEP); + execute(); + + this.assertHandCount(playerA, 1); + + } + + // test that an extra card is not drawn + @Test + public void testNotDrawCard() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerA, "Ephara, God of the Polis"); + + setStopAt(3, PhaseStep.UPKEEP); + execute(); + + this.assertHandCount(playerA, 0); + + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/FellShepherdTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/FellShepherdTest.java new file mode 100644 index 00000000000..160f68428f0 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/FellShepherdTest.java @@ -0,0 +1,46 @@ +package org.mage.test.cards.watchers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class FellShepherdTest extends CardTestPlayerBase { + /* + * Fell Shepherd + * Creature — Avatar 8/6, 5BB (7) + * Whenever Fell Shepherd deals combat damage to a player, you may return to + * your hand all creature cards that were put into your graveyard from the battlefield this turn. + * {B}, Sacrifice another creature: Target creature gets -2/-2 until end of turn. + * + */ + + // test that creatures are returned to hand + @Test + public void testCreaturesReturn() { + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1); + addCard(Zone.BATTLEFIELD, playerA, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Raging Goblin"); + addCard(Zone.BATTLEFIELD, playerA, "Goblin Roughrider"); + addCard(Zone.BATTLEFIELD, playerA, "Fell Shepherd"); + + playerA.addChoice("Craw Wurm"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{B},Sacrifice another creature: Target creature gets -2/-2 until end of turn.", "Raging Goblin"); + attack(3, playerA, "Fell Shepherd"); + + setStopAt(3, PhaseStep.END_TURN); + execute(); + + assertLife(playerB, 12); + assertPermanentCount(playerA, "Goblin Roughrider", 1); + assertPermanentCount(playerA, "Raging Goblin", 0); + assertPermanentCount(playerA, "Craw Wurm", 0); + assertHandCount(playerA, "Craw Wurm", 1); + assertHandCount(playerA, "Raging Goblin", 1); + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/FuryOfTheHordeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/FuryOfTheHordeTest.java new file mode 100644 index 00000000000..99286d2cdd7 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/FuryOfTheHordeTest.java @@ -0,0 +1,78 @@ +package org.mage.test.cards.watchers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class FuryOfTheHordeTest extends CardTestPlayerBase { + /* + * Fury of the Horde + * Sorcery, 5RR (7) + * You may exile two red cards from your hand rather than pay Fury of the + * Horde's mana cost. + * Untap all creatures that attacked this turn. After this main phase, there + * is an additional combat phase followed by an additional main phase. + * + */ + + // test that creatures attack twice + @Test + public void testCreaturesAttackTwice() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 7); + addCard(Zone.BATTLEFIELD, playerA, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Goblin Roughrider"); + addCard(Zone.HAND, playerA, "Fury of the Horde"); + + attack(3, playerA, "Craw Wurm"); + attack(3, playerA, "Goblin Roughrider"); + castSpell(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Fury of the Horde"); + + setStopAt(3, PhaseStep.END_TURN); + execute(); + + this.assertLife(playerB, 2); + + } + + // test that creatures attack once + @Test + public void testCreaturesAttackOnce() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 7); + addCard(Zone.BATTLEFIELD, playerA, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Goblin Roughrider"); + addCard(Zone.HAND, playerA, "Fury of the Horde"); + + attack(3, playerA, "Craw Wurm"); + attack(3, playerA, "Goblin Roughrider"); + + setStopAt(3, PhaseStep.END_TURN); + execute(); + + this.assertLife(playerB, 11); + + } + + // test that only creatures that attacked attack twice + @Test + public void testCreaturesThatAttacked() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 7); + addCard(Zone.BATTLEFIELD, playerA, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Goblin Roughrider"); + addCard(Zone.HAND, playerA, "Fury of the Horde"); + + attack(3, playerA, "Craw Wurm"); + castSpell(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Fury of the Horde"); + + setStopAt(3, PhaseStep.END_TURN); + execute(); + + this.assertLife(playerB, 8); + + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/GoblinCohortTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/GoblinCohortTest.java new file mode 100644 index 00000000000..bb26ca0f2af --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/GoblinCohortTest.java @@ -0,0 +1,53 @@ +package org.mage.test.cards.watchers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class GoblinCohortTest extends CardTestPlayerBase { + /* + * Goblin Cohort + * Creature — Goblin Warrior 2/2, R (1) + * Goblin Cohort can't attack unless you've cast a creature spell this turn. + * + */ + + // test that Goblin Cohort can attack + @Test + public void testCanAttack() { + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerB, "Goblin Cohort"); + addCard(Zone.HAND, playerB, "Goblin Roughrider"); + + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Goblin Roughrider"); + attack(2, playerB, "Goblin Cohort"); + + setStopAt(2, PhaseStep.DECLARE_BLOCKERS); + execute(); + + assertAttacking("Goblin Cohort", true); + + } + + // test that Goblin Cohort can't attack + @Test + public void testCantAttack() { + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerB, "Goblin Cohort"); + addCard(Zone.HAND, playerB, "Goblin Roughrider"); + + attack(2, playerB, "Goblin Cohort"); + + setStopAt(2, PhaseStep.DECLARE_BLOCKERS); + execute(); + + assertAttacking("Goblin Cohort", false); + + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/HallOfTheBanditLordTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/HallOfTheBanditLordTest.java new file mode 100644 index 00000000000..20d74cefb82 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/HallOfTheBanditLordTest.java @@ -0,0 +1,55 @@ +package org.mage.test.cards.watchers; + +import mage.abilities.keyword.HasteAbility; +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class HallOfTheBanditLordTest extends CardTestPlayerBase { + /* + * Hall of the Bandit Lord + * Legendary Land + * Hall of the Bandit Lord enters the battlefield tapped. + * {T}, Pay 3 life: Add {1} to your mana pool. If that mana is spent on a + * creature spell, it gains haste. + * + */ + + // test that a creature cast using Hall of the Bandit Lord mana gains haste + @Test + public void testGainsHaste() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.BATTLEFIELD, playerA, "Hall of the Bandit Lord"); + addCard(Zone.HAND, playerA, "Goblin Roughrider"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin Roughrider"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + this.assertAbility(playerA, "Goblin Roughrider", HasteAbility.getInstance(), true); + + } + + // test that a creature cast not using Hall of the Bandit Lord mana does not gain haste + @Test + public void testNotGainsHaste() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.BATTLEFIELD, playerA, "Hall of the Bandit Lord"); + addCard(Zone.HAND, playerA, "Ember Hauler"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ember Hauler"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + this.assertAbility(playerA, "Ember Hauler", HasteAbility.getInstance(), false); + + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/KaradorGhostChieftainTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/KaradorGhostChieftainTest.java new file mode 100644 index 00000000000..0d02dcfddea --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/KaradorGhostChieftainTest.java @@ -0,0 +1,74 @@ +package org.mage.test.cards.watchers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class KaradorGhostChieftainTest extends CardTestPlayerBase { + /* + * Karador, Ghost Chieftain + * Legendary Creature — Centaur Spirit 3/4, 5WBG (8) + * Karador, Ghost Chieftain costs {1} less to cast for each creature card in your graveyard. + * During each of your turns, you may cast one creature card from your graveyard. + * + */ + + // test that can play spell from graveyard + @Test + public void testPlayFromGraveyard() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerA, "Karador, Ghost Chieftain"); + addCard(Zone.GRAVEYARD, playerA, "Raging Goblin"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Raging Goblin"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + this.assertPermanentCount(playerA, "Raging Goblin", 1); + this.assertGraveyardCount(playerA, "Raging Goblin", 0); + + } + + // test that can only play one spell from graveyard + @Test + public void testPlayOneFromGraveyard() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerA, "Karador, Ghost Chieftain"); + addCard(Zone.GRAVEYARD, playerA, "Raging Goblin", 2); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Raging Goblin"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Raging Goblin"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + this.assertPermanentCount(playerA, "Raging Goblin", 1); + this.assertGraveyardCount(playerA, "Raging Goblin", 1); + + } + + // test that can only play one spell from graveyard per turn + @Test + public void testPlayOneFromGraveyardPerTurn() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerA, "Karador, Ghost Chieftain"); + addCard(Zone.GRAVEYARD, playerA, "Raging Goblin", 2); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Raging Goblin"); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Raging Goblin"); + + setStopAt(3, PhaseStep.BEGIN_COMBAT); + execute(); + + this.assertPermanentCount(playerA, "Raging Goblin", 2); + this.assertGraveyardCount(playerA, "Raging Goblin", 0); + + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/OvermasterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/OvermasterTest.java new file mode 100644 index 00000000000..8cb0a04e440 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/OvermasterTest.java @@ -0,0 +1,66 @@ +package org.mage.test.cards.watchers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class OvermasterTest extends CardTestPlayerBase { + /* + * Overmaster + * Sorcery, R (1) + * The next instant or sorcery spell you cast this turn can't be countered by spells or abilities. + * Draw a card. + * + */ + + // test that next spell can't be countered + @Test + public void testCantCounter() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.HAND, playerA, "Counterspell"); + addCard(Zone.HAND, playerA, "Overmaster"); + addCard(Zone.BATTLEFIELD, playerA, "Raging Goblin"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Overmaster"); + + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Raging Goblin"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Counterspell", "Lightning Bolt"); + + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertPermanentCount(playerA, "Raging Goblin", 0); + assertGraveyardCount(playerA, "Raging Goblin", 1); + } + + // test that second spell can be countered + @Test + public void testCanCounter() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.HAND, playerA, "Lightning Bolt", 2); + addCard(Zone.HAND, playerA, "Counterspell"); + addCard(Zone.HAND, playerA, "Overmaster"); + addCard(Zone.BATTLEFIELD, playerA, "Raging Goblin", 2); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Overmaster"); + castSpell(1, PhaseStep.DECLARE_ATTACKERS, playerA, "Lightning Bolt", "Raging Goblin"); + + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Raging Goblin"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Counterspell", "Lightning Bolt"); + + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertPermanentCount(playerA, "Raging Goblin", 1); + assertGraveyardCount(playerA, "Raging Goblin", 1); + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/SiftThroughSandsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/SiftThroughSandsTest.java new file mode 100644 index 00000000000..13b4b6c999b --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/SiftThroughSandsTest.java @@ -0,0 +1,82 @@ +package org.mage.test.cards.watchers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class SiftThroughSandsTest extends CardTestPlayerBase { + /* + * Sift Through Sands + * Instant — Arcane, 1UU (3) + * Draw two cards, then discard a card. + * If you've cast a spell named Peer Through Depths and a spell named Reach + * Through Mists this turn, you may search your library for a card named + * The Unspeakable, put it onto the battlefield, then shuffle your library. + * + * Peer Through Depths + * Instant — Arcane, 1U (2) + * Look at the top five cards of your library. You may reveal an instant or + * sorcery card from among them and put it into your hand. Put the rest on + * the bottom of your library in any order. + * + * Reach Through Mists + * Instant — Arcane, U (1) + * Draw a card. + * + * The Unspeakable + * Legendary Creature — Spirit 6/7, 6UUU (9) + * Flying, trample + * Whenever The Unspeakable deals combat damage to a player, you may return + * target Arcane card from your graveyard to your hand. + * + */ + + // test that The Unspeakable is put onto the battlefield + @Test + public void testTheUnspeakable() { + addCard(Zone.BATTLEFIELD, playerA, "Island", 6); + addCard(Zone.HAND, playerA, "Sift Through Sands"); + addCard(Zone.HAND, playerA, "Peer Through Depths"); + addCard(Zone.HAND, playerA, "Reach Through Mists"); + addCard(Zone.LIBRARY, playerA, "The Unspeakable"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Reach Through Mists"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Peer Through Depths"); + + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Sift Through Sands"); + + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertPermanentCount(playerA, "The Unspeakable", 1); + assertHandCount(playerA, 2); + + } + + // test that The Unspeakable is not put onto the battlefield + @Test + public void testNotTheUnspeakable() { + addCard(Zone.BATTLEFIELD, playerA, "Island", 6); + addCard(Zone.HAND, playerA, "Sift Through Sands"); + addCard(Zone.HAND, playerA, "Peer Through Depths"); + addCard(Zone.HAND, playerA, "Reach Through Mists"); + addCard(Zone.LIBRARY, playerA, "The Unspeakable"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Reach Through Mists"); + + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Sift Through Sands"); + + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertPermanentCount(playerA, "The Unspeakable", 0); + assertHandCount(playerA, 3); + + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/SpiritOfTheLabyrinthTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/SpiritOfTheLabyrinthTest.java new file mode 100644 index 00000000000..2dae2257e5e --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/SpiritOfTheLabyrinthTest.java @@ -0,0 +1,37 @@ +package org.mage.test.cards.watchers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class SpiritOfTheLabyrinthTest extends CardTestPlayerBase { + /* + * Spirit of the Labyrinth + * Enchantment Creature — Spirit 3/1, 1W (2) + * Each player can't draw more than one card each turn. + * + */ + + // test that only 1 card is drawn + @Test + public void testDrawCard() { + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + addCard(Zone.BATTLEFIELD, playerA, "Spirit of the Labyrinth"); + addCard(Zone.HAND, playerA, "Brilliant Plan"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Brilliant Plan"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + this.assertHandCount(playerA, 1); + + } + + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/TunnelIgnusTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/TunnelIgnusTest.java new file mode 100644 index 00000000000..d80e7b1e3fd --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/TunnelIgnusTest.java @@ -0,0 +1,38 @@ +package org.mage.test.cards.watchers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class TunnelIgnusTest extends CardTestPlayerBase { + /* + * Tunnel Ignus + * Creature — Elemental 2/1, 1R (2) + * Whenever a land enters the battlefield under an opponent's control, if + * that player had another land enter the battlefield under his or her + * control this turn, Tunnel Ignus deals 3 damage to that player. + * + */ + + // test extra lands damage controller + @Test + public void testExtraLandsDamage() { + addCard(Zone.BATTLEFIELD, playerB, "Tunnel Ignus"); + addCard(Zone.HAND, playerA, "Scalding Tarn"); + + playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Scalding Tarn"); + activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{T}, Pay 1 life, Sacrifice {this}: Search your library for a Island or Mountain and put it onto the battlefield. Then shuffle your library."); + + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertLife(playerA, 16); + assertGraveyardCount(playerA, "Scalding Tarn", 1); + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/UnscytheKillerOfKingsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/UnscytheKillerOfKingsTest.java new file mode 100644 index 00000000000..8c5a7783a44 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/UnscytheKillerOfKingsTest.java @@ -0,0 +1,66 @@ +package org.mage.test.cards.watchers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class UnscytheKillerOfKingsTest extends CardTestPlayerBase { + /* + * Unscythe, Killer of Kings + * Legendary Artifact — Equipment, UBBR (4) + * Equipped creature gets +3/+3 and has first strike. + * Whenever a creature dealt damage by equipped creature this turn dies, you + * may exile that card. If you do, put a 2/2 black Zombie creature token onto + * the battlefield. + * Equip {2} + * + */ + + // test that when creature damaged by equipped creature dies a Zombie token is created + @Test + public void testDamagedCreatureDies() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.BATTLEFIELD, playerA, "Unscythe, Killer of Kings"); + addCard(Zone.BATTLEFIELD, playerA, "Prodigal Pyromancer"); + addCard(Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); + + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", "Prodigal Pyromancer"); + activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{T}: {source} deals 1 damage to target creature or player.", "Sejiri Merfolk"); + + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertPermanentCount(playerB, "Sejiri Merfolk", 0); + assertPermanentCount(playerA, "Zombie", 1); + assertExileCount("Sejiri Merfolk", 1); + + } + + // test that when creature damaged by equipped creature dies a Zombie token is created + @Test + public void testDamagedCreatureDiesAfterEquipped() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.BATTLEFIELD, playerA, "Unscythe, Killer of Kings"); + addCard(Zone.BATTLEFIELD, playerA, "Prodigal Pyromancer"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); + + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: {source} deals 1 damage to target creature or player.", "Craw Wurm"); + activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Equip", "Prodigal Pyromancer"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Craw Wurm"); + + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertPermanentCount(playerB, "Craw Wurm", 0); + assertPermanentCount(playerA, "Zombie", 1); + assertExileCount("Craw Wurm", 1); + + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/ZuberasTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/ZuberasTest.java new file mode 100644 index 00000000000..6561393c922 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/ZuberasTest.java @@ -0,0 +1,70 @@ +package org.mage.test.cards.watchers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class ZuberasTest extends CardTestPlayerBase { + /* + * Ashen-Skin Zubera + * Creature — Zubera Spirit 1/2, 1B (2) + * When Ashen-Skin Zubera dies, target opponent discards a card for each + * Zubera that died this turn. + + * Dripping-Tongue Zubera + * Creature — Zubera Spirit 1/2, 1G (2) + * When Dripping-Tongue Zubera dies, put a 1/1 colorless Spirit creature + * token onto the battlefield for each Zubera that died this turn. + + * Ember-Fist Zubera + * Creature — Zubera Spirit 1/2, 1R (2) + * When Ember-Fist Zubera dies, it deals damage to target creature or player + * equal to the number of Zubera that died this turn. + + * Floating-Dream Zubera + * Creature — Zubera Spirit 1/2, 1U (2) + * When Floating-Dream Zubera dies, draw a card for each Zubera that died + * this turn. + + * Silent-Chant Zubera + * Creature — Zubera Spirit 1/2, 1W (2) + * When Silent-Chant Zubera dies, you gain 2 life for each Zubera that died this turn. + */ + + // test that creatures damaged by Aggravate attack + @Test + public void testZuberas() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerA, "Ashen-Skin Zubera"); + addCard(Zone.BATTLEFIELD, playerA, "Dripping-Tongue Zubera"); + addCard(Zone.BATTLEFIELD, playerA, "Ember-Fist Zubera"); + addCard(Zone.BATTLEFIELD, playerA, "Floating-Dream Zubera"); + addCard(Zone.BATTLEFIELD, playerA, "Silent-Chant Zubera"); + addCard(Zone.HAND, playerA, "Lightning Bolt", 5); + addCard(Zone.HAND, playerB, "Island", 3); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Silent-Chant Zubera"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Floating-Dream Zubera"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Ember-Fist Zubera"); + addTarget(playerA, playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Ashen-Skin Zubera"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Dripping-Tongue Zubera"); + + setStopAt(1, PhaseStep.DECLARE_BLOCKERS); + execute(); + + assertPermanentCount(playerA, "Spirit", 1); + assertHandCount(playerB, 1); + assertHandCount(playerA, 4); + assertLife(playerB, 17); + assertLife(playerA, 30); + + } + + +} diff --git a/Mage/src/mage/abilities/Ability.java b/Mage/src/mage/abilities/Ability.java index 85e3526ea92..5d31f50d971 100644 --- a/Mage/src/mage/abilities/Ability.java +++ b/Mage/src/mage/abilities/Ability.java @@ -50,6 +50,7 @@ import mage.game.Game; import mage.players.Player; import mage.target.Target; import mage.target.Targets; +import mage.watchers.Watcher; /** * Practically everything in the game is started from an Ability. This @@ -360,6 +361,9 @@ public interface Ability extends Controllable, Serializable { boolean canChooseTarget(Game game); + List getWatchers(); + void addWatcher(Watcher watcher); + /** * Returns true if this abilities source is in the zone for the ability * diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java index c3af738254f..86778a06933 100644 --- a/Mage/src/mage/abilities/AbilityImpl.java +++ b/Mage/src/mage/abilities/AbilityImpl.java @@ -75,6 +75,7 @@ import mage.game.stack.StackAbility; import mage.players.Player; import mage.target.Target; import mage.target.Targets; +import mage.watchers.Watcher; import org.apache.log4j.Logger; /** @@ -84,6 +85,7 @@ import org.apache.log4j.Logger; public abstract class AbilityImpl implements Ability { private static final transient Logger logger = Logger.getLogger(AbilityImpl.class); + private static final List emptyWatchers = new ArrayList<>(); protected UUID id; protected UUID originalId; @@ -107,6 +109,7 @@ public abstract class AbilityImpl implements Ability { protected boolean activated = false; protected boolean worksFaceDown = false; protected MageObject sourceObject; + protected List watchers = null; public AbilityImpl(AbilityType abilityType, Zone zone) { this.id = UUID.randomUUID(); @@ -136,6 +139,12 @@ public abstract class AbilityImpl implements Ability { for (AlternativeCost cost: ability.alternativeCosts) { this.alternativeCosts.add((AlternativeCost)cost.copy()); } + if (ability.watchers != null) { + this.watchers = new ArrayList<>(); + for (Watcher watcher: ability.watchers) { + watchers.add(watcher.copy()); + } + } this.modes = ability.modes.copy(); this.ruleAtTheTop = ability.ruleAtTheTop; this.ruleVisible = ability.ruleVisible; @@ -548,6 +557,11 @@ public abstract class AbilityImpl implements Ability { @Override public void setControllerId(UUID controllerId) { this.controllerId = controllerId; + if (watchers != null) { + for (Watcher watcher: watchers) { + watcher.setControllerId(controllerId); + } + } } @@ -565,6 +579,11 @@ public abstract class AbilityImpl implements Ability { this.sourceId = sourceId; } } + if (watchers != null) { + for (Watcher watcher: watchers) { + watcher.setSourceId(sourceId); + } + } } @Override @@ -624,6 +643,23 @@ public abstract class AbilityImpl implements Ability { return zone; } + @Override + public List getWatchers() { + if (watchers != null) + return watchers; + else + return emptyWatchers; + } + + @Override + public void addWatcher(Watcher watcher) { + if (watchers == null) + watchers = new ArrayList<>(); + watcher.setSourceId(this.sourceId); + watcher.setControllerId(this.controllerId); + watchers.add(watcher); + } + @Override public boolean isUsesStack() { return usesStack; diff --git a/Mage/src/mage/abilities/TriggeredAbilities.java b/Mage/src/mage/abilities/TriggeredAbilities.java index dba1a450f70..bf49b4f0dec 100644 --- a/Mage/src/mage/abilities/TriggeredAbilities.java +++ b/Mage/src/mage/abilities/TriggeredAbilities.java @@ -140,12 +140,17 @@ public class TriggeredAbilities extends ConcurrentHashMap uuidList = new LinkedList<>(); - uuidList.add(sourceId); - // if the object that gained the ability moves zone, also then the triggered ability must be removed - uuidList.add(attachedTo.getId()); - sources.put(getKey(ability, attachedTo), uuidList); + if (sourceId == null) { + add(ability, attachedTo); + } + else { + this.add(ability, attachedTo); + List uuidList = new LinkedList<>(); + uuidList.add(sourceId); + // if the object that gained the ability moves zone, also then the triggered ability must be removed + uuidList.add(attachedTo.getId()); + sources.put(getKey(ability, attachedTo), uuidList); + } } public void add(TriggeredAbility ability, MageObject attachedTo) { diff --git a/Mage/src/mage/abilities/condition/common/SourceHasCounterCondition.java b/Mage/src/mage/abilities/condition/common/SourceHasCounterCondition.java index 357a638e739..42a249b4621 100644 --- a/Mage/src/mage/abilities/condition/common/SourceHasCounterCondition.java +++ b/Mage/src/mage/abilities/condition/common/SourceHasCounterCondition.java @@ -74,7 +74,7 @@ public class SourceHasCounterCondition implements Condition { if (from != -1) { //range compare int count; if (card != null) { - count = card.getCounters().getCount(counterType); + count = card.getCounters(game).getCount(counterType); } else { count = permanent.getCounters().getCount(counterType); } @@ -84,7 +84,7 @@ public class SourceHasCounterCondition implements Condition { return count >= from && count <= to; } else { // single compare (lte) if (card != null) { - return card.getCounters().getCount(counterType) >= amount; + return card.getCounters(game).getCount(counterType) >= amount; } else { return permanent.getCounters().getCount(counterType) >= amount; } diff --git a/Mage/src/mage/abilities/condition/common/SuspendedCondition.java b/Mage/src/mage/abilities/condition/common/SuspendedCondition.java index 3b2538b5843..742f30ce30e 100644 --- a/Mage/src/mage/abilities/condition/common/SuspendedCondition.java +++ b/Mage/src/mage/abilities/condition/common/SuspendedCondition.java @@ -71,7 +71,7 @@ public class SuspendedCondition implements Condition { } if (found) { if (game.getState().getZone(card.getId()) == Zone.EXILED && - card.getCounters().getCount(CounterType.TIME) > 0) { + card.getCounters(game).getCount(CounterType.TIME) > 0) { return true; } } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java b/Mage/src/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java index 3a06c8aa580..a1df5caba3c 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java @@ -32,7 +32,6 @@ import mage.abilities.Ability; import mage.abilities.MageSingleton; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; -import mage.cards.Card; import mage.game.Game; import mage.watchers.common.PlayerGainedLifeWatcher; @@ -53,8 +52,7 @@ public class ControllerGotLifeCount implements DynamicValue, MageSingleton { return fINSTANCE; } - public static ControllerGotLifeCount getInstance(Card card) { - card.addWatcher(new PlayerGainedLifeWatcher()); + public static ControllerGotLifeCount getInstance() { return fINSTANCE; } diff --git a/Mage/src/mage/abilities/effects/common/counter/RemoveCounterSourceEffect.java b/Mage/src/mage/abilities/effects/common/counter/RemoveCounterSourceEffect.java index 8b27a016726..da5842f460e 100644 --- a/Mage/src/mage/abilities/effects/common/counter/RemoveCounterSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/counter/RemoveCounterSourceEffect.java @@ -65,11 +65,11 @@ public class RemoveCounterSourceEffect extends OneShotEffect { return true; } Card c = game.getCard(source.getSourceId()); - if (c != null && c.getCounters().getCount(counter.getName()) >= counter.getCount()) { + if (c != null && c.getCounters(game).getCount(counter.getName()) >= counter.getCount()) { c.removeCounters(counter.getName(), counter.getCount(), game); game.informPlayers(new StringBuilder("Removed ").append(counter.getCount()).append(" ").append(counter.getName()) .append(" counter from ").append(c.getName()) - .append(" (").append(c.getCounters().getCount(counter.getName())).append(" left)").toString()); + .append(" (").append(c.getCounters(game).getCount(counter.getName())).append(" left)").toString()); return true; } return false; diff --git a/Mage/src/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java b/Mage/src/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java index d6bcef4738b..4d8d3f79686 100644 --- a/Mage/src/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java @@ -66,11 +66,11 @@ public class RemoveCounterTargetEffect extends OneShotEffect { return true; } Card c = game.getCard(targetPointer.getFirst(game, source)); - if (c != null && c.getCounters().getCount(counter.getName()) >= counter.getCount()) { + if (c != null && c.getCounters(game).getCount(counter.getName()) >= counter.getCount()) { c.removeCounters(counter.getName(), counter.getCount(), game); game.informPlayers(new StringBuilder("Removed ").append(counter.getCount()).append(" ").append(counter.getName()) .append(" counter from ").append(c.getName()) - .append(" (").append(c.getCounters().getCount(counter.getName())).append(" left)").toString()); + .append(" (").append(c.getCounters(game).getCount(counter.getName())).append(" left)").toString()); return true; } return false; diff --git a/Mage/src/mage/abilities/effects/common/replacement/DealtDamageToCreatureBySourceDies.java b/Mage/src/mage/abilities/effects/common/replacement/DealtDamageToCreatureBySourceDies.java index e9781d1bc2c..bc7a72bdc91 100644 --- a/Mage/src/mage/abilities/effects/common/replacement/DealtDamageToCreatureBySourceDies.java +++ b/Mage/src/mage/abilities/effects/common/replacement/DealtDamageToCreatureBySourceDies.java @@ -52,7 +52,6 @@ public class DealtDamageToCreatureBySourceDies extends ReplacementEffectImpl { public DealtDamageToCreatureBySourceDies(Card card, Duration duration) { super(Duration.WhileOnBattlefield, Outcome.Exile); - card.addWatcher(new DamagedByWatcher()); if (card.getCardType().contains(CardType.CREATURE)) { staticText = "If a creature dealt damage by {this} this turn would die, exile it instead"; } else { diff --git a/Mage/src/mage/abilities/keyword/MiracleAbility.java b/Mage/src/mage/abilities/keyword/MiracleAbility.java index 1b601d5b548..56691ee1c7c 100644 --- a/Mage/src/mage/abilities/keyword/MiracleAbility.java +++ b/Mage/src/mage/abilities/keyword/MiracleAbility.java @@ -98,7 +98,7 @@ public class MiracleAbility extends TriggeredAbilityImpl { @SuppressWarnings("unchecked") public MiracleAbility(Card card, ManaCosts miracleCosts) { super(Zone.HAND, new MiracleEffect((ManaCosts)miracleCosts), true); - card.addWatcher(new MiracleWatcher()); + addWatcher(new MiracleWatcher()); ruleText = "Miracle " + miracleCosts.getText() + staticRule; } diff --git a/Mage/src/mage/abilities/keyword/ProwlAbility.java b/Mage/src/mage/abilities/keyword/ProwlAbility.java index 35711dcbe99..fb752f990b5 100644 --- a/Mage/src/mage/abilities/keyword/ProwlAbility.java +++ b/Mage/src/mage/abilities/keyword/ProwlAbility.java @@ -72,7 +72,7 @@ public class ProwlAbility extends StaticAbility implements AlternativeSourceCost name = PROWL_KEYWORD; setReminderText(card); this.addProwlCost(manaString); - card.addWatcher(new ProwlWatcher()); + addWatcher(new ProwlWatcher()); } diff --git a/Mage/src/mage/abilities/keyword/SuspendAbility.java b/Mage/src/mage/abilities/keyword/SuspendAbility.java index bf6a2a9dbb0..7cff82d2a2b 100644 --- a/Mage/src/mage/abilities/keyword/SuspendAbility.java +++ b/Mage/src/mage/abilities/keyword/SuspendAbility.java @@ -290,7 +290,7 @@ class SuspendPlayCardAbility extends TriggeredAbilityImpl { if (event.getTargetId().equals(getSourceId())) { Card card = game.getCard(getSourceId()); if (card != null && game.getState().getZone(card.getId()) == Zone.EXILED - && card.getCounters().getCount(CounterType.TIME) == 0) { + && card.getCounters(game).getCount(CounterType.TIME) == 0) { return true; } } diff --git a/Mage/src/mage/cards/Card.java b/Mage/src/mage/cards/Card.java index 25f7edc7018..aa53894b2e2 100644 --- a/Mage/src/mage/cards/Card.java +++ b/Mage/src/mage/cards/Card.java @@ -49,11 +49,9 @@ public interface Card extends MageObject { Rarity getRarity(); void setOwnerId(UUID ownerId); void addAbility(Ability ability); - void addWatcher(Watcher watcher); void setSpellAbility(SpellAbility ability); SpellAbility getSpellAbility(); List getRules(); - List getWatchers(); String getExpansionSetCode(); String getTokenSetCode(); void setFaceDown(boolean value); @@ -119,7 +117,7 @@ public interface Card extends MageObject { * @return true if there exists various art images for this card */ boolean getUsesVariousArt(); - Counters getCounters(); + Counters getCounters(Game game); void addCounters(String name, int amount, Game game); void addCounters(String name, int amount, Game game, ArrayList appliedEffects); diff --git a/Mage/src/mage/cards/CardImpl.java b/Mage/src/mage/cards/CardImpl.java index 6774095dc5e..505ffe95035 100644 --- a/Mage/src/mage/cards/CardImpl.java +++ b/Mage/src/mage/cards/CardImpl.java @@ -76,7 +76,6 @@ public abstract class CardImpl extends MageObjectImpl implements Card { protected UUID ownerId; protected int cardNumber; - protected List watchers = new ArrayList<>(); protected String expansionSetCode; protected String tokenSetCode; protected Rarity rarity; @@ -90,7 +89,6 @@ public abstract class CardImpl extends MageObjectImpl implements Card { protected int zoneChangeCounter = 1; protected Map info; protected boolean usesVariousArt = false; - protected Counters counters; protected boolean splitCard; protected boolean morphCard; @@ -119,7 +117,6 @@ public abstract class CardImpl extends MageObjectImpl implements Card { abilities.add(ability); } this.usesVariousArt = Character.isDigit(this.getClass().getName().charAt(this.getClass().getName().length()-1)); - this.counters = new Counters(); this.morphCard = false; } @@ -134,14 +131,12 @@ public abstract class CardImpl extends MageObjectImpl implements Card { protected CardImpl(UUID ownerId, String name) { this.ownerId = ownerId; this.name = name; - this.counters = new Counters(); } protected CardImpl(UUID id, UUID ownerId, String name) { super(id); this.ownerId = ownerId; this.name = name; - this.counters = new Counters(); } public CardImpl(final CardImpl card) { @@ -150,10 +145,6 @@ public abstract class CardImpl extends MageObjectImpl implements Card { cardNumber = card.cardNumber; expansionSetCode = card.expansionSetCode; rarity = card.rarity; - this.watchers.clear(); - for (Watcher watcher: (List)card.getWatchers()) { - watchers.add(watcher.copy()); - } faceDown = card.faceDown; canTransform = card.canTransform; @@ -170,7 +161,6 @@ public abstract class CardImpl extends MageObjectImpl implements Card { flipCardName = card.flipCardName; splitCard = card.splitCard; usesVariousArt = card.usesVariousArt; - counters = card.counters.copy(); morphCard = card.isMorphCard(); } @@ -241,14 +231,12 @@ public abstract class CardImpl extends MageObjectImpl implements Card { ability.setSourceId(this.getId()); abilities.add(ability); } - - @Override - public void addWatcher(Watcher watcher) { - watcher.setSourceId(this.getId()); - watcher.setControllerId(this.ownerId); - watchers.add(watcher); - } + protected void addAbility(Ability ability, Watcher watcher) { + addAbility(ability); + ability.addWatcher(watcher); + } + @Override public SpellAbility getSpellAbility() { if (spellAbility == null) { @@ -268,11 +256,6 @@ public abstract class CardImpl extends MageObjectImpl implements Card { abilities.setControllerId(ownerId); } - @Override - public List getWatchers() { - return watchers; - } - @Override public String getExpansionSetCode() { return expansionSetCode; @@ -664,8 +647,8 @@ public abstract class CardImpl extends MageObjectImpl implements Card { } @Override - public Counters getCounters() { - return counters; + public Counters getCounters(Game game) { + return game.getState().getCardState(this.objectId).getCounters(); } @Override @@ -682,7 +665,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card { GameEvent event = GameEvent.getEvent(GameEvent.EventType.ADD_COUNTER, objectId, ownerId, name, 1); event.setAppliedEffects(appliedEffects); if (!game.replaceEvent(event)) { - counters.addCounter(name, 1); + game.getState().getCardState(this.objectId).getCounters().addCounter(name, 1); game.fireEvent(GameEvent.getEvent(GameEvent.EventType.COUNTER_ADDED, objectId, ownerId, name, 1)); } } @@ -706,7 +689,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card { GameEvent event = GameEvent.getEvent(GameEvent.EventType.ADD_COUNTER, objectId, ownerId, counter.getName(), 1); event.setAppliedEffects(appliedEffects); if (!game.replaceEvent(event)) { - counters.addCounter(eventCounter); + game.getState().getCardState(this.objectId).getCounters().addCounter(eventCounter); game.fireEvent(GameEvent.getEvent(GameEvent.EventType.COUNTER_ADDED, objectId, ownerId, counter.getName(), 1)); } } @@ -716,7 +699,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card { @Override public void removeCounters(String name, int amount, Game game) { for (int i = 0; i < amount; i++) { - counters.removeCounter(name, 1); + game.getState().getCardState(this.objectId).getCounters().removeCounter(name, 1); GameEvent event = GameEvent.getEvent(GameEvent.EventType.COUNTER_REMOVED, objectId, ownerId); event.setData(name); game.fireEvent(event); diff --git a/Mage/src/mage/cards/SplitCard.java b/Mage/src/mage/cards/SplitCard.java index 204812c3fec..1a5fb845fcd 100644 --- a/Mage/src/mage/cards/SplitCard.java +++ b/Mage/src/mage/cards/SplitCard.java @@ -42,7 +42,6 @@ import static mage.constants.SpellAbilityType.SPLIT_LEFT; import static mage.constants.SpellAbilityType.SPLIT_RIGHT; import mage.constants.Zone; import mage.game.Game; -import mage.watchers.Watcher; /** * @@ -166,14 +165,6 @@ public abstract class SplitCard extends CardImpl { } - @Override - public List getWatchers() { - List allWatchers = new ArrayList<>(); - allWatchers.addAll(super.getWatchers()); - allWatchers.addAll(leftHalfCard.getWatchers()); - allWatchers.addAll(rightHalfCard.getWatchers()); - return allWatchers; - } } /* diff --git a/Mage/src/mage/filter/predicate/permanent/CounterPredicate.java b/Mage/src/mage/filter/predicate/permanent/CounterPredicate.java index 4c8852246fa..320ad68eca5 100644 --- a/Mage/src/mage/filter/predicate/permanent/CounterPredicate.java +++ b/Mage/src/mage/filter/predicate/permanent/CounterPredicate.java @@ -46,7 +46,7 @@ public class CounterPredicate implements Predicate { @Override public boolean apply(Card input, Game game) { - return input.getCounters().containsKey(counter); + return input.getCounters(game).containsKey(counter); } @Override diff --git a/Mage/src/mage/game/CardState.java b/Mage/src/mage/game/CardState.java new file mode 100644 index 00000000000..3311c5e5193 --- /dev/null +++ b/Mage/src/mage/game/CardState.java @@ -0,0 +1,64 @@ +package mage.game; + +import java.util.HashMap; +import java.util.Map; +import mage.abilities.Abilities; +import mage.abilities.AbilitiesImpl; +import mage.abilities.Ability; +import mage.counters.Counters; +/** + * + * @author BetaSteward + */ +public class CardState { + + protected Map info; + protected Counters counters; + + private static final Map emptyInfo = new HashMap<>(); + + public CardState() { + counters = new Counters(); + } + + public CardState(final CardState state) { + if (state.info != null) { + info = new HashMap<>(); + info.putAll(state.info); + } + counters = state.counters.copy(); + } + + public CardState copy() { + return new CardState(this); + } + + public Counters getCounters() { + return counters; + } + + public void addInfo(String key, String value) { + if (info == null) { + info = new HashMap<>(); + } + if (value == null || value.isEmpty()) { + info.remove(key); + } else { + info.put(key, value); + } + } + + public Map getInfo() { + if (info == null) { + return emptyInfo; + } + return info; + } + + + public void clear() { + counters.clear(); + info = null; + } + +} diff --git a/Mage/src/mage/game/GameState.java b/Mage/src/mage/game/GameState.java index 7a7e4f8abc3..c91ce9894ee 100644 --- a/Mage/src/mage/game/GameState.java +++ b/Mage/src/mage/game/GameState.java @@ -105,6 +105,7 @@ public class GameState implements Serializable, Copyable { private Map values = new HashMap<>(); private Map zones = new HashMap<>(); private List simultaneousEvents = new ArrayList<>(); + private Map cardState = new HashMap<>(); public GameState() { players = new Players(); @@ -160,6 +161,9 @@ public class GameState implements Serializable, Copyable { } this.paused = state.paused; this.simultaneousEvents.addAll(state.simultaneousEvents); + for (Map.Entry entry: state.cardState.entrySet()) { + cardState.put(entry.getKey(), entry.getValue().copy()); + } } @Override @@ -420,7 +424,10 @@ public class GameState implements Serializable, Copyable { } public void addEffect(ContinuousEffect effect, UUID sourceId, Ability source) { - effects.addEffect(effect, sourceId, source); + if (sourceId == null) + effects.addEffect(effect, source); + else + effects.addEffect(effect, sourceId, source); } // public void addMessage(String message) { @@ -491,6 +498,7 @@ public class GameState implements Serializable, Copyable { origPlayer.restore(copyPlayer); } this.simultaneousEvents = state.simultaneousEvents; + this.cardState = state.cardState; } public void addSimultaneousEvent(GameEvent event, Game game) { @@ -527,11 +535,6 @@ public class GameState implements Serializable, Copyable { public void addCard(Card card) { setZone(card.getId(), Zone.OUTSIDE); - for (Watcher watcher: card.getWatchers()) { - watcher.setControllerId(card.getOwnerId()); - watcher.setSourceId(card.getId()); - watchers.add(watcher); - } for (Ability ability: card.getAbilities()) { addAbility(ability, card); } @@ -553,6 +556,10 @@ public class GameState implements Serializable, Copyable { * @param ability * @param attachedTo */ + public void addAbility(Ability ability, Card attachedTo) { + addAbility(ability, null, attachedTo); + } + public void addAbility(Ability ability, MageObject attachedTo) { if (ability instanceof StaticAbility) { for (Mode mode: ability.getModes().values()) { @@ -574,7 +581,7 @@ public class GameState implements Serializable, Copyable { * @param sourceId * @param attachedTo */ - public void addAbility(Ability ability, UUID sourceId, MageObject attachedTo) { + public void addAbility(Ability ability, UUID sourceId, Card attachedTo) { if (ability instanceof StaticAbility) { for (Mode mode: ability.getModes().values()) { for (Effect effect: mode.getEffects()) { @@ -588,6 +595,11 @@ public class GameState implements Serializable, Copyable { // TODO: add sources for triggers - the same way as in addEffect: sources this.triggers.add((TriggeredAbility)ability, sourceId, attachedTo); } + for (Watcher watcher: ability.getWatchers()) { + watcher.setControllerId(attachedTo.getOwnerId()); + watcher.setSourceId(attachedTo.getId()); + watchers.add(watcher); + } } public void addCommandObject(CommandObject commandObject) { @@ -732,6 +744,7 @@ public class GameState implements Serializable, Copyable { gameOver = false; specialActions.clear(); otherAbilities.clear(); + cardState.clear(); combat.clear(); turnMods.clear(); watchers.clear(); @@ -767,4 +780,16 @@ public class GameState implements Serializable, Copyable { public TriggeredAbilities getTriggers() { return triggers; } + + public CardState getCardState(UUID cardId) { + if (!cardState.containsKey(cardId)) { + cardState.putIfAbsent(cardId, new CardState()); + } + return cardState.get(cardId); + } + + public void addWatcher(Watcher watcher) { + this.watchers.add(watcher); + } + } diff --git a/Mage/src/mage/game/permanent/Permanent.java b/Mage/src/mage/game/permanent/Permanent.java index fe471e7d5cd..4b17b88e216 100644 --- a/Mage/src/mage/game/permanent/Permanent.java +++ b/Mage/src/mage/game/permanent/Permanent.java @@ -36,6 +36,7 @@ import mage.abilities.Ability; import mage.cards.Card; import mage.constants.Rarity; import mage.constants.Zone; +import mage.counters.Counters; import mage.game.Controllable; import mage.game.Game; @@ -79,6 +80,8 @@ public interface Permanent extends Card, Controllable { void setFlipCardName(String flipCardName); void setSecondCardFace(Card card); + Counters getCounters(); + List getAttachments(); UUID getAttachedTo(); void attachTo(UUID permanentId, Game game); diff --git a/Mage/src/mage/game/permanent/PermanentCard.java b/Mage/src/mage/game/permanent/PermanentCard.java index 82ec0802165..3db80516186 100644 --- a/Mage/src/mage/game/permanent/PermanentCard.java +++ b/Mage/src/mage/game/permanent/PermanentCard.java @@ -90,8 +90,6 @@ public class PermanentCard extends PermanentImpl { this.abilities.clear(); this.abilities.addAll(card.getAbilities().copy()); this.abilities.setControllerId(this.controllerId); - this.watchers.clear(); - this.watchers.addAll(card.getWatchers()); this.cardType.clear(); this.cardType.addAll(card.getCardType()); this.color = card.getColor().copy(); diff --git a/Mage/src/mage/game/permanent/PermanentImpl.java b/Mage/src/mage/game/permanent/PermanentImpl.java index faa2d2a1437..983d4411a07 100644 --- a/Mage/src/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/mage/game/permanent/PermanentImpl.java @@ -61,6 +61,7 @@ import mage.constants.Rarity; import mage.constants.Zone; import mage.counters.Counter; import mage.counters.CounterType; +import mage.counters.Counters; import mage.game.Game; import mage.game.events.DamageCreatureEvent; import mage.game.events.DamagePlaneswalkerEvent; @@ -104,6 +105,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { protected List dealtDamageByThisTurn; protected UUID attachedTo; protected UUID pairedCard; + protected Counters counters; protected List markedDamage; protected int timesLoyaltyUsed = 0; @@ -113,12 +115,14 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { super(ownerId, name); this.originalControllerId = controllerId; this.controllerId = controllerId; + this.counters = new Counters(); } public PermanentImpl(UUID id, UUID ownerId, UUID controllerId, String name) { super(id, ownerId, name); this.originalControllerId = controllerId; this.controllerId = controllerId; + this.counters = new Counters(); } public PermanentImpl(final PermanentImpl permanent) { @@ -148,6 +152,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { } } } + this.counters = permanent.counters.copy(); this.attachedTo = permanent.attachedTo; this.minBlockedBy = permanent.minBlockedBy; this.maxBlockedBy = permanent.maxBlockedBy; @@ -251,6 +256,16 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { getAbilities().clear(); } + @Override + public Counters getCounters() { + return counters; + } + + @Override + public void addCounters(String name, int amount, Game game) { + addCounters(name, amount, game, null); + } + @Override public void addCounters(String name, int amount, Game game, ArrayList appliedEffects) { GameEvent countersEvent = GameEvent.getEvent(GameEvent.EventType.ADD_COUNTERS, objectId, controllerId, name, amount); @@ -295,6 +310,12 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { game.fireEvent(event); } } + + @Override + public void removeCounters(Counter counter, Game game) { + removeCounters(counter.getName(), counter.getCount(), game); + } + @Override public int getTurnsOnBattlefield() { return turnsOnBattlefield; diff --git a/Mage/src/mage/game/stack/Spell.java b/Mage/src/mage/game/stack/Spell.java index 2ea2c858ebd..2565de7ea98 100644 --- a/Mage/src/mage/game/stack/Spell.java +++ b/Mage/src/mage/game/stack/Spell.java @@ -667,9 +667,6 @@ public class Spell implements StackObject, Card { @Override public void addAbility(Ability ability) {} - @Override - public void addWatcher(Watcher watcher) {} - @Override public SpellAbility getSpellAbility() { return ability; @@ -691,11 +688,6 @@ public class Spell implements StackObject, Card { return card.getRules(); } - @Override - public List getWatchers() { - return card.getWatchers(); - } - @Override public String getExpansionSetCode() { return card.getExpansionSetCode(); @@ -925,8 +917,8 @@ public class Spell implements StackObject, Card { public void build() {} @Override - public Counters getCounters() { - return card.getCounters(); + public Counters getCounters(Game game) { + return card.getCounters(game); } @Override diff --git a/Mage/src/mage/game/stack/StackAbility.java b/Mage/src/mage/game/stack/StackAbility.java index 2e65c538cca..3eb4254f2ed 100644 --- a/Mage/src/mage/game/stack/StackAbility.java +++ b/Mage/src/mage/game/stack/StackAbility.java @@ -57,6 +57,7 @@ import java.util.UUID; import mage.cards.Card; import mage.constants.AbilityWord; import mage.players.Player; +import mage.watchers.Watcher; /** * @@ -475,6 +476,16 @@ public class StackAbility implements StackObject, Ability { public void setWorksFaceDown(boolean worksFaceDown) { this.ability.setWorksFaceDown(worksFaceDown); } + + @Override + public List getWatchers() { + return this.ability.getWatchers(); + } + + @Override + public void addWatcher(Watcher watcher) { + throw new UnsupportedOperationException("Not supported."); + } @Override public MageObject getSourceObject(Game game) {