diff --git a/.eslintrc b/.eslintrc index 02958e7cd4..7b02889754 100644 --- a/.eslintrc +++ b/.eslintrc @@ -116,7 +116,7 @@ "id-length": "off", "id-match": "off", "indent": ["error", "tab"], - "key-spacing": "off", + "key-spacing": "error", "lines-around-comment": "off", "max-nested-callbacks": "off", "max-statements-per-line": "off", diff --git a/chat-commands.js b/chat-commands.js index 2f033de875..5caca1a510 100644 --- a/chat-commands.js +++ b/chat-commands.js @@ -1228,7 +1228,7 @@ exports.commands = { } let buffer = Object.keys(rankLists).sort((a, b) => - (Config.groups[b] || {rank:0}).rank - (Config.groups[a] || {rank:0}).rank + (Config.groups[b] || {rank: 0}).rank - (Config.groups[a] || {rank: 0}).rank ).map(r => { let roomRankList = rankLists[r].sort(); roomRankList = roomRankList.map(s => s in targetRoom.users ? "**" + s + "**" : s); diff --git a/chat-plugins/datasearch.js b/chat-plugins/datasearch.js index cab6ddce9a..f25ca29fe6 100644 --- a/chat-plugins/datasearch.js +++ b/chat-plugins/datasearch.js @@ -354,13 +354,13 @@ if (process.send && module === process.mainModule) { function runDexsearch(target, cmd, canAll, message) { let searches = []; - let allTiers = {'uber':'Uber', 'ubers':'Uber', 'ou':'OU', 'bl':'BL', 'uu':'UU', 'bl2':'BL2', 'ru':'RU', 'bl3':'BL3', 'nu':'NU', 'bl4':'BL4', 'pu':'PU', 'nfe':'NFE', 'lcuber':'LC Uber', 'lcubers':'LC Uber', 'lc':'LC', 'cap':'CAP', 'caplc':'CAP LC', 'capnfe':'CAP NFE', __proto__:null}; + let allTiers = {'uber': 'Uber', 'ubers': 'Uber', 'ou': 'OU', 'bl': 'BL', 'uu': 'UU', 'bl2': 'BL2', 'ru': 'RU', 'bl3': 'BL3', 'nu': 'NU', 'bl4': 'BL4', 'pu': 'PU', 'nfe': 'NFE', 'lcuber': 'LC Uber', 'lcubers': 'LC Uber', 'lc': 'LC', 'cap': 'CAP', 'caplc': 'CAP LC', 'capnfe': 'CAP NFE', __proto__: null}; let allTypes = Object.create(null); for (let i in Dex.data.TypeChart) { allTypes[toId(i)] = i; } let allColors = ['green', 'red', 'blue', 'white', 'brown', 'yellow', 'purple', 'pink', 'gray', 'black']; - let allEggGroups = {'amorphous':'Amorphous', 'bug':'Bug', 'ditto':'Ditto', 'dragon':'Dragon', 'fairy':'Fairy', 'field':'Field', 'flying':'Flying', 'grass':'Grass', 'humanlike':'Human-Like', 'mineral':'Mineral', 'monster':'Monster', 'undiscovered':'Undiscovered', 'water1':'Water 1', 'water2':'Water 2', 'water3':'Water 3', __proto__:null}; + let allEggGroups = {'amorphous': 'Amorphous', 'bug': 'Bug', 'ditto': 'Ditto', 'dragon': 'Dragon', 'fairy': 'Fairy', 'field': 'Field', 'flying': 'Flying', 'grass': 'Grass', 'humanlike': 'Human-Like', 'mineral': 'Mineral', 'monster': 'Monster', 'undiscovered': 'Undiscovered', 'water1': 'Water 1', 'water2': 'Water 2', 'water3': 'Water 3', __proto__: null}; let allStats = ['hp', 'atk', 'def', 'spa', 'spd', 'spe', 'bst', 'weight', 'height', 'gen']; let showAll = false; let megaSearch = null; @@ -1532,7 +1532,7 @@ function runLearn(target, cmd) { let buffer = `In ${formatName}, `; buffer += "" + template.name + (problem ? " can't learn " : " can learn ") + (targets.length > 2 ? "these moves" : move.name); if (!problem) { - let sourceNames = {E:"egg", S:"event", D:"dream world", V:"virtual console transfer from gen 1-2", X:"egg, traded back", Y:"event, traded back"}; + let sourceNames = {E: "egg", S: "event", D: "dream world", V: "virtual console transfer from gen 1-2", X: "egg, traded back", Y: "event, traded back"}; let sourcesBefore = lsetData.sourcesBefore; if (lsetData.sources || sourcesBefore < gen) buffer += " only when obtained"; buffer += " from: