From d754c4efd03ac6cfb81378b1ea627c137ccbe80a Mon Sep 17 00:00:00 2001 From: drdev Date: Fri, 18 Jul 2014 07:59:04 +0000 Subject: [PATCH] Fix so "Creature" isn't capitalized in abilities that start with "Sacrifice a creature:" --- forge-game/src/main/java/forge/game/cost/Cost.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/cost/Cost.java b/forge-game/src/main/java/forge/game/cost/Cost.java index f0f878d9553..c1419524c1a 100644 --- a/forge-game/src/main/java/forge/game/cost/Cost.java +++ b/forge-game/src/main/java/forge/game/cost/Cost.java @@ -676,7 +676,7 @@ public class Cost { * a {@link java.lang.String} object. * @return a {@link java.lang.String} object. */ - public static String convertIntAndTypeToWords(final int i, final String type) { + public static String convertIntAndTypeToWords(final int i, String type) { if (i == 1 && type.startsWith("another")) { return type; //prevent returning "an another" } @@ -685,13 +685,19 @@ public class Cost { if (i >= Cost.NUM_NAMES.length) { sb.append(i); - } else if ((1 == i) && Cost.VOWEL_PATTERN.matcher(type).find()) { + } + else if ((1 == i) && Cost.VOWEL_PATTERN.matcher(type).find()) { sb.append("an"); - } else { + } + else { sb.append(Cost.NUM_NAMES[i]); } sb.append(" "); + char firstChar = type.charAt(0); + if (Character.isUpperCase(firstChar)) { //fix case of type before appending + type = Character.toLowerCase(firstChar) + type.substring(1); + } sb.append(type); if (1 != i) { sb.append("s");