diff --git a/Mage.Sets/src/mage/cards/b/BlinkmothUrn.java b/Mage.Sets/src/mage/cards/b/BlinkmothUrn.java
index 607832d265e..a067684b01b 100644
--- a/Mage.Sets/src/mage/cards/b/BlinkmothUrn.java
+++ b/Mage.Sets/src/mage/cards/b/BlinkmothUrn.java
@@ -51,7 +51,7 @@ class BlinkmothUrnEffect extends OneShotEffect {
public BlinkmothUrnEffect() {
super(Outcome.PutManaInPool);
- this.staticText = "if Blinkmoth Urn is untapped, that player adds {1} to their mana pool for each artifact he or she controls";
+ this.staticText = "if Blinkmoth Urn is untapped, that player adds {1} for each artifact he or she controls";
}
public BlinkmothUrnEffect(final BlinkmothUrnEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BubblingMuck.java b/Mage.Sets/src/mage/cards/b/BubblingMuck.java
index fd6acd31e93..ab8ab74fab4 100644
--- a/Mage.Sets/src/mage/cards/b/BubblingMuck.java
+++ b/Mage.Sets/src/mage/cards/b/BubblingMuck.java
@@ -56,7 +56,7 @@ public class BubblingMuck extends CardImpl {
public BubblingMuck(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
- // Until end of turn, whenever a player taps a Swamp for mana, that player adds {B} to their mana pool.
+ // Until end of turn, whenever a player taps a Swamp for mana, that player adds {B}.
this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new BubblingMuckTriggeredAbility()));
}
@@ -111,6 +111,6 @@ class BubblingMuckTriggeredAbility extends DelayedTriggeredManaAbility {
@Override
public String getRule() {
- return "Until end of turn, whenever a player taps a Swamp for mana, that player adds {B} to their mana pool";
+ return "Until end of turn, whenever a player taps a Swamp for mana, that player adds {B}";
}
}
diff --git a/Mage.Sets/src/mage/cards/c/ChaosMoon.java b/Mage.Sets/src/mage/cards/c/ChaosMoon.java
index 8ece9bb8ee3..814868f55ef 100644
--- a/Mage.Sets/src/mage/cards/c/ChaosMoon.java
+++ b/Mage.Sets/src/mage/cards/c/ChaosMoon.java
@@ -33,13 +33,10 @@ import mage.Mana;
import mage.ObjectColor;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
-import mage.abilities.common.TapForManaAllTriggeredManaAbility;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
-import mage.abilities.effects.ContinuousEffect;
import mage.abilities.effects.Effect;
import mage.abilities.effects.mana.AddManaToManaPoolTargetControllerEffect;
import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
-import mage.abilities.effects.common.ManaEffect;
import mage.abilities.effects.common.continuous.BoostAllEffect;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.ReplacementEffectImpl;
@@ -47,7 +44,6 @@ import mage.abilities.mana.DelayedTriggeredManaAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
-import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
@@ -67,10 +63,9 @@ import mage.target.targetpointer.FixedTarget;
public class ChaosMoon extends CardImpl {
public ChaosMoon(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}");
+ super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}");
-
- // At the beginning of each upkeep, count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds {R} to their mana pool (in addition to the mana the land produces). If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type.
+ // At the beginning of each upkeep, count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds {R} (in addition to the mana the land produces). If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type.
this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new ChaosMoonEffect(), TargetController.ANY, false));
}
@@ -94,7 +89,7 @@ class ChaosMoonEffect extends OneShotEffect {
public ChaosMoonEffect() {
super(Outcome.Neutral);
- this.staticText = "count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds {R} to their mana pool (in addition to the mana the land produces). If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type";
+ this.staticText = "count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds {R} (in addition to the mana the land produces). If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type";
}
public ChaosMoonEffect(final ChaosMoonEffect effect) {
@@ -115,8 +110,7 @@ class ChaosMoonEffect extends OneShotEffect {
if (permanentsInPlay % 2 != 0) {
game.addEffect(new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), source);
new CreateDelayedTriggeredAbilityEffect(new ChaosMoonOddTriggeredAbility()).apply(game, source);
- }
- // Even
+ } // Even
else {
game.addEffect(new BoostAllEffect(-1, -1, Duration.EndOfTurn, filter, false), source);
game.addEffect(new ChaosMoonEvenReplacementEffect(), source);
@@ -168,7 +162,7 @@ class ChaosMoonOddTriggeredAbility extends DelayedTriggeredManaAbility {
@Override
public String getRule() {
- return "Until end of turn, whenever a player taps a Mountain for mana, that player adds {R} to their mana pool";
+ return "Until end of turn, whenever a player taps a Mountain for mana, that player adds {R}";
}
}
diff --git a/Mage.Sets/src/mage/cards/d/DawnsReflection.java b/Mage.Sets/src/mage/cards/d/DawnsReflection.java
index 8c428f547a4..79e2bbf734e 100644
--- a/Mage.Sets/src/mage/cards/d/DawnsReflection.java
+++ b/Mage.Sets/src/mage/cards/d/DawnsReflection.java
@@ -65,7 +65,7 @@ public class DawnsReflection extends CardImpl {
this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
- // Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to their mana pool.
+ // Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors.
this.addAbility(new DawnsReflectionTriggeredAbility());
}
@@ -107,7 +107,7 @@ class DawnsReflectionTriggeredAbility extends TriggeredManaAbility {
@Override
public String getRule() {
- return "Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to their mana pool (in addition to the mana the land produces).";
+ return "Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors (in addition to the mana the land produces).";
}
}
@@ -115,7 +115,7 @@ class DawnsReflectionManaEffect extends ManaEffect {
public DawnsReflectionManaEffect() {
super();
- this.staticText = "its controller adds two mana in any combination of colors to their mana pool";
+ this.staticText = "its controller adds two mana in any combination of colors";
}
public DawnsReflectionManaEffect(final DawnsReflectionManaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/DictateOfKarametra.java b/Mage.Sets/src/mage/cards/d/DictateOfKarametra.java
index a1e16a54df6..b43f0335af5 100644
--- a/Mage.Sets/src/mage/cards/d/DictateOfKarametra.java
+++ b/Mage.Sets/src/mage/cards/d/DictateOfKarametra.java
@@ -49,7 +49,7 @@ public class DictateOfKarametra extends CardImpl {
// Flash
this.addAbility(FlashAbility.getInstance());
- // Whenever a player taps a land for mana, that player adds one mana to their mana pool of any type that land produced.
+ // Whenever a player taps a land for mana, that player adds one mana of any type that land produced.
this.addAbility(new TapForManaAllTriggeredManaAbility(
new AddManaOfAnyTypeProducedEffect(),
new FilterLandPermanent("a player taps a land"),
diff --git a/Mage.Sets/src/mage/cards/d/DoublingCube.java b/Mage.Sets/src/mage/cards/d/DoublingCube.java
index 5a67189ce66..67c57e7f1a5 100644
--- a/Mage.Sets/src/mage/cards/d/DoublingCube.java
+++ b/Mage.Sets/src/mage/cards/d/DoublingCube.java
@@ -73,7 +73,7 @@ class DoublingCubeEffect extends ManaEffect {
DoublingCubeEffect() {
super();
- staticText = "Double the amount of each type of mana in your mana pool";
+ staticText = "Double the amount of each type of unspent mana you have";
}
DoublingCubeEffect(final DoublingCubeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/DroidFoundry.java b/Mage.Sets/src/mage/cards/d/DroidFoundry.java
index 492600c0262..4d2221dfd08 100644
--- a/Mage.Sets/src/mage/cards/d/DroidFoundry.java
+++ b/Mage.Sets/src/mage/cards/d/DroidFoundry.java
@@ -53,7 +53,7 @@ public class DroidFoundry extends CardImpl {
// When Droid Foundry enters the battlefield , add {U}.
this.addAbility(new EntersBattlefieldTriggeredAbility(new AddManaToManaPoolSourceControllerEffect(Mana.BlueMana(1))));
- // {T}: Add {W} or {B} to you mana pool.
+ // {T}: Add {W} or {B}.
this.addAbility(new WhiteManaAbility());
this.addAbility(new BlackManaAbility());
}
diff --git a/Mage.Sets/src/mage/cards/e/ElvishGuidance.java b/Mage.Sets/src/mage/cards/e/ElvishGuidance.java
index 0b40d130621..17bdaae8472 100644
--- a/Mage.Sets/src/mage/cards/e/ElvishGuidance.java
+++ b/Mage.Sets/src/mage/cards/e/ElvishGuidance.java
@@ -55,7 +55,7 @@ import mage.target.common.TargetLandPermanent;
public class ElvishGuidance extends CardImpl {
public ElvishGuidance(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}");
+ super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}");
this.subtype.add(SubType.AURA);
// Enchant land
@@ -65,7 +65,7 @@ public class ElvishGuidance extends CardImpl {
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
- // Whenever enchanted land is tapped for mana, its controller adds {G} to their mana pool for each Elf on the battlefield.
+ // Whenever enchanted land is tapped for mana, its controller adds {G} for each Elf on the battlefield.
this.addAbility(new ElvishGuidanceTriggeredAbility());
}
@@ -107,6 +107,6 @@ class ElvishGuidanceTriggeredAbility extends TriggeredManaAbility {
@Override
public String getRule() {
- return "Whenever enchanted land is tapped for mana, its controller adds {G} to their mana pool for each Elf on the battlefield.";
+ return "Whenever enchanted land is tapped for mana, its controller adds {G} for each Elf on the battlefield.";
}
}
diff --git a/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java b/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java
index 404c886f3dd..75982a9d735 100644
--- a/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java
+++ b/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java
@@ -74,7 +74,7 @@ public class ExtraplanarLens extends CardImpl {
ability.addTarget(new TargetLandPermanent(filter));
this.addAbility(ability);
- // Whenever a land with the same name as the exiled card is tapped for mana, its controller adds one mana to their mana pool of any type that land produced.
+ // Whenever a land with the same name as the exiled card is tapped for mana, its controller adds one mana of any type that land produced.
this.addAbility(new ExtraplanarLensTriggeredAbility());
}
diff --git a/Mage.Sets/src/mage/cards/f/FertileGround.java b/Mage.Sets/src/mage/cards/f/FertileGround.java
index 7b98035eed0..290fe25b966 100644
--- a/Mage.Sets/src/mage/cards/f/FertileGround.java
+++ b/Mage.Sets/src/mage/cards/f/FertileGround.java
@@ -54,17 +54,16 @@ import mage.target.targetpointer.FixedTarget;
public class FertileGround extends CardImpl {
public FertileGround(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}");
+ super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}");
this.subtype.add(SubType.AURA);
-
// Enchant land
TargetPermanent auraTarget = new TargetLandPermanent();
this.getSpellAbility().addTarget(auraTarget);
this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
- // Whenever enchanted land is tapped for mana, its controller adds one mana of any color to their mana pool.
+ // Whenever enchanted land is tapped for mana, its controller adds one mana of any color.
this.addAbility(new FertileGroundTriggeredAbility());
}
@@ -80,7 +79,6 @@ public class FertileGround extends CardImpl {
class FertileGroundTriggeredAbility extends TriggeredManaAbility {
-
public FertileGroundTriggeredAbility() {
super(Zone.BATTLEFIELD, new AddManaAnyColorAttachedControllerEffect());
}
@@ -96,14 +94,14 @@ class FertileGroundTriggeredAbility extends TriggeredManaAbility {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
- Permanent enchantment = game.getPermanent(this.getSourceId());
- if (enchantment != null && event.getSourceId().equals(enchantment.getAttachedTo())) {
- Permanent enchanted = game.getPermanent(enchantment.getAttachedTo());
- if (enchanted != null) {
- getEffects().get(0).setTargetPointer(new FixedTarget(enchanted.getControllerId()));
- return true;
- }
+ Permanent enchantment = game.getPermanent(this.getSourceId());
+ if (enchantment != null && event.getSourceId().equals(enchantment.getAttachedTo())) {
+ Permanent enchanted = game.getPermanent(enchantment.getAttachedTo());
+ if (enchanted != null) {
+ getEffects().get(0).setTargetPointer(new FixedTarget(enchanted.getControllerId()));
+ return true;
}
+ }
return false;
}
@@ -114,6 +112,6 @@ class FertileGroundTriggeredAbility extends TriggeredManaAbility {
@Override
public String getRule() {
- return "Whenever enchanted land is tapped for mana, its controller adds one mana of any color to their mana pool";
+ return "Whenever enchanted land is tapped for mana, its controller adds one mana of any color";
}
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/cards/g/GauntletOfMight.java b/Mage.Sets/src/mage/cards/g/GauntletOfMight.java
index d167731847b..30126316b9e 100644
--- a/Mage.Sets/src/mage/cards/g/GauntletOfMight.java
+++ b/Mage.Sets/src/mage/cards/g/GauntletOfMight.java
@@ -63,9 +63,9 @@ public class GauntletOfMight extends CardImpl {
// Red creatures get +1/+1.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false)));
- // Whenever a Mountain is tapped for mana, its controller adds {R} to their mana pool.
+ // Whenever a Mountain is tapped for mana, its controller adds {R}.
ManaEffect effect = new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.R), "their");
- effect.setText("its controller adds {R} to their mana pool");
+ effect.setText("its controller adds {R}");
this.addAbility(new TapForManaAllTriggeredManaAbility(
effect, filterMountain, SetTargetPointer.PLAYER));
}
diff --git a/Mage.Sets/src/mage/cards/g/GauntletOfPower.java b/Mage.Sets/src/mage/cards/g/GauntletOfPower.java
index dbe64da15d4..3b22559ef92 100644
--- a/Mage.Sets/src/mage/cards/g/GauntletOfPower.java
+++ b/Mage.Sets/src/mage/cards/g/GauntletOfPower.java
@@ -73,7 +73,7 @@ public class GauntletOfPower extends CardImpl {
// Creatures of the chosen color get +1/+1.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GauntletOfPowerEffect1()));
- // Whenever a basic land is tapped for mana of the chosen color, its controller adds one mana of that color to their mana pool.
+ // Whenever a basic land is tapped for mana of the chosen color, its controller adds one mana of that color.
this.addAbility(new TapForManaAllTriggeredAbility(new GauntletOfPowerEffectEffect2(), filter, SetTargetPointer.PERMANENT));
}
@@ -198,7 +198,7 @@ class GauntletOfPowerEffectEffect2 extends ManaEffect {
public GauntletOfPowerEffectEffect2() {
super();
- staticText = "its controller adds one mana of that color to their mana pool";
+ staticText = "its controller adds one mana of that color";
}
public GauntletOfPowerEffectEffect2(final GauntletOfPowerEffectEffect2 effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java b/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java
index 11c68921bb9..9015da3dc14 100644
--- a/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java
+++ b/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java
@@ -54,7 +54,7 @@ import mage.target.common.TargetArtifactPermanent;
public class GlissaSunseeker extends CardImpl {
public GlissaSunseeker(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}");
+ super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.ELF);
this.power = new MageInt(3);
@@ -62,7 +62,7 @@ public class GlissaSunseeker extends CardImpl {
// First strike
this.addAbility(FirstStrikeAbility.getInstance());
-
+
// {tap}: Destroy target artifact if its converted mana cost is equal to the amount of mana in your mana pool.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GlissaSunseekerEffect(), new TapSourceCost());
ability.addTarget(new TargetArtifactPermanent());
@@ -83,7 +83,7 @@ class GlissaSunseekerEffect extends OneShotEffect {
public GlissaSunseekerEffect() {
super(Outcome.DestroyPermanent);
- this.staticText = "Destroy target artifact if its converted mana cost is equal to the amount of mana in your mana pool";
+ this.staticText = "Destroy target artifact if its converted mana cost is equal to the amount of unspent mana you have";
}
public GlissaSunseekerEffect(final GlissaSunseekerEffect effect) {
@@ -114,4 +114,4 @@ class GlissaSunseekerEffect extends OneShotEffect {
}
return false;
}
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/cards/h/HeartbeatOfSpring.java b/Mage.Sets/src/mage/cards/h/HeartbeatOfSpring.java
index 82a298b4760..f42943f85c6 100644
--- a/Mage.Sets/src/mage/cards/h/HeartbeatOfSpring.java
+++ b/Mage.Sets/src/mage/cards/h/HeartbeatOfSpring.java
@@ -46,7 +46,7 @@ public class HeartbeatOfSpring extends CardImpl {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}");
- // Whenever a player taps a land for mana, that player adds one mana to their mana pool of any type that land produced.
+ // Whenever a player taps a land for mana, that player adds one mana of any type that land produced.
this.addAbility(new TapForManaAllTriggeredManaAbility(
new AddManaOfAnyTypeProducedEffect(),
new FilterLandPermanent("a player taps a land"),
diff --git a/Mage.Sets/src/mage/cards/h/HighTide.java b/Mage.Sets/src/mage/cards/h/HighTide.java
index dddbcd588d5..62740549683 100644
--- a/Mage.Sets/src/mage/cards/h/HighTide.java
+++ b/Mage.Sets/src/mage/cards/h/HighTide.java
@@ -56,7 +56,7 @@ public class HighTide extends CardImpl {
public HighTide(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}");
- // Until end of turn, whenever a player taps an Island for mana, that player adds {U} to their mana pool.
+ // Until end of turn, whenever a player taps an Island for mana, that player adds {U}.
this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new HighTideTriggeredAbility()));
}
@@ -112,6 +112,6 @@ class HighTideTriggeredAbility extends DelayedTriggeredManaAbility {
@Override
public String getRule() {
- return "Until end of turn, whenever a player taps an Island for mana, that player adds {U} to their mana pool";
+ return "Until end of turn, whenever a player taps an Island for mana, that player adds {U}";
}
}
diff --git a/Mage.Sets/src/mage/cards/i/IceCauldron.java b/Mage.Sets/src/mage/cards/i/IceCauldron.java
index 9c7555d4a45..893fab8321b 100644
--- a/Mage.Sets/src/mage/cards/i/IceCauldron.java
+++ b/Mage.Sets/src/mage/cards/i/IceCauldron.java
@@ -81,7 +81,7 @@ public class IceCauldron extends CardImpl {
ability.addCost(new TapSourceCost());
this.addAbility(ability);
- // {T}, Remove a charge counter from Ice Cauldron: Add Ice Cauldron's last noted type and amount of mana to your mana pool. Spend this mana only to cast the last card exiled with Ice Cauldron.
+ // {T}, Remove a charge counter from Ice Cauldron: Add Ice Cauldron's last noted type and amount of mana. Spend this mana only to cast the last card exiled with Ice Cauldron.
Ability ability2 = new SimpleManaAbility(Zone.BATTLEFIELD, new IceCauldronAddManaEffect(), new TapSourceCost());
ability2.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance()));
this.addAbility(ability2);
@@ -221,7 +221,7 @@ class IceCauldronAddManaEffect extends ManaEffect {
IceCauldronAddManaEffect() {
super();
- staticText = "Add {this}'s last noted type and amount of mana to your mana pool. Spend this mana only to cast the last card exiled with {this}";
+ staticText = "Add {this}'s last noted type and amount of mana. Spend this mana only to cast the last card exiled with {this}";
}
IceCauldronAddManaEffect(IceCauldronAddManaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfProgenitus.java b/Mage.Sets/src/mage/cards/k/KeeperOfProgenitus.java
index faaf4ad35b9..f9ead2736c8 100644
--- a/Mage.Sets/src/mage/cards/k/KeeperOfProgenitus.java
+++ b/Mage.Sets/src/mage/cards/k/KeeperOfProgenitus.java
@@ -64,7 +64,7 @@ public class KeeperOfProgenitus extends CardImpl {
this.power = new MageInt(1);
this.toughness = new MageInt(3);
- // Whenever a player taps a Mountain, Forest, or Plains for mana, that player adds one mana to their mana pool of any type that land produced.
+ // Whenever a player taps a Mountain, Forest, or Plains for mana, that player adds one mana of any type that land produced.
this.addAbility(new TapForManaAllTriggeredManaAbility(
new AddManaOfAnyTypeProducedEffect(),
filter, SetTargetPointer.PERMANENT));
diff --git a/Mage.Sets/src/mage/cards/m/MadScienceFairProject.java b/Mage.Sets/src/mage/cards/m/MadScienceFairProject.java
index bc79e82ec01..7076823c27f 100644
--- a/Mage.Sets/src/mage/cards/m/MadScienceFairProject.java
+++ b/Mage.Sets/src/mage/cards/m/MadScienceFairProject.java
@@ -51,7 +51,7 @@ public class MadScienceFairProject extends CardImpl {
public MadScienceFairProject(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
- // {tap}: Roll a six-sided die. On a 3 or lower, target player adds {C} to their mana pool. Otherwise, that player adds one mana of any color he or she chooses to their mana pool.
+ // {tap}: Roll a six-sided die. On a 3 or lower, target player adds {C}. Otherwise, that player adds one mana of any color he or she chooses.
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new MadScienceFairManaEffect(), new TapSourceCost()));
}
@@ -69,7 +69,7 @@ class MadScienceFairManaEffect extends ManaEffect {
public MadScienceFairManaEffect() {
super();
- this.staticText = "Roll a six-sided die. On a 3 or lower, target player adds {C} to their mana pool. Otherwise, that player adds one mana of any color he or she chooses to their mana pool";
+ this.staticText = "Roll a six-sided die. On a 3 or lower, target player adds {C}. Otherwise, that player adds one mana of any color he or she chooses";
}
public MadScienceFairManaEffect(final MadScienceFairManaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/ManaFlare.java b/Mage.Sets/src/mage/cards/m/ManaFlare.java
index ecaa9aa01b7..7464ef81122 100644
--- a/Mage.Sets/src/mage/cards/m/ManaFlare.java
+++ b/Mage.Sets/src/mage/cards/m/ManaFlare.java
@@ -45,7 +45,7 @@ public class ManaFlare extends CardImpl {
public ManaFlare(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}");
- // Whenever a player taps a land for mana, that player adds one mana to their mana pool of any type that land produced.
+ // Whenever a player taps a land for mana, that player adds one mana of any type that land produced.
this.addAbility(new TapForManaAllTriggeredManaAbility(
new AddManaOfAnyTypeProducedEffect(),
new FilterLandPermanent("a player taps a land"),
diff --git a/Mage.Sets/src/mage/cards/m/ManaShort.java b/Mage.Sets/src/mage/cards/m/ManaShort.java
index 701ebe6c831..b9d2491666e 100644
--- a/Mage.Sets/src/mage/cards/m/ManaShort.java
+++ b/Mage.Sets/src/mage/cards/m/ManaShort.java
@@ -45,7 +45,7 @@ import mage.target.TargetPlayer;
public class ManaShort extends CardImpl {
public ManaShort(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}");
+ super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{U}");
// Tap all lands target player controls and empty their mana pool.
this.getSpellAbility().addEffect(new ManaShortEffect());
@@ -66,7 +66,7 @@ class ManaShortEffect extends TapAllTargetPlayerControlsEffect {
public ManaShortEffect() {
super(new FilterLandPermanent());
- staticText = "Tap all lands target player controls and empty their mana pool";
+ staticText = "Tap all lands target player controls and that player loses all unspent mana";
}
public ManaShortEffect(final ManaShortEffect effect) {
@@ -81,7 +81,7 @@ class ManaShortEffect extends TapAllTargetPlayerControlsEffect {
@Override
public boolean apply(Game game, Ability source) {
Player targetPlayer = game.getPlayer(source.getFirstTarget());
- if(targetPlayer != null) {
+ if (targetPlayer != null) {
super.apply(game, source);
targetPlayer.getManaPool().emptyPool(game);
return true;
diff --git a/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java b/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java
index d68731b7ec8..2899c075188 100644
--- a/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java
+++ b/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java
@@ -59,22 +59,21 @@ import mage.target.targetpointer.FixedTarget;
public class MarkOfSakiko extends CardImpl {
public MarkOfSakiko(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}");
+ super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}");
this.subtype.add(SubType.AURA);
-
// Enchant creature
TargetPermanent auraTarget = new TargetCreaturePermanent();
this.getSpellAbility().addTarget(auraTarget);
this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
-
+
// Enchanted creature has "Whenever this creature deals combat damage to a player, add that much {G}. Until end of turn, you don’t lose this mana as steps and phases end."
- Effect effect = new GainAbilityAttachedEffect(new MarkOfSakikoTriggeredAbility(), AttachmentType.AURA);
+ Effect effect = new GainAbilityAttachedEffect(new MarkOfSakikoTriggeredAbility(), AttachmentType.AURA);
effect.setText("Enchanted creature has \"Whenever this creature deals combat damage to a player, add that much {G}. Until end of turn, you don’t lose this mana as steps and phases end.\"");
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
-
+
}
public MarkOfSakiko(final MarkOfSakiko card) {
@@ -114,7 +113,7 @@ class MarkOfSakikoTriggeredAbility extends TriggeredAbilityImpl {
this.getEffects().clear();
Effect effect = new AddManaToManaPoolTargetControllerEffect(Mana.GreenMana(event.getAmount()), "that player", true);
effect.setTargetPointer(new FixedTarget(getControllerId()));
- effect.setText("add that much {G}. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end");
+ effect.setText("add that much {G}. Until end of turn, you don’t lose this mana as steps and phases end");
this.addEffect(effect);
return true;
}
@@ -127,4 +126,4 @@ class MarkOfSakikoTriggeredAbility extends TriggeredAbilityImpl {
return "Whenever this creature deals combat damage to a player, add that much {G}. "
+ "Until end of turn, you don’t lose this mana as steps and phases end.";
}
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/cards/m/MarketFestival.java b/Mage.Sets/src/mage/cards/m/MarketFestival.java
index 441c57cff81..e986fe6bd27 100644
--- a/Mage.Sets/src/mage/cards/m/MarketFestival.java
+++ b/Mage.Sets/src/mage/cards/m/MarketFestival.java
@@ -67,7 +67,7 @@ public class MarketFestival extends CardImpl {
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
- // Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to their mana pool (in addition to the mana the land produces).
+ // Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors (in addition to the mana the land produces).
this.addAbility(new MarketFestivalTriggeredAbility());
}
@@ -109,7 +109,7 @@ class MarketFestivalTriggeredAbility extends TriggeredManaAbility {
@Override
public String getRule() {
- return "Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to their mana pool (in addition to the mana the land produces).";
+ return "Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors (in addition to the mana the land produces).";
}
}
@@ -117,7 +117,7 @@ class MarketFestivalManaEffect extends ManaEffect {
public MarketFestivalManaEffect() {
super();
- this.staticText = "its controller adds two mana in any combination of colors to their mana pool";
+ this.staticText = "its controller adds two mana in any combination of colors";
}
public MarketFestivalManaEffect(final MarketFestivalManaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/o/Overabundance.java b/Mage.Sets/src/mage/cards/o/Overabundance.java
index b6fb9b281d6..bb36bfef9f5 100644
--- a/Mage.Sets/src/mage/cards/o/Overabundance.java
+++ b/Mage.Sets/src/mage/cards/o/Overabundance.java
@@ -48,7 +48,7 @@ public class Overabundance extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{G}");
- // Whenever a player taps a land for mana, that player adds one mana to their mana pool of any type that land produced, and Overabundance deals 1 damage to him or her.
+ // Whenever a player taps a land for mana, that player adds one mana of any type that land produced, and Overabundance deals 1 damage to him or her.
this.addAbility(new TapForManaAllTriggeredManaAbility(
new AddManaOfAnyTypeProducedEffect(),
new FilterLandPermanent( "a player taps a land"),
diff --git a/Mage.Sets/src/mage/cards/o/Overgrowth.java b/Mage.Sets/src/mage/cards/o/Overgrowth.java
index 26bf28bb892..e1e4a3980ab 100644
--- a/Mage.Sets/src/mage/cards/o/Overgrowth.java
+++ b/Mage.Sets/src/mage/cards/o/Overgrowth.java
@@ -65,7 +65,7 @@ public class Overgrowth extends CardImpl {
this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
- // Whenever enchanted land is tapped for mana, its controller adds {G}{G} to their mana pool.
+ // Whenever enchanted land is tapped for mana, its controller adds {G}{G}.
this.addAbility(new OvergrowthTriggeredAbility());
}
@@ -116,6 +116,6 @@ class OvergrowthTriggeredAbility extends TriggeredManaAbility {
@Override
public String getRule() {
- return "Whenever enchanted land is tapped for mana, its controller adds {G}{G} to their mana pool";
+ return "Whenever enchanted land is tapped for mana, its controller adds {G}{G}";
}
}
diff --git a/Mage.Sets/src/mage/cards/p/PowerSink.java b/Mage.Sets/src/mage/cards/p/PowerSink.java
index 4ed69dbe9a1..e078625be13 100644
--- a/Mage.Sets/src/mage/cards/p/PowerSink.java
+++ b/Mage.Sets/src/mage/cards/p/PowerSink.java
@@ -53,10 +53,9 @@ import mage.target.TargetSpell;
public class PowerSink extends CardImpl {
public PowerSink(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{X}{U}");
+ super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{U}");
-
- // Counter target spell unless its controller pays {X}. If he or she doesn't, that player taps all lands with mana abilities he or she controls and empties their mana pool.
+ // Counter target spell unless its controller pays {X}. If that player doesn’t, they tap all lands with mana abilities they control and lose all unspent mana.
this.getSpellAbility().addEffect(new PowerSinkCounterUnlessPaysEffect());
this.getSpellAbility().addTarget(new TargetSpell());
}
@@ -75,7 +74,7 @@ class PowerSinkCounterUnlessPaysEffect extends OneShotEffect {
public PowerSinkCounterUnlessPaysEffect() {
super(Outcome.Detriment);
- this.staticText = "Counter target spell unless its controller pays {X}. If he or she doesn't, that player taps all lands with mana abilities he or she controls and empties their mana pool.";
+ this.staticText = "Counter target spell unless its controller pays {X}. If that player doesn’t, they tap all lands with mana abilities they control and lose all unspent mana";
}
public PowerSinkCounterUnlessPaysEffect(final PowerSinkCounterUnlessPaysEffect effect) {
@@ -98,19 +97,19 @@ class PowerSinkCounterUnlessPaysEffect extends OneShotEffect {
int amount = source.getManaCostsToPay().getX();
if (amount > 0) {
GenericManaCost cost = new GenericManaCost(amount);
- StringBuilder sb = new StringBuilder("Pay ").append(cost.getText()).append('?');
- if (player.chooseUse(Outcome.Benefit, sb.toString(), source, game)) {
+ String sb = String.valueOf("Pay " + cost.getText()) + Character.toString('?');
+ if (player.chooseUse(Outcome.Benefit, sb, source, game)) {
if (cost.pay(source, game, source.getSourceId(), player.getId(), false)) {
game.informPlayers(new StringBuilder(sourceObject.getName()).append(": additional cost was paid").toString());
return true;
}
}
-
+
// Counter target spell unless its controller pays {X}
if (game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game)) {
game.informPlayers(new StringBuilder(sourceObject.getName()).append(": additional cost wasn't paid - countering ").append(spell.getName()).toString());
}
-
+
// that player taps all lands with mana abilities he or she controls...
List lands = game.getBattlefield().getAllActivePermanents(new FilterLandPermanent(), player.getId(), game);
for (Permanent land : lands) {
@@ -131,5 +130,5 @@ class PowerSinkCounterUnlessPaysEffect extends OneShotEffect {
}
return false;
}
-
+
}
diff --git a/Mage.Sets/src/mage/cards/s/SakikoMotherOfSummer.java b/Mage.Sets/src/mage/cards/s/SakikoMotherOfSummer.java
index 628c24b5194..e1cbb2c81dd 100644
--- a/Mage.Sets/src/mage/cards/s/SakikoMotherOfSummer.java
+++ b/Mage.Sets/src/mage/cards/s/SakikoMotherOfSummer.java
@@ -53,7 +53,7 @@ import mage.target.targetpointer.FixedTarget;
public class SakikoMotherOfSummer extends CardImpl {
public SakikoMotherOfSummer(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}");
+ super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}{G}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.SNAKE);
this.subtype.add(SubType.SHAMAN);
@@ -63,7 +63,7 @@ public class SakikoMotherOfSummer extends CardImpl {
// Whenever a creature you control deals combat damage to a player, add that much {G}. Until end of turn, you don’t lose this mana as steps and phases end.
this.addAbility(new SakikoMotherOfSummerTriggeredAbility());
-
+
}
public SakikoMotherOfSummer(final SakikoMotherOfSummer card) {
@@ -104,7 +104,7 @@ class SakikoMotherOfSummerTriggeredAbility extends TriggeredAbilityImpl {
this.getEffects().clear();
Effect effect = new AddManaToManaPoolTargetControllerEffect(Mana.GreenMana(event.getAmount()), "that player", true);
effect.setTargetPointer(new FixedTarget(creature.getControllerId()));
- effect.setText("add that much {G}. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end");
+ effect.setText("add that much {G}. Until end of turn, you don’t lose this mana as steps and phases end");
this.addEffect(effect);
return true;
}
@@ -116,4 +116,4 @@ class SakikoMotherOfSummerTriggeredAbility extends TriggeredAbilityImpl {
public String getRule() {
return "Whenever a creature you control deals combat damage to a player, add that much {G}. Until end of turn, you don’t lose this mana as steps and phases end.";
}
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/cards/s/SakuraTribeSpringcaller.java b/Mage.Sets/src/mage/cards/s/SakuraTribeSpringcaller.java
index 65ade8f8c36..6f89107eec9 100644
--- a/Mage.Sets/src/mage/cards/s/SakuraTribeSpringcaller.java
+++ b/Mage.Sets/src/mage/cards/s/SakuraTribeSpringcaller.java
@@ -47,7 +47,7 @@ import mage.constants.Zone;
public class SakuraTribeSpringcaller extends CardImpl {
public SakuraTribeSpringcaller(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}");
+ super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}");
this.subtype.add(SubType.SNAKE);
this.subtype.add(SubType.SHAMAN);
@@ -56,7 +56,7 @@ public class SakuraTribeSpringcaller extends CardImpl {
// At the beginning of your upkeep, add {G}. Until end of turn, you don’t lose this mana as steps and phases end.
Effect effect = new AddManaToManaPoolTargetControllerEffect(new Mana(Mana.GreenMana(1)), "your", true);
- effect.setText("add {G}. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end");
+ effect.setText("add {G}. Until end of turn, you don’t lose this mana as steps and phases end");
this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.YOU, false));
}
diff --git a/Mage.Sets/src/mage/cards/s/SavageVentmaw.java b/Mage.Sets/src/mage/cards/s/SavageVentmaw.java
index 3f0427cbdd5..640d65c1f1b 100644
--- a/Mage.Sets/src/mage/cards/s/SavageVentmaw.java
+++ b/Mage.Sets/src/mage/cards/s/SavageVentmaw.java
@@ -59,7 +59,7 @@ public class SavageVentmaw extends CardImpl {
// Whenever Savage Ventmaw attacks, add {R}{R}{R}{G}{G}{G}. Until end of turn, you don’t lose this mana as steps and phases end.
Effect effect = new SavageVentmawManaEffect(new Mana(3, 3, 0, 0, 0, 0, 0, 0), "your", true);
- effect.setText("add {R}{R}{R}{G}{G}{G}. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end");
+ effect.setText("add {R}{R}{R}{G}{G}{G}. Until end of turn, you don’t lose this mana as steps and phases end");
this.addAbility(new AttacksTriggeredAbility(effect, false));
}
@@ -83,7 +83,7 @@ class SavageVentmawManaEffect extends ManaEffect {
super();
this.mana = mana;
this.emptyOnlyOnTurnsEnd = emptyOnTurnsEnd;
- this.staticText = (textManaPoolOwner.equals("their") ? "that player adds " : "add ") + mana.toString() + " to " + textManaPoolOwner + " mana pool";
+ this.staticText = (textManaPoolOwner.equals("their") ? "that player adds " : "add ") + mana.toString();
}
public SavageVentmawManaEffect(final SavageVentmawManaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/ShizukoCallerOfAutumn.java b/Mage.Sets/src/mage/cards/s/ShizukoCallerOfAutumn.java
index 358a169aa44..1ce23d31194 100644
--- a/Mage.Sets/src/mage/cards/s/ShizukoCallerOfAutumn.java
+++ b/Mage.Sets/src/mage/cards/s/ShizukoCallerOfAutumn.java
@@ -56,9 +56,9 @@ public class ShizukoCallerOfAutumn extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(3);
- // At the beginning of each player's upkeep, that player adds {G}{G}{G} to their mana pool. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end.
+ // At the beginning of each player's upkeep, that player adds {G}{G}{G}. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end.
Effect effect = new AddManaToManaPoolTargetControllerEffect(Mana.GreenMana(3), "that player", true);
- effect.setText("that player adds {G}{G}{G} to their mana pool. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end");
+ effect.setText("that player adds {G}{G}{G}. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end");
this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.ANY, false));
}
diff --git a/Mage.Sets/src/mage/cards/s/SpectralSearchlight.java b/Mage.Sets/src/mage/cards/s/SpectralSearchlight.java
index 05878cda7a7..70d83ad73d2 100644
--- a/Mage.Sets/src/mage/cards/s/SpectralSearchlight.java
+++ b/Mage.Sets/src/mage/cards/s/SpectralSearchlight.java
@@ -52,9 +52,9 @@ public class SpectralSearchlight extends CardImpl {
public SpectralSearchlight(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
- // {T}: Choose a player. That player adds one mana of any color he or she chooses to their mana pool.
+ // {T}: Choose a player. That player adds one mana of any color he or she chooses.
ManaEffect effect = new SpectralSearchlightManaEffect("chosen player");
- effect.setText("That player adds one mana of any color he or she chooses to their mana pool");
+ effect.setText("That player adds one mana of any color he or she chooses");
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, effect, new TapSourceCost());
// choosing player as first effect, before adding mana effect
ability.getEffects().add(0, new ChoosePlayerEffect(Outcome.PutManaInPool));
diff --git a/Mage.Sets/src/mage/cards/t/Tangleroot.java b/Mage.Sets/src/mage/cards/t/Tangleroot.java
index 2268edc948c..ae35b7410df 100644
--- a/Mage.Sets/src/mage/cards/t/Tangleroot.java
+++ b/Mage.Sets/src/mage/cards/t/Tangleroot.java
@@ -46,7 +46,7 @@ public class Tangleroot extends CardImpl {
public Tangleroot(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
- // Whenever a player casts a creature spell, that player adds {G} to their mana pool.
+ // Whenever a player casts a creature spell, that player adds {G}.
this.addAbility(new SpellCastAllTriggeredAbility(
new AddManaToManaPoolTargetControllerEffect(Mana.GreenMana(1), "their"), StaticFilters.FILTER_SPELL_A_CREATURE, false, SetTargetPointer.PLAYER));
}
diff --git a/Mage.Sets/src/mage/cards/t/TraceOfAbundance.java b/Mage.Sets/src/mage/cards/t/TraceOfAbundance.java
index 099a6c57b14..f0462b02250 100644
--- a/Mage.Sets/src/mage/cards/t/TraceOfAbundance.java
+++ b/Mage.Sets/src/mage/cards/t/TraceOfAbundance.java
@@ -73,7 +73,7 @@ public class TraceOfAbundance extends CardImpl {
// Enchanted land has shroud.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield, rule)));
- // Whenever enchanted land is tapped for mana, its controller adds one mana of any color to their mana pool.
+ // Whenever enchanted land is tapped for mana, its controller adds one mana of any color.
this.addAbility(new TraceOfAbundanceTriggeredAbility());
}
@@ -115,6 +115,6 @@ class TraceOfAbundanceTriggeredAbility extends TriggeredManaAbility {
@Override
public String getRule() {
- return "Whenever enchanted land is tapped for mana, its controller adds one mana of any color to their mana pool.";
+ return "Whenever enchanted land is tapped for mana, its controller adds one mana of any color.";
}
}
diff --git a/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java b/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java
index 441f29cfc38..36941251fe3 100644
--- a/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java
+++ b/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java
@@ -69,7 +69,7 @@ public class UtopiaSprawl extends CardImpl {
this.addAbility(ability);
// As Utopia Sprawl enters the battlefield, choose a color.
this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Detriment)));
- // Whenever enchanted Forest is tapped for mana, its controller adds one mana of the chosen color to their mana pool.
+ // Whenever enchanted Forest is tapped for mana, its controller adds one mana of the chosen color.
this.addAbility(new UtopiaSprawlTriggeredAbility());
}
@@ -111,7 +111,7 @@ class UtopiaSprawlTriggeredAbility extends TriggeredManaAbility {
@Override
public String getRule() {
- return "Whenever enchanted Forest is tapped for mana, its controller adds one mana of the chosen color to their mana pool.";
+ return "Whenever enchanted Forest is tapped for mana, its controller adds one mana of the chosen color.";
}
}
@@ -119,7 +119,7 @@ class UtopiaSprawlEffect extends ManaEffect {
public UtopiaSprawlEffect() {
super();
- staticText = "its controller adds one mana of the chosen color to their mana pool";
+ staticText = "its controller adds one mana of the chosen color";
}
public UtopiaSprawlEffect(final UtopiaSprawlEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/v/Valleymaker.java b/Mage.Sets/src/mage/cards/v/Valleymaker.java
index 93283100403..c3cce5a9b86 100644
--- a/Mage.Sets/src/mage/cards/v/Valleymaker.java
+++ b/Mage.Sets/src/mage/cards/v/Valleymaker.java
@@ -74,7 +74,7 @@ public class Valleymaker extends CardImpl {
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
- // {tap}, Sacrifice a Forest: Choose a player. That player adds {G}{G}{G} to their mana pool.
+ // {tap}, Sacrifice a Forest: Choose a player. That player adds {G}{G}{G}.
Ability ability2 = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaToManaPoolTargetControllerEffect(Mana.GreenMana(3), "chosen player"), new TapSourceCost());
ability2.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter2)));
ability2.addTarget(new TargetPlayer(1, 1, true));
diff --git a/Mage.Sets/src/mage/cards/v/VerdantHaven.java b/Mage.Sets/src/mage/cards/v/VerdantHaven.java
index 301124c5411..55c8e554168 100644
--- a/Mage.Sets/src/mage/cards/v/VerdantHaven.java
+++ b/Mage.Sets/src/mage/cards/v/VerdantHaven.java
@@ -69,7 +69,7 @@ public class VerdantHaven extends CardImpl {
// When Verdant Haven enters the battlefield, you gain 2 life.
this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(2)));
- // Whenever enchanted land is tapped for mana, its controller adds one mana of any color to their mana pool.
+ // Whenever enchanted land is tapped for mana, its controller adds one mana of any color.
this.addAbility(new VerdantHavenTriggeredAbility());
}
@@ -112,6 +112,6 @@ class VerdantHavenTriggeredAbility extends TriggeredManaAbility {
@Override
public String getRule() {
- return "Whenever enchanted land is tapped for mana, its controller adds one mana of any color to their mana pool.";
+ return "Whenever enchanted land is tapped for mana, its controller adds one mana of any color.";
}
}
diff --git a/Mage.Sets/src/mage/cards/v/VernalBloom.java b/Mage.Sets/src/mage/cards/v/VernalBloom.java
index 3420d2fdc40..8d3baf682dc 100644
--- a/Mage.Sets/src/mage/cards/v/VernalBloom.java
+++ b/Mage.Sets/src/mage/cards/v/VernalBloom.java
@@ -55,7 +55,7 @@ public class VernalBloom extends CardImpl {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}");
- // Whenever a Forest is tapped for mana, its controller adds {G} to their mana pool.
+ // Whenever a Forest is tapped for mana, its controller adds {G}.
this.addAbility(new TapForManaAllTriggeredManaAbility(
new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.G), "their"),
filter, SetTargetPointer.PLAYER));
diff --git a/Mage.Sets/src/mage/cards/w/WildGrowth.java b/Mage.Sets/src/mage/cards/w/WildGrowth.java
index 2893922d83c..a73d8f8f832 100644
--- a/Mage.Sets/src/mage/cards/w/WildGrowth.java
+++ b/Mage.Sets/src/mage/cards/w/WildGrowth.java
@@ -67,7 +67,7 @@ public class WildGrowth extends CardImpl {
this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
- // Whenever enchanted land is tapped for mana, its controller adds {G} to their mana pool.
+ // Whenever enchanted land is tapped for mana, its controller adds {G}.
this.addAbility(new WildGrowthTriggeredAbility());
}
@@ -120,6 +120,6 @@ class WildGrowthTriggeredAbility extends TriggeredManaAbility {
@Override
public String getRule() {
- return "Whenever enchanted land is tapped for mana, its controller adds {G} to their mana pool";
+ return "Whenever enchanted land is tapped for mana, its controller adds {G}";
}
}
diff --git a/Mage.Sets/src/mage/cards/w/WintersNight.java b/Mage.Sets/src/mage/cards/w/WintersNight.java
index 2b6b78cb341..a90c07ea49f 100644
--- a/Mage.Sets/src/mage/cards/w/WintersNight.java
+++ b/Mage.Sets/src/mage/cards/w/WintersNight.java
@@ -58,10 +58,10 @@ public class WintersNight extends CardImpl {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{R}{G}{W}");
addSuperType(SuperType.WORLD);
- // Whenever a player taps a snow land for mana, that player adds one mana to their mana pool of any type that land produced.
+ // Whenever a player taps a snow land for mana, that player adds one mana of any type that land produced.
// That land doesn't untap during its controller's next untap step.
ManaEffect effect = new AddManaOfAnyTypeProducedEffect();
- effect.setText("that player adds one mana to their mana pool of any type that land produced");
+ effect.setText("that player adds one mana of any type that land produced");
Ability ability = new TapForManaAllTriggeredManaAbility(effect, filter, SetTargetPointer.PERMANENT);
Effect effect2 = new DontUntapInControllersNextUntapStepTargetEffect();
effect2.setText("That land doesn't untap during its controller's next untap step");
diff --git a/Mage.Sets/src/mage/cards/w/Worldpurge.java b/Mage.Sets/src/mage/cards/w/Worldpurge.java
index daf4bd7c4c3..a584115a709 100644
--- a/Mage.Sets/src/mage/cards/w/Worldpurge.java
+++ b/Mage.Sets/src/mage/cards/w/Worldpurge.java
@@ -54,9 +54,9 @@ import mage.target.common.TargetCardInHand;
public class Worldpurge extends CardImpl {
public Worldpurge(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{W/U}{W/U}{W/U}{W/U}");
+ super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{W/U}{W/U}{W/U}{W/U}");
- // Return all permanents to their owners' hands. Each player chooses up to seven cards in their hand, then shuffles the rest into their library. Empty all mana pools.
+ // Return all permanents to their owners’ hands. Each player chooses up to seven cards in their hand, then shuffles the rest into their library. Each player loses all unspent mana.
this.getSpellAbility().addEffect(new WorldpurgeEffect());
}
@@ -75,7 +75,7 @@ class WorldpurgeEffect extends OneShotEffect {
public WorldpurgeEffect() {
super(Outcome.Discard);
- this.staticText = "Return all permanents to their owners' hands. Each player chooses up to seven cards in their hand, then shuffles the rest into their library. Empty all mana pools.";
+ this.staticText = "Return all permanents to their owners’ hands. Each player chooses up to seven cards in their hand, then shuffles the rest into their library. Each player loses all unspent mana";
}
public WorldpurgeEffect(final WorldpurgeEffect effect) {
@@ -117,7 +117,7 @@ class WorldpurgeEffect extends OneShotEffect {
}
}
game.emptyManaPools();
- game.informPlayers(sourceObject.getLogName() + " - All mana pools have been emptied");
+ game.informPlayers(sourceObject.getLogName() + " - All players have lost all unspent mana");
return true;
}
return false;
diff --git a/Mage.Sets/src/mage/cards/z/ZhurTaaAncient.java b/Mage.Sets/src/mage/cards/z/ZhurTaaAncient.java
index cc9cfa39d05..2c259dd1d98 100644
--- a/Mage.Sets/src/mage/cards/z/ZhurTaaAncient.java
+++ b/Mage.Sets/src/mage/cards/z/ZhurTaaAncient.java
@@ -51,7 +51,7 @@ public class ZhurTaaAncient extends CardImpl {
this.power = new MageInt(7);
this.toughness = new MageInt(5);
- // Whenever a player taps a land for mana, that player adds one mana to their mana pool of any type that land produced.
+ // Whenever a player taps a land for mana, that player adds one mana of any type that land produced.
this.addAbility(new TapForManaAllTriggeredManaAbility(
new AddManaOfAnyTypeProducedEffect(),
new FilterLandPermanent("a player taps a land"),
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java
index 7cb9d15d87a..cab6b2eaddd 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java
@@ -191,7 +191,7 @@ public class CleverImpersonatorTest extends CardTestPlayerBase {
/*
{3}{G} Dawn's Reflection
Enchantment - Aura, Enchant Land
- Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to their mana pool (in addition to the mana the land produces).
+ Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors (in addition to the mana the land produces).
*/
addCard(Zone.HAND, playerA, dReflection);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/EldraziTempleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/EldraziTempleTest.java
index 20f7586743f..f975c154a2c 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/EldraziTempleTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/EldraziTempleTest.java
@@ -97,7 +97,7 @@ public class EldraziTempleTest extends CardTestPlayerBase {
// {T}: Add {C}{C}. Spend this mana only to cast colorless Eldrazi spells or activate abilities of colorless Eldrazi.
addCard(Zone.BATTLEFIELD, playerA, "Eldrazi Temple", 1);
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2);
- // {T}: Add {W}, {B}, or {G} to your mana pool.
+ // {T}: Add {W}, {B}, or {G}.
// {W}{B}{G}, {T}, Sacrifice Abzan Banner: Draw a card.
addCard(Zone.HAND, playerA, "Abzan Banner", 1); // Artifact {3}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/EmptyOnlyOnTurnsEndManaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/EmptyOnlyOnTurnsEndManaTest.java
index 9ab2021b2e9..bde2f8aefdf 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/EmptyOnlyOnTurnsEndManaTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/EmptyOnlyOnTurnsEndManaTest.java
@@ -41,7 +41,7 @@ public class EmptyOnlyOnTurnsEndManaTest extends CardTestPlayerBase {
@Test
public void testDaxosOfMeletis() {
- // At the beginning of each player's upkeep, that player adds {G}{G}{G} to their mana pool. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end.
+ // At the beginning of each player's upkeep, that player adds {G}{G}{G}. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end.
addCard(Zone.BATTLEFIELD, playerA, "Shizuko, Caller of Autumn", 1);
addCard(Zone.HAND, playerA, "Birds of Paradise", 1);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaFlareTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaFlareTest.java
index f8d954ed361..cd7b4d121a9 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaFlareTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaFlareTest.java
@@ -40,7 +40,7 @@ public class ManaFlareTest extends CardTestPlayerBase {
@Test
public void testIsland() {
- // Whenever a player taps a land for mana, that player adds one mana to their mana pool of any type that land produced.
+ // Whenever a player taps a land for mana, that player adds one mana of any type that land produced.
addCard(Zone.BATTLEFIELD, playerA, "Mana Flare", 1);
addCard(Zone.BATTLEFIELD, playerA, "Island", 1);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/HeartbeatOfSpringTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/HeartbeatOfSpringTest.java
index 5ac66853f03..8f9db4bd86f 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/HeartbeatOfSpringTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/HeartbeatOfSpringTest.java
@@ -46,7 +46,7 @@ public class HeartbeatOfSpringTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerA, "Forest", 3);
// {T}: Add {C}. If you control an Urza's Power-Plant and an Urza's Tower, add {C}{C} instead.
addCard(Zone.HAND, playerA, "Urza's Mine", 1);
- // Whenever a player taps a land for mana, that player adds one mana to their mana pool of any type that land produced.
+ // Whenever a player taps a land for mana, that player adds one mana of any type that land produced.
addCard(Zone.HAND, playerA, "Heartbeat of Spring"); // {2}{G}
// Whenever a player casts a white spell, you may gain 1 life.
addCard(Zone.HAND, playerA, "Angel's Feather"); // {2}
diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaTypeInManaPoolCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaTypeInManaPoolCount.java
index 73572da3bec..55dc44ddbc0 100644
--- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaTypeInManaPoolCount.java
+++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaTypeInManaPoolCount.java
@@ -45,7 +45,7 @@ public class ManaTypeInManaPoolCount implements DynamicValue {
@Override
public String getMessage() {
- StringBuilder sb = new StringBuilder();
+ StringBuilder sb = new StringBuilder("unspent ");
switch (manaType) {
case BLACK:
sb.append("black");
@@ -66,7 +66,7 @@ public class ManaTypeInManaPoolCount implements DynamicValue {
sb.append("colorless");
break;
}
- sb.append(" mana in your mana pool");
+ sb.append(" mana you have");
return sb.toString();
}
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderManaReplacementEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderManaReplacementEffect.java
index 67302439642..8737704aec9 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderManaReplacementEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderManaReplacementEffect.java
@@ -50,6 +50,7 @@ import mage.game.events.ManaEvent;
* Commander rule #4 was removed Jan. 18, 2016
*
*/
+@Deprecated
public class CommanderManaReplacementEffect extends ReplacementEffectImpl {
private final UUID playerId;
diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddManaAnyColorAttachedControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddManaAnyColorAttachedControllerEffect.java
index 2fdf2db8076..52eb55bf843 100644
--- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaAnyColorAttachedControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaAnyColorAttachedControllerEffect.java
@@ -45,7 +45,7 @@ public class AddManaAnyColorAttachedControllerEffect extends ManaEffect {
public AddManaAnyColorAttachedControllerEffect() {
super();
- staticText = "its controller adds one mana of any color to their mana pool";
+ staticText = "its controller adds one mana of any color";
}
public AddManaAnyColorAttachedControllerEffect(final AddManaAnyColorAttachedControllerEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyTypeProducedEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyTypeProducedEffect.java
index 2885f791b4c..21424b92220 100644
--- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyTypeProducedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyTypeProducedEffect.java
@@ -44,7 +44,7 @@ public class AddManaOfAnyTypeProducedEffect extends ManaEffect {
public AddManaOfAnyTypeProducedEffect() {
super();
- staticText = "that player adds one mana to their mana pool of any type that land produced";
+ staticText = "that player adds one mana of any type that land produced";
}
public AddManaOfAnyTypeProducedEffect(final AddManaOfAnyTypeProducedEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddManaToManaPoolTargetControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddManaToManaPoolTargetControllerEffect.java
index 44bfec584d2..0770c1f94d6 100644
--- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaToManaPoolTargetControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaToManaPoolTargetControllerEffect.java
@@ -38,7 +38,7 @@ public class AddManaToManaPoolTargetControllerEffect extends ManaEffect {
super();
this.mana = mana;
this.emptyOnlyOnTurnsEnd = emptyOnTurnsEnd;
- this.staticText = (textManaPoolOwner.equals("their") ? "that player adds " : "add ") + mana.toString() + " to " + textManaPoolOwner + " mana pool";
+ this.staticText = (textManaPoolOwner.equals("their") ? "that player adds " : "add ") + mana.toString();
}
public AddManaToManaPoolTargetControllerEffect(final AddManaToManaPoolTargetControllerEffect effect) {