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

- Only write out the card art index to the deck if the art count for the card is greater than 1.

Browse Source
This commit is contained in:
Agetian
2014-01-14 15:42:47 +00:00
parent d65b645a64
commit eb4a355dc7
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-core/src/main/java/forge/card/CardDb.java
View File

@@ -277,7 +277,7 @@ public final class CardDb implements ICardDatabase {
Collection<PaperCard> cards = allCardsByName.get(cardName); Collection<PaperCard> cards = allCardsByName.get(cardName);
if ( null == cards ) { if ( null == cards ) {
throw new NoSuchElementException(String.format("Card '%s' not found in our database.", cardName)); return 0;
} }
for ( PaperCard pc : cards ) { for ( PaperCard pc : cards ) {

11
forge-core/src/main/java/forge/deck/Deck.java
View File

@@ -32,6 +32,7 @@ import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.StaticData;
import forge.card.CardDb; import forge.card.CardDb;
import forge.card.ColorSet; import forge.card.ColorSet;
@@ -223,8 +224,16 @@ public class Deck extends DeckBase implements Iterable<Entry<DeckSection, CardPo
sb.append(n).append(" ").append(card.getName()); sb.append(n).append(" ").append(card.getName());
if (!hasBadSetInfo) { if (!hasBadSetInfo) {
int artCount = StaticData.instance().getCommonCards().getArtCount(card.getName(), card.getEdition());
if (artCount < 1) {
artCount = StaticData.instance().getVariantCards().getArtCount(card.getName(), card.getEdition());
}
sb.append("|").append(card.getEdition()); sb.append("|").append(card.getEdition());
sb.append("|").append(card.getArtIndex());
if (artCount > 1) {
sb.append("|").append(card.getArtIndex());
}
} }
if(card.isFoil()) { if(card.isFoil()) {
sb.append(CardDb.foilSuffix); sb.append(CardDb.foilSuffix);