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

- More cleanup of xCount.

Browse Source
This commit is contained in:
Sloth
2012-11-26 19:39:34 +00:00
parent 2f2f4a4bcf
commit e9bc0f92f7
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -1921,13 +1921,6 @@ public class CardFactoryUtil {
return CardFactoryUtil.doXMath(Integer.parseInt(sq[2]), m, c); // not Kicked return CardFactoryUtil.doXMath(Integer.parseInt(sq[2]), m, c); // not Kicked
} }
} }
if (sq[0].startsWith("Kicked")) {
if (sa.isKicked()) {
return CardFactoryUtil.doXMath(Integer.parseInt(sq[1]), m, c); // Kicked
} else {
return CardFactoryUtil.doXMath(Integer.parseInt(sq[2]), m, c); // not Kicked
}
}
} }
return xCount(c, s); return xCount(c, s);
} }
@@ -2091,7 +2084,7 @@ public class CardFactoryUtil {
return CardFactoryUtil.doXMath(c.getController().getBloodthirstAmount(), m, c); return CardFactoryUtil.doXMath(c.getController().getBloodthirstAmount(), m, c);
} }
if (sq[0].contains("RegeneratedThisTurn")) { if (sq[0].equals("RegeneratedThisTurn")) {
return CardFactoryUtil.doXMath(c.getRegeneratedThisTurn(), m, c); return CardFactoryUtil.doXMath(c.getRegeneratedThisTurn(), m, c);
} }