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

Improved support for Unknown cards in DeckImport

Browse Source 
DeckImport now avoids including non-deck and metadata info in decklist as UnknownText, whilst any line that looks like a card request (i.e. includes a card quantity in the beginning) is interpreted as Unknown card.

This seems a good compromise with showing typo and any mispelling in card list whilst avoiding flooding decklist with unnecessary info.
This commit is contained in:
leriomaggio
2021-10-20 10:47:44 +02:00
parent 0d67e7950e
commit 87439388db
9 changed files with 75 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -584,7 +584,7 @@ public class DeckRecognizer {
public Token recogniseCardToken(final String text, final DeckSection currentDeckSection) {
String line = text.trim();
Token uknonwnCardToken = null;
Token unknownCardToken = null;
StaticData data = StaticData.instance();
List<Matcher> cardMatchers = getRegExMatchers(line);
for (Matcher matcher : cardMatchers) {
@@ -596,10 +596,7 @@ public class DeckRecognizer {
if (!data.isMTGCard(cardName)){
// check the case for double-sided cards
cardName = checkDoubleSidedCard(cardName);
if (cardName == null)
continue;
}
String ccount = getRexGroup(matcher, REGRP_CARDNO);
String setCode = getRexGroup(matcher, REGRP_SET);
String collNo = getRexGroup(matcher, REGRP_COLLNR);
@@ -607,6 +604,14 @@ public class DeckRecognizer {
String deckSecFromCardLine = getRexGroup(matcher, REGRP_DECK_SEC_XMAGE_STYLE);
boolean isFoil = foilGr != null;
int cardCount = ccount != null ? Integer.parseInt(ccount) : 1;
if (cardName == null){
if (ccount != null)
// setting cardCount to zero as the text is the whole line
unknownCardToken = Token.UnknownCard(text, null, 0);
continue;
}
// if any, it will be tried to convert specific collector number to art index (useful for lands).
String collectorNumber = collNo != null ? collNo : IPaperCard.NO_COLLECTOR_NUMBER;
int artIndex;
@@ -620,7 +625,7 @@ public class DeckRecognizer {
CardEdition edition = StaticData.instance().getEditions().get(setCode);
if (edition == null) {
// set the case for unknown card (in case) and continue to the next for any better matching
uknonwnCardToken = Token.UnknownCard(cardName, setCode, cardCount);
unknownCardToken = Token.UnknownCard(cardName, setCode, cardCount);
continue;
}
@@ -652,7 +657,7 @@ public class DeckRecognizer {
return checkAndSetCardToken(pc, edition, cardCount, deckSecFromCardLine, currentDeckSection);
}
}
return uknonwnCardToken; // either null or unknown card
return unknownCardToken; // either null or unknown card
}
private String checkDoubleSidedCard(final String cardName){