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

Revamped methods called by Ability_Cost.toString() to make generated text closer to oracle text in the the case of ability costs like "Cost<1/X>".

Browse Source
This commit is contained in:
jendave
2011-08-06 14:56:46 +00:00
parent f4793bcfaf
commit 346680a637
1 changed files with 32 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/forge/Ability_Cost.java
View File

@@ -1,5 +1,7 @@
package forge; package forge;
import java.util.regex.Pattern;
public class Ability_Cost { public class Ability_Cost {
private boolean isAbility = true; private boolean isAbility = true;
@@ -305,7 +307,7 @@ public class Ability_Cost {
cost.append("pay "); cost.append("pay ");
else else
cost.append("and pay "); cost.append("and pay ");
cost.append(convertIntToWords(lifeAmount)); cost.append(lifeAmount);
cost.append(" Life"); cost.append(" Life");
first = false; first = false;
@@ -381,11 +383,8 @@ public class Ability_Cost {
cost.append("Tap "); cost.append("Tap ");
else else
cost.append(", tap "); cost.append(", tap ");
cost.append(convertIntToWords(tapXTypeAmount)); cost.append(convertIntAndTypeToWords(tapXTypeAmount, "untapped " + tapXType));
cost.append("untapped "); // cost.append(tapXType); // needs IsValid String converter
cost.append(tapXType); // needs IsValid String converter
if (tapXTypeAmount > 1)
cost.append("s");
first = false; first = false;
} }
@@ -398,12 +397,8 @@ public class Ability_Cost {
else else
cost.append(", remove "); cost.append(", remove ");
cost.append(convertIntToWords(counterAmount)); cost.append(convertIntAndTypeToWords(counterAmount, counterType.getName() + " counter"));
cost.append(counterType.getName());
cost.append(" counter");
if (counterAmount != 1)
cost.append("s");
cost.append(" from "); cost.append(" from ");
cost.append(name); cost.append(name);
} }
@@ -420,12 +415,8 @@ public class Ability_Cost {
else else
cost.append(", put "); cost.append(", put ");
cost.append(convertIntToWords(counterAmount)); cost.append(convertIntAndTypeToWords(counterAmount, counterType.getName() + " counter"));
cost.append(counterType.getName());
cost.append(" counter");
if (counterAmount != 1)
cost.append("s");
cost.append(" on "); cost.append(" on ");
cost.append(name); cost.append(name);
} }
@@ -437,7 +428,7 @@ public class Ability_Cost {
cost.append("Pay "); cost.append("Pay ");
else else
cost.append(", Pay "); cost.append(", Pay ");
cost.append(convertIntToWords(lifeAmount)); cost.append(lifeAmount);
cost.append(" Life"); cost.append(" Life");
first = false; first = false;
@@ -494,19 +485,17 @@ public class Ability_Cost {
cost.append(name); cost.append(name);
} }
else if (discardType.equals("Hand")){ else if (discardType.equals("Hand")){
cost.append(" your hand"); cost.append("your hand");
} }
else if(discardType.equals("LastDrawn")) { else if(discardType.equals("LastDrawn")) {
cost.append("last drawn card"); cost.append("last drawn card");
} }
else{ else{
cost.append(convertIntToWords(discardAmount));
if (!discardType.equals("Any") && !discardType.equals("Card") && !discardType.equals("Random")){ if (!discardType.equals("Any") && !discardType.equals("Card") && !discardType.equals("Random")){
cost.append(discardType).append(" "); cost.append(convertIntAndTypeToWords(discardAmount, discardType + " card"));
} } else
cost.append("card"); cost.append(convertIntAndTypeToWords(discardAmount, "card"));
if (discardAmount > 1)
cost.append("s");
if (discardType.equals("Random")) if (discardType.equals("Random"))
cost.append(" at random"); cost.append(" at random");
} }
@@ -528,12 +517,9 @@ public class Ability_Cost {
if (sacType.equals("CARDNAME")) if (sacType.equals("CARDNAME"))
cost.append(name); cost.append(name);
else{ else
cost.append(convertIntToWords(sacAmount)); cost.append(convertIntAndTypeToWords(sacAmount, sacType));
cost.append(sacType);
if (sacAmount > 1)
cost.append("s");
}
return cost.toString(); return cost.toString();
} }
@@ -551,12 +537,9 @@ public class Ability_Cost {
if(exileType.equals("CARDNAME")) if(exileType.equals("CARDNAME"))
cost.append(name); cost.append(name);
else { else
cost.append(convertIntToWords(exileAmount)); cost.append(convertIntAndTypeToWords(exileAmount, exileType));
cost.append(exileType);
if(exileAmount > 1)
cost.append("s");
}
return cost.toString(); return cost.toString();
} }
@@ -575,10 +558,7 @@ public class Ability_Cost {
if(exileType.equals("CARDNAME")) if(exileType.equals("CARDNAME"))
cost.append(name); cost.append(name);
else { else {
cost.append(convertIntToWords(exileAmount)); cost.append(convertIntAndTypeToWords(exileFromHandAmount, exileFromHandType));
cost.append(exileType);
if(exileAmount > 1)
cost.append("s");
cost.append(" from your hand"); cost.append(" from your hand");
} }
return cost.toString(); return cost.toString();
@@ -600,11 +580,9 @@ public class Ability_Cost {
if (returnType.equals("CARDNAME")) if (returnType.equals("CARDNAME"))
cost.append(name); cost.append(name);
else{ else{
cost.append(convertIntToWords(returnAmount)); cost.append(convertIntAndTypeToWords(returnAmount, returnType));
cost.append(returnType);
if (returnAmount > 1){ if (returnAmount > 1){
cost.append("s");
pronoun = "their"; pronoun = "their";
} }
cost.append(" you control"); cost.append(" you control");
@@ -613,19 +591,27 @@ public class Ability_Cost {
return cost.toString(); return cost.toString();
} }
// TODO: If an Ability_Cost needs to pay more than 10 of something, fill this array as appropriate // TODO: If an Ability_Cost needs to pay more than 10 of something, fill this array as appropriate
private static final String[] numNames = { "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten" }; private static final String[] numNames = { "zero", "a", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten" };
private static final Pattern vowelPattern = Pattern.compile("^[aeiou]", Pattern.CASE_INSENSITIVE);
private String convertIntToWords(int i){ private String convertIntAndTypeToWords(int i, String type){
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (i >= numNames.length) if (i >= numNames.length) {
sb.append(i); sb.append(i);
}
else if(1 == i && vowelPattern.matcher(type).find())
sb.append("an");
else else
sb.append(numNames[i]); sb.append(numNames[i]);
sb.append(" "); sb.append(" ");
sb.append(type);
if (1 != i)
sb.append("s");
return sb.toString(); return sb.toString();
} }