diff --git a/Mage.Sets/src/mage/cards/c/CoramTheUndertaker.java b/Mage.Sets/src/mage/cards/c/CoramTheUndertaker.java index 36148d5d5af..a21db6e1b91 100644 --- a/Mage.Sets/src/mage/cards/c/CoramTheUndertaker.java +++ b/Mage.Sets/src/mage/cards/c/CoramTheUndertaker.java @@ -122,7 +122,7 @@ class CoramTheUndertakerStaticAbility extends SimpleStaticAbility { @Override public String getRule() { - return "During each of your turns, you may play a land and cast a spell from among cards in graveyards that were put there from libraries this turn"; + return "During each of your turns, you may play a land and cast a spell from among cards in graveyards that were put there from libraries this turn."; } } @@ -223,7 +223,7 @@ class CoramTheUndertakerWatcher extends Watcher { public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.ZONE_CHANGE) { ZoneChangeEvent zce = (ZoneChangeEvent) event; - if (zce == null || !Zone.LIBRARY.equals(zce.getFromZone()) || !Zone.GRAVEYARD.equals(zce.getToZone())) { + if (!Zone.LIBRARY.equals(zce.getFromZone()) || !Zone.GRAVEYARD.equals(zce.getToZone())) { return; } Card card = game.getCard(zce.getTargetId()); diff --git a/Mage.Sets/src/mage/cards/g/GenkuFutureShaper.java b/Mage.Sets/src/mage/cards/g/GenkuFutureShaper.java index 32075bdfb44..2898c2e9e6c 100644 --- a/Mage.Sets/src/mage/cards/g/GenkuFutureShaper.java +++ b/Mage.Sets/src/mage/cards/g/GenkuFutureShaper.java @@ -69,7 +69,7 @@ public final class GenkuFutureShaper extends CardImpl { ability.addMode( new Mode( new CreateTokenEffect(new Rat11LifelinkToken()) - .setText("1/1 black Rat with flying") + .setText("1/1 black Rat with lifelink") ).setModeTag("1/1 black Rat with lifelink") ); ability.getModes().setChooseText("choose one that hasn't been chosen this turn. Create a creature token with those characteristics."); diff --git a/Mage.Sets/src/mage/cards/n/NearbyPlanet.java b/Mage.Sets/src/mage/cards/n/NearbyPlanet.java index 7368581a6af..32f502ac8e9 100644 --- a/Mage.Sets/src/mage/cards/n/NearbyPlanet.java +++ b/Mage.Sets/src/mage/cards/n/NearbyPlanet.java @@ -55,7 +55,7 @@ class NearbyPlanetEffect extends ContinuousEffectImpl { NearbyPlanetEffect() { super(Duration.Custom, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); staticText = "Rangeling (This card is every land type, including Plains, Island, Swamp, " + - "Mountain, Forest, Desert, Gate, Lair, Locus, and all those Urza's ones.)."; + "Mountain, Forest, Desert, Gate, Lair, Locus, and all those Urza's ones.)"; } private NearbyPlanetEffect(final NearbyPlanetEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/PlanarNexus.java b/Mage.Sets/src/mage/cards/p/PlanarNexus.java index 01d22a95204..cfaf7f22e73 100644 --- a/Mage.Sets/src/mage/cards/p/PlanarNexus.java +++ b/Mage.Sets/src/mage/cards/p/PlanarNexus.java @@ -56,7 +56,7 @@ class PlanarNexusEffect extends ContinuousEffectImpl { super(Duration.Custom, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); staticText = "{this} is every nonbasic land type. " + "(Nonbasic land types include Cave, Desert, Gate, Lair, " + - "Locus, Mine, Power-Plant, Sphere, Tower, and Urza's.)."; + "Locus, Mine, Power-Plant, Sphere, Tower, and Urza's.)"; } private PlanarNexusEffect(final PlanarNexusEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/Modes.java b/Mage/src/main/java/mage/abilities/Modes.java index c612205e1fc..f13921adeb8 100644 --- a/Mage/src/main/java/mage/abilities/Modes.java +++ b/Mage/src/main/java/mage/abilities/Modes.java @@ -536,13 +536,13 @@ public class Modes extends LinkedHashMap implements Copyable return this.getMode().getEffects().getText(this.getMode()); } StringBuilder sb = new StringBuilder(); - if (mayChooseNone) { - sb.append("you may "); - } if (this.chooseText == null) { if (chooseController == TargetController.OPPONENT) { sb.append("an opponent chooses "); } else { + if (mayChooseNone) { + sb.append("you may "); + } sb.append("choose "); } if (this.getMinModes() == 0 && this.getMaxModes(null, null) == 1) { @@ -562,17 +562,16 @@ public class Modes extends LinkedHashMap implements Copyable if (isRandom) { sb.append(" at random"); } + if (isLimitUsageByOnce() && this.getMaxModesFilter() == null) { + sb.append(" that hasn't been chosen"); + } + if (isLimitUsageResetOnNewTurn()) { + sb.append(" this turn"); + } } else { sb.append(chooseText); } - if (isLimitUsageByOnce() && this.getMaxModesFilter() == null) { - sb.append(" that hasn't been chosen"); - } - if (isLimitUsageResetOnNewTurn()) { - sb.append(" this turn"); - } - if (this.getMaxModesFilter() != null) { sb.append(". Each mode must target ").append(getMaxModesFilter().getMessage()).append('.'); } else if (isMayChooseSameModeMoreThanOnce()) {