Skip to content

only card, no quantity #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ggekos wants to merge 3 commits into
base: gh-pages
Choose a base branch
from
Open

only card, no quantity #66

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42034ae
only card, no quantity
ggekos Nov 22, 2019
641cce5
Update js/decklist/decklist.js
ggekos Nov 22, 2019
9c59307
Update js/decklist/decklist.js
ggekos Nov 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion js/decklist/decklist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ var Decklist = {
main: [
/^\s*(\d+)\s+\[.*\]\s+(.+?)\s*$/, // MWS, what an ugly format
/^\s*(\d+)x*\s(.+?)\s*$/, // MTGO deck format (4 Brainstorm) also TCG (4x Brainstorm)
/^\s*()?(.+?)\s*$/, // Single card
],
side: [
/^\s*SB:\s*(\d+)\s+\[.*\]\s(.+?)\s*$/, // MWS, what an ugly format
/^\s*SB:\s+(\d+)\s(.+?)\s*$/, // Sideboard lines begin with SB:
/^\s*()?(.+?)\s*$/, // Single card
],
};

Expand Down Expand Up @@ -76,7 +78,7 @@ var Decklist = {
}

let result = re.exec(line),
quantity = parseInt(result[1]),
quantity = parseInt(result[1]) || 1,
cardName = result[2],
card = getCard(cardName);
// add quantity field to card object
Expand Down