From 915a07dd625f292a6099960e9e2592bd9dff4d46 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Fri, 26 Oct 2018 23:18:58 +1100 Subject: [PATCH] Testing and bugfixing --- ADAM/adam.js | 4 ++-- ADAM/core.js | 21 +++++++++++++++++++-- ADAM_CptMon/adam-cptmon.js | 2 +- ADAM_Dairo/adam-dairo.js | 3 ++- ADAM_Kamala/adam-kamala.js | 2 +- Shared/data_request.js | 2 ++ package.json | 17 ----------------- 7 files changed, 27 insertions(+), 24 deletions(-) delete mode 100644 package.json diff --git a/ADAM/adam.js b/ADAM/adam.js index e94f1db..592f086 100644 --- a/ADAM/adam.js +++ b/ADAM/adam.js @@ -140,14 +140,14 @@ function processBasicCommands(client, message) { //ADAM and the faction leaders print the intros in the gate //TODO: prune the unneeded intros from each bot case "intro": - if (shared.IsAdmin(client, message.author)) { + if (shared.IsAdmin(client, message.author) && message.channel.id !== process.env.GATE_CHANNEL_ID) { shared.SendPublicMessage(client, client.channels.get(process.env.GATE_CHANNEL_ID), dialog("intro")); message.delete(1000); } return true; case "introend": - if (shared.IsAdmin(client, message.author)) { + if (shared.IsAdmin(client, message.author) && message.channel.id !== process.env.GATE_CHANNEL_ID) { shared.SendPublicMessage(client, client.channels.get(process.env.GATE_CHANNEL_ID), dialog("introEnd")); message.delete(1000); } diff --git a/ADAM/core.js b/ADAM/core.js index 3fb26bb..a00694f 100644 --- a/ADAM/core.js +++ b/ADAM/core.js @@ -29,7 +29,12 @@ exports.ProcessGameplayCommands = function(client, message, dialog) { return true; case "give": //TODO: fold this code into a function - let amount = Math.floor(args[0]); + let amount = Math.floor(parseFloat(args[0])); + + if (isNaN(amount)) { + shared.SendPublicMessage(client, message.channel, dialog("giveFailed", message.author.id)); + return true; + } //not enough if (amount <= 0) { @@ -202,7 +207,7 @@ exports.PrintStats = function(client, member, channel, stats) { .addField("Stats", userStats) .setFooter("Commands: !help | !lore | !checkin | !give"); - channel.send(embed); + channel.send({ embed }); } //HandleLevelUp @@ -211,6 +216,18 @@ exports.PrintStats = function(client, member, channel, stats) { //channel - discord.js channel //dialog - dialog function exports.HandleLevelUp = function(client, member, channel, dialog) { + //handle member strings + if (typeof(member) === "string") { //TODO: fold these into their own functions EVERYWHERE. + //get the member + let user = client.users.find(item => item.username === member || item.id === member); + member = guild.members.get(user.id); + } + + //handle channel strings + if (typeof(channel) === "string") { + channel = client.channels.find(item => item.name === channel || item.id === channel); + } + // Sees if the user is supposed to level up let [levelUpResponse, level, statPoints] = shared.LevelUp(client, member); diff --git a/ADAM_CptMon/adam-cptmon.js b/ADAM_CptMon/adam-cptmon.js index 0f69b69..83b9108 100644 --- a/ADAM_CptMon/adam-cptmon.js +++ b/ADAM_CptMon/adam-cptmon.js @@ -93,7 +93,7 @@ function processBasicCommands(client, message) { //ADAM and the faction leaders print the intros in the gate case "introgenesis": - if (shared.IsAdmin(client, message.author)) { + if (shared.IsAdmin(client, message.author) && message.channel.id !== process.env.GATE_CHANNEL_ID) { shared.SendPublicMessage(client, client.channels.get(process.env.GATE_CHANNEL_ID), dialog("introGenesis", process.env.GROUP_B_ROLE)); message.delete(1000); } diff --git a/ADAM_Dairo/adam-dairo.js b/ADAM_Dairo/adam-dairo.js index 91f73fa..b54721a 100644 --- a/ADAM_Dairo/adam-dairo.js +++ b/ADAM_Dairo/adam-dairo.js @@ -91,8 +91,9 @@ function processBasicCommands(client, message) { case "hand": return core.ProcessFactionChangeAttempt(client, message, process.env.GROUP_C_ROLE, dialog, "Hand"); + //ADAM and the faction leaders print the intros in the gate case "introhand": - if (shared.IsAdmin(client, message.author)) { + if (shared.IsAdmin(client, message.author) && message.channel.id !== process.env.GATE_CHANNEL_ID) { shared.SendPublicMessage(client, client.channels.get(process.env.GATE_CHANNEL_ID), dialog("introHand", process.env.GROUP_C_ROLE)); message.delete(1000); } diff --git a/ADAM_Kamala/adam-kamala.js b/ADAM_Kamala/adam-kamala.js index fedcab9..61ec121 100644 --- a/ADAM_Kamala/adam-kamala.js +++ b/ADAM_Kamala/adam-kamala.js @@ -93,7 +93,7 @@ function processBasicCommands(client, message) { //ADAM and the faction leaders print the intros in the gate case "introobsidian": - if (shared.IsAdmin(client, message.author)) { + if (shared.IsAdmin(client, message.author) && message.channel.id !== process.env.GATE_CHANNEL_ID) { shared.SendPublicMessage(client, client.channels.get(process.env.GATE_CHANNEL_ID), dialog("introObsidian", process.env.GROUP_A_ROLE)); message.delete(1000); } diff --git a/Shared/data_request.js b/Shared/data_request.js index b914f24..f88280c 100644 --- a/Shared/data_request.js +++ b/Shared/data_request.js @@ -6,10 +6,12 @@ let request = require("sync-request"); exports.LoadServerData = function(dataType, usersID = "") { let response = request("GET", `${process.env.SERVER_ADDRESS}/getData.php?pk=${process.env.SERVER_PASS_KEY}&dataType=${dataType}&userid=${usersID}`); +// console.log(response.getBody()); return response.getBody(); } exports.SendServerData = function(dataType, usersID = "", dataToSend="", dataToSend2 = ""){ let response = request("GET", `${process.env.SERVER_ADDRESS}/sendData.php?pk=${process.env.SERVER_PASS_KEY}&dataType=${dataType}&userid=${usersID}&dataToSend=${dataToSend}&dataToSend2=${dataToSend2}`); +// console.log(response.getBody()); return response.getBody(); } diff --git a/package.json b/package.json deleted file mode 100644 index 989b4df..0000000 --- a/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "Sanctuary", - "version": "1.0.0", - "description": "A text-based massively multiplayer game about the survival of the fittest.", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "Tim", - "license": "ISC", - "dependencies": { - "discord.io": "github:woor/discord.io#gateway_v6", - "dotenv": "^6.0.0", - "node-cron": "^1.2.1", - "sync-request": "^6.0.0" - } -}