From ac6fc04fcf61c7e8dbc13a9de15595ebbd27126d Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 31 Mar 2018 21:45:52 -0400 Subject: HUGE cleanup --- commands/Getting Started/contribute.js | 13 +------------ commands/Getting Started/help.js | 13 +------------ commands/Getting Started/ping.js | 13 +------------ commands/Getting Started/start.js | 13 +------------ 4 files changed, 4 insertions(+), 48 deletions(-) (limited to 'commands/Getting Started') diff --git a/commands/Getting Started/contribute.js b/commands/Getting Started/contribute.js index 0e1ae82..2530058 100644 --- a/commands/Getting Started/contribute.js +++ b/commands/Getting Started/contribute.js @@ -3,18 +3,7 @@ * Contribute: Plugin for PokeBot that redirects users to the proper place to contribute. * Copyright (C) 2018 TheEdge, jtsshieh, Alee * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Licensed under the Open Software License version 3.0 * * *************************************/ diff --git a/commands/Getting Started/help.js b/commands/Getting Started/help.js index 457e6ec..94a2128 100644 --- a/commands/Getting Started/help.js +++ b/commands/Getting Started/help.js @@ -3,18 +3,7 @@ * Help: Plugin for PokeBot that guides the user on how to use the bot. * Copyright (C) 2018 TheEdge, jtsshieh, Alee * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Licensed under the Open Software License version 3.0 * * *************************************/ diff --git a/commands/Getting Started/ping.js b/commands/Getting Started/ping.js index 3de0479..365c9f4 100644 --- a/commands/Getting Started/ping.js +++ b/commands/Getting Started/ping.js @@ -3,18 +3,7 @@ * Ping: Plugin for PokeBot that provides diagnostic information. * Copyright (C) 2018 TheEdge, jtsshieh, Alee * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Licensed under the Open Software License version 3.0 * * *************************************/ diff --git a/commands/Getting Started/start.js b/commands/Getting Started/start.js index c31ff1c..9da8be7 100644 --- a/commands/Getting Started/start.js +++ b/commands/Getting Started/start.js @@ -3,18 +3,7 @@ * GettingStarted: Plugin for PokeBot that guides the user on how to start a journey. * Copyright (C) 2018 TheEdge, jtsshieh, Alee * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Licensed under the Open Software License version 3.0 * * *************************************/ -- cgit v1.2.3 From 25a77ee0dab23409516ce4f87c3b72600d3118f4 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 3 Apr 2018 18:49:13 -0400 Subject: last changes --- commands/Getting Started/start.js | 2 +- commands/Pokemon/join.js | 2 +- events/guildMemberAdd.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'commands/Getting Started') diff --git a/commands/Getting Started/start.js b/commands/Getting Started/start.js index 9da8be7..e24ca70 100644 --- a/commands/Getting Started/start.js +++ b/commands/Getting Started/start.js @@ -15,7 +15,7 @@ exports.run = (bot, msg) => { .setColor(0x00ae86) .setTitle('Getting Started in PokeWorld') .addField('PokeCord', 'First off, we need to get you up and running in PokeCord!\n\nMake sure to use the `p!start` command to pick a starter pokemon. Once you have done that, you can start using PokeCord related features in the server!') - .addField('Teams // Gyms', 'Next, you may join a team using PokeBot. To do this, run the `join` command followed by the team you want to join. You can join `aqua`, `magma`, and `rocket`. Now, you can start claiming gyms. To do this, run `p:claim` in a gym channel. If no one owns it, the gym will now be yours. However if someone does own it, it will either tell you to lay off (if your team owns the gym), or it will ping the owner of the gym and tell them to battle you. If you lose said battle, you will not recieve the gym. Otherwise, the owner of the gym will have to drop it for you to claim. You can also trade gyms with other members using the `tradegym` command.') + .addField('Teams // Gyms', 'Next, you may join a team using PokeBot. To do this, run the `join` command followed by the team you want to join. You can join `flare` or `skull`. Now, you can start claiming gyms. To do this, run `p:claim` in a gym channel. If no one owns it, the gym will now be yours. However if someone does own it, it will either tell you to lay off (if your team owns the gym), or it will ping the owner of the gym and tell them to battle you. If you lose said battle, you will not recieve the gym. Otherwise, the owner of the gym will have to drop it for you to claim. You can also trade gyms with other members using the `tradegym` command.') .addField('The End of the Introduction', 'Now that you have done all of this, you are ready to start your journey in the digital region! Chat with people, make friends, and most importantly, have fun!\n\n-The official "sentience" of the PokeWorld server!') .setFooter('PokeBot v1.0') ); diff --git a/commands/Pokemon/join.js b/commands/Pokemon/join.js index 91c6c7e..2187eef 100644 --- a/commands/Pokemon/join.js +++ b/commands/Pokemon/join.js @@ -58,5 +58,5 @@ exports.conf = { exports.help = { name: 'join', description: 'Join one of the teams!', - usage: '', + usage: '', }; diff --git a/events/guildMemberAdd.js b/events/guildMemberAdd.js index 63081b1..11c0c18 100644 --- a/events/guildMemberAdd.js +++ b/events/guildMemberAdd.js @@ -33,7 +33,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 `'); + bot.channels.get('417088992329334794').send('Welcome to the server <@' + member.id + '>. Be sure to join a team: `p:join `. Also, make sure to read our introduction: `p:start`.'); const role = member.guild.roles.find('name', 'Trainers'); member.addRole(role); }; -- cgit v1.2.3 From d0879c5f8b04d678318ef6138734689a76fc4269 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 3 Apr 2018 18:50:16 -0400 Subject: jk, now last fixes --- commands/Getting Started/help.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'commands/Getting Started') diff --git a/commands/Getting Started/help.js b/commands/Getting Started/help.js index 94a2128..1f6cf44 100644 --- a/commands/Getting Started/help.js +++ b/commands/Getting Started/help.js @@ -14,7 +14,7 @@ exports.run = (bot, msg, args) => { embed .setColor (0x36393e) .setTitle('PokeBot Command List') - .setDescription('Full help contents can be found at http://www.digitalregion.ml/pokeworld/pokebot/commands/') + .setDescription('Full help contents can be found at http://universedevgroup.net/pokeworld/pokebot/commands/') .setFooter('PokeBot v1.0'); const categories = Array.from(bot.categories.keys()); -- cgit v1.2.3 From 8186a6af44384b8782f72a4dd7dd3f2d51188bfe Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 3 Apr 2018 22:02:33 -0400 Subject: change in repo --- README.md | 2 +- commands/Getting Started/contribute.js | 2 +- commands/Utility/git.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'commands/Getting Started') diff --git a/README.md b/README.md index 750f2e4..6d07b76 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@

PokeWorld Discord - GitHub commits (since latest release) + GitHub commits (since latest release) Discord Bot List

diff --git a/commands/Getting Started/contribute.js b/commands/Getting Started/contribute.js index 2530058..15204fd 100644 --- a/commands/Getting Started/contribute.js +++ b/commands/Getting Started/contribute.js @@ -8,7 +8,7 @@ * *************************************/ exports.run = (bot, msg) => { - msg.channel.send('Want to help the bot? Here you go: https://github.com/PokeWorld/PokeBot.'); + msg.channel.send('Want to help the bot? Here you go: https://github.com/UniverseDevGroup/PokeBot.'); }; exports.conf = { diff --git a/commands/Utility/git.js b/commands/Utility/git.js index f5113a2..67374bb 100644 --- a/commands/Utility/git.js +++ b/commands/Utility/git.js @@ -8,7 +8,7 @@ * *************************************/ exports.run = (bot, msg) => { - msg.channel.send('The GitHub page for PokeBot can be found here: https://github.com/PokeWorld/PokeBot'); + msg.channel.send('The GitHub page for PokeBot can be found here: https://github.com/UniverseDevGroup/PokeBot.'); }; exports.conf = { -- cgit v1.2.3