feature/combat rating system

commands/leaderboard.js

@@ -30,6 +30,9 @@ module.exports = {
       { name: "Longest Kill", value: "longestKill" },
       { name: "KDR", value: "KDR" },
       { name: "Server Connections", value: "connections" },
+      { name: "Shots Landed", value: "shotsLanded" },
+      { name: "Times Shot", value: "timesShot" },
+      { name: "Combat Rating", value: "combatRating" },
     ]
   }, {
     name: "limit",
@@ -81,7 +84,10 @@ module.exports = {
         category == 'totalSessionTime' ? "Total Time Played" : 
         category == 'longestSessionTime' ? "Longest Game Session" : 
         category == 'KDR' ? "Kill Death Ratio" : 
-        category == 'connections' ? "Times Connected" : 'N/A Error';
+        category == 'connections' ? "Times Connected" : 
+        category == 'shotsLanded' ? "Shots Landed" :
+        category == 'timesShot' ? "Times Shot" :
+        category == 'combatRating' ? "Combat Rating" : 'N/A Error';
 
       leaderboardEmbed.setTitle(`**${title} - DayZ Reforger**`);
 
@@ -100,16 +106,17 @@ module.exports = {
                     category == 'totalSessionTime' ? `**Total:** ${client.secondsToDhms(leaderboard[i].totalSessionTime)}\n> **Last Session:** ${client.secondsToDhms(leaderboard[i].lastSessionTime)}` : 
                     category == 'longestSessionTime' ? `**Longest Game Session:** ${client.secondsToDhms(leaderboard[i].longestSessionTime)}` : 
                     category == 'KDR' ? `**KDR: ${leaderboard[i].KDR.toFixed(2)}**` : 
-                    category == 'connection' ? `**Connections: ${leaderboard[i].connections}**` : 'N/A Error';
+                    category == 'connection' ? `**Connections: ${leaderboard[i].connections}**` : 
+                    category == 'combatRating' ? `**Combat Rating:** ${leaderboard[i].combatRating}` : 'N/A Error';
 
         if (category == 'money') des += `**${i+1}.** <@${leaderboard[i].user.userID}> - **${stats}**\n`
-        else if (category == 'totalSessionTime' || category == 'longestSessionTime') {
+        else if (category == 'totalSessionTime' || category == 'longestSessionTime' || category == 'combatRating') {
           tag = leaderboard[i].discordID != "" ? `<@${leaderboard[i].discordID}>` : leaderboard[i].gamertag;
           des += `**${i+1}.** ${tag}\n> ${stats}\n\n`;
         } else leaderboardEmbed.addFields({ name: `**${i+1}. ${leaderboard[i].gamertag}**`, value: `**${stats}**`, inline: true });
       }
 
-      if (['money', 'totalSessionTime', 'longestSessionTime'].includes(category)) leaderboardEmbed.setDescription(des);
+      if (['money', 'totalSessionTime', 'longestSessionTime', 'combatRating'].includes(category)) leaderboardEmbed.setDescription(des);
       
       return interaction.send({ embeds: [leaderboardEmbed] });
     },

commands/player-stats.js

@@ -106,7 +106,8 @@ module.exports = {
         category == 'KDR' ? "Kill Death Ratio" :
         category == 'connections' ? "Times Connected" : 
         category == 'shotsLanded' ? "Shots Landed" :
-        category == 'timesShot' ? "Times Shot" : 'N/A Error';
+        category == 'timesShot' ? "Times Shot" :
+        category == 'combatRating' ? "Combat Rating" : 'N/A Error';
 
       let statsEmbed = new EmbedBuilder()
         .setColor(client.config.Colors.Default);
@@ -126,7 +127,8 @@ module.exports = {
                   category == 'longestKill' ? `${query.longestKill}m` : 
                   category == 'money' ? `$${(query.user.guilds[GuildDB.serverID].balance).toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2})}` :  
                   category == 'KDR' ? `${query.KDR.toFixed(2)} KDR` : 
-                  category == 'connections' ? `${query.connections} connections` : 'N/A Error';
+                  category == 'connections' ? `${query.connections} connections` : 
+                  category == 'combatRating' ? `${query.combatRating}` : 'N/A Error';
 
       statsEmbed.addFields({ name: 'Leaderboard Position', value: `# ${leaderboardPos}`, inline: true });
       
@@ -200,6 +202,32 @@ module.exports = {
         
         statsEmbed.setImage(chartURL);
     
+      } else if (category == 'combatRating') {
+
+        statsEmbed.addFields({ name: 'Combat Rating', value: `${query.combatRating}`, inline: true });
+
+        const chart = {
+          type: 'bar',
+          data: {
+            labels: new Array(query.combatRatingHistory),
+            datasets: [
+              {
+                type: 'line',
+                label: 'Combat Rating over time',
+                borderColor: 'rgb(54, 162, 235)',
+                borderWidth: 2,
+                fill: false,
+                data: query.combatRatingHistory,
+              },
+            ],
+          },
+        }
+      
+        const encodedChart = encodeURIComponent(JSON.stringify(chart));
+        const chartURL = `https://quickchart.io/chart?c=${encodedChart}`;
+        
+        statsEmbed.setImage(chartURL);
+
       } else statsEmbed.addFields({ name: title, value: stats, inline: true });
  
       return interaction.send({ embeds: [statsEmbed] });