From d57d6a67479779730aa75551deecb12d04564fae Mon Sep 17 00:00:00 2001 From: TheEdgeNK <32907415+TheEdgeNK@users.noreply.github.com> Date: Tue, 27 Mar 2018 19:37:54 -0400 Subject: Teams! --- commands/Pokemon/join.js | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) (limited to 'commands/Pokemon/join.js') diff --git a/commands/Pokemon/join.js b/commands/Pokemon/join.js index 6be75be..6596787 100644 --- a/commands/Pokemon/join.js +++ b/commands/Pokemon/join.js @@ -26,23 +26,18 @@ exports.run = async (bot, msg, args) => { const team = findTeam(msg, args[0]); switch (args[0]) { - case 'aqua': { - msg.member.addRole(msg.guild.roles.find('name', 'Aqua')); - msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Aqua.`); + case 'skull': { + msg.member.addRole(msg.guild.roles.find('name', 'Skull')); + msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Skull.`); break; } - case 'rocket' : { - msg.member.addRole(msg.guild.roles.find('name', 'Rocket')); - msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Rocket.`); - break; - } - case 'magma' : { - msg.member.addRole(msg.guild.roles.find('name', 'Magma')); - msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Magma.`); + case 'flare' : { + msg.member.addRole(msg.guild.roles.find('name', 'Flare')); + msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Flare.`); break; } default : { - msg.reply('You have to pick, aqua, rocket, or magma.'); + msg.reply('You have to pick skull, or flare.'); break; } } @@ -52,21 +47,16 @@ function findTeam(msg, team) { let oldTeam; - if (msg.member.roles.find('name', 'Aqua')) { + if (msg.member.roles.find('name', 'Skull')) { if (team == 'aqua') return; - msg.member.removeRole(msg.guild.roles.find('name', 'Aqua')); + msg.member.removeRole(msg.guild.roles.find('name', 'Skull')); oldTeam = 'Aqua'; } - else if (msg.member.roles.find('name', 'Rocket')) { + else if (msg.member.roles.find('name', 'Flare')) { if (team == 'rocket') return; - msg.member.removeRole(msg.guild.roles.find('name', 'Rocket')); + msg.member.removeRole(msg.guild.roles.find('name', 'Flare')); oldTeam = 'Rocket'; } - else if (msg.member.roles.find('name', 'Magma')) { - if (team == 'magma') return; - msg.member.removeRole(msg.guild.roles.find('name', 'Magma')); - oldTeam = 'Magma'; - } return oldTeam; } -- cgit v1.2.3