diff --git a/processors/games/SkyWars.js b/processors/games/SkyWars.js index 8694e3a7..8d7d9cc8 100644 --- a/processors/games/SkyWars.js +++ b/processors/games/SkyWars.js @@ -24,18 +24,29 @@ module.exports = ({ soul_well = 0, soul_well_rares = 0, soul_well_legendaries = 0, + heads = 0, + heads_eww = 0, + heads_yucky = 0, + heads_meh = 0, + heads_decent = 0, + heads_salty = 0, + heads_tasty = 0, + heads_succulent = 0, + heads_sweet = 0, + heads_divine = 0, + heads_heavenly = 0, ...rest }) => { const getModeStats = (regexp) => pickKeys(rest, { regexp, - keyMap: (key) => key.replace(regexp, '') + keyMap: (key) => key.replace(regexp, ''), }); const gamemodes = {}; const betterModeNames = { - 'solo(?!_insane|_normal)': 'solo', + '(? { gamemodes[betterModeNames[name]] = getModeStats(new RegExp(`_${name}$`)); - gamemodes[betterModeNames[name]].kill_death_ratio = getRatio(gamemodes[betterModeNames[name]].kills, gamemodes[betterModeNames[name]].deaths); - gamemodes[betterModeNames[name]].win_loss_ratio = getRatio(gamemodes[betterModeNames[name]].wins, gamemodes[betterModeNames[name]].losses); }); - Object.keys(gamemodes).forEach(function(name) { + Object.keys(gamemodes).forEach((name) => { const mode = gamemodes[name]; - mode.kill_death_ratio = getRatio(mode.kills,mode.deaths); - mode.kill_death_ratio = getRatio(mode.wins,mode.losses); + mode.kill_death_ratio = getRatio(mode.kills, mode.deaths); + mode.win_loss_ratio = getRatio(mode.wins, mode.losses); + mode.arrow_hit_miss_ratio = getRatio(mode.arrows_hit, mode.arrows_shot) }); return ({ coins, @@ -59,7 +69,7 @@ module.exports = ({ win_loss_ratio: getRatio(wins, losses), experience: skywars_experience, level: getLevelForExp(skywars_experience), - levelFormatted: `${levelFormatted.replace(/§[\da-f]/g, '$&[')}]`, + levelFormatted: `${levelFormatted.replace(/§[\da-f]/g, '$&[').replace(/§/, '&')}]`, kills, deaths, assists, @@ -76,6 +86,19 @@ module.exports = ({ soul_well_uses: soul_well, soul_well_rares, soul_well_legendaries, + heads: { + total_heads: heads, + heads_eww, + heads_yucky, + heads_meh, + heads_decent, + heads_salty, + heads_tasty, + heads_succulent, + heads_sweet, + heads_divine, + heads_heavenly, + }, gamemodes, }); };