From d2c2c9b4a4a841c46541a8aa8fb1841207983981 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Fri, 29 Mar 2013 18:55:24 +0100
Subject: [PATCH] Some small improvements to framework classes.

---
 .../costs/common/RevealTargetFromHandCost.java         |  2 +-
 .../common/SacrificeSourceUnlessPaysEffect.java        | 10 +++++++---
 .../effects/common/TapSourceUnlessPaysEffect.java      |  3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Mage/src/mage/abilities/costs/common/RevealTargetFromHandCost.java b/Mage/src/mage/abilities/costs/common/RevealTargetFromHandCost.java
index 0e2136eb50..e845f5feb1 100644
--- a/Mage/src/mage/abilities/costs/common/RevealTargetFromHandCost.java
+++ b/Mage/src/mage/abilities/costs/common/RevealTargetFromHandCost.java
@@ -74,7 +74,7 @@ public class RevealTargetFromHandCost extends CostImpl<RevealTargetFromHandCost>
                 cards.add(card);                
                 paid = true;
             }
-            player.revealCards("Revealed card", cards, game); // this is not a boolean
+            player.revealCards("card cost", cards, game); // this is not a boolean
             return paid;
         }
         paid = false;
diff --git a/Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java b/Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java
index 139f74aebe..583151de3b 100644
--- a/Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java
+++ b/Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java
@@ -33,9 +33,13 @@ public class SacrificeSourceUnlessPaysEffect extends OneShotEffect<SacrificeSour
         Player player = game.getPlayer(source.getControllerId());
         Permanent permanent = game.getPermanent(source.getSourceId());
         if (player != null && permanent != null) { 
-            if (player.chooseUse(Outcome.Benefit, "Pay " + cost.getText() /* + " or sacrifice " + permanent.getName() */ + "?", game)) {
+            StringBuilder sb = new StringBuilder(cost.getText()).append("?");
+            if (!sb.toString().toLowerCase().startsWith("exile ") && !sb.toString().toLowerCase().startsWith("return ") ) {
+                sb.insert(0, "Pay ");
+            }
+            if (player.chooseUse(Outcome.Benefit, sb.toString(), game)) {
                 cost.clearPaid();
-                if (cost.pay(source, game, source.getId(), source.getControllerId(), false))
+                if (cost.pay(source, game, source.getSourceId(), source.getControllerId(), false))
                     return true;
             }
             permanent.sacrifice(source.getSourceId(), game);
@@ -53,7 +57,7 @@ public class SacrificeSourceUnlessPaysEffect extends OneShotEffect<SacrificeSour
     public String getText(Mode mode) {
             StringBuilder sb = new StringBuilder("sacrifice {this} unless you ");
             String costText = cost.getText();
-            if (costText.toLowerCase().startsWith("discard") || costText.toLowerCase().startsWith("remove") || costText.toLowerCase().startsWith("return")) {
+            if (costText.toLowerCase().startsWith("discard") || costText.toLowerCase().startsWith("remove") || costText.toLowerCase().startsWith("return") || costText.toLowerCase().startsWith("exile")) {
                 sb.append(costText.substring(0, 1).toLowerCase());
                 sb.append(costText.substring(1));
             } 
diff --git a/Mage/src/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java b/Mage/src/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java
index b03f82c5ca..6be23d057b 100644
--- a/Mage/src/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java
+++ b/Mage/src/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java
@@ -59,7 +59,8 @@ public class TapSourceUnlessPaysEffect extends OneShotEffect<TapSourceUnlessPays
         Player player = game.getPlayer(source.getControllerId());
         Permanent permanent = game.getPermanent(source.getSourceId());
         if (player != null && permanent != null) { 
-            if (player.chooseUse(Outcome.Benefit, cost.getText() + " or " + permanent.getName() + " comes into play tapped?", game)) {
+            if (cost.canPay(source.getSourceId(), source.getControllerId(), game)
+                    && player.chooseUse(Outcome.Benefit, cost.getText() + " or " + permanent.getName() + " comes into play tapped?", game)) {
                 cost.clearPaid();
                 if (cost.pay(source, game, source.getId(), source.getControllerId(), false))
                     return true;