Move RemoveDeck parsing to new form

This commit is contained in:
Chris H
2018-10-16 23:04:21 -04:00
parent 1304227020
commit 6b6f85c289
6 changed files with 33 additions and 52 deletions

View File

@@ -352,9 +352,18 @@ public final class CardRules implements ICardCharacteristics {
switch(key.charAt(0)) {
case 'A':
if ("A".equals(key))
if ("A".equals(key)) {
this.faces[curFace].addAbility(value);
else if ("AlternateMode".equals(key)) {
} else if ("AI".equals(key)) {
colonPos = value.indexOf(':');
String variable = colonPos > 0 ? value.substring(0, colonPos) : value;
value = colonPos > 0 ? value.substring(1+colonPos) : null;
if ( "RemoveDeck".equals(variable) ) {
this.removedFromAIDecks = "All".equalsIgnoreCase(value);
this.removedFromRandomDecks = "Random".equalsIgnoreCase(value);
}
} else if ("AlternateMode".equals(key)) {
//System.out.println(faces[curFace].getName());
this.altMode = CardSplitType.smartValueOf(value);
} else if ("ALTERNATE".equals(key)) {
@@ -447,11 +456,7 @@ public final class CardRules implements ICardCharacteristics {
String variable = colonPos > 0 ? value.substring(0, colonPos) : value;
value = colonPos > 0 ? value.substring(1+colonPos) : null;
if ( "RemAIDeck".equals(variable) ) {
this.removedFromAIDecks = "True".equalsIgnoreCase(value);
} else if ( "RemRandomDeck".equals(variable) ) {
this.removedFromRandomDecks = "True".equalsIgnoreCase(value);
} else if ( "Picture".equals(variable) ) {
if ( "Picture".equals(variable) ) {
this.pictureUrl[this.curFace] = value;
} else
this.faces[curFace].addSVar(variable, value);