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

A few bugfixes

Browse Source
This commit is contained in:
Kayne Ruse
2018-10-29 18:21:06 +11:00
parent a3886fc863
commit 02a52f0b07
4 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ADAM/adam.js
View File

@@ -63,7 +63,7 @@ client.on('ready', async () => {
//ADAM updates stamina (1) and health by 1% every 2 min.
cron.schedule('*/2 * * * *', () => { //TODO: move this to Mori
console.log('Updating STAMINA every 2 min.');
//s console.log('Updating STAMINA every 2 min.');
shared.SendServerData("updateStamina");
});
});

18
ADAM/core.js
View File

@@ -64,7 +64,7 @@ exports.ProcessFactionChangeAttempt = function(client, message, factionRole, dia
shared.ChangeFaction(client, factionRole, message.channel, message.member, handleResponse);
}
//ProcessStatsCommand
//ProcessCheckinCommand
//client - discord.js client
//member - discord.js member
//channel - discord.js channel
@@ -82,7 +82,7 @@ exports.ProcessCheckinCommand = function(client, member, channel, dialog) {
dataRequest.OnServerData("checkin", handleResponse, member.user.id); //ID of the person who checked in TODO: username too
}
//ProcessStatsCommand
//ProcessGiveCommand
//client - discord.js client
//message - discord.js message
//args - arguments to the give command
@@ -144,9 +144,11 @@ exports.ProcessGiveCommand = function(client, message, args, dialog) {
//channel - discord.js channel
//dialog - dialog function
exports.ProcessStatsCommand = function(client, member, channel, dialog) {
exports.HandleLevelUp(client, member, channel, dialog);
exports.GetStats(member.user, (stats) => {
exports.PrintStats(client, member, channel, stats);
exports.HandleLevelUp(client, member, channel, dialog, () => {
//BUGFIX: this code is in a next function to resolve the stats display bug
exports.GetStats(member.user, (stats) => {
exports.PrintStats(client, member, channel, stats);
});
});
}
@@ -208,7 +210,7 @@ exports.PrintStats = function(client, member, channel, stats) {
//member - discord.js member
//channel - discord.js channel
//dialog - dialog function
exports.HandleLevelUp = function(client, member, channel, dialog) {
exports.HandleLevelUp = function(client, member, channel, dialog, next) {
//handle member strings
if (typeof(member) === "string") { //TODO: fold these into their own functions EVERYWHERE.
//get the member
@@ -226,11 +228,13 @@ exports.HandleLevelUp = function(client, member, channel, dialog) {
//handle levelling up
if (response === "levelUp" || response === "RankUp") {
if (level >= process.env.RANK_3_THRESHOLD) {
shared.SendPublicMessage(client, member.user, channel, dialog("levelUpCap", dialog("levelUpCapRemark"), level));
shared.SendPublicMessage(client, member.user, channel, dialog("levelUpCap", dialog("levelUpCapRemark"), process.env.RANK_3_THRESHOLD));
} else {
shared.SendPublicMessage(client, member.user, channel, dialog("LevelUp", dialog("levelUpRemark"), level, upgradePoints));
}
}
if (next) next(); //BUGFIX
}
shared.LevelUp(client, member, handleResponse);