1 files changed, 21 insertions, 9 deletions
diff --git a/build/cleaners/skyblock/slayers.js b/build/cleaners/skyblock/slayers.js
index d2b9dbe..dbc20fc 100644
--- a/build/cleaners/skyblock/slayers.js
+++ b/build/cleaners/skyblock/slayers.js
@@ -1,52 +1,64 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanSlayers = void 0;
-const slayerLevels = 4; // number of slayer levels, this might be 5 soon
+exports.cleanSlayers = exports.slayerLevels = void 0;
+exports.slayerLevels = 4; // number of slayer levels, this might be 5 soon
 const SLAYER_NAMES = {
     spider: 'tarantula',
     zombie: 'revenant',
     wolf: 'sven'
 };
 function cleanSlayers(data) {
+    var _a, _b;
     const slayers = [];
     const slayersDataRaw = data === null || data === void 0 ? void 0 : data.slayer_bosses;
     let totalXp = 0;
+    let totalKills = 0;
     for (const slayerNameRaw in slayersDataRaw) {
         const slayerDataRaw = slayersDataRaw[slayerNameRaw];
         // convert name provided by api (spider) to the real name (tarantula)
-        const slayerName = SLAYER_NAMES[slayerDataRaw];
-        const slayerXp = slayerDataRaw.xp;
+        const slayerName = SLAYER_NAMES[slayerNameRaw];
+        const slayerXp = (_a = slayerDataRaw.xp) !== null && _a !== void 0 ? _a : 0;
+        let slayerKills = 0;
         const slayerTiers = [];
         for (const slayerDataKey in slayerDataRaw) {
             // if a key starts with boss_kills_tier_ (boss_kills_tier_1), get the last number
             if (slayerDataKey.startsWith('boss_kills_tier_')) {
                 const slayerTierRaw = parseInt(slayerDataKey.substr('boss_kills_tier_'.length));
-                const slayerTierKills = slayerDataRaw[slayerDataKey];
+                const slayerTierKills = (_b = slayerDataRaw[slayerDataKey]) !== null && _b !== void 0 ? _b : 0;
                 // add 1 since hypixel is using 0 indexed tiers
                 const slayerTier = slayerTierRaw + 1;
                 slayerTiers.push({
                     kills: slayerTierKills,
                     tier: slayerTier
                 });
+                // count up the total number of kills for this slayer
+                if (slayerTierKills)
+                    slayerKills += slayerTierKills;
             }
         }
         // if the slayer tier length is less than the max, add more empty ones
-        while (slayerTiers.length < slayerLevels)
+        while (slayerTiers.length < exports.slayerLevels)
             slayerTiers.push({
                 tier: slayerTiers.length + 1,
                 kills: 0
             });
         const slayer = {
             name: slayerName,
+            raw_name: slayerNameRaw,
             tiers: slayerTiers,
-            xp: slayerXp
+            xp: slayerXp !== null && slayerXp !== void 0 ? slayerXp : 0,
+            kills: slayerKills
         };
         slayers.push(slayer);
-        // add the xp from this slayer to the total xp
-        totalXp += slayerXp;
+        // add the xp and kills from this slayer to the total xp
+        if (slayerXp)
+            totalXp += slayerXp;
+        if (slayerKills)
+            totalKills += slayerKills;
     }
     return {
         xp: totalXp,
+        kills: totalKills,
         bosses: slayers
     };
 }