Ratstail91/SANCTUM
1
0
Fork 0
mirror of https://github.com/Ratstail91/SANCTUM.git synced 2025-11-29 02:24:27 +11:00
Code Issues Packages Projects Releases Wiki Activity

Testing and bugfixing

Browse Source
This commit is contained in:
Kayne Ruse
2018-10-26 23:18:58 +11:00
parent 165d7526a3
commit 915a07dd62
7 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ADAM/adam.js
View File

@@ -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);
}

21
ADAM/core.js
View File

@@ -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);