From d733ddc7c7d76547f3435732f69f9e2dccc75edb Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Wed, 29 May 2013 14:31:38 +0000
Subject: [PATCH] removed code for 'NextUpkeep' because no cards left that use
 it

---
 .../card/ability/effects/DrawEffect.java      | 40 +++++++------------
 src/main/java/forge/util/Lang.java            |  5 ++-
 2 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/src/main/java/forge/card/ability/effects/DrawEffect.java b/src/main/java/forge/card/ability/effects/DrawEffect.java
index 3371197b06b..be2a524b601 100644
--- a/src/main/java/forge/card/ability/effects/DrawEffect.java
+++ b/src/main/java/forge/card/ability/effects/DrawEffect.java
@@ -26,14 +26,8 @@ public class DrawEffect extends SpellAbilityEffect {
             if (tgtPlayers.size() > 1) {
                 sb.append(" each");
             }
-            sb.append(Lang.joinVerb(tgtPlayers, "draw")).append(" ");
-
-            sb.append(numCards).append(Lang.joinNounToAmount(numCards, " card"));
-
-            if (sa.hasParam("NextUpkeep")) {
-                sb.append(" at the beginning of the next upkeep");
-            }
-
+            sb.append(Lang.joinVerb(tgtPlayers, " draw")).append(" ");
+            sb.append(Lang.nounWithAmount(numCards, " card"));
             sb.append(".");
         }
 
@@ -49,30 +43,24 @@ public class DrawEffect extends SpellAbilityEffect {
         final Target tgt = sa.getTarget();
 
         final boolean optional = sa.hasParam("OptionalDecider");
-        final boolean slowDraw = sa.hasParam("NextUpkeep");
+
 
         for (final Player p : getDefinedPlayersBeforeTargetOnes(sa)) {
-            if ((tgt == null) || p.canBeTargetedBy(sa)) {
-                if (optional && !p.getController().confirmAction(sa, null, "Do you want to draw " + numCards + " cards(s)?"))
+            if ((tgt == null) || p.canBeTargetedBy(sa)) 
+                if (optional && !p.getController().confirmAction(sa, null, "Do you want to draw " + Lang.nounWithAmount(numCards, " card") + "?"))
                     continue;
 
                 //TODO: remove this deprecation exception
-                if (slowDraw) {
-                    throw new RuntimeException("This api option is no longer supported.  Please file a bug report with the card that threw this error.");
-                } else {
-                    final List<Card> drawn = p.drawCards(numCards);
-                    if (sa.hasParam("Reveal")) {
-                        p.getGame().getAction().reveal(drawn, p);
-                    }
-                    if (sa.hasParam("RememberDrawn")) {
-                        for (final Card c : drawn) {
-                            source.addRemembered(c);
-                        }
-                    }
-
+                final List<Card> drawn = p.drawCards(numCards);
+                if (sa.hasParam("Reveal")) {
+                    p.getGame().getAction().reveal(drawn, p);
+                }
+                if (sa.hasParam("RememberDrawn")) {
+                    for (final Card c : drawn) {
+                        source.addRemembered(c);
+                    }
                 }
-
             }
         }
     } // drawResolve()
-}
+
diff --git a/src/main/java/forge/util/Lang.java b/src/main/java/forge/util/Lang.java
index ccf8b8424c0..0b526e28fa3 100644
--- a/src/main/java/forge/util/Lang.java
+++ b/src/main/java/forge/util/Lang.java
@@ -48,9 +48,10 @@ public class Lang {
         return subjects.size() > 1 ? verb : verb + "s";
     }
 
-    public static <T> String joinNounToAmount(int cnt, String noun) {
+    public static <T> String nounWithAmount(int cnt, String noun) {
         //  Simpliest check
-        return cnt > 1 ? noun : ( noun.endsWith("s") || noun.endsWith("x") ? noun + "es" : noun + "s");
+        String suffix = cnt <= 1 ? "" : ( noun.endsWith("s") || noun.endsWith("x") ? "es" : "s"); 
+        return String.valueOf(cnt) + " " + noun + suffix;
     }    
     
     /**