Skip to content
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.

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

Add SV support v2 #704

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion api/services/Flairs.js
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ exports.formattedRequirements = function (flair, flairs) {
return formatted;
};

exports.gameOptions = ['X', 'Y', 'ΩR', 'αS', 'S', 'M', 'US', 'UM', 'LGP', 'LGE', 'SW', 'SH', 'BD', 'SP', 'PLA'].join('|');
exports.gameOptions = ['X', 'Y', 'ΩR', 'αS', 'S', 'M', 'US', 'UM', 'LGP', 'LGE', 'SW', 'SH', 'BD', 'SP', 'PLA', 'SCA', 'VIO'].join('|');
exports.legalIgn = '[^()|,]{0,11}[^()|,\\s]';

// Parse the games. e.g. 'ExampleName (X, Y)' --> [{ign: 'ExampleName', game: 'X'}, {ign: 'ExampleName', game: 'Y'}]
Expand Down
4 changes: 2 additions & 2 deletions assets/common/regexCommon.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
var ptradesFlair = "(:[a-zA-Z0-9_-]*:)*((?:SW-)?([0-9]{4}-){2}[0-9]{4})(, ((?:SW-)?([0-9]{4}-){2}[0-9]{4}))* \\|\\| ([^ ,|(]*( \\((X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA)(, (X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA))*\\))?)(, ([^ ,|(]*( \\((X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA)(, (X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA))*\\))?))*";
var ptradesFlair = "(:[a-zA-Z0-9_-]*:)*((?:SW-)?([0-9]{4}-){2}[0-9]{4})(, ((?:SW-)?([0-9]{4}-){2}[0-9]{4}))* \\|\\| ([^ ,|(]*( \\((X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA|SCA|VIO)(, (X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA|SCA|VIO))*\\))?)(, ([^ ,|(]*( \\((X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA|SCA|VIO)(, (X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA|SCA|VIO))*\\))?))*";
var regex = {
emoji: "(:[a-zA-Z0-9_-]*:)",
tsv: "[0-3]\\d{3}|40(?:[0-8]\\d|9[0-5])",
tsvBars: "(\\|\\| [0-9]{4})|(, [0-9]{4})",
fc: "((?:SW-)?([0-9]{4}-){2}[0-9]{4})",
console: "Switch|3DS",
game: "((\\()|(,))(X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA)((,)|(\\)))",
game: "((\\()|(,))(X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA|SCA|VIO)((,)|(\\)))",
ign: "((\\d \\|\\|)|(\\),)) [^(|,]*( (\\()|(\\|)|(,)|$)",

ptradesFlair: ptradesFlair,
Expand Down
2 changes: 1 addition & 1 deletion assets/userCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ module.exports = function ($scope, $location, io) {
};

$scope.possibleConsoles = ["Switch", "3DS"];
$scope.possibleGames = ["X", "Y", "ΩR", "αS", "S", "M", "US", "UM", "LGP", "LGE", "SW", "SH", "BD", "SP", "PLA"];
$scope.possibleGames = ["X", "Y", "ΩR", "αS", "S", "M", "US", "UM", "LGP", "LGE", "SW", "SH", "BD", "SP", "PLA", "SCA", "VIO"];

$scope.setFlairText = function () {
$("#setTextError").html("").hide();
Expand Down