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

- Made some cards ready for multiplayer

Browse Source 
- minor style cleanup
This commit is contained in:
moomarc
2013-04-05 08:42:48 +00:00
parent 67bff88772
commit 010c7672ba
5 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/forge/card/ability/AbilityUtils.java
View File

@@ -291,18 +291,17 @@ public class AbilityUtils {
*/
public static int calculateAmount(final Card card, String amount, final SpellAbility ability) {
// return empty strings and constants
if (StringUtils.isBlank(amount)) return 0;
if (StringUtils.isBlank(amount)) { return 0; }
final boolean startsWithPlus = amount.charAt(0) == '+';
if(startsWithPlus) amount = amount.substring(1);
if (startsWithPlus) { amount = amount.substring(1); }
// Strip and save sign for calculations
boolean startsWithMinus = amount.charAt(0) == '-';
int multiplier = startsWithMinus ? -1 : 1;
if(startsWithMinus)
amount = amount.substring(1);
if (startsWithMinus) { amount = amount.substring(1); }
// return result soon for plain numbers
if (StringUtils.isNumeric(amount)) return Integer.parseInt(amount) * multiplier;
if (StringUtils.isNumeric(amount)) { return Integer.parseInt(amount) * multiplier; }
// These are some special cases - who is implementing them?
if (amount.equals("ChosenX") || amount.equals("ChosenY")) {
@@ -320,34 +319,38 @@ public class AbilityUtils {
svarval = ability.getSVar(amount);
}
if (StringUtils.isBlank(svarval)) {
if( ability != null) {
if (ability != null) {
System.err.printf("SVar '%s' not found in ability, fallback to Card (%s). Ability is (%s)%n", amount, card.getName(), ability);
}
svarval = card.getSVar(amount);
}
// Nothing to do here if value is missing or blank
if (StringUtils.isBlank(svarval)) {
System.err.printf("SVar '%s' not defined in Card (%s)%n", amount, card.getName());
return 0;
}
// Handle numeric constant coming in svar value
if( StringUtils.isNumeric(svarval) )
if (StringUtils.isNumeric(svarval)) {
return multiplier * Integer.parseInt(svarval);
}
// Parse Object$Property string
final String[] calcX = svarval.split("\\$");
// Incorrect parses mean zero.
if ((calcX.length == 1) || calcX[1].equals("none"))
return 0;
if (calcX[0].startsWith("Count"))
// Incorrect parses mean zero.
if ((calcX.length == 1) || calcX[1].equals("none")) {
return 0;
}
if (calcX[0].startsWith("Count")) {
return AbilityUtils.xCount(card, calcX[1], ability) * multiplier;
if (calcX[0].startsWith("Number"))
}
if (calcX[0].startsWith("Number")) {
return CardFactoryUtil.xCount(card, svarval) * multiplier;
}
if (calcX[0].startsWith("SVar")) {
final String[] l = calcX[1].split("/");