From 0ff159a05338241cd06df9acfc56f270ac2a11e7 Mon Sep 17 00:00:00 2001 From: Alex Brow Date: Mon, 17 Feb 2020 07:57:28 -0500 Subject: [PATCH 1/2] Add Linux remove windows --- README.md | 3 ++- src/bot.bat | 9 --------- src/index.js | 17 +++++++++-------- 3 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 src/bot.bat diff --git a/README.md b/README.md index 94adf28..b0a9c7f 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ -# Osselbot \ No newline at end of file +# Osselbot +A bot that is kinda stupid but it works surprisingly well diff --git a/src/bot.bat b/src/bot.bat deleted file mode 100644 index 4660a30..0000000 --- a/src/bot.bat +++ /dev/null @@ -1,9 +0,0 @@ -@ECHO OFF -#clears the terminal -ECHO "Updating..." -cd C:\Technicolor_Bot\ -git pull Technicolor_Bot -npm install discord.js - -ECHO "Running bot" -node C:\Technocolor_Bot\src\index.js diff --git a/src/index.js b/src/index.js index 5cc023a..c00b945 100755 --- a/src/index.js +++ b/src/index.js @@ -182,34 +182,35 @@ client.on("message", async message => { // HERE COMES SHITTY COMMANDS MADE BY YOURS TRUELY if(command === 'help') { return message.reply('https://technicolor.2a03.party/bot/'); - } + }; if(command === "rand") { //Generates random number between 1-100 min = Math.ceil(0); max = Math.floor(101); return message.channel.send(Math.floor(Math.random() * (max - min)) + min); //The maximum is exclusive and the minimum is inclusive - } + }; if(command === "oath") { return message.reply("The cadet oath is as follows.\nI pledge that I will serve faithfully in the Civil Air Patrol cadet program. That I will attend meetings regularly, wear my uniform properly, obey my officers, and advance my education and training rapidly to prepare myself to be of service to my community state and nation."); }; if(command === "ask") { return message.channel.send("Dont Ask, Just ask!\n https://iki.fi/sol/dontask.html") - } + }; if(command === "damage") { return message.channel.send("https://cdn.discordapp.com/attachments/619631814696239142/678467158660874270/ohmydamage.mov") - } + }; if(command === "osseley") { return message.channel.send("Ohhh Osseley,\n how I missed you sooo much \nOne of these days...") - } + }; if(command === "psych") { return message.channel.send("Rules for finding a psychopath: \n1. Favorite color is orange \n2. Likes the left burners, worse if its top left\n3. Calls pizza sauce/tomato sauce gravy\n4. Doesnt like salad\n5. Likes country music\n6. Makes hot chocolate with water\n7. Likes black licorice") - } + }; if(command === "squad") { min = Math.ceil(0); max = Math.floor(11); let rate = Math.floor(Math.random() * (max - min) + min); //The maximum is exclusive and the minimum is inclusive - return message.reply(`The squad rates this ${rate} out of 10`) - } + return message.reply(`The squad rates this ${rate} out of 10`); + }; + }); client.login(config.token); From 95b333a24d91a2045ea8768a8bdde71fd5db5433 Mon Sep 17 00:00:00 2001 From: Alex Brow Date: Mon, 17 Feb 2020 23:52:38 -0500 Subject: [PATCH 2/2] magic command --- src/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index c00b945..519d2a7 100755 --- a/src/index.js +++ b/src/index.js @@ -210,7 +210,9 @@ client.on("message", async message => { let rate = Math.floor(Math.random() * (max - min) + min); //The maximum is exclusive and the minimum is inclusive return message.reply(`The squad rates this ${rate} out of 10`); }; - + if(command === "magic") { + return message.channel.send("Do you believe in magic in a young girl's heart\nHow the music can free her, whenever it starts\nAnd it's magic, if the music is groovy\nIt makes you feel happy like an old-time movie\nI'll tell you about the magic, and it'll free your soul\nBut it's like trying to tell a stranger \'bout rock and roll\'"} + } }); client.login(config.token);