diff --git a/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java b/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java index 61378b5594..1a973751e3 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java +++ b/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java @@ -98,6 +98,6 @@ class GloryscaleViashinoAbility extends TriggeredAbilityImpl { public VengefulRebirthEffect() { super(Outcome.DrawCard); - staticText = "Return target card from your graveyard to your hand. If you return a nonland card to your hand this way, Vengeful Rebirth deals damage equal to that card's converted mana cost to target creature or player"; + staticText = "Return target card from your graveyard to your hand. If you return a nonland card to your hand this way, {this} deals damage equal to that card's converted mana cost to target creature or player"; } public VengefulRebirthEffect(final VengefulRebirthEffect effect) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java index d165b50358..6bb8aedbaa 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java @@ -82,7 +82,7 @@ class AkkiLavarunnerAbility extends TriggeredAbilityImpl @Override public String getRule() { - return "Whenever Akki Lavarunner deals damage to an opponent, flip it."; + return "Whenever {this} deals damage to an opponent, flip it."; } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java index df9e31b67d..6bfe3a4df9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java @@ -104,7 +104,7 @@ class AkkiUnderminerAbility extends TriggeredAbilityImpl @Override public String getRule() { - return "Whenever Akki Underminer deals combat damage to a player, that player sacrifices a permanent."; + return "Whenever {this} deals combat damage to a player, that player sacrifices a permanent."; } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java index f3517304ee..de3f1ff55b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java @@ -87,7 +87,7 @@ public class BudokaGardener extends CardImpl { class BudokaGardenerEffect extends OneShotEffect { BudokaGardenerEffect() { super(Constants.Outcome.PutLandInPlay); - staticText = "You may put a land card from your hand onto the battlefield. If you control ten or more lands, flip Budoka Gardener."; + staticText = "You may put a land card from your hand onto the battlefield. If you control ten or more lands, flip {this}."; } BudokaGardenerEffect(final BudokaGardenerEffect effect) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java index c478f6719e..f84278a704 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java @@ -85,7 +85,7 @@ public class HikariTwilightGuardian extends CardImpl { class HikariTwilightGuardianEffect extends OneShotEffect { - private static final String effectText = "Exile Hikari, Twilight Guardian. Return it to the battlefield under your control at the beginning of the next end step"; + private static final String effectText = "Exile {this}. Return it to the battlefield under your control at the beginning of the next end step"; HikariTwilightGuardianEffect ( ) { super(Constants.Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java index 9457cd32e8..f9be404353 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java @@ -77,7 +77,7 @@ public class Mindblaze extends CardImpl { class MindblazeEffect extends OneShotEffect { MindblazeEffect() { super(Constants.Outcome.Damage); - staticText = "Name a nonland card and choose a number greater than 0. Target player reveals his or her library. If that library contains exactly the chosen number of the named card, Mindblaze deals 8 damage to that player. Then that player shuffles his or her library"; + staticText = "Name a nonland card and choose a number greater than 0. Target player reveals his or her library. If that library contains exactly the chosen number of the named card, {this} deals 8 damage to that player. Then that player shuffles his or her library"; } MindblazeEffect(final MindblazeEffect effect) { diff --git a/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java b/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java index 3d194b8294..72404da807 100644 --- a/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java +++ b/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java @@ -108,7 +108,7 @@ class BloodhallOozeTriggeredAbility1 extends TriggeredAbilityImpl { class DarksteelColossusEffect extends OneShotEffect { DarksteelColossusEffect() { super(Constants.Outcome.Benefit); - staticText = "reveal Darksteel Colossus and shuffle it into its owner's library instead"; + staticText = "reveal {this} and shuffle it into its owner's library instead"; } DarksteelColossusEffect(final DarksteelColossusEffect effect) { diff --git a/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java b/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java index 59be636bea..02a1e8ff4a 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java +++ b/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java @@ -120,6 +120,6 @@ class SwordOfFireAndIceAbility extends TriggeredAbilityImpl { - private static final String effectText = "Exile Ghost Council of Orzhova. Return it to the battlefield under its owner's control at the beginning of the next end step"; + private static final String effectText = "Exile {this}. Return it to the battlefield under its owner's control at the beginning of the next end step"; GhostCouncilOfOrzhovaRemovingEffect () { super(Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/magic2010/Earthquake.java b/Mage.Sets/src/mage/sets/magic2010/Earthquake.java index 6475dd278e..2cf19670e6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Earthquake.java +++ b/Mage.Sets/src/mage/sets/magic2010/Earthquake.java @@ -75,7 +75,7 @@ class EarthquakeEffect extends OneShotEffect { public EarthquakeEffect() { super(Outcome.Damage); - staticText = "Earthquake deals X damage to each creature without flying and each player"; + staticText = "{this} deals X damage to each creature without flying and each player"; } public EarthquakeEffect(final EarthquakeEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2010/Fireball.java b/Mage.Sets/src/mage/sets/magic2010/Fireball.java index 7c702645db..a864abb2d6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Fireball.java +++ b/Mage.Sets/src/mage/sets/magic2010/Fireball.java @@ -77,7 +77,7 @@ class FireballEffect extends OneShotEffect { public FireballEffect() { super(Outcome.Damage); - staticText = "Fireball deals X damage divided evenly, rounded down, among any number of target creatures and/or players.\n Fireball costs {1} more to cast for each target beyond the first."; + staticText = "{this} deals X damage divided evenly, rounded down, among any number of target creatures and/or players.\n {this} costs {1} more to cast for each target beyond the first."; } public FireballEffect(final FireballEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2010/IceCage.java b/Mage.Sets/src/mage/sets/magic2010/IceCage.java index a88d08f810..0615f7676a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/IceCage.java +++ b/Mage.Sets/src/mage/sets/magic2010/IceCage.java @@ -151,7 +151,7 @@ class IceCageAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "When enchanted creature becomes the target of a spell or ability, destroy Ice Cage."; + return "When enchanted creature becomes the target of a spell or ability, destroy {this}."; } } diff --git a/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java b/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java index ff9813b452..6cdc013681 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java +++ b/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java @@ -75,7 +75,7 @@ public class PalaceGuard extends CardImpl { public PalaceGuardEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); - staticText = "Palace Guard can block any number of creatures"; + staticText = "{this} can block any number of creatures"; } public PalaceGuardEffect(final PalaceGuardEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java b/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java index 07c47fa104..a028239832 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java +++ b/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java @@ -84,7 +84,7 @@ public class ProteanHydra extends CardImpl { public ProteanHydraEffect1() { super(Outcome.BoostCreature); - staticText = "Protean Hydra enters the battlefield with X +1/+1 counters on it"; + staticText = "{this} enters the battlefield with X +1/+1 counters on it"; } public ProteanHydraEffect1(final ProteanHydraEffect1 effect) { @@ -116,7 +116,7 @@ public class ProteanHydra extends CardImpl { public ProteanHydraEffect2(final ProteanHydraEffect2 effect) { super(effect); - staticText = "If damage would be dealt to Protean Hydra, prevent that damage and remove that many +1/+1 counters from it"; + staticText = "If damage would be dealt to {this}, prevent that damage and remove that many +1/+1 counters from it"; } @Override @@ -183,7 +183,7 @@ public class ProteanHydra extends CardImpl { @Override public String getRule() { - return "Whenever a +1/+1 counter is removed from Protean Hydra, put two +1/+1 counters on it at the beginning of the next end step."; + return "Whenever a +1/+1 counter is removed from {this}, put two +1/+1 counters on it at the beginning of the next end step."; } } diff --git a/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java b/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java index 0e64a1add0..c3d5516fda 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java +++ b/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java @@ -99,7 +99,7 @@ class WallOfFrostAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever Wall of Frost blocks a creature, that creature doesn't untap during its controller's next untap step"; + return "Whenever {this} blocks a creature, that creature doesn't untap during its controller's next untap step"; } } diff --git a/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java b/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java index 073162a76c..637b2c669d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java +++ b/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java @@ -95,7 +95,7 @@ class AjanisPridemateAbility extends TriggeredAbilityImpl { public ChandrasOutrageEffect() { super(Outcome.Damage); - staticText = "Chandra's Outrage deals 4 damage to target creature and 2 damage to that creature's controller"; + staticText = "{this} deals 4 damage to target creature and 2 damage to that creature's controller"; } public ChandrasOutrageEffect(final ChandrasOutrageEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java b/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java index d3c75a558c..3d053581f8 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java +++ b/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java @@ -94,7 +94,7 @@ class ChandrasSpitfireAbility extends TriggeredAbilityImpl { public CorruptEffect() { super(Outcome.Damage); - staticText = "Corrupt deals damage equal to the number of Swamps you control to target creature or player. You gain life equal to the damage dealt this way"; + staticText = "{this} deals damage equal to the number of Swamps you control to target creature or player. You gain life equal to the damage dealt this way"; } public CorruptEffect(final CorruptEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java index 56d162ad5d..4971947b28 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java +++ b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java @@ -77,7 +77,7 @@ class CyclopsGladiatorEffect extends OneShotEffect { public CyclopsGladiatorEffect() { super(Outcome.Damage); - staticText = "you may have it deal damage equal to its power to target creature defending player controls. If you do, that creature deals damage equal to its power to Cyclops Gladiator"; + staticText = "you may have it deal damage equal to its power to target creature defending player controls. If you do, that creature deals damage equal to its power to {this}"; } public CyclopsGladiatorEffect(final CyclopsGladiatorEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java b/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java index ae3542d7be..48f0592363 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java +++ b/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java @@ -78,7 +78,7 @@ class ElixerOfImmortalityEffect extends OneShotEffect public ElixerOfImmortalityEffect() { super(Outcome.GainLife); - staticText = "Shuffle Elixir of Immortality and your graveyard into your library"; + staticText = "Shuffle {this} and your graveyard into your library"; } public ElixerOfImmortalityEffect(final ElixerOfImmortalityEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2011/Fling.java b/Mage.Sets/src/mage/sets/magic2011/Fling.java index 559eff5166..f3f4a59b2c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Fling.java +++ b/Mage.Sets/src/mage/sets/magic2011/Fling.java @@ -72,7 +72,7 @@ class FlingEffect extends OneShotEffect { public FlingEffect() { super(Outcome.Damage); - staticText = "Fling deals damage equal to the sacrificed creature's power to target creature or player"; + staticText = "{this} deals damage equal to the sacrificed creature's power to target creature or player"; } public FlingEffect(final FlingEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java index ecf896a07e..4cc8a9484a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java @@ -104,7 +104,7 @@ class FrostTitanAbility1 extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever Frost Titan becomes the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays {2}"; + return "Whenever {this} becomes the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays {2}"; } } @@ -142,7 +142,7 @@ class FrostTitanAbility2 extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever Frost Titan enters the battlefield or attacks, tap target permanent. It doesn't untap during its controller's next untap step"; + return "Whenever {this} enters the battlefield or attacks, tap target permanent. It doesn't untap during its controller's next untap step"; } } diff --git a/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java b/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java index 9e7aab2c67..09be6114a6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java +++ b/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java @@ -80,7 +80,7 @@ class GargoyleSentinelEffect extends ContinuousEffectImpl { @Override public String getRule() { - return "Whenever Grave Titan enters the battlefield or attacks, put two 2/2 black Zombie creature tokens onto the battlefield"; + return "Whenever {this} enters the battlefield or attacks, put two 2/2 black Zombie creature tokens onto the battlefield"; } } diff --git a/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java b/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java index 1711475ffc..6d3e69986c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java +++ b/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java @@ -86,7 +86,7 @@ class HarborSerpentEffect extends ReplacementEffectImpl { public HarborSerpentEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); - staticText = "Harbor Serpent can't attack unless there are five or more Islands on the battlefield"; + staticText = "{this} can't attack unless there are five or more Islands on the battlefield"; } public HarborSerpentEffect(final HarborSerpentEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java b/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java index 2dd6695a8d..192104fbf4 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java +++ b/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java @@ -92,7 +92,7 @@ class HoardingDragonEffect extends OneShotEffect { super(Outcome.Exile); this.exileId = exileId; target = new TargetCardInLibrary(); - staticText = "When Hoarding Dragon enters the battlefield, you may search your library for an artifact card, exile it, then shuffle your library"; + staticText = "When {this} enters the battlefield, you may search your library for an artifact card, exile it, then shuffle your library"; } public HoardingDragonEffect(final HoardingDragonEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java index a081f643ee..cd022a6195 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java @@ -107,7 +107,7 @@ class InfernoTitanAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever Inferno Titan enters the battlefield or attacks, it deals 3 damage divided as you choose among one, two, or three target creatures and/or players."; + return "Whenever {this} enters the battlefield or attacks, it deals 3 damage divided as you choose among one, two, or three target creatures and/or players."; } } diff --git a/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java b/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java index c6593a422f..febff6d077 100644 --- a/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java +++ b/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java @@ -79,7 +79,7 @@ class JinxedIdolEffect extends ContinuousEffectImpl { public JinxedIdolEffect() { super(Duration.WhileOnBattlefield, Layer.ControlChangingEffects_2, SubLayer.NA, Outcome.GainControl); - staticText = "Target opponent gains control of Jinxed Idol"; + staticText = "Target opponent gains control of {this}"; } public JinxedIdolEffect(final JinxedIdolEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java index 3ac474a81a..4f8f431aea 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java +++ b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java @@ -91,7 +91,7 @@ class NecroticPlagueEffect extends ContinuousEffectImpl { public NecroticPlagueEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); - staticText = "Enchanted creature has \"At the beginning of your upkeep, sacrifice this creature.\" When enchanted creature is put into a graveyard, its controller chooses target creature one of his or her opponents controls. Return Necrotic Plague from its owner's graveyard to the battlefield attached to that creature."; + staticText = "Enchanted creature has \"At the beginning of your upkeep, sacrifice this creature.\" When enchanted creature is put into a graveyard, its controller chooses target creature one of his or her opponents controls. Return {this} from its owner's graveyard to the battlefield attached to that creature."; } public NecroticPlagueEffect(final NecroticPlagueEffect effect) { @@ -148,7 +148,7 @@ class NecroticPlagueEffect2 extends OneShotEffect { public NecroticPlagueEffect2(UUID cardId) { super(Outcome.PutCardInPlay); this.cardId = cardId; - staticText = "its controller chooses target creature one of his or her opponents controls. Return Necrotic Plague from its owner's graveyard to the battlefield attached to that creature."; + staticText = "its controller chooses target creature one of his or her opponents controls. Return {this} from its owner's graveyard to the battlefield attached to that creature."; } public NecroticPlagueEffect2(final NecroticPlagueEffect2 effect) { diff --git a/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java b/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java index a3ea2eb951..f50df9f66a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java +++ b/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java @@ -82,7 +82,7 @@ class ObstinateBalothEffect extends ReplacementEffectImpl public ObstinateBalothEffect() { super(Duration.EndOfGame, Outcome.PutCardInPlay); - staticText = "If a spell or ability an opponent controls causes you to discard Obstinate Baloth, put it onto the battlefield instead of putting it into your graveyard"; + staticText = "If a spell or ability an opponent controls causes you to discard {this}, put it onto the battlefield instead of putting it into your graveyard"; } public ObstinateBalothEffect(final ObstinateBalothEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java b/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java index 5b952f1914..6842e4442d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java +++ b/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java @@ -92,7 +92,7 @@ public class PhantomBeast extends CardImpl { @Override public String getRule() { - return "When Phantom Beast becomes the target of a spell or ability, sacrifice it"; + return "When {this} becomes the target of a spell or ability, sacrifice it"; } } diff --git a/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java b/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java index 2c826dd921..c2f4293cfd 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java +++ b/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java @@ -105,7 +105,7 @@ public class PhylacteryLich extends CardImpl { @Override public String getRule() { - return "When you control no permanents with phylactery counters on them, sacrifice Phylactery Lich."; + return "When you control no permanents with phylactery counters on them, sacrifice {this}."; } } diff --git a/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java b/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java index 2bfbb2d1db..4ca106b718 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java +++ b/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java @@ -136,7 +136,7 @@ class PrimalCocoonAbility2 extends TriggeredAbilityImpl { @Override public String getRule() { - return "When enchanted creature attacks or blocks, sacrifice Primal Cocoon."; + return "When enchanted creature attacks or blocks, sacrifice {this}."; } } diff --git a/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java b/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java index a5fec10a4c..a9a9c6932e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java @@ -107,7 +107,7 @@ class PrimevalTitanAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever Primeval Titan enters the battlefield or attacks, you may search your library for up to two land cards, put them onto the battlefield tapped, then shuffle your library."; + return "Whenever {this} enters the battlefield or attacks, you may search your library for up to two land cards, put them onto the battlefield tapped, then shuffle your library."; } } diff --git a/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java b/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java index 99f0a61f40..9f77ea3a37 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java +++ b/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java @@ -81,7 +81,7 @@ class SerraAscendantEffect extends ContinuousEffectImpl { public SerraAscendantEffect() { super(Duration.WhileOnBattlefield, Outcome.BoostCreature); - staticText = "As long as you have 30 or more life, Serra Ascendant gets +5/+5 and has flying"; + staticText = "As long as you have 30 or more life, {this} gets +5/+5 and has flying"; } public SerraAscendantEffect(final SerraAscendantEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2011/SorcerersStrongbox.java b/Mage.Sets/src/mage/sets/magic2011/SorcerersStrongbox.java index bbf4411b7d..0cd91e038e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SorcerersStrongbox.java +++ b/Mage.Sets/src/mage/sets/magic2011/SorcerersStrongbox.java @@ -76,7 +76,7 @@ class SorcerersStrongboxEffect extends OneShotEffect { public SorcerersStrongboxEffect() { super(Outcome.DrawCard); - staticText = "Flip a coin. If you win the flip, sacrifice Sorcerer's Strongbox and draw three cards"; + staticText = "Flip a coin. If you win the flip, sacrifice {this} and draw three cards"; } public SorcerersStrongboxEffect(final SorcerersStrongboxEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2011/SunTitan.java b/Mage.Sets/src/mage/sets/magic2011/SunTitan.java index f5888b0697..2a92812278 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SunTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/SunTitan.java @@ -121,7 +121,7 @@ class SunTitanAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever Sun Titan enters the battlefield or attacks, you may return target permanent card with converted mana cost 3 or less from your graveyard to the battlefield."; + return "Whenever {this} enters the battlefield or attacks, you may return target permanent card with converted mana cost 3 or less from your graveyard to the battlefield."; } } diff --git a/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java b/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java index 85834028cf..feb0400d41 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java +++ b/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java @@ -82,7 +82,7 @@ class VengefulArchonEffect extends PreventionEffectImpl { public VengefulArchonEffect() { super(Duration.EndOfTurn); - staticText = "Prevent the next X damage that would be dealt to you this turn. If damage is prevented this way, Vengeful Archon deals that much damage to target player"; + staticText = "Prevent the next X damage that would be dealt to you this turn. If damage is prevented this way, {this} deals that much damage to target player"; } public VengefulArchonEffect(final VengefulArchonEffect effect) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlightsteelColossus.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlightsteelColossus.java index d552334c2c..6d3b44651a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlightsteelColossus.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlightsteelColossus.java @@ -82,7 +82,7 @@ public class BlightsteelColossus extends CardImpl { class BlightsteelColossusEffect extends OneShotEffect { BlightsteelColossusEffect() { super(Constants.Outcome.Benefit); - staticText = "reveal Blightsteel Colossus and shuffle it into its owner's library"; + staticText = "reveal {this} and shuffle it into its owner's library"; } BlightsteelColossusEffect(final BlightsteelColossusEffect effect) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java index 1277369eb7..1e520ebe2b 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java @@ -72,7 +72,7 @@ public class BurntheImpure extends CardImpl { public BurntheImpureEffect(int amount) { super(Constants.Outcome.Damage); this.amount = amount; - staticText = "Burn the Impure deals 3 damage to target creature. If that creature has infect, Burn the Impure deals 3 damage to that creature's controller."; + staticText = "{this} deals 3 damage to target creature. If that creature has infect, {this} deals 3 damage to that creature's controller."; } public int getAmount() { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java index 7f8086e19b..c24cf0fa89 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java @@ -75,7 +75,7 @@ class CryptoplasmTransformEffect extends ContinuousEffectImpl { @Override public String getRule() { - return "Signal Pest can't be blocked except by creatures with flying or reach"; + return "{this} can't be blocked except by creatures with flying or reach"; } @Override diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChainedThroatseeker.java b/Mage.Sets/src/mage/sets/newphyrexia/ChainedThroatseeker.java index b332855526..052edeb0dd 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ChainedThroatseeker.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ChainedThroatseeker.java @@ -75,7 +75,7 @@ class ChainedThroatseekerEffect extends ReplacementEffectImpl { SwordOfWarAndPeaceDamageEffect() { super(Outcome.Damage); - staticText = "Sword of War and Peace deals damage to that player equal to the number of cards in his or her hand"; + staticText = "{this} deals damage to that player equal to the number of cards in his or her hand"; } SwordOfWarAndPeaceDamageEffect(final SwordOfWarAndPeaceDamageEffect effect) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FissureVent.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FissureVent.java index 03a15cc717..25cbaf1f81 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FissureVent.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FissureVent.java @@ -44,7 +44,7 @@ import mage.target.common.TargetNonBasicLandPermanent; public class FissureVent extends CardImpl { public FissureVent(UUID ownerId) { - super(ownerId, 0, "Fissure Vent", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); + super(ownerId, 144, "Fissure Vent", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); this.expansionSetCode = "ROE"; this.color.setRed(true); this.getSpellAbility().addTarget(new TargetArtifactPermanent()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java index 8cd34b3f10..57e586ed88 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java @@ -112,7 +112,7 @@ class GideonJuraEffect extends RequirementEffect { public GideonJuraEffect() { super(Duration.Custom); - staticText = "During target opponent's next turn, creatures that player controls attack Gideon Jura if able"; + staticText = "During target opponent's next turn, creatures that player controls attack {this} if able"; } public GideonJuraEffect(final GideonJuraEffect effect) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KhalniHydra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KhalniHydra.java index 26a2396488..fd4064f41d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KhalniHydra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KhalniHydra.java @@ -94,7 +94,7 @@ public class KhalniHydra extends CardImpl { } class KhalniHydraCostReductionEffect extends OneShotEffect { - private static final String effectText = "Khalni Hydra costs {G} less to cast for each green creature you control"; + private static final String effectText = "{this} costs {G} less to cast for each green creature you control"; KhalniHydraCostReductionEffect ( ) { super(Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherOfTruth.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherOfTruth.java index ba3a0d0a25..c788db59f3 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherOfTruth.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherOfTruth.java @@ -78,7 +78,7 @@ public class KozilekButcherOfTruth extends CardImpl { class KozilekButcherOfTruthOnCastAbility extends TriggeredAbilityImpl { - private static final String abilityText = "When you cast Kozilek, Butcher of Truth, draw four cards"; + private static final String abilityText = "When you cast {this}, draw four cards"; KozilekButcherOfTruthOnCastAbility() { super(Zone.STACK, new DrawCardControllerEffect(4)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PestilenceDemon.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PestilenceDemon.java index e610fae8fa..7a68ee11c9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PestilenceDemon.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PestilenceDemon.java @@ -75,7 +75,7 @@ public class PestilenceDemon extends CardImpl { class PestilenceDemonEffect extends OneShotEffect { PestilenceDemonEffect() { super(Constants.Outcome.Damage); - staticText = "Pestilence Demon deals 1 damage to each creature and each player"; + staticText = "{this} deals 1 damage to each creature and each player"; } PestilenceDemonEffect(final PestilenceDemonEffect effect) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java index c102b19ab3..ca56a9138d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java @@ -90,7 +90,7 @@ public class SarkhanTheMad extends CardImpl { class SarkhanTheMadRevealAndDrawEffect extends OneShotEffect { - private static final String effectText = "Reveal the top card of your library and put it into your hand. Sarkhan the Mad deals damage to himself equal to that card's converted mana cost"; + private static final String effectText = "Reveal the top card of your library and put it into your hand. {this} deals damage to himself equal to that card's converted mana cost"; SarkhanTheMadRevealAndDrawEffect ( ) { super(Outcome.DrawCard); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java index 7e12b86f29..5f8a30b1fa 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java @@ -83,7 +83,7 @@ public class UlamogTheInfiniteGyre extends CardImpl { class UlamogTheInfiniteGyreDestroyOnCastAbility extends TriggeredAbilityImpl { - private static final String abilityText = "When you cast Ulamog, the Infinite Gyre, destroy target permanent"; + private static final String abilityText = "When you cast {this}, destroy target permanent"; UlamogTheInfiniteGyreDestroyOnCastAbility ( ) { super(Zone.STACK, new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java index bc81c9aa5e..9c826a41cd 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java @@ -102,7 +102,7 @@ class VengevineAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever you cast a spell, if it's the second creature spell you cast this turn, you may return Vengevine from your graveyard to the battlefield."; + return "Whenever you cast a spell, if it's the second creature spell you cast this turn, you may return {this} from your graveyard to the battlefield."; } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentSphinx.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentSphinx.java index 31f262745b..3573a650df 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentSphinx.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentSphinx.java @@ -81,7 +81,7 @@ public class ArgentSphinx extends CardImpl { class ArgentSphinxEffect extends OneShotEffect { - private static final String effectText = "Exile Argent Sphinx. Return it to the battlefield under your control at the beginning of the next end step"; + private static final String effectText = "Exile {this}. Return it to the battlefield under your control at the beginning of the next end step"; ArgentSphinxEffect ( ) { super(Constants.Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java index beb4fd16b6..ab6259a0ef 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java @@ -98,7 +98,7 @@ class CopperhornScoutTriggeredAbility extends TriggeredAbilityImpl { class CullingDaisEffect extends OneShotEffect { CullingDaisEffect() { super(Constants.Outcome.DrawCard); - staticText = "Draw a card for each charge counter on Culling Dais"; + staticText = "Draw a card for each charge counter on {this}"; } CullingDaisEffect(final CullingDaisEffect effect) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java index 9afe4d7084..31f7ef6db2 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java @@ -82,7 +82,7 @@ public class Embersmith extends CardImpl { class EmbersmithEffect extends OneShotEffect { EmbersmithEffect() { super(Constants.Outcome.Damage); - staticText = "you may pay {1}. If you do, Embersmith deals 1 damage to target creature or player"; + staticText = "you may pay {1}. If you do, {this} deals 1 damage to target creature or player"; } EmbersmithEffect(final EmbersmithEffect effect) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java index 75e9e74960..a2eabbd51d 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java @@ -77,7 +77,7 @@ public class GlintHawk extends CardImpl { class GlintHawkEffect extends OneShotEffect { private static final FilterControlledPermanent filter; - private static final String effectText = "When Glint Hawk enters the battlefield, sacrifice it unless you return an artifact you control to its owner's hand"; + private static final String effectText = "When {this} enters the battlefield, sacrifice it unless you return an artifact you control to its owner's hand"; static { filter = new FilterControlledPermanent(); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawkIdol.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawkIdol.java index 4e5a3df049..42da6b9404 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawkIdol.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawkIdol.java @@ -102,7 +102,7 @@ class GlintHawkIdolTriggeredAbility extends TriggeredAbilityImpl { class GoldenUrnEffect extends OneShotEffect { public GoldenUrnEffect() { super(Constants.Outcome.GainLife); - staticText = "You gain life equal to the number of charge counters on Golden Urn"; + staticText = "You gain life equal to the number of charge counters on {this}"; } public GoldenUrnEffect(final GoldenUrnEffect effect) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java index c27f104a4e..b78c518092 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java @@ -75,7 +75,7 @@ public class Grindclock extends CardImpl { class GrindclockEffect extends OneShotEffect { public GrindclockEffect() { super(Constants.Outcome.Detriment); - staticText = "Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of charge counters on Grindclock"; + staticText = "Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of charge counters on {this}"; } public GrindclockEffect(final GrindclockEffect effect) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java index 2f278640c8..cc72bb6eb1 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java @@ -87,7 +87,7 @@ class HoardSmelterEffect extends ContinuousEffectImpl { HoardSmelterEffect() { super(Constants.Duration.EndOfTurn, Constants.Layer.PTChangingEffects_7, Constants.SubLayer.ModifyPT_7c, Constants.Outcome.BoostCreature); - staticText = "Hoard-Smelter Dragon gets +X/+0 until end of turn, where X is that artifact's converted mana cost"; + staticText = "{this} gets +X/+0 until end of turn, where X is that artifact's converted mana cost"; } HoardSmelterEffect(final HoardSmelterEffect effect) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeOfTheTangle.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeOfTheTangle.java index 7b96f50eb1..6d24953730 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeOfTheTangle.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeOfTheTangle.java @@ -118,7 +118,7 @@ class LiegeOfTheTangleTriggeredAbility extends TriggeredAbilityImpl { class MeltTerrainEffect extends OneShotEffect { MeltTerrainEffect() { super(Constants.Outcome.Damage); - staticText = "Melt Terrain deals 2 damage to that land's controller"; + staticText = "{this} deals 2 damage to that land's controller"; } MeltTerrainEffect(final MeltTerrainEffect effect) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java index f66be17f17..0f5e73a89e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java @@ -113,6 +113,6 @@ class MoltenTailMasticoreAbility extends TriggeredAbilityImpl { + + public NecroticOoze(UUID ownerId) { + super(ownerId, 72, "Necrotic Ooze", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); + this.expansionSetCode = "SOM"; + this.subtype.add("Ooze"); + this.color.setBlack(true); + this.power = new MageInt(4); + this.toughness = new MageInt(3); + + this.addAbility(new NecroticOozeAbility()); + } + + public NecroticOoze(final NecroticOoze card) { + super(card); + } + + @Override + public NecroticOoze copy() { + return new NecroticOoze(this); + } + +} + +class NecroticOozeAbility extends StaticAbility { + + public NecroticOozeAbility() { + super(Zone.BATTLEFIELD, new NecroticOozeEffect()); + } + + public NecroticOozeAbility(final NecroticOozeAbility ability) { + super(ability); + } + + @Override + public NecroticOozeAbility copy() { + return new NecroticOozeAbility(this); + } + +} + +class NecroticOozeEffect extends ContinuousEffectImpl { + + public NecroticOozeEffect() { + super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); + staticText = "As long as {this} is on the battlefield, it has all activated abilities of all creature cards in all graveyards"; + } + + public NecroticOozeEffect(final NecroticOozeEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source) { + Permanent perm = game.getPermanent(source.getSourceId()); + if (perm != null) { + for (Player player: game.getPlayers().values()) { + for (Card card: player.getGraveyard().getCards(game)) { + if (card.getCardType().contains(CardType.CREATURE)) { + for (Ability ability: card.getAbilities()) { + if (ability instanceof ActivatedAbility) { + perm.addAbility(ability.copy()); + } + } + } + } + } + } + return true; + } + + @Override + public NecroticOozeEffect copy() { + return new NecroticOozeEffect(this); + } + +} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RatchetBomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RatchetBomb.java index 67d8697dfb..3e45610071 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RatchetBomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RatchetBomb.java @@ -73,7 +73,7 @@ public class RatchetBomb extends CardImpl { public RatchetBombEffect() { super(Constants.Outcome.DestroyPermanent); - staticText = "Destroy each nonland permanent with converted mana cost equal to the number of charge counters on Ratchet Bomb"; + staticText = "Destroy each nonland permanent with converted mana cost equal to the number of charge counters on {this}"; } public RatchetBombEffect(final RatchetBombEffect effect) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SpikeshotElder.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SpikeshotElder.java index f374b2082c..1bdc0ed039 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SpikeshotElder.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SpikeshotElder.java @@ -78,7 +78,7 @@ public class SpikeshotElder extends CardImpl { class SpikeshotElderEffect extends OneShotEffect { public SpikeshotElderEffect() { super(Constants.Outcome.Damage); - staticText = "Spikeshot Elder deals damage equal to its power to target creature or player"; + staticText = "{this} deals damage equal to its power to target creature or player"; } public SpikeshotElderEffect(final SpikeshotElderEffect effect) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java index d69ccd1133..315a9f1400 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java @@ -141,6 +141,6 @@ class TunnelIgnusTriggeredAbility extends TriggeredAbilityImpl { public TurnToSlagEffect() { super(Constants.Outcome.DestroyPermanent); - staticText = "Turn to Slag deals 5 damage to target creature. Destroy all Equipment attached to that creature"; + staticText = "{this} deals 5 damage to target creature. Destroy all Equipment attached to that creature"; } public TurnToSlagEffect(final TurnToSlagEffect effect) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java index 97de065d2d..24df62803a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java @@ -79,7 +79,7 @@ public class VolitionReins extends CardImpl { public UntapVolitionReinsEffect() { super(Constants.Outcome.Untap); - staticText = "When Volition Reins enters the battlefield, if enchanted permanent is tapped, untap it."; + staticText = "When {this} enters the battlefield, if enchanted permanent is tapped, untap it."; } public UntapVolitionReinsEffect(final UntapVolitionReinsEffect effect) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java b/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java index eff3865a0a..95b45d7b68 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java @@ -78,7 +78,7 @@ public class FlameblastDragon extends CardImpl { class FlameblastDragonEffect extends OneShotEffect { FlameblastDragonEffect() { super(Constants.Outcome.Benefit); - staticText = "you may pay {X}{R}. If you do, Flameblast Dragon deals X damage to target creature or player"; + staticText = "you may pay {X}{R}. If you do, {this} deals X damage to target creature or player"; } FlameblastDragonEffect(final FlameblastDragonEffect effect) { diff --git a/Mage.Sets/src/mage/sets/tenth/Juggernaut.java b/Mage.Sets/src/mage/sets/tenth/Juggernaut.java index ac7d5db2ae..3fcf352f01 100644 --- a/Mage.Sets/src/mage/sets/tenth/Juggernaut.java +++ b/Mage.Sets/src/mage/sets/tenth/Juggernaut.java @@ -80,7 +80,7 @@ class JuggernautAbility extends EvasionAbility { @Override public String getRule() { - return "Juggernaut can't be blocked by Walls."; + return "{this} can't be blocked by Walls."; } @Override diff --git a/Mage.Sets/src/mage/sets/tenth/Megrim.java b/Mage.Sets/src/mage/sets/tenth/Megrim.java index 49a785bb5b..dfc8e0cb51 100644 --- a/Mage.Sets/src/mage/sets/tenth/Megrim.java +++ b/Mage.Sets/src/mage/sets/tenth/Megrim.java @@ -90,6 +90,6 @@ class MergimTriggeredAbility extends TriggeredAbilityImpl { public RelentlessRatsEffect() { super(Duration.WhileOnBattlefield, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature); - staticText = "Relentless Rats gets +1/+1 for each other creature on the battlefield named Relentless Rats"; + staticText = "{this} gets +1/+1 for each other creature on the battlefield named Relentless Rats"; } public RelentlessRatsEffect(final RelentlessRatsEffect effect) { diff --git a/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java b/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java index 637736d61c..848e22c6fc 100644 --- a/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java +++ b/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java @@ -120,7 +120,7 @@ class KalastriaHighbornTriggeredAbility extends TriggeredAbilityImpl { public ArmamentMasterEffect() { super(Duration.WhileOnBattlefield, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature); - staticText = "Other Kor creatures you control get +2/+2 for each Equipment attached to Armament Master"; + staticText = "Other Kor creatures you control get +2/+2 for each Equipment attached to {this}"; } public ArmamentMasterEffect(final ArmamentMasterEffect effect) { diff --git a/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java b/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java index 03cf63b61d..faa9b79244 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java @@ -99,7 +99,7 @@ class BeastmasterAscensionAbility extends TriggeredAbilityImpl { public EldraziMonumentEffect() { super(Outcome.Sacrifice); - staticText = "sacrifice a creature. If you can't, sacrifice Eldrazi Monument"; + staticText = "sacrifice a creature. If you can't, sacrifice {this}"; } public EldraziMonumentEffect(final EldraziMonumentEffect ability) { diff --git a/Mage.Sets/src/mage/sets/zendikar/KhalniHeartExpedition.java b/Mage.Sets/src/mage/sets/zendikar/KhalniHeartExpedition.java index ea0a56d596..65b59e7386 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KhalniHeartExpedition.java +++ b/Mage.Sets/src/mage/sets/zendikar/KhalniHeartExpedition.java @@ -95,7 +95,7 @@ class KhalniHeartExpeditionAbility extends ActivatedAbilityImpl { public NissasChosenEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); - staticText = "If Nissa's Chosen would be put into a graveyard from the battlefield, put it on the bottom of its owner's library instead"; + staticText = "If {this} would be put into a graveyard from the battlefield, put it on the bottom of its owner's library instead"; } public NissasChosenEffect(final NissasChosenEffect effect) { diff --git a/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java b/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java index 1bc1a5e553..eb30e1b163 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java @@ -116,7 +116,7 @@ class PyromancerAscensionQuestTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "At the beginning of your upkeep, if you control five or more lands, put four +1/+1 counters on Scute Mob."; + return "At the beginning of your upkeep, if you control five or more lands, put four +1/+1 counters on {this}."; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java b/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java index 789ca69aa7..d77bb69ba2 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java +++ b/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java @@ -115,6 +115,6 @@ class ValakutTheMoltenPinnacleTriggeredAbility extends TriggeredAbilityImpl public VinesOfVastwoodEffect(FilterStackObject filterSource, Duration duration) { super(duration, Outcome.Benefit); this.filterSource = filterSource; - staticText = "Target creature can't be the target of spells or abilities your opponents control this turn. If Vines of Vastwood was kicked, that creature gets +4/+4 until end of turn."; + staticText = "Target creature can't be the target of spells or abilities your opponents control this turn. If {this} was kicked, that creature gets +4/+4 until end of turn."; } public VinesOfVastwoodEffect(final VinesOfVastwoodEffect effect) {