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

added option to use only core and expansion sets in deck importer, fixed a related bug

Browse Source
This commit is contained in:
Maxmtg
2014-01-25 19:54:32 +00:00
parent 1986df1961
commit 003c252d8a
3 changed files with 18 additions and 8 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

@@ -221,7 +221,7 @@ public final class CardDb implements ICardDatabase {
@Override
public PaperCard getCardFromEdition(final String cardName, final Date printedBefore, final SetPreference fromSet) {
return getCardFromEdition(cardName, null, fromSet, -1);
return getCardFromEdition(cardName, printedBefore, fromSet, -1);
}
@Override

14
forge-core/src/main/java/forge/deck/DeckRecognizer.java
View File

@@ -164,12 +164,18 @@ public class DeckRecognizer {
//private static final Pattern READ_SEPARATED_EDITION = Pattern.compile("[[\\(\\{]([a-zA-Z0-9]){1,3})[]*\\s+(.*)");
private final boolean useLastSet;
private final SetPreference useLastSet;
private final ICardDatabase db;
private Date recognizeCardsPrintedBefore = null;
public DeckRecognizer(boolean fromLatestSet, CardDb db) {
useLastSet = fromLatestSet;
public DeckRecognizer(boolean fromLatestSet, boolean onlyCoreAndExp, CardDb db) {
if(!fromLatestSet)
useLastSet = null;
else if (onlyCoreAndExp)
useLastSet = SetPreference.LatestCoreExp;
else
useLastSet = SetPreference.Latest;
this.db = db;
}
@@ -203,7 +209,7 @@ public class DeckRecognizer {
}
private PaperCard tryGetCard(String text) {
return db.getCardFromEdition(text, recognizeCardsPrintedBefore, useLastSet ? SetPreference.Latest : null);
return db.getCardFromEdition(text, recognizeCardsPrintedBefore, useLastSet);
}
private Token recognizePossibleNameAndNumber(final String name, final int n) {