Teams!

5 files changed, 29 insertions, 48 deletions

diff --git a/commands/Pokemon/claim.js b/commands/Pokemon/claim.js
index 5d2085c..1c9bd32 100644
--- a/commands/Pokemon/claim.js
+++ b/commands/Pokemon/claim.js
@@ -23,18 +23,16 @@ exports.run = async (bot, msg) => {
   if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.');
   if (msg.channel.topic == 'Current Owner: *none*') {
     let team;
-    if (msg.member.roles.find('name', 'Aqua')) team = 'Aqua';
-    if (msg.member.roles.find('name', 'Rocket')) team = 'Rocket';
-    if (msg.member.roles.find('name', 'Magma')) team = 'Magma';
+    if (msg.member.roles.find('name', 'Skull')) team = 'Skull';
+    if (msg.member.roles.find('name', 'Flare')) team = 'Flare';
     if (!team) return msg.reply('You have to join a team before you can claim a gym.');
     msg.reply('Alright, you have claimed this gym as yours! Be ready to battle anyone who approaches you');
     msg.channel.setTopic('Current Owner: ' + msg.author.id + '/' + msg.author.tag + '/' + team);
   }
   else {
     let team;
-    if (msg.member.roles.find('name', 'Aqua')) team = 'Aqua';
-    if (msg.member.roles.find('name', 'Rocket')) team = 'Rocket';
-    if (msg.member.roles.find('name', 'Magma')) team = 'Magma';
+    if (msg.member.roles.find('name', 'Skull')) team = 'Skull';
+    if (msg.member.roles.find('name', 'Flare')) team = 'Flare';
     if (!team) return msg.reply('You have to join a team before you can claim a gym.');
     const owner = msg.channel.topic.slice(15).substring(0, 18);
     if (msg.guild.members.find('id', owner).roles.find('name', team)) return msg.reply('Don\'t try battling your own team. They won\'t like you.');
@@ -57,7 +55,7 @@ exports.run = async (bot, msg) => {
             bot.removeListener('message', func);
           }
           if (user.id == msg.author.id) {
-            await msg.channel.send('The owner has been defeated! Transfaring gym!');
+            await msg.channel.send('The owner has been defeated! Transferring gym!');
             bot.cooldown.push(msg.channel.id);
             let lastProcessedHour = -1;
             setInterval(function() {
@@ -71,9 +69,8 @@ exports.run = async (bot, msg) => {
               }
             }, 1000);
             let recipientTeam;
-            if (msg.member.roles.find('name', 'Aqua')) recipientTeam = 'Aqua';
-            if (msg.member.roles.find('name', 'Rocket')) recipientTeam = 'Rocket';
-            if (msg.member.roles.find('name', 'Magma')) recipientTeam = 'Magma';
+            if (msg.member.roles.find('name', 'Skull')) recipientTeam = 'Skull';
+            if (msg.member.roles.find('name', 'Flare')) recipientTeam = 'Flare';
             await msg.channel.setTopic('Current Owner: ' + msg.member.id + '/' + msg.author.tag + '/' + recipientTeam);
             bot.gyms.set(msg.channel.id, null);
             bot.removeListener('message', func);
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;
 }
 
diff --git a/commands/Pokemon/leave.js b/commands/Pokemon/leave.js
index c885060..13ba141 100644
--- a/commands/Pokemon/leave.js
+++ b/commands/Pokemon/leave.js
@@ -21,17 +21,13 @@
 exports.run = async (bot, msg) => {
   if (msg.guild.id != '417088992329334792') return msg.reply ('This is a PokeWorld exclusive command. Sorry!');
 
-  if (msg.member.roles.find('name', 'Aqua')) {
-    msg.member.removeRole(msg.guild.roles.find('name', 'Aqua'));
-    msg.reply('Alright, you are not longer in team Aqua.');
+  if (msg.member.roles.find('name', 'Skull')) {
+    msg.member.removeRole(msg.guild.roles.find('name', 'Skull'));
+    msg.reply('Alright, you are not longer in team Skull.');
   }
-  else if (msg.member.roles.find('name', 'Rocket')) {
-    msg.member.removeRole(msg.guild.roles.find('name', 'Rocket'));
-    msg.reply('Alright, you are not longer in team Rocket.');
-  }
-  else if (msg.member.roles.find('name', 'Magma')) {
-    msg.member.removeRole(msg.guild.roles.find('name', 'Magma'));
-    msg.reply('Alright, you are not longer in team Magma.');
+  else if (msg.member.roles.find('name', 'Flare')) {
+    msg.member.removeRole(msg.guild.roles.find('name', 'Flare'));
+    msg.reply('Alright, you are not longer in team Flare.');
   }
   else {
     msg.reply('You are not in a team.');
diff --git a/commands/Pokemon/tradegym.js b/commands/Pokemon/tradegym.js
index 3d775ca..b9d590b 100644
--- a/commands/Pokemon/tradegym.js
+++ b/commands/Pokemon/tradegym.js
@@ -23,18 +23,16 @@ exports.run = async (bot, msg) => {
 
   if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.');
   let team;
-  if (msg.member.roles.find('name', 'Aqua')) team = 'Aqua';
-  if (msg.member.roles.find('name', 'Rocket')) team = 'Rocket';
-  if (msg.member.roles.find('name', 'Magma')) team = 'Magma';
+  if (msg.member.roles.find('name', 'Skull')) team = 'Skull';
+  if (msg.member.roles.find('name', 'Flare')) team = 'Flare';
   if (msg.channel.topic == 'Current Owner: ' + msg.author.id + '/' + msg.author.tag + '/' + team) {
     if (!msg.mentions.members.first()) return msg.reply('Sorry, you have to ping the recipient of the gym!');
     const recipient = msg.mentions.members.first();
 
     msg.reply('Trading gym to ' + recipient);
     let recipientTeam;
-    if (recipient.roles.find('name', 'Aqua')) recipientTeam = 'Aqua';
-    if (recipient.roles.find('name', 'Rocket')) recipientTeam = 'Rocket';
-    if (recipient.roles.find('name', 'Magma')) recipientTeam = 'Magma';
+    if (recipient.roles.find('name', 'Skull')) recipientTeam = 'Skull';
+    if (recipient.roles.find('name', 'Flare')) recipientTeam = 'Flare';
     msg.channel.setTopic('Current Owner: ' + recipient.id + '/' + recipient.user.tag + '/' + recipientTeam);
   }
   else {
diff --git a/events/guildMemberAdd.js b/events/guildMemberAdd.js
index c427863..57ff757 100644
--- a/events/guildMemberAdd.js
+++ b/events/guildMemberAdd.js
@@ -44,7 +44,7 @@ module.exports = async (bot, member) => {
   bot.channels.get('426829685289123850').setName('Member Count: ' + (member.guild.memberCount - botCount));
   bot.channels.get('426829838238613504').setName('Bot Count: ' + botCount);
   bot.channels.get('417100669980508160').send(`Welcome to the server **${member.user.tag}**! Make sure to read the rules! We now have ${member.guild.memberCount} members.`);
-  bot.channels.get('417088992329334794').send('Welcome to the server <@' + member.id + '>. Be sure to join a team: `p:join <magma, rocket, aqua>`');
+  bot.channels.get('417088992329334794').send('Welcome to the server <@' + member.id + '>. Be sure to join a team: `p:join <skull, flare>`');
   const role = member.guild.roles.find('name', 'Trainers');
   member.addRole(role);
 };