diff --git a/DeckEditor/Rules.js b/DeckEditor/Rules.js index d3c4551..70d8053 100644 --- a/DeckEditor/Rules.js +++ b/DeckEditor/Rules.js @@ -521,7 +521,7 @@ IllustRule.parse = function (words) { /////////////////////////////////////////////////////////////// var WxidRule = {}; WxidRule.parseWord = function (word) { - var match = word.match(/^(wx\d{2}|wd\d{2}|pr|sp\d{2})-?(re\d{0,2}|cb\d{0,2}|\d{0,3})$/); + var match = word.match(/^(wx\d{2}|wd\d{2}|pr|sp\d{2})-?(re\d{0,2}|cb\d{0,2}|\d{0,3}[a|b]?)$/); if (!match) return null; return match[1] + '-' + match[2]; } diff --git a/DeckManager.js b/DeckManager.js index 693005c..0a7b1a8 100644 --- a/DeckManager.js +++ b/DeckManager.js @@ -205,6 +205,9 @@ DeckManager.prototype.checkDuplicate = function (pids) { var bucket = {}; pids.forEach(function (pid) { var info = CardInfo[pid]; + if (info.sideA) { + info = CardInfo[info.sideA] + } if (info.cid in bucket) { bucket[info.cid]++; } else {