diff --git a/forge-core/src/main/java/forge/deck/DeckRecognizer.java b/forge-core/src/main/java/forge/deck/DeckRecognizer.java index d2f040a4d38..7e0261e1958 100644 --- a/forge-core/src/main/java/forge/deck/DeckRecognizer.java +++ b/forge-core/src/main/java/forge/deck/DeckRecognizer.java @@ -368,7 +368,7 @@ public class DeckRecognizer { public static final String REGRP_MANA = "mana"; public static final String REX_NOCARD = String.format("^(?
[^a-zA-Z]*)\\s*(?(\\w+[:]\\s*))?(?<%s>[a-zA-Z]+)(? [^a-zA-Z]*)?$", REGRP_TOKEN); public static final String REX_CMC = String.format("^(? [^a-zA-Z]*)\\s*(?<%s>(C(M)?C(\\s)?\\d{1,2}))(?[^\\d]*)?$", REGRP_TOKEN); - public static final String REX_RARITY = String.format("^(? [^a-zA-Z]*)\\s*(?<%s>((un)?common|(mythic)?\\s*(rare)?|land))(?[^a-zA-Z]*)?$", REGRP_TOKEN); + public static final String REX_RARITY = String.format("^(? [^a-zA-Z]*)\\s*(?<%s>((un)?common|(mythic)?\\s*(rare)?|land|special))(?[^a-zA-Z]*)?$", REGRP_TOKEN); public static final String MANA_SYMBOLS = "w|u|b|r|g|c|m|wu|ub|br|rg|gw|wb|ur|bg|rw|gu"; public static final String REX_MANA_SYMBOLS = String.format("\\{(?<%s>(%s))\\}", REGRP_MANA, MANA_SYMBOLS); public static final String REX_MANA_COLOURS = String.format("(\\{(%s)\\})|(white|blue|black|red|green|colo(u)?rless|multicolo(u)?r)", MANA_SYMBOLS); diff --git a/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java b/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java index aba032c4c17..faef5c24422 100644 --- a/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java +++ b/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java @@ -284,7 +284,7 @@ public class DeckRecognizerTest extends ForgeCardMockTestCase { } @Test void testRarityTypeTokenMatch(){ - String[] rarityTokens = new String[] {"Common", "uncommon", "rare", "mythic", "mythic rare", "land"}; + String[] rarityTokens = new String[] {"Common", "uncommon", "rare", "mythic", "mythic rare", "land", "special"}; for (String line : rarityTokens) assertTrue(DeckRecognizer.isCardRarity(line), "Fail on "+line);