From 87d14c5d29e2396a817062abd2b78f647e8c52db Mon Sep 17 00:00:00 2001 From: Braeden Sowinski Date: Tue, 7 Nov 2023 19:03:48 -0800 Subject: [PATCH] change/combat rating history limit + default max min combat rating --- commands/player-stats.js | 4 ++-- package.json | 2 +- util/KillfeedHandler.js | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commands/player-stats.js b/commands/player-stats.js index 9dfcc5a..cc0525a 100644 --- a/commands/player-stats.js +++ b/commands/player-stats.js @@ -231,8 +231,8 @@ module.exports = { let data = query.combatRatingHistory; - if (!client.exists(query.highestCombatRating)) query.highestCombatRating = query.combatRating; - if (!client.exists(query.lowestCombatRating)) query.lowestCombatRating = query.combatRating; + if (!client.exists(query.highestCombatRating)) query.highestCombatRating = Math.max(...query.combatRatingHistory); + if (!client.exists(query.lowestCombatRating)) query.lowestCombatRating = Math.min(...query.combatRatingHistory); statsEmbed.addFields( { name: 'Combat Rating', value: `${query.combatRating}`, inline: true }, diff --git a/package.json b/package.json index 8a65776..6a1ba5e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dayzr-bot", - "version": "12.3.9", + "version": "12.3.10", "description": "A General Purpose Discord Bot for DayZ Nitrado Servers.", "main": "index.js", "nodemonConfig": { diff --git a/util/KillfeedHandler.js b/util/KillfeedHandler.js index b2d4100..9c1e6d1 100644 --- a/util/KillfeedHandler.js +++ b/util/KillfeedHandler.js @@ -187,16 +187,16 @@ module.exports = { if (!client.exists(victimStat.combatRating)) victimStat.combatRating = 800; if (!client.exists(killerStat.combatRatingHistory)) killerStat.combatRatingHistory = [800]; if (!client.exists(victimStat.combatRatingHistory)) victimStat.combatRatingHistory = [800]; - if (!client.exists(killerStat.highestCombatRating)) killerStat.highestCombatRating = killerStat.combatRating; - if (!client.exists(victimStat.lowestCombatRating)) victimStat.lowestCombatRating = victimStat.combatRating; + if (!client.exists(killerStat.highestCombatRating)) killerStat.highestCombatRating = Math.max(...killerStat.combatRatingHistory); + if (!client.exists(victimStat.lowestCombatRating)) victimStat.lowestCombatRating = Math.min(...victimStat.combatRatingHistory); let killerOldRating = killerStat.combatRating; let victimOldRating = victimStat.combatRating; killerStat.combatRating = calculateNewCombatRating(killerStat.combatRating, victimStat.combatRating, client.exists(info.bodyPart) && info.bodyPart.includes('Head') ? 1.25 : 1); victimStat.combatRating = calculateNewCombatRating(victimStat.combatRating, killerStat.combatRating, 0); if (killerStat.combatRating > killerStat.highestCombatRating) killerStat.highestCombatRating = killerStat.combatRating; if (victimStat.combatRating < victimStat.lowestCombatRating) killerStat.lowestCombatRating = victimStat.combatRating; - if (killerStat.combatRatingHistory.length == 15) killerStat.combatRatingHistory = killerStat.combatRatingHistory.slice(1); // Remove first element (limits history to length 15) - if (victimStat.combatRatingHistory.length == 15) victimStat.combatRatingHistory = victimStat.combatRatingHistory.slice(1); // Remove first element (limits history to length 15) + if (killerStat.combatRatingHistory.length > 12) killerStat.combatRatingHistory = killerStat.combatRatingHistory.slice(1); // Remove first element (limits history to length 12) + if (victimStat.combatRatingHistory.length > 12) victimStat.combatRatingHistory = victimStat.combatRatingHistory.slice(1); // Remove first element (limits history to length 12) killerStat.combatRatingHistory.push(killerStat.combatRating); victimStat.combatRatingHistory.push(victimStat.combatRating); let kdiff = killerStat.combatRating - killerOldRating;