external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed code for 'NextUpkeep' because no cards left that use it

Browse Source
This commit is contained in:
Maxmtg
2013-05-29 14:31:38 +00:00
parent 3e7d885b3c
commit d733ddc7c7
2 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/forge/card/ability/effects/DrawEffect.java
View File

@@ -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()
}

5
src/main/java/forge/util/Lang.java
View File

@@ -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;
}
/**