tgpholly/Binato
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity Actions

add ranking mode switching

Browse source
This commit is contained in:
Holly Stubbs 2021-09-03 23:47:46 +01:00
parent 1dc1742fa0
commit 17f9605e8f
3 changed files with 157 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
server/BotCommandHandler.js
View file

@ -15,14 +15,21 @@ module.exports = function(User, Message, Stream, IsCalledFromMultiplayer = false
case "!help":
// This is terrible
if (args.length == 1) {
responseMessage = "Commands:" +
responseMessage = "Commands with an * next to them have a sub help section" +
"\n!help - Shows this message" +
"\n!roll - Rolls a random number or a number between 0 and a given number" +
"\n - Submenus:" +
"\n mp - Shows information about all multiplayer commands" +
"\n admin - Shows information about all admin commands";
"\n!ranking* - Sets your perfered ranking type" +
"\n!mp* - Shows information about all multiplayer commands" +
"\n!admin* - Shows information about all admin commands";
} else {
switch (args[1]) {
case "ranking":
responseMessage = "Ranking Commands:" +
"\n!ranking pp - Sets your ranking type to pp" +
"\n!ranking score - Sets your ranking type to score" +
"\n!ranking acc - Sets your ranking type to accuracy";
break;
case "mp":
responseMessage = "Multiplayer Commands:" +
"\n!mp start - Starts a multiplayer match with a delay" +
@ -41,6 +48,32 @@ module.exports = function(User, Message, Stream, IsCalledFromMultiplayer = false
}
break;
case "!ranking":
if (args.length == 1) {
} else {
switch (args[1]) {
case "pp":
responseMessage = "Set ranking mode to pp";
User.rankingMode = 0;
User.getNewUserInformationFromDatabase();
break;
case "score":
responseMessage = "Set ranking mode to score";
User.rankingMode = 1;
User.getNewUserInformationFromDatabase();
break;
case "acc":
responseMessage = "Set ranking mode to accuracy";
User.rankingMode = 2;
User.getNewUserInformationFromDatabase();
break;
}
}
break;
case "!roll":
if (args.length == 1) {
responseMessage = User.username + " rolled " + maths.randInt(0, 65535);

2
server/Packets/StatusUpdate.js
View file

@ -25,7 +25,7 @@ module.exports = function(currentUser, id = 0, sendImmidiate = true) {
playCount: User.playCount,
totalScore: User.totalScore,
rank: User.rank,
performance: User.pp
performance: (currentUser.rankingMode == 0 ? User.pp : 0)
};
osuPacketWriter.HandleOsuUpdate(UserStatusObject);

52
server/User.js
View file

@ -8,6 +8,9 @@ module.exports = class {
this.connectTime = connectTime;
this.queue = new Buffer.alloc(0);
// Binato specific
this.rankingMode = 0;
this.playMode = 0;
this.countryID = 0;
this.spectators = [];
@ -55,16 +58,49 @@ module.exports = class {
}
// Gets the user's score information from the database and caches it
async getNewUserInformationFromDatabase() {
async getNewUserInformationFromDatabase(forceUpdate = false) {
const userScoreDB = await global.DatabaseHelper.query(`SELECT * FROM users_modes_info WHERE user_id = ${this.id} AND mode_id = ${this.playMode} LIMIT 1`);
const userRankDB = await global.DatabaseHelper.query(`SELECT user_id, pp_raw FROM users_modes_info WHERE mode_id = ${this.playMode} ORDER BY pp_raw DESC`);
let userRankDB = null;
switch (this.rankingMode) {
case 0:
userRankDB = await global.DatabaseHelper.query(`SELECT user_id, pp_raw FROM users_modes_info WHERE mode_id = ${this.playMode} ORDER BY pp_raw DESC`);
break;
case 1:
userRankDB = await global.DatabaseHelper.query(`SELECT user_id, ranked_score FROM users_modes_info WHERE mode_id = ${this.playMode} ORDER BY ranked_score DESC`);
break;
case 2:
userRankDB = await global.DatabaseHelper.query(`SELECT user_id, avg_accuracy FROM users_modes_info WHERE mode_id = ${this.playMode} ORDER BY avg_accuracy DESC`);
break;
}
if (userScoreDB == null || userRankDB == null) throw "fuck";
let userScoreUpdate = false;
if (forceUpdate) {
userScoreUpdate = true;
} else {
switch (this.rankingMode) {
case 0:
if (this.pp != userScoreDB.pp_raw) {
userScoreUpdate = true;
}
break;
case 1:
if (this.rankedScore != userScoreDB.ranked_score) {
userScoreUpdate = true;
}
break;
case 2:
if (this.accuracy != userScoreDB.avg_accuracy) {
userScoreUpdate = true;
}
break;
}
}
this.rankedScore = userScoreDB.ranked_score;
this.totalScore = userScoreDB.total_score;
@ -73,7 +109,19 @@ module.exports = class {
for (let i = 0; i < userRankDB.length; i++) {
if (userRankDB[i]["user_id"] == this.id) this.rank = i + 1;
}
switch (this.rankingMode) {
case 0:
this.pp = userScoreDB.pp_raw;
break;
case 1:
this.pp = 0;
break;
case 2:
this.pp = 0;
break;
}
if (userScoreUpdate) {
StatusUpdate(this, this.id);