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

more updates to spMakeToken

Browse Source
This commit is contained in:
jendave
2011-08-06 08:16:46 +00:00
parent cf92e22966
commit 03f97f470c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/forge/CardFactory.java
View File

@@ -5708,8 +5708,8 @@ public class CardFactory implements NewConstants {
String parse = card.getKeyword().get(n).toString();
card.removeIntrinsicKeyword(parse);
final String[] k = parse.split("<>");
final int num = "X".equals(k[1]) ? CardFactoryUtil.xCount(card, card.getSVar("X")) : Integer.valueOf(k[1]);
final String numString = k[1].equals("X") ? card.getSVar("X") : k[1];
final boolean xString = k[1].equals("X") ? true : false;
final String name = k[2];
final String imageName = k[3];
final String controllerString = k[4];
@@ -5724,7 +5724,7 @@ public class CardFactory implements NewConstants {
@Override
public boolean canPlayAI() {
if(num == 0) {
if(xString && CardFactoryUtil.xCount(card, numString) > 0) {
return false;
}
else{
@@ -5734,6 +5734,7 @@ public class CardFactory implements NewConstants {
@Override
public void resolve() {
int num = xString ? CardFactoryUtil.xCount(card, numString) : Integer.valueOf(numString);
String controller = (controllerString.equals("Controller") ? card.getController() : AllZone.GameAction.getOpponent(card.getController()));
for(int i = 0; i < num; i ++ ){
if(keywords[0].equals("None")) keywords[0] = "";