From 6e25defa261f69f48be2f6f36929a24686cfef42 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Thu, 3 Jan 2013 11:14:00 +0100
Subject: [PATCH] Some changes to rule text generation.

---
 .../src/mage/sets/innistrad/MentorOfTheMeek.java    | 13 +++++++------
 .../abilities/costs/common/DiscardCardCost.java     |  4 ++--
 .../mage/abilities/effects/common/DoIfCostPaid.java |  7 ++++++-
 .../effects/common/ReturnToHandSpellEffect.java     |  2 +-
 .../SwitchPowerToughnessSourceEffect.java           |  2 +-
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/innistrad/MentorOfTheMeek.java b/Mage.Sets/src/mage/sets/innistrad/MentorOfTheMeek.java
index 4c8725ee908..e241cd10824 100644
--- a/Mage.Sets/src/mage/sets/innistrad/MentorOfTheMeek.java
+++ b/Mage.Sets/src/mage/sets/innistrad/MentorOfTheMeek.java
@@ -29,10 +29,9 @@
 package mage.sets.innistrad;
 
 import java.util.UUID;
-
-import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
+import mage.Constants.Zone;
 import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.costs.mana.ManaCostsImpl;
@@ -77,7 +76,7 @@ public class MentorOfTheMeek extends CardImpl<MentorOfTheMeek> {
 class MentorOfTheMeekAbility extends TriggeredAbilityImpl<MentorOfTheMeekAbility> {
 
     public MentorOfTheMeekAbility() {
-        super(Constants.Zone.BATTLEFIELD, new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{1}")), true);
+        super(Zone.BATTLEFIELD, new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{1}")), true);
      }
 
     public MentorOfTheMeekAbility(final MentorOfTheMeekAbility ability) {
@@ -93,9 +92,11 @@ class MentorOfTheMeekAbility extends TriggeredAbilityImpl<MentorOfTheMeekAbility
     public boolean checkTrigger(GameEvent event, Game game) {
         if (event.getType() == GameEvent.EventType.ZONE_CHANGE && !event.getTargetId().equals(this.getSourceId())) {
             ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
-            if (zEvent.getToZone() == Constants.Zone.BATTLEFIELD) {
+            if (zEvent.getToZone() == Zone.BATTLEFIELD) {
                 Permanent permanent = game.getPermanent(event.getTargetId());
-                if (permanent != null && permanent.getCardType().contains(CardType.CREATURE) && permanent.getControllerId().equals(this.getControllerId()) && permanent.getPower().getValue() <= 2) {
+                if (permanent != null && permanent.getCardType().contains(CardType.CREATURE) 
+                        && permanent.getControllerId().equals(this.getControllerId())
+                        && permanent.getPower().getValue() <= 2) {
                     return true;
                 }
             }
@@ -105,7 +106,7 @@ class MentorOfTheMeekAbility extends TriggeredAbilityImpl<MentorOfTheMeekAbility
 
     @Override
     public String getRule() {
-        return "Whenever another creature with power 2 or less enters the battlefield under your control, you may pay {1}. If you do, draw a card.";
+        return new StringBuilder("Whenever another creature with power 2 or less enters the battlefield under your control, ").append(super.getRule()).toString();
     }
 
 }
diff --git a/Mage/src/mage/abilities/costs/common/DiscardCardCost.java b/Mage/src/mage/abilities/costs/common/DiscardCardCost.java
index 7138e9056d6..80ed68d43b2 100644
--- a/Mage/src/mage/abilities/costs/common/DiscardCardCost.java
+++ b/Mage/src/mage/abilities/costs/common/DiscardCardCost.java
@@ -37,11 +37,11 @@ import mage.target.common.TargetCardInHand;
 public class DiscardCardCost extends DiscardTargetCost {
 
     public DiscardCardCost() {
-        super(new TargetCardInHand(new FilterCard()), false);
+        this(false);
     }
 
     public DiscardCardCost(boolean randomDiscard) {
-        super(new TargetCardInHand(new FilterCard("a Card at random")), randomDiscard);
+        super(new TargetCardInHand(new FilterCard(randomDiscard ?"a card at random":"a card")), randomDiscard);
     }
 
     public DiscardCardCost(DiscardCardCost cost) {
diff --git a/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java b/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java
index 18842659206..d69ecaca510 100644
--- a/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java
+++ b/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java
@@ -42,7 +42,12 @@ public class DoIfCostPaid extends OneShotEffect<DoIfCostPaid> {
 
     @Override
     public String getText(Mode mode) {
-        return "you may pay " + cost.getText() + ". If you do, " + executingEffect.getText(mode);
+        StringBuilder sb = new StringBuilder("you may ");
+        String costText = cost.getText();
+        if (costText.length() <7 || !costText.substring(0, 7).toLowerCase().equals("discard")) {
+            sb.append("pay ");
+        }
+        return sb.append(costText).append(". If you do, ").append(executingEffect.getText(mode)).toString();
     }
 
     @Override
diff --git a/Mage/src/mage/abilities/effects/common/ReturnToHandSpellEffect.java b/Mage/src/mage/abilities/effects/common/ReturnToHandSpellEffect.java
index f84d332a6e1..6a3f9ca8195 100644
--- a/Mage/src/mage/abilities/effects/common/ReturnToHandSpellEffect.java
+++ b/Mage/src/mage/abilities/effects/common/ReturnToHandSpellEffect.java
@@ -22,7 +22,7 @@ public class ReturnToHandSpellEffect extends PostResolveEffect<ReturnToHandSpell
         }
 
         private ReturnToHandSpellEffect() {
-            staticText = "Return {this} into its owner's hand";
+            staticText = "Return {this} to its owner's hand";
         }
 
         public static ReturnToHandSpellEffect getInstance() {
diff --git a/Mage/src/mage/abilities/effects/common/continious/SwitchPowerToughnessSourceEffect.java b/Mage/src/mage/abilities/effects/common/continious/SwitchPowerToughnessSourceEffect.java
index 470a271dd4a..744479b58fa 100644
--- a/Mage/src/mage/abilities/effects/common/continious/SwitchPowerToughnessSourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continious/SwitchPowerToughnessSourceEffect.java
@@ -44,7 +44,7 @@ public class SwitchPowerToughnessSourceEffect extends ContinuousEffectImpl<Switc
 
     public SwitchPowerToughnessSourceEffect(Duration duration) {
         super(duration, Layer.PTChangingEffects_7, SubLayer.SwitchPT_e, Outcome.BoostCreature);
-        staticText = "switch its power and toughness " + duration.toString();
+        staticText = "switch {this}'s power and toughness " + duration.toString();
     }
 
     public SwitchPowerToughnessSourceEffect(final SwitchPowerToughnessSourceEffect effect) {