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

- Fixed creating card pools with cards that have specific art indices specified.

Browse Source
This commit is contained in:
Agetian
2016-12-02 10:18:08 +00:00
parent a23d06b8c4
commit dd950f589a
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-core/src/main/java/forge/deck/CardPool.java
View File

@@ -49,7 +49,19 @@ public class CardPool extends ItemPool<PaperCard> {
}
public void add(final String cardName, final int amount) {
this.add(cardName, null, -1, amount);
if (cardName.contains("|")) {
// an encoded cardName with set and possibly art index was passed, split it and pass in full
String[] splitCardName = StringUtils.split(cardName, "|");
if (splitCardName.length == 2) {
// set specified
this.add(splitCardName[0], splitCardName[1], amount);
} else if (splitCardName.length == 3) {
// set and art specified
this.add(splitCardName[0], splitCardName[1], Integer.parseInt(splitCardName[2]), amount);
}
} else {
this.add(cardName, null, -1, amount);
}
}
public void add(final String cardName, final String setCode) {
@@ -82,7 +94,7 @@ public class CardPool extends ItemPool<PaperCard> {
cp = StaticData.instance().getCommonCards().createUnsuportedCard(cardName);
}
boolean artIndexExplicitlySet = artIndex > 0 || Character.isDigit(cardName.charAt(cardName.length()-1)) && cardName.charAt(cardName.length()-2) == CardDb.NameSetSeparator;
boolean artIndexExplicitlySet = artIndex > 0 || (Character.isDigit(cardName.charAt(cardName.length()-1)) && cardName.charAt(cardName.length()-2) == CardDb.NameSetSeparator);
if (artIndexExplicitlySet || artCount <= 1) {
// either a specific art index is specified, or there is only one art, so just add the card
this.add(cp, amount);