New Plugin and New Stories

2 files changed, 52 insertions, 1 deletions

diff --git a/commands/Fun/findmyphone.js b/commands/Fun/findmyphone.js
new file mode 100644
index 0000000..482ceb3
--- /dev/null
+++ b/commands/Fun/findmyphone.js
@@ -0,0 +1,48 @@
+/****************************************
+ *
+ *   FindMyPhone: Plugin for PokeBot that "helps you find your phone".
+ *   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 <http://www.gnu.org/licenses/>.
+ *
+ * *************************************/
+
+exports.run = (bot, msg) => {
+    const cities = [
+        'Aurora', 
+        'Montgomery', 
+        'Chandler', 
+        'Boise',
+        'Fresno', 
+        'Lubbock',
+        'Miami', 
+        'Stockton', 
+        'Colorado Springs', 
+        'Portland',
+        'Cincinnati',
+    ];
+
+    msg.channel.send(cities[Math.floor(Math.random() * cities.length)]);
+  };
+  
+  exports.conf = {
+    aliases: ['findphone', 'findmyiphone', 'findmyandroid', 'findmyandroidphone'],
+    guildOnly: true,
+  };
+  
+  exports.help = {
+    name: 'findmyphone',
+    description: 'Find your phone. Not just a random list of cities being randomly picked.',
+  };
+  
\ No newline at end of file
diff --git a/commands/Fun/story.js b/commands/Fun/story.js
index 0ee4b78..a61c2d8 100644
--- a/commands/Fun/story.js
+++ b/commands/Fun/story.js
@@ -25,12 +25,15 @@ exports.run = async (bot, msg) => {
     const selectedUser1 = membersList[Math.floor(Math.random() * membersList.length)].user;
     const selectedUser2 = membersList[Math.floor(Math.random() * membersList.length)].user;
     const selectedUser3 = membersList[Math.floor(Math.random() * membersList.length)].user;
+    const selectedUser4 = membersList[Math.floor(Math.random() * membersList.length)].user;
 
     const stories =
     [
       `${selectedUser1.username} bought ${selectedUser2.username} his favorite video game. This game is called "Pokemon". Then, they became best friends.`,
       `${selectedUser1.username} wants to become a Pokemon trainer, but he needs to get a Pokemon first!`,
-      `One day, ${selectedUser1.username} decided to go to a shop. He took his motorbike. Once he arrived at the shop, he went inside. He headed right, towards the chips. He grabbed a packet, and headed to check-out. He bumped into ${selectedUser2.username} at the counter, and decided to say hi. They had a little chat, and then decided to gossip about ${selectedUser3.username}. Then, as they were saying some horrible things about ${selectedUser3.username}, they unexpectedly showed up! Then, ${selectedUser1.username} and ${selectedUser2.username} got into a fight against ${selectedUser3.username}.\n\nKids, this is why you don't start drama.\nNow ${selectedUser1.username}, ${selectedUser2.username}, and ${selectedUser3.username} are no longer friends.`
+      `One day, ${selectedUser1.username} decided to go to a shop. He took his motorbike. Once he arrived at the shop, he went inside. He headed right, towards the chips. He grabbed a packet, and headed to check-out. He bumped into ${selectedUser2.username} at the counter, and decided to say hi. They had a little chat, and then decided to gossip about ${selectedUser3.username}. Then, as they were saying some horrible things about ${selectedUser3.username}, they unexpectedly showed up! Then, ${selectedUser1.username} and ${selectedUser2.username} got into a fight against ${selectedUser3.username}.\n\nKids, this is why you don't start drama.\nNow ${selectedUser1.username}, ${selectedUser2.username}, and ${selectedUser3.username} are no longer friends.`,
+      `At a point in time, ${selectedUser1.username} was battling ${selectedUser2.username} for a gym. ${selectedUser1.username} chose Sylveon to battle, when ${selectedUser2.username} chose their trusty Eevee. First, Eevee used Tackle, when Sylveon went in for Draining Kiss. Then, ${selectedUser2.username} shouted an expletive. Once they shouted it, ${selectedUser3.username} came inside the room. ${selectedUser3.username} does not like expletives, so they got into an arguement about them. Soon enough, vicr123 got in here too and started using "-" in place of expletives during the argument. Eventually, ${selectedUser2.username} and ${selectedUser3.username} were shouting expletives at each-other, vicr123 was audibly shouting "Dash! Dash you!", while ${selectedUser1.username} was smashing his head on his desk.`,
+      `It was the day of the release of Pokemon Ultra Sun and Ultra Moon. ${selectedUser1.username} and ${selecteduser2.username} decided to go to GameStop to wait in line to grab their pre-order copies. Then, ${selectedUser3.username} came along, and got mad once they realised ${selectedUser1.username} and ${selectedUser2.username} had pre-orders, when ${selectedUser3.username} did not. Eventually, ${selectedUser3.username} started physically assaulting ${selectedUser1.username} when they came outside with their pre-order copy. Then, known police officer ${selectedUser4.username} came up to ${selectedUser3.username} and ${selectedUser1.username} and charged them both for Indecent Exposure, and Assault of the Second Degree.\n\nMoral of the story: Do not get into an assualt over a video-game, like ${selectedUser3.username} and ${selectedUser1.username} did.`,
     ];
     const storySelected = [Math.floor(Math.random() * stories.length)];
     const { RichEmbed } = require('discord.js');