hypixel-api-reborn 8.3.0 → 10.0.0

package/src/structures/MiniGames/Duels.js

@@ -1,39 +1,41 @@
 /* eslint-disable max-len */
 const divide = require('../../utils/divide');
+const romanize = require('../../utils/romanize');
+// eslint-disable-next-line camelcase
+const { duels_divisions } = require('../../utils/Constants');
+
 /**
- * @param {string} string
- * @return {string}
+ * @param {object<string,any>} data
+ * @param {string|null} mode
+ * @returns {string|undefined}
  */
-function capitalize (string) {
-  return string.charAt(0).toUpperCase() + string.slice(1);
+function getDivision (data, mode) {
+  for (const div of duels_divisions.slice().reverse()) {
+    const prestige = data[`${mode ? mode : 'all_modes'}_${div.key}_title_prestige`];
+    if (prestige !== undefined) {
+      return `${div.name} ${romanize(prestige)}`;
+    }
+  }
+  return null;
 }
-const numerals = {
-  1: 'I',
-  2: 'II',
-  3: 'III',
-  4: 'IV',
-  5: 'V',
-  6: 'VI',
-  7: 'VII',
-  8: 'VIII',
-  9: 'IX',
-  10: 'X'
-};
 /**
- * @param {object} data
- * @return {string|null}
+ * @param {object<string,any>} data
+ * @return {{kills:number,deaths:number}}
  */
-function cosmeticTitlePrestige (data) {
-  if (data.active_cosmetictitle === 'custom') {
-    if (!data.equipped_custom_titles) return null;
-    return `${data.equipped_custom_titles.replace(/§[0-9a-fl]{1}/g, '')}`;
-  }
-  if (data.active_cosmetictitle) {
-    const prestige = data[`${data.active_cosmetictitle.split('_').reverse().join('_')}_title_prestige`] || 1;
-    return `${capitalize(data.active_cosmetictitle.split('_')[1])} ${capitalize(data.active_cosmetictitle.split('_')[0])} ${numerals[prestige]}`;
-  } else {
-    return null;
+function getTotalKillsDeaths (data) {
+  let totalDeaths = 0;
+  let totalKills = 0;
+  for (const [k, v] of Object.entries(data)) {
+    if (k.includes('deaths') && k !== 'deaths') {
+      totalDeaths += v;
+    } else if (k.includes('kills') && k !== 'kills') {
+      totalKills += v;
+    }
   }
+  return {
+    kills: totalKills,
+    deaths: totalDeaths
+  };
 }
 /**
  * Duels class
@@ -49,20 +51,20 @@ class Duels {
      */
     this.coins = data.coins || 0;
     /**
-     * Cosmetic title
+     * All modes division
      * @type {string|null}
      */
-    this.title = cosmeticTitlePrestige(data);
+    this.division = getDivision(data);
     /**
      * Kills
      * @type {number}
      */
-    this.kills = data.kills || 0;
+    this.kills = getTotalKillsDeaths(data).kills;
     /**
      * Deaths
      * @type {number}
      */
-    this.deaths = data.deaths || 0;
+    this.deaths = getTotalKillsDeaths(data).deaths;
     /**
      * Kill Death ratio
      * @type {number}
@@ -88,13 +90,25 @@ class Duels {
      * @type {number}
      */
     this.playedGames = data.games_played_duels || 0;
+    /**
+     * Current winstreak
+     * @type {number}
+     */
+    this.winstreak = data.current_winstreak || 0;
+    /**
+     * Best overall winstreak
+     * @type {number}
+     */
+    this.bestWinstreak = data.best_overall_winstreak || 0;
     /**
      * UHC duels stats
      * @type {DuelsUHC}
      */
     this.uhc = {
       'overall': {
-        winstreak: (data.current_winstreak_mode_uhc_duel || 0) + (data.current_winstreak_mode_uhc_doubles || 0) + (data.current_winstreak_mode_uhc_four || 0) + (data.current_winstreak_mode_uhc_meetup || 0),
+        division: getDivision(data, 'uhc'),
+        winstreak: data.current_uhc_winstreak || 0,
+        bestWinstreak: data.best_uhc_winstreak || 0,
         kills: (data.uhc_duel_kills || 0) + (data.uhc_doubles_kills || 0) + (data.uhc_four_kills || 0) + (data.uhc_meetup_kills || 0),
         deaths: (data.uhc_duel_deaths || 0) + (data.uhc_doubles_deaths || 0) + (data.uhc_four_deaths || 0) + (data.uhc_meetup_deaths || 0),
         KDRatio: divide((data.uhc_duel_kills || 0) + (data.uhc_doubles_kills || 0) + (data.uhc_four_kills || 0) + (data.uhc_meetup_kills || 0), (data.uhc_duel_deaths || 0) + (data.uhc_doubles_deaths || 0) + (data.uhc_four_deaths || 0) + (data.uhc_meetup_deaths || 0)),
@@ -104,7 +118,9 @@ class Duels {
         playedGames: (data.uhc_duel_rounds_played || 0) + (data.uhc_doubles_rounds_played || 0) + (data.uhc_four_rounds_played || 0) + (data.uhc_meetup_rounds_played || 0)
       },
       '1v1': {
+        division: getDivision(data, 'uhc'),
         winstreak: data.current_winstreak_mode_uhc_duel || 0,
+        bestWinstreak: data.best_winstreak_mode_uhc_duel || 0,
         kills: data.uhc_duel_kills || 0,
         deaths: data.uhc_duel_deaths || 0,
         KDRatio: divide(data.uhc_duel_kills, data.uhc_duel_deaths),
@@ -114,7 +130,9 @@ class Duels {
         playedGames: data.uhc_duel_rounds_played || 0
       },
       '2v2': {
+        division: getDivision(data, 'uhc'),
         winstreak: data.current_winstreak_mode_uhc_doubles || 0,
+        bestWinstreak: data.best_winstreak_mode_uhc_doubles || 0,
         kills: data.uhc_doubles_kills || 0,
         deaths: data.uhc_doubles_deaths || 0,
         KDRatio: divide(data.uhc_doubles_kills, data.uhc_doubles_deaths),
@@ -124,7 +142,9 @@ class Duels {
         playedGames: data.uhc_doubles_rounds_played || 0
       },
       '4v4': {
+        division: getDivision(data, 'uhc'),
         winstreak: data.current_winstreak_mode_uhc_four || 0,
+        bestWinstreak: data.best_winstreak_mode_uhc_four || 0,
         kills: data.uhc_four_kills || 0,
         deaths: data.uhc_four_deaths || 0,
         KDRatio: divide(data.uhc_four_kills, data.uhc_four_deaths),
@@ -134,7 +154,9 @@ class Duels {
         playedGames: data.uhc_four_rounds_played || 0
       },
       'meetup': {
+        division: getDivision(data, 'uhc'),
         winstreak: data.current_winstreak_mode_uhc_meetup || 0,
+        bestWinstreak: data.best_winstreak_mode_uhc_meetup || 0,
         kills: data.uhc_meetup_kills || 0,
         deaths: data.uhc_meetup_deaths || 0,
         KDRatio: divide(data.uhc_meetup_kills, data.uhc_meetup_deaths),
@@ -144,8 +166,64 @@ class Duels {
         playedGames: data.uhc_meetup_rounds_played || 0
       }
     };
+    /**
+     * @type {DuelsParkour}
+     */
+    this.parkour = {
+      division: getDivision(data, 'parkour'),
+      deaths: data.parkour_eight_deaths || 0,
+      wins: data.parkour_eight_wins || 0,
+      losses: data.parkour_eight_losses || 0,
+      WLRatio: divide(data.parkour_eight_wins, data.parkour_eight_losses),
+      playedGames: data.parkour_eight_rounds_played || 0
+    };
+    /**
+     * @type {DuelsBoxing}
+     */
+    this.boxing = {
+      division: getDivision(data, 'boxing'),
+      kills: data.boxing_duel_kills || 0,
+      wins: data.boxing_duel_wins || 0,
+      losses: data.boxing_duel_losses || 0,
+      WLRatio: divide(data.boxing_duel_wins, data.boxing_duel_losses),
+      playedGames: data.boxing_duel_rounds_played || 0,
+      meleeSwings: data.boxing_duel_melee_swings || 0,
+      meleeHits: data.boxing_duel_melee_hits || 0
+    };
+    /**
+     * @type {DuelsBowspleef}
+     */
+    this.bowspleef = {
+      division: getDivision(data, 'tnt_games'),
+      winstreak: data.current_tnt_games_winstreak || 0,
+      bestWinstreak: data.best_tnt_games_winstreak || 0,
+      bowShots: data.bowspleef_duel_bow_shots || 0,
+      deaths: data.bowspleef_duel_deaths || 0,
+      wins: data.bowspleef_duel_wins || 0,
+      losses: data.bowspleef_duel_losses || 0,
+      WLRatio: divide((data.bowspleef_duel_wins || 0), (data.bowspleef_duel_losses || 0)),
+      playedGames: data.bowspleef_duel_rounds_played || 0
+    };
+    /**
+     * @type {DuelsArena}
+     */
+    this.arena = {
+      kills: data.duel_arena_kills || 0,
+      deaths: data.duel_arena_deaths || 0,
+      KDRatio: divide(data.duel_arena_kills, data.duel_arena_deaths),
+      wins: data.duel_arena_wins || 0,
+      losses: data.duel_arena_losses || 0,
+      WLRatio: divide(data.duel_arena_wins, data.duel_arena_losses),
+      playedGames: data.duel_arena_rounds_played || 0
+    };
+    /**
+     * MegaWalls duels stats
+     * @type {DuelsModeStats}
+     */
     this.megawalls = {
+      division: getDivision(data, 'mega_walls'),
       winstreak: data.current_winstreak_mode_mw_duel || 0,
+      bestWinstreak: data.best_winstreak_mode_mw_duel || 0,
       kills: data.mw_duel_kills || 0,
       deaths: data.mw_duel_deaths || 0,
       KDRatio: divide(data.mw_duel_kills, data.mw_duel_deaths),
@@ -160,7 +238,9 @@ class Duels {
      */
     this.op = {
       'overall': {
-        winstreak: (data.current_winstreak_mode_op_duel || 0) + (data.current_winstreak_mode_op_doubles || 0),
+        division: getDivision(data, 'op'),
+        winstreak: data.current_op_winstreak || 0,
+        bestWinstreak: data.best_op_winstreak || 0,
         kills: (data.op_duel_kills || 0) + (data.op_doubles_kills || 0),
         deaths: (data.op_duel_deaths || 0) + (data.op_doubles_deaths || 0),
         KDRatio: divide((data.op_duel_kills || 0) + (data.op_doubles_kills || 0), (data.op_duel_deaths || 0) + (data.op_doubles_deaths || 0)),
@@ -170,7 +250,9 @@ class Duels {
         playedGames: (data.op_duel_rounds_played || 0) + (data.op_doubles_rounds_played || 0)
       },
       '1v1': {
+        division: getDivision(data, 'op'),
         winstreak: data.current_winstreak_mode_op_duel || 0,
+        bestWinstreak: data.best_winstreak_mode_op_duel || 0,
         kills: data.op_duel_kills || 0,
         deaths: data.op_duel_deaths || 0,
         KDRatio: divide(data.op_duel_kills, data.op_duel_deaths),
@@ -180,7 +262,9 @@ class Duels {
         playedGames: data.op_duel_rounds_played || 0
       },
       '2v2': {
+        division: getDivision(data, 'op'),
         winstreak: data.current_winstreak_mode_op_doubles || 0,
+        bestWinstreak: data.best_winstreak_mode_op_doubles || 0,
         kills: data.op_doubles_kills || 0,
         deaths: data.op_doubles_deaths || 0,
         KDRatio: divide(data.op_doubles_kills, data.op_doubles_deaths),
@@ -196,17 +280,21 @@ class Duels {
      */
     this.skywars = {
       'overall': {
-        winstreak: (data.current_winstreak_mode_sw_duel || 0) + (data.current_winstreak_mode_sw_doubles || 0),
-        kills: (data.sw_duel_kills || 0) + (data.sw_doubles_kills || 0),
-        deaths: (data.sw_duel_deaths || 0) + (data.sw_doubles_deaths || 0),
+        division: getDivision(data, 'skywars'),
+        winstreak: data.current_skywars_winstreak || 0,
+        bestWinstreak: data.best_skywars_winstreak || 0,
+        kills: ((data.sw_duel_kills || 0) + (data.sw_doubles_kills || 0)),
+        deaths: ((data.sw_duel_deaths || 0) + (data.sw_doubles_deaths || 0)),
         KDRatio: divide((data.sw_duel_kills || 0) + (data.sw_doubles_kills || 0), (data.sw_duel_deaths || 0) + (data.sw_doubles_deaths || 0)),
-        wins: (data.sw_duel_wins || 0) + (data.sw_doubles_wins || 0),
-        losses: (data.sw_duel_losses || 0) + (data.sw_doubles_losses || 0),
+        wins: ((data.sw_duel_wins || 0) + (data.sw_doubles_wins || 0)),
+        losses: ((data.sw_duel_losses || 0) + (data.sw_doubles_losses || 0)),
         WLRatio: divide((data.sw_duel_wins || 0) + (data.sw_doubles_wins || 0), (data.sw_duel_losses || 0) + (data.sw_doubles_losses || 0)),
         playedGames: (data.sw_duel_rounds_played || 0) + (data.sw_doubles_rounds_played || 0)
       },
       '1v1': {
+        division: getDivision(data, 'skywars'),
         winstreak: data.current_winstreak_mode_sw_duel || 0,
+        bestWinstreak: data.best_winstreak_mode_sw_duel || 0,
         kills: data.sw_duel_kills || 0,
         deaths: data.sw_duel_deaths || 0,
         KDRatio: divide(data.sw_duel_kills, data.sw_duel_deaths),
@@ -216,7 +304,9 @@ class Duels {
         playedGames: data.sw_duel_rounds_played || 0
       },
       '2v2': {
+        division: getDivision(data, 'skywars'),
         winstreak: data.current_winstreak_mode_sw_doubles || 0,
+        bestWinstreak: data.best_winstreak_mode_sw_doubles || 0,
         kills: data.sw_doubles_kills || 0,
         deaths: data.sw_doubles_deaths || 0,
         KDRatio: divide(data.sw_doubles_kills, data.sw_doubles_deaths),
@@ -231,7 +321,9 @@ class Duels {
      * @type {DuelsModeStats}
      */
     this.sumo = {
+      division: getDivision(data, 'sumo'),
       winstreak: data.current_winstreak_mode_sumo_duel || 0,
+      bestWinstreak: data.best_winstreak_mode_sumo_duel || 0,
       kills: data.sumo_duel_kills || 0,
       deaths: data.sumo_duel_deaths || 0,
       KDRatio: divide(data.sumo_duel_kills, data.sumo_duel_deaths),
@@ -245,7 +337,9 @@ class Duels {
      * @type {DuelsModeStats}
      */
     this.classic = {
+      division: getDivision(data, 'classic'),
       winstreak: data.current_winstreak_mode_classic_duel || 0,
+      bestWinstreak: data.best_winstreak_mode_classic_duel || 0,
       kills: data.classic_duel_kills || 0,
       deaths: data.classic_duel_deaths || 0,
       KDRatio: divide(data.classic_duel_kills, data.classic_duel_deaths),
@@ -259,7 +353,9 @@ class Duels {
      * @type {DuelsModeStats}
      */
     this.combo = {
+      division: getDivision(data, 'combo'),
       winstreak: data.current_winstreak_mode_combo_duel || 0,
+      bestWinstreak: data.best_winstreak_mode_combo_duel || 0,
       kills: data.combo_duel_kills || 0,
       deaths: data.combo_duel_deaths || 0,
       KDRatio: divide(data.combo_duel_kills, data.combo_duel_deaths),
@@ -274,44 +370,100 @@ class Duels {
      */
     this.bridge = {
       'overall': {
-        winstreak: (data.current_winstreak_mode_bridge_duel || 0) + (data.current_winstreak_mode_bridge_doubles || 0) + (data.current_winstreak_mode_bridge_four || 0),
-        kills: ((data.bridge_duel_kills || data.bridge_duel_bridge_kills) || 0) + ((data.bridge_doubles_kills || data.bridge_doubles_bridge_kills) || 0) + ((data.bridge_four_kills || data.bridge_four_bridge_kills) || 0),
-        deaths: ((data.bridge_duel_deaths || data.bridge_duel_bridge_deaths) || 0) + ((data.bridge_doubles_deaths || data.bridge_doubles_bridge_deaths) || 0) + ((data.bridge_four_deaths || data.bridge_four_bridge_deaths) || 0),
-        KDRatio: divide(((data.bridge_duel_kills || data.bridge_duel_bridge_kills) || 0) + ((data.bridge_doubles_kills || data.bridge_doubles_bridge_kills) || 0) + ((data.bridge_four_kills || data.bridge_four_bridge_kills) || 0), ((data.bridge_duel_deaths || data.bridge_duel_bridge_deaths) || 0) + ((data.bridge_doubles_deaths || data.bridge_doubles_bridge_deaths) || 0) + ((data.bridge_four_deaths || data.bridge_four_bridge_deaths) || 0)),
-        wins: (data.bridge_duel_wins || 0) + (data.bridge_doubles_wins || 0) + (data.bridge_four_wins || 0),
-        losses: (data.bridge_duel_losses || 0) + (data.bridge_doubles_losses || 0) + (data.bridge_four_losses || 0),
-        WLRatio: divide((data.bridge_duel_wins || 0) + (data.bridge_doubles_wins || 0) + (data.bridge_four_wins || 0), (data.bridge_duel_losses || 0) + (data.bridge_doubles_losses || 0) + (data.bridge_four_losses || 0)),
-        playedGames: (data.bridge_duel_rounds_played || 0) + (data.bridge_doubles_rounds_played || 0) + (data.bridge_four_rounds_played || 0)
+        division: getDivision(data, 'bridge'),
+        winstreak: data.current_bridge_winstreak || 0,
+        bestWinstreak: data.best_bridge_winstreak || 0,
+        kills: ((data.bridge_duel_bridge_kills || 0) + (data.bridge_doubles_bridge_kills || 0) + (data.bridge_2v2v2v2_bridge_kills || 0) + (data.bridge_3v3v3v3_bridge_kills || 0) + (data.bridge_four_bridge_kills || 0) + (data.bridge_threes_bridge_kills || 0) + (data.capture_threes_bridge_kills || 0)),
+        deaths: ((data.bridge_duel_bridge_deaths || 0) + (data.bridge_doubles_bridge_deaths || 0) + (data.bridge_2v2v2v2_bridge_deaths || 0) + (data.bridge_3v3v3v3_bridge_deaths || 0) + (data.bridge_four_bridge_deaths || 0) + (data.bridge_threes_bridge_deaths || 0) + (data.capture_threes_bridge_deaths || 0)),
+        KDRatio: divide(((data.bridge_duel_bridge_kills || 0) + (data.bridge_doubles_bridge_kills || 0) + (data.bridge_2v2v2v2_bridge_kills || 0) + (data.bridge_3v3v3v3_bridge_kills || 0) + (data.bridge_four_bridge_kills || 0) + (data.bridge_threes_bridge_kills || 0) + (data.capture_threes_bridge_kills || 0)), ((data.bridge_duel_bridge_deaths || 0) + (data.bridge_doubles_bridge_deaths || 0) + (data.bridge_2v2v2v2_bridge_deaths || 0) + (data.bridge_3v3v3v3_bridge_deaths || 0) + (data.bridge_four_bridge_deaths || 0) + (data.bridge_threes_bridge_deaths || 0) + (data.capture_threes_bridge_deaths || 0))),
+        wins: ((data.bridge_duel_wins || 0) + (data.bridge_doubles_wins || 0) + (data.bridge_2v2v2v2_wins || 0) + (data.bridge_3v3v3v3_wins || 0) + (data.bridge_four_wins || 0) + (data.bridge_threes_bridge_wins || 0) + (data.capture_threes_wins || 0)),
+        losses: ((data.bridge_duel_losses || 0) + (data.bridge_doubles_losses || 0) + (data.bridge_2v2v2v2_losses || 0) + (data.bridge_3v3v3v3_losses || 0) + (data.bridge_four_losses || 0) + (data.bridge_threes_bridge_losses || 0) + (data.capture_threes_bridge_losses || 0)),
+        WLRatio: divide(((data.bridge_duel_wins || 0) + (data.bridge_doubles_wins || 0) + (data.bridge_2v2v2v2_wins || 0) + (data.bridge_3v3v3v3_wins || 0) + (data.bridge_four_wins || 0) + (data.bridge_threes_bridge_wins || 0) + (data.capture_threes_wins || 0)), ((data.bridge_duel_losses || 0) + (data.bridge_doubles_losses || 0) + (data.bridge_2v2v2v2_losses || 0) + (data.bridge_3v3v3v3_losses || 0) + (data.bridge_four_losses || 0) + (data.bridge_threes_bridge_losses || 0) + (data.capture_threes_bridge_losses || 0))),
+        playedGames: ((data.bridge_duel_rounds_played || 0) + (data.bridge_doubles_rounds_played || 0) + (data.bridge_2v2v2v2_rounds_played || 0) + (data.bridge_3v3v3v3_rounds_played || 0) + (data.bridge_four_rounds_played || 0) + (data.bridge_threes_bridge_rounds_played || 0) + (data.capture_threes_rounds_played || 0))
       },
       '1v1': {
+        division: getDivision(data, 'bridge'),
         winstreak: data.current_winstreak_mode_bridge_duel || 0,
-        kills: (data.bridge_duel_kills || data.bridge_duel_bridge_kills) || 0,
-        deaths: (data.bridge_duel_deaths || data.bridge_duel_bridge_deaths) || 0,
-        KDRatio: divide((data.bridge_duel_kills || data.bridge_duel_bridge_kills), (data.bridge_duel_deaths || data.bridge_duel_bridge_deaths)),
+        bestWinstreak: data.best_winstreak_mode_bridge_duel || 0,
+        kills: data.bridge_duel_bridge_kills || 0,
+        deaths: data.bridge_duel_bridge_deaths || 0,
+        KDRatio: divide(data.bridge_duel_bridge_kills, data.bridge_duel_bridge_deaths),
         wins: data.bridge_duel_wins || 0,
         losses: data.bridge_duel_losses || 0,
         WLRatio: divide(data.bridge_duel_wins, data.bridge_duel_losses),
         playedGames: data.bridge_duel_rounds_played || 0
       },
       '2v2': {
+        division: getDivision(data, 'bridge'),
         winstreak: data.current_winstreak_mode_bridge_doubles || 0,
-        kills: (data.bridge_doubles_kills || data.bridge_doubles_bridge_kills) || 0,
-        deaths: (data.bridge_doubles_deaths || data.bridge_doubles_bridge_deaths) || 0,
-        KDRatio: divide((data.bridge_doubles_kills || data.bridge_doubles_bridge_kills), (data.bridge_doubles_deaths || data.bridge_doubles_bridge_deaths)),
+        bestWinstreak: data.best_winstreak_mode_bridge_doubles || 0,
+        kills: data.bridge_doubles_bridge_kills || 0,
+        deaths: data.bridge_doubles_bridge_deaths || 0,
+        KDRatio: divide(data.bridge_doubles_bridge_kills, data.bridge_doubles_bridge_deaths),
         wins: data.bridge_doubles_wins || 0,
         losses: data.bridge_doubles_losses || 0,
         WLRatio: divide(data.bridge_doubles_wins, data.bridge_doubles_losses),
         playedGames: data.bridge_doubles_rounds_played || 0
       },
+      '3v3': {
+        division: getDivision(data, 'bridge'),
+        winstreak: data.current_winstreak_mode_bridge_threes || 0,
+        bestWinstreak: data.best_winstreak_mode_bridge_threes || 0,
+        kills: data.bridge_threes_bridge_kills || 0,
+        deaths: data.bridge_threes_bridge_deaths || 0,
+        KDRatio: divide(data.bridge_threes_bridge_kills, data.bridge_threes_bridge_deaths),
+        wins: data.bridge_threes_wins || 0,
+        losses: data.bridge_threes_losses || 0,
+        WLRatio: divide(data.bridge_threes_wins, data.bridge_threes_losses),
+        playedGames: data.bridge_threes_rounds_played || 0
+      },
+      '2v2v2v2': {
+        division: getDivision(data, 'bridge'),
+        winstreak: data.current_winstreak_mode_bridge_2v2v2v2 || 0,
+        bestWinstreak: data.best_winstreak_mode_bridge_2v2v2v2 || 0,
+        kills: data.bridge_2v2v2v2_bridge_kills || 0,
+        deaths: data.bridge_2v2v2v2_bridge_deaths || 0,
+        KDRatio: divide(data.bridge_2v2v2v2_bridge_kills, data.bridge_2v2v2v2_bridge_deaths),
+        wins: data.bridge_2v2v2v2_wins || 0,
+        losses: data.bridge_2v2v2v2_losses || 0,
+        WLRatio: divide(data.bridge_2v2v2v2_wins, data.bridge_2v2v2v2_losses),
+        playedGames: data.bridge_2v2v2v2_rounds_played || 0
+      },
+      '3v3v3v3': {
+        division: getDivision(data, 'bridge'),
+        winstreak: data.current_winstreak_mode_bridge_3v3v3v3 || 0,
+        bestWinstreak: data.best_winstreak_mode_bridge_3v3v3v3 || 0,
+        kills: data.bridge_3v3v3v3_bridge_kills || 0,
+        deaths: data.bridge_3v3v3v3_bridge_deaths || 0,
+        KDRatio: divide(data.bridge_3v3v3v3_bridge_kills, data.bridge_3v3v3v3_bridge_deaths),
+        wins: data.bridge_3v3v3v3_wins || 0,
+        losses: data.bridge_3v3v3v3_losses || 0,
+        WLRatio: divide(data.bridge_3v3v3v3_wins, data.bridge_3v3v3v3_losses),
+        playedGames: data.bridge_3v3v3v3_rounds_played || 0
+      },
       '4v4': {
+        division: getDivision(data, 'bridge'),
         winstreak: data.current_winstreak_mode_bridge_four || 0,
-        kills: (data.bridge_four_kills || data.bridge_four_bridge_kills) || 0,
-        deaths: (data.bridge_four_deaths || data.bridge_four_bridge_deaths) || 0,
-        KDRatio: divide((data.bridge_four_kills || data.bridge_four_bridge_kills), (data.bridge_four_deaths || data.bridge_four_bridge_deaths)),
+        bestWinstreak: data.best_winstreak_mode_bridge_four || 0,
+        kills: data.bridge_four_bridge_kills || 0,
+        deaths: data.bridge_four_bridge_deaths || 0,
+        KDRatio: divide(data.bridge_four_bridge_kills, data.bridge_four_bridge_deaths),
         wins: data.bridge_four_wins || 0,
         losses: data.bridge_four_losses || 0,
         WLRatio: divide(data.bridge_four_wins, data.bridge_four_losses),
         playedGames: data.bridge_four_rounds_played || 0
+      },
+      // eslint-disable-next-line quote-props
+      ctf: {
+        division: getDivision(data, 'bridge'),
+        kills: data.capture_threes_bridge_kills || 0,
+        deaths: data.capture_threes_bridge_deaths || 0,
+        KDRatio: divide(data.capture_threes_bridge_kills, data.capture_threes_bridge_deaths),
+        wins: data.capture_threes_wins || 0,
+        losses: data.capture_threes_losses || 0,
+        WLRatio: divide(data.capture_threes_wins, data.capture_threes_losses),
+        captures: data.capture_threes_captures || 0,
+        playedGames: data.capture_threes_rounds_played || 0
       }
     };
     /**
@@ -319,7 +471,9 @@ class Duels {
      * @type {DuelsModeStats}
      */
     this.blitz = {
+      division: getDivision(data, 'blitz'),
       winstreak: data.current_winstreak_mode_blitz_duel || 0,
+      bestWinstreak: data.best_winstreak_mode_blitz_duel || 0,
       kills: data.blitz_duel_kills || 0,
       deaths: data.blitz_duel_deaths || 0,
       KDRatio: divide(data.blitz_duel_kills, data.blitz_duel_deaths),
@@ -333,7 +487,9 @@ class Duels {
      * @type {DuelsModeStats}
      */
     this.nodebuff = {
+      division: getDivision(data, 'no_debuff'),
       winstreak: data.current_winstreak_mode_potion_duel || 0,
+      bestWinstreak: data.best_winstreak_mode_potion_duel || 0,
       kills: data.potion_duel_kills || 0,
       deaths: data.potion_duel_deaths || 0,
       KDRatio: divide(data.potion_duel_kills, data.potion_duel_deaths),
@@ -347,7 +503,9 @@ class Duels {
      * @type {DuelsModeStats}
      */
     this.bow = {
+      division: getDivision(data, 'bow'),
       winstreak: data.current_winstreak_mode_bow_duel || 0,
+      bestWinstreak: data.best_winstreak_mode_bow_duel || 0,
       kills: data.bow_duel_kills || 0,
       deaths: data.bow_duel_deaths || 0,
       KDRatio: divide(data.bow_duel_kills, data.bow_duel_deaths),
@@ -360,7 +518,76 @@ class Duels {
 }
 /**
  * @typedef {object} DuelsModeStats
+ * @property {number|undefined} winstreak Current winstreak
+ * @property {number|undefined} bestWinstreak Best winstreak
+ * @property {string|null} division Division
+ * @property {number} kills Kills
+ * @property {number} deaths Deaths
+ * @property {number} wins Wins
+ * @property {number} losses Losses
+ * @property {number} KDRatio Kill/Death ratio
+ * @property {number} WLRatio Win/Loss ratio
+ * @property {number} playedGames Played games
+ */
+/**
+ * @typedef {object} BridgeModeStats
+ * @property {number|undefined} winstreak Current winstreak
+ * @property {number|undefined} bestWinstreak Best winstreak
+ * @property {string|null} division Division
+ * @property {number} kills Kills
+ * @property {number} deaths Deaths
+ * @property {number} wins Wins
+ * @property {number} losses Losses
+ * @property {number} KDRatio Kill/Death ratio
+ * @property {number} WLRatio Win/Loss ratio
+ * @property {number} playedGames Played games
+ * @property {number} goals Goals
+ */
+/**
+ * @typedef {object} DuelsBowspleef
+ * @property {string|null} division Division
  * @property {number} winstreak Winstreak
+ * @property {number} bestWinstreak Best winstreak
+ * @property {number} bowShots Bow shots
+ * @property {number} deaths Deaths
+ * @property {number} wins Wins
+ * @property {number} losses Losses
+ * @property {number} WLRatio Win/Loss ratio
+ * @property {number} playedGames Played games
+ */
+/**
+ * @typedef {object} BridgeCTFModeStats
+ * @property {string|null} division Division
+ * @property {number} kills Kills
+ * @property {number} deaths Deaths
+ * @property {number} wins Wins
+ * @property {number} losses Losses
+ * @property {number} KDRatio Kill/Death ratio
+ * @property {number} WLRatio Win/Loss ratio
+ * @property {number} playedGames Played games
+ * @property {number} captures Captures
+ */
+/**
+ * @typedef {object} DuelsParkour
+ * @property {number} deaths Deaths
+ * @property {number} wins Wins
+ * @property {number} losses Losses
+ * @property {number} WLRatio Win/Loss ratio
+ * @property {number} playedGames Played games
+ */
+/**
+ * @typedef {object} DuelsBoxing
+ * @property {string} division Division
+ * @property {number} kills Kills
+ * @property {number} wins Wins
+ * @property {number} losses Losses
+ * @property {number} WLRatio Win/Loss ratio
+ * @property {number} playedGames Played games
+ * @property {number} meleeSwings Melee swings
+ * @property {number} meleeHits Melee hits
+ */
+/**
+ * @typedef {object} DuelsArena
  * @property {number} kills Kills
  * @property {number} deaths Deaths
  * @property {number} wins Wins
@@ -391,9 +618,13 @@ class Duels {
  */
 /**
  * @typedef {object} DuelsBridge
- * @property {DuelsModeStats} overall Overall The Bridge duel stats
- * @property {DuelsModeStats} '1v1' The Bridge Duel 1v1 stats
- * @property {DuelsModeStats} '2v2' The Bridge Duel 2v2 stats
- * @property {DuelsModeStats} '4v4' The Bridge Duel 4v4 stats
+ * @property {BridgeModeStats} overall Overall The Bridge duel stats
+ * @property {BridgeModeStats} '1v1' The Bridge Duel 1v1 stats
+ * @property {BridgeModeStats} '2v2' The Bridge Duel 2v2 stats
+ * @property {BridgeModeStats} '3v3' The Bridge Duel 3v3 stats
+ * @property {BridgeModeStats} '4v4' The Bridge Duel 4v4 stats
+ * @property {BridgeModeStats} '2v2v2v2' The Bridge Duel 2v2v2v2 stats
+ * @property {BridgeModeStats} '3v3v3v3' The Bridge Duel 3v3v3v3 stats
+ * @property {BridgeCTFModeStats} ctf The Bridge Capture The Flag duel 3v3 stats
  */
 module.exports = Duels;

package/src/structures/MiniGames/SkyWars.js

@@ -17,8 +17,9 @@ const generateStatsForMode = (data, mode) => {
 class SkyWars {
   /**
    * @param {object} data SkyWars data
+   * @param {object|null} extraRSWData Extra Ranked Skywars data, if any
    */
-  constructor (data) {
+  constructor (data, extraRSWData) {
     /**
      * Coins
      * @type {number}
@@ -204,7 +205,7 @@ class SkyWars {
       deaths: data.deaths_ranked || 0,
       KDRatio: divide(data.kills_ranked, data.deaths_ranked),
       WLRatio: divide(data.wins_ranked, data.losses_ranked),
-      ratings: getRankedPositions(data)
+      ratings: getRankedPositions(data, extraRSWData)
     };
     /**
      * Mega Skywars Stats
@@ -417,19 +418,26 @@ const ratingRegex = /^SkyWars_skywars_rating_(\d{1,2})_(\d{1,2})_(position|ratin
 /**
  * gets ratings & positions on the leaderboard
  * @param {Object} data data
+ * @param {Object|null} extraRSWData extra data to be attached
  * @returns {SkywarsRankedStats} some map
  */
-function getRankedPositions (data) {
+function getRankedPositions (data, extraRSWData) {
   const map = new Map();
   const keys = Object.keys(data).map((key) => key.match(ratingRegex)).filter((x) => x);
   for (const key of keys) {
-    const computedKey = `${(key[1].length - 1 ? '' : '0')}${key[1]}-${key[2]}`;
+    let [property, month, year, type] = key;
+    month = parseInt(month, 10);
+    year = parseInt(year, 10);
+    const computedKey = `${month}_${year}`;
+    const initDate = new Date(1000 * 60 * 60 * 5);
     map.set(computedKey, {
       ...map.get(computedKey),
-      [key[3]]: parseInt(data[key[0]], 10) || 0,
-      date: new Date(new Date(1000 * 60 * 60 * 5).setFullYear(2000 + parseInt(key[2], 10), parseInt(key[1], 10) - 1, 1))
+      'seasonKey': computedKey,
+      [type]: parseInt(data[property], 10) || 0,
+      'date': new Date(initDate.setFullYear(2000 + year, month - 1, 1))
     });
   }
+  if (extraRSWData) map.set(extraRSWData.seasonKey, extraRSWData);
   return map;
 }
 

package/src/structures/MiniGames/SkyWarsRanked.js

@@ -0,0 +1,45 @@
+/**
+ * SkyWars Ranked class
+ */
+class SkyWarsRanked {
+  /**
+   * @param {object} data
+   */
+  constructor (data) {
+    /**
+     * Ranked season key (e.g. 7_21 - July 2021)
+     * @type {string}
+     */
+    this.seasonKey = data.key;
+    /**
+     * Current position
+     * @type {number}
+     */
+    this.position = data.position;
+    /**
+     * Current rating
+     * @type {number}
+     */
+    this.rating = data.score;
+    /**
+     * Season key parsed as date, should usually be current season
+     * @type {Date}
+     */
+    this.date = getDateFromKey(this.seasonKey);
+  }
+}
+
+/**
+ * Gets date from season key
+ * @param {string} key Season Key
+ * @return {Date|null}
+ */
+function getDateFromKey(key) {
+  const initDate = new Date(1000 * 60 * 60 * 5);
+  const [month, year] = key.split('_').map(Number);
+  // month needs to be 0 indexed cuz js :)
+  if (isNaN(month) || isNaN(year) || month > 11) return null;
+  return new Date(initDate.setFullYear(2000 + year, month - 1, 1));
+}
+
+module.exports = SkyWarsRanked;