mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 20:58:03 +00:00
more updates to spMakeToken
This commit is contained in:
@@ -5708,8 +5708,8 @@ public class CardFactory implements NewConstants {
|
|||||||
String parse = card.getKeyword().get(n).toString();
|
String parse = card.getKeyword().get(n).toString();
|
||||||
card.removeIntrinsicKeyword(parse);
|
card.removeIntrinsicKeyword(parse);
|
||||||
final String[] k = parse.split("<>");
|
final String[] k = parse.split("<>");
|
||||||
|
final String numString = k[1].equals("X") ? card.getSVar("X") : k[1];
|
||||||
final int num = "X".equals(k[1]) ? CardFactoryUtil.xCount(card, card.getSVar("X")) : Integer.valueOf(k[1]);
|
final boolean xString = k[1].equals("X") ? true : false;
|
||||||
final String name = k[2];
|
final String name = k[2];
|
||||||
final String imageName = k[3];
|
final String imageName = k[3];
|
||||||
final String controllerString = k[4];
|
final String controllerString = k[4];
|
||||||
@@ -5724,7 +5724,7 @@ public class CardFactory implements NewConstants {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canPlayAI() {
|
public boolean canPlayAI() {
|
||||||
if(num == 0) {
|
if(xString && CardFactoryUtil.xCount(card, numString) > 0) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
@@ -5734,7 +5734,8 @@ public class CardFactory implements NewConstants {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void resolve() {
|
public void resolve() {
|
||||||
String controller = (controllerString.equals("Controller") ? card.getController() : AllZone.GameAction.getOpponent(card.getController()));
|
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 ++ ){
|
for(int i = 0; i < num; i ++ ){
|
||||||
if(keywords[0].equals("None")) keywords[0] = "";
|
if(keywords[0].equals("None")) keywords[0] = "";
|
||||||
CardFactoryUtil.makeToken(name, imageName, controller, manaCost, types, attack, defense, keywords);
|
CardFactoryUtil.makeToken(name, imageName, controller, manaCost, types, attack, defense, keywords);
|
||||||
|
|||||||
Reference in New Issue
Block a user