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

generalize power, toughness, and cmc hasProperty variable counting (Thanks to slowe I believe).

Browse Source
This commit is contained in:
slapshot5
2011-11-05 04:36:55 +00:00
parent 0a6a26f5e2
commit b249450ac3
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/forge/Card.java
View File

@@ -6635,29 +6635,26 @@ public class Card extends GameEntity implements Comparable<Card> {
}
}
} else if (property.startsWith("power") || // 8/10
} else if (property.startsWith("power") ||
property.startsWith("toughness") || property.startsWith("cmc")) {
int x = 0;
int y = 0;
int z = 0;
String rhs = "";
if (property.startsWith("power")) {
z = 7;
rhs = property.substring(7);
y = getNetAttack();
} else if (property.startsWith("toughness")) {
z = 11;
rhs = property.substring(11);
y = getNetDefense();
} else if (property.startsWith("cmc")) {
z = 5;
rhs = property.substring(5);
y = getCMC();
}
if (property.substring(z).equals("X")) {
x = CardFactoryUtil.xCount(source, source.getSVar("X"));
} else if (property.substring(z).equals("Y")) {
x = CardFactoryUtil.xCount(source, source.getSVar("Y"));
} else {
x = Integer.parseInt(property.substring(z));
try {
x = Integer.parseInt(rhs);
} catch (NumberFormatException e) {
x = CardFactoryUtil.xCount(source, source.getSVar(rhs));
}
if (!AllZoneUtil.compare(y, property, x)) {