From e02ac0799e58b6eb5fe6bae86039dad4bcae736b Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 19 Mar 2013 01:41:57 +0100 Subject: [PATCH] Changed wrong zones and durations for characteristic-defining abilities of creatures (rule 604.3) that have also to be calculated if not on the battlefield. --- .../src/mage/sets/futuresight/Tarmogoyf.java | 16 ++++++++++------ .../mage/sets/gatecrash/ConsumingAberration.java | 2 +- .../src/mage/sets/gatecrash/Rubblehulk.java | 2 +- .../src/mage/sets/iceage/PestilenceRats.java | 2 +- .../mage/sets/innistrad/GeistHonoredMonk.java | 2 +- .../src/mage/sets/innistrad/Sturmgeist.java | 2 +- .../sets/magic2010/SerpentOfTheEndlessSea.java | 2 +- .../mage/sets/ninthedition/BeastOfBurden.java | 2 +- .../src/mage/sets/ninthedition/SwarmOfRats.java | 10 +++++++--- .../src/mage/sets/planechase/Broodstar.java | 2 +- .../src/mage/sets/returntoravnica/PackRat.java | 2 +- .../sets/returntoravnica/WayfaringTemple.java | 2 +- .../riseoftheeldrazi/SoulsurgeElemental.java | 3 ++- .../src/mage/sets/shadowmoor/CrowdOfCinders.java | 2 +- .../src/mage/sets/shadowmoor/DroveOfElves.java | 2 +- .../src/mage/sets/shadowmoor/FaerieSwarm.java | 2 +- .../src/mage/sets/shadowmoor/KithkinRabble.java | 2 +- .../sets/shardsofalara/MasterOfEtherium.java | 2 +- .../src/mage/sets/tenth/MolimoMaroSorcerer.java | 5 +++-- Mage.Sets/src/mage/sets/tenth/Mortivore.java | 6 ++++-- Mage.Sets/src/mage/sets/tenth/Nightmare.java | 5 +++-- .../src/mage/sets/tenth/ScionOfTheWild.java | 2 +- .../sets/urzaslegacy/MultaniMaroSorcerer.java | 2 +- 23 files changed, 46 insertions(+), 33 deletions(-) diff --git a/Mage.Sets/src/mage/sets/futuresight/Tarmogoyf.java b/Mage.Sets/src/mage/sets/futuresight/Tarmogoyf.java index d1568eb8f7..d0550c1c63 100644 --- a/Mage.Sets/src/mage/sets/futuresight/Tarmogoyf.java +++ b/Mage.Sets/src/mage/sets/futuresight/Tarmogoyf.java @@ -28,10 +28,15 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants; import mage.Constants.CardType; +import mage.Constants.Duration; +import mage.Constants.Layer; +import mage.Constants.Outcome; import mage.Constants.Rarity; +import mage.Constants.SubLayer; +import mage.Constants.Zone; import mage.MageInt; +import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -40,7 +45,6 @@ import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; import mage.game.Game; -import mage.game.permanent.Permanent; import mage.players.Player; /** @@ -59,7 +63,7 @@ public class Tarmogoyf extends CardImpl { this.toughness = new MageInt(1); // Tarmogoyf's power is equal to the number of card types among cards in all graveyards and its toughness is equal to that number plus 1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new mage.sets.futuresight.TarmogoyfEffect())); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new TarmogoyfEffect())); } public Tarmogoyf(final Tarmogoyf card) { @@ -77,7 +81,7 @@ class TarmogoyfEffect extends ContinuousEffectImpl { public TarmogoyfEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.PTChangingEffects_7, Constants.SubLayer.SetPT_7b, Constants.Outcome.BoostCreature); + super(Duration.EndOfGame, Layer.PTChangingEffects_7, SubLayer.SetPT_7b, Outcome.BoostCreature); staticText = "{this}'s power is equal to the number of card types among cards in all graveyards and its toughness is equal to that number plus 1"; } @@ -93,7 +97,7 @@ class TarmogoyfEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Permanent target = game.getPermanent(source.getSourceId()); + MageObject target = game.getObject(source.getSourceId()); if (target != null) { int number = 0; Cards cards = new CardsImpl(); @@ -122,4 +126,4 @@ class TarmogoyfEffect extends ContinuousEffectImpl { return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java b/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java index d575388a56..09ecd34039 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java @@ -66,7 +66,7 @@ public class ConsumingAberration extends CardImpl { this.toughness = new MageInt(0); //Consuming Aberration's power and toughness are each equal to the number of cards in your opponents' graveyards. - this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInOpponentsGraveyardsCount(), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInOpponentsGraveyardsCount(), Constants.Duration.EndOfGame))); //Whenever you cast a spell, each opponent reveals cards from the top of his or her library until he or she reveals a land card, then puts those cards into his or her graveyard. this.addAbility(new SpellCastTriggeredAbility(new ConsumingAberrationEffect(), false)); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java b/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java index 4d8124b133..16bdd55920 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java @@ -64,7 +64,7 @@ public class Rubblehulk extends CardImpl { DynamicValue controlledLands = new PermanentsOnBattlefieldCount(filter); // Rubblehulk's power and toughness are each equal to the number of lands you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(controlledLands, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(controlledLands, Constants.Duration.EndOfGame))); // Bloodrush - 1{R}{G}, Discard Rubblehulk: Target attacking creature gets +X/+X until end of turn, where X is the number of lands you control. this.addAbility(new BloodrushAbility("{1}{R}{G}", new BoostTargetEffect(controlledLands,controlledLands, Duration.EndOfTurn))); diff --git a/Mage.Sets/src/mage/sets/iceage/PestilenceRats.java b/Mage.Sets/src/mage/sets/iceage/PestilenceRats.java index 7e0e276870..2f451f5e0e 100644 --- a/Mage.Sets/src/mage/sets/iceage/PestilenceRats.java +++ b/Mage.Sets/src/mage/sets/iceage/PestilenceRats.java @@ -64,7 +64,7 @@ public class PestilenceRats extends CardImpl { this.toughness = new MageInt(3); // Pestilence Rats's power is equal to the number of other Rats on the battlefield. (For example, as long as there are two other Rats on the battlefield, Pestilence Rats's power and toughness are 2/3.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new StaticValue(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new StaticValue(0), Duration.EndOfGame))); } public PestilenceRats(final PestilenceRats card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/GeistHonoredMonk.java b/Mage.Sets/src/mage/sets/innistrad/GeistHonoredMonk.java index b1e1c7b9e7..dd865a89e0 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GeistHonoredMonk.java +++ b/Mage.Sets/src/mage/sets/innistrad/GeistHonoredMonk.java @@ -61,7 +61,7 @@ public class GeistHonoredMonk extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Geist-Honored Monk's power and toughness are each equal to the number of creatures you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), Constants.Duration.EndOfGame))); // When Geist-Honored Monk enters the battlefield, put two 1/1 white Spirit creature tokens with flying onto the battlefield. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken(), 2))); diff --git a/Mage.Sets/src/mage/sets/innistrad/Sturmgeist.java b/Mage.Sets/src/mage/sets/innistrad/Sturmgeist.java index 927020bece..802e69ffb0 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Sturmgeist.java +++ b/Mage.Sets/src/mage/sets/innistrad/Sturmgeist.java @@ -58,7 +58,7 @@ public class Sturmgeist extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sturmgeist's power and toughness are each equal to the number of cards in your hand. - this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInControllerHandCount(), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInControllerHandCount(), Duration.EndOfGame))); // Whenever Sturmgeist deals combat damage to a player, draw a card. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DrawCardControllerEffect(1), false)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java b/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java index 24c32f8fb6..127815a835 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java +++ b/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java @@ -68,7 +68,7 @@ public class SerpentOfTheEndlessSea extends CardImpl { this.toughness = new MageInt(0); // Serpent of the Endless Sea's power and toughness are each equal to the number of Islands you control. - this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); // Serpent of the Endless Sea can't attack unless defending player controls an Island. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SerpentOfTheEndlessSeaEffect())); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/BeastOfBurden.java b/Mage.Sets/src/mage/sets/ninthedition/BeastOfBurden.java index 3a1bf0312c..9cbefb4c30 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/BeastOfBurden.java +++ b/Mage.Sets/src/mage/sets/ninthedition/BeastOfBurden.java @@ -53,7 +53,7 @@ public class BeastOfBurden extends CardImpl { this.toughness = new MageInt(0); // Beast of Burden's power and toughness are each equal to the number of creatures on the battlefield. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(new FilterCreaturePermanent("creatures on the battlefield")), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(new FilterCreaturePermanent("creatures on the battlefield")), Constants.Duration.EndOfGame))); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/SwarmOfRats.java b/Mage.Sets/src/mage/sets/ninthedition/SwarmOfRats.java index be31fb2de1..b36312517b 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/SwarmOfRats.java +++ b/Mage.Sets/src/mage/sets/ninthedition/SwarmOfRats.java @@ -28,9 +28,13 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; import mage.Constants.CardType; +import mage.Constants.Duration; +import mage.Constants.Layer; +import mage.Constants.Outcome; import mage.Constants.Rarity; +import mage.Constants.SubLayer; +import mage.Constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -59,7 +63,7 @@ public class SwarmOfRats extends CardImpl { this.toughness = new MageInt(1); // Swarm of Rats's power is equal to the number of Rats you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SwarmOfRatsEffect())); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SwarmOfRatsEffect())); } public SwarmOfRats(final SwarmOfRats card) { @@ -82,7 +86,7 @@ class SwarmOfRatsEffect extends ContinuousEffectImpl { private DynamicValue amount; public SwarmOfRatsEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.PTChangingEffects_7, Constants.SubLayer.SetPT_7b, Constants.Outcome.BoostCreature); + super(Duration.EndOfGame, Layer.PTChangingEffects_7, SubLayer.SetPT_7b, Outcome.BoostCreature); this.amount = new PermanentsOnBattlefieldCount(filter); staticText = "{this}'s power is equal to the number of Rats you control"; } diff --git a/Mage.Sets/src/mage/sets/planechase/Broodstar.java b/Mage.Sets/src/mage/sets/planechase/Broodstar.java index 338ed4b178..553fd7e4b2 100644 --- a/Mage.Sets/src/mage/sets/planechase/Broodstar.java +++ b/Mage.Sets/src/mage/sets/planechase/Broodstar.java @@ -66,7 +66,7 @@ public class Broodstar extends CardImpl { this.addAbility(new AffinityForArtifactsAbility()); this.addAbility(FlyingAbility.getInstance()); // Broodstar's power and toughness are each equal to the number of artifacts you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Constants.Duration.EndOfGame))); } public Broodstar(final Broodstar card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PackRat.java b/Mage.Sets/src/mage/sets/returntoravnica/PackRat.java index 00b7bc7e83..6c0136d4e8 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PackRat.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PackRat.java @@ -85,7 +85,7 @@ public class PackRat extends CardImpl { this.toughness = new MageInt(0); // Pack Rat's power and toughness are each equal to the number of Rats you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Constants.Duration.EndOfGame))); // {2}{B}, Discard a card: Put a token onto the battlefield that's a copy of Pack Rat. Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PackRatEffect(this), new ManaCostsImpl("{2}{B}")); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/WayfaringTemple.java b/Mage.Sets/src/mage/sets/returntoravnica/WayfaringTemple.java index 6d2e05d87d..9c5e8319c9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/WayfaringTemple.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/WayfaringTemple.java @@ -58,7 +58,7 @@ public class WayfaringTemple extends CardImpl { this.toughness = new MageInt(0); // Wayfaring Temple's power and toughness are each equal to the number of creatures you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), Constants.Duration.EndOfCombat))); // Whenever Wayfaring Temple deals combat damage to a player, populate. (Put a token onto the battlefield that's a copy of a creature token you control.) this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new PopulateEffect(), false)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsurgeElemental.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsurgeElemental.java index a06be1f82b..6cc32a6115 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsurgeElemental.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsurgeElemental.java @@ -31,6 +31,7 @@ import java.util.UUID; import mage.Constants; import mage.Constants.CardType; +import mage.Constants.Duration; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; @@ -58,7 +59,7 @@ public class SoulsurgeElemental extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FirstStrikeAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new BoostSourceEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), new StaticValue(0), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new BoostSourceEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), new StaticValue(0), Duration.EndOfGame))); } public SoulsurgeElemental(final SoulsurgeElemental card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CrowdOfCinders.java b/Mage.Sets/src/mage/sets/shadowmoor/CrowdOfCinders.java index 6f18305f52..43d5202c57 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CrowdOfCinders.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CrowdOfCinders.java @@ -65,7 +65,7 @@ public class CrowdOfCinders extends CardImpl { this.addAbility(FearAbility.getInstance()); // Crowd of Cinders's power and toughness are each equal to the number of black permanents you control. - this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); } public CrowdOfCinders(final CrowdOfCinders card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DroveOfElves.java b/Mage.Sets/src/mage/sets/shadowmoor/DroveOfElves.java index cf9813a902..ebbb75f2a2 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DroveOfElves.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DroveOfElves.java @@ -65,7 +65,7 @@ public class DroveOfElves extends CardImpl { this.addAbility(HexproofAbility.getInstance()); // Drove of Elves's power and toughness are each equal to the number of green permanents you control. - this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); } public DroveOfElves(final DroveOfElves card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FaerieSwarm.java b/Mage.Sets/src/mage/sets/shadowmoor/FaerieSwarm.java index c33b3d7bcd..11e3c11b73 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FaerieSwarm.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FaerieSwarm.java @@ -65,7 +65,7 @@ public class FaerieSwarm extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Faerie Swarm's power and toughness are each equal to the number of blue permanents you control. - this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); } public FaerieSwarm(final FaerieSwarm card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/KithkinRabble.java b/Mage.Sets/src/mage/sets/shadowmoor/KithkinRabble.java index 6d20637f54..7e00a50bed 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/KithkinRabble.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/KithkinRabble.java @@ -65,7 +65,7 @@ public class KithkinRabble extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Kithkin Rabble's power and toughness are each equal to the number of white permanents you control. - this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); } public KithkinRabble(final KithkinRabble card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java b/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java index b15c519eda..3185e4a880 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java @@ -66,7 +66,7 @@ public class MasterOfEtherium extends CardImpl { this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(0); - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filterCounted), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filterCounted), Constants.Duration.EndOfGame))); this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filterBoosted, true))); } diff --git a/Mage.Sets/src/mage/sets/tenth/MolimoMaroSorcerer.java b/Mage.Sets/src/mage/sets/tenth/MolimoMaroSorcerer.java index 16b26bc827..c4ffb06074 100644 --- a/Mage.Sets/src/mage/sets/tenth/MolimoMaroSorcerer.java +++ b/Mage.Sets/src/mage/sets/tenth/MolimoMaroSorcerer.java @@ -28,9 +28,10 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; import mage.Constants.CardType; +import mage.Constants.Duration; import mage.Constants.Rarity; +import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -60,7 +61,7 @@ public class MolimoMaroSorcerer extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Molimo, Maro-Sorcerer's power and toughness are each equal to the number of lands you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); } public MolimoMaroSorcerer(final MolimoMaroSorcerer card) { diff --git a/Mage.Sets/src/mage/sets/tenth/Mortivore.java b/Mage.Sets/src/mage/sets/tenth/Mortivore.java index 79d1d4eb91..ff7820b79f 100644 --- a/Mage.Sets/src/mage/sets/tenth/Mortivore.java +++ b/Mage.Sets/src/mage/sets/tenth/Mortivore.java @@ -31,7 +31,9 @@ import java.util.UUID; import mage.Constants; import mage.Constants.CardType; +import mage.Constants.Duration; import mage.Constants.Rarity; +import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -55,8 +57,8 @@ public class Mortivore extends CardImpl { this.color.setBlack(true); this.power = new MageInt(0); this.toughness = new MageInt(0); - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInAllGraveyardsCount(new FilterCreatureCard()), Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.B))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInAllGraveyardsCount(new FilterCreatureCard()), Duration.EndOfGame))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.B))); } public Mortivore(final Mortivore card) { diff --git a/Mage.Sets/src/mage/sets/tenth/Nightmare.java b/Mage.Sets/src/mage/sets/tenth/Nightmare.java index 7e6d3e7806..17d7923b75 100644 --- a/Mage.Sets/src/mage/sets/tenth/Nightmare.java +++ b/Mage.Sets/src/mage/sets/tenth/Nightmare.java @@ -29,9 +29,10 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; import mage.Constants.CardType; +import mage.Constants.Duration; import mage.Constants.Rarity; +import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -62,7 +63,7 @@ public class Nightmare extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(0); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); } public Nightmare(final Nightmare card) { diff --git a/Mage.Sets/src/mage/sets/tenth/ScionOfTheWild.java b/Mage.Sets/src/mage/sets/tenth/ScionOfTheWild.java index f6d08f1391..dacc0f3a31 100644 --- a/Mage.Sets/src/mage/sets/tenth/ScionOfTheWild.java +++ b/Mage.Sets/src/mage/sets/tenth/ScionOfTheWild.java @@ -53,7 +53,7 @@ public class ScionOfTheWild extends CardImpl { this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Constants.Duration.EndOfGame))); } public ScionOfTheWild(final ScionOfTheWild card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MultaniMaroSorcerer.java b/Mage.Sets/src/mage/sets/urzaslegacy/MultaniMaroSorcerer.java index 8597562b36..cddc1e2fff 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/MultaniMaroSorcerer.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/MultaniMaroSorcerer.java @@ -60,7 +60,7 @@ public class MultaniMaroSorcerer extends CardImpl { // Shroud this.addAbility(ShroudAbility.getInstance()); // Multani, Maro-Sorcerer's power and toughness are each equal to the total number of cards in all players' hands. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInHandCount(), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInHandCount(), Constants.Duration.EndOfGame))); } public MultaniMaroSorcerer(final MultaniMaroSorcerer card) {