From e4c10ade077215a79c397944d78be39ff4207ff2 Mon Sep 17 00:00:00 2001 From: dragonfire535 Date: Sat, 4 Mar 2017 18:13:53 -0500 Subject: [PATCH] Move some things around --- commands/{pokemon => search}/pkdex.json | 0 commands/{pokemon => search}/pokedex.js | 6 ++++-- commands/search/weather.js | 2 +- index.js | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) rename commands/{pokemon => search}/pkdex.json (100%) rename commands/{pokemon => search}/pokedex.js (90%) diff --git a/commands/pokemon/pkdex.json b/commands/search/pkdex.json similarity index 100% rename from commands/pokemon/pkdex.json rename to commands/search/pkdex.json diff --git a/commands/pokemon/pokedex.js b/commands/search/pokedex.js similarity index 90% rename from commands/pokemon/pokedex.js rename to commands/search/pokedex.js index c593f642..0fcbc49a 100644 --- a/commands/pokemon/pokedex.js +++ b/commands/search/pokedex.js @@ -6,7 +6,7 @@ class PokedexCommand extends commando.Command { constructor(Client){ super(Client, { name: 'pokedex', - group: 'pokemon', + group: 'search', memberName: 'pokedex', description: 'Gives the pokedex entry for a Pokemon. (;pokedex Pikachu)', examples: [';pokedex Pikachu'] @@ -34,7 +34,9 @@ class PokedexCommand extends commando.Command { .addField('Type', pokedex.type[pokemon]); message.channel.sendEmbed(embed).catch(console.error); - } else {message.channel.sendMessage(":x: This Pokémon either doesn't exist, or isn't implemented yet.");} + } else { + message.channel.sendMessage(":x: This Pokémon either doesn't exist, or isn't implemented yet."); + } } } diff --git a/commands/search/weather.js b/commands/search/weather.js index 70ea51ea..717ea84f 100644 --- a/commands/search/weather.js +++ b/commands/search/weather.js @@ -24,7 +24,7 @@ class WeatherCommand extends commando.Command { weather(locationtosearch, 'f').then(info => { const embed = new Discord.RichEmbed() .setColor(0x0000FF) - .setAuthor(info.title, 'http://static.dnaindia.com/sites/default/files/2015/08/21/367776-yahoo2.jpg') + .setAuthor(info.title, 'http://media.idownloadblog.com/wp-content/uploads/2013/12/yahoo-weather-213x220.png') .setURL(info.link) .setTimestamp() .addField('**City:**', diff --git a/index.js b/index.js index 7ec9c3a9..d324e78c 100644 --- a/index.js +++ b/index.js @@ -23,7 +23,6 @@ client.registry ['avataredit', 'Avatar Manipulation'], ['textedit', 'Text Manipulation'], ['search', 'Search'], - ['pokemon', 'Pokémon'], ['random', 'Random/Other'], ['roleplay', 'Roleplay'] ])