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

Fix so "Creature" isn't capitalized in abilities that start with "Sacrifice a creature:"

Browse Source
This commit is contained in:
drdev
2014-07-18 07:59:04 +00:00
parent b3edcf8620
commit d754c4efd0
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-game/src/main/java/forge/game/cost/Cost.java
View File

@@ -676,7 +676,7 @@ public class Cost {
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
* @return 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")) { if (i == 1 && type.startsWith("another")) {
return type; //prevent returning "an another" return type; //prevent returning "an another"
} }
@@ -685,13 +685,19 @@ public class Cost {
if (i >= Cost.NUM_NAMES.length) { if (i >= Cost.NUM_NAMES.length) {
sb.append(i); 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"); sb.append("an");
} else { }
else {
sb.append(Cost.NUM_NAMES[i]); sb.append(Cost.NUM_NAMES[i]);
} }
sb.append(" "); 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); sb.append(type);
if (1 != i) { if (1 != i) {
sb.append("s"); sb.append("s");