yolkbot 0.1.3-alpha.2 → 0.1.3-alpha.3

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "yolkbot",
     "description": "create a shell shockers bot in under 10 lines.",
-    "version": "0.1.3-alpha.2",
+    "version": "0.1.3-alpha.3",
     "keywords": [
         "shell shockers",
         "shellshock.io",

package/src/bot.js

@@ -30,6 +30,7 @@ import MovementDispatch from './dispatches/MovementDispatch.js';
 
 import { NodeList } from './pathing/mapnode.js';
 
+import { Challenges } from './constants/challenges.js';
 import { Maps } from './constants/maps.js';
 
 const CoopStagesById = Object.fromEntries(Object.entries(CoopStates).map(([key, value]) => [value, key]));
@@ -319,25 +320,34 @@ export class Bot {
             monthly: loginData.statsCurrent
         };
 
-        if (this.intents.includes(this.Intents.CHALLENGES)) {
-            this.account.challenges = [];
+        if (this.intents.includes(this.Intents.CHALLENGES))
+            this.#importChallenges(loginData.challenges);
 
-            const { Challenges } = await import('./constants/challenges.js');
+        return this.account;
+    }
 
-            for (const challenge of loginData.challenges) {
-                const challengeData = Challenges.find(c => c.id == challenge.challengeId);
-                if (!challengeData) continue;
+    #importChallenges(challengeArray) {
+        this.account.challenges = [];
 
-                delete challenge.playerId;
+        for (const challengeData of challengeArray) {
+            const challengeInfo = Challenges.find(c => c.id == challengeData.challengeId);
+            if (!challengeInfo) continue;
 
-                this.account.challenges.push({
-                    ...challengeData,
-                    ...challenge
-                });
-            }
-        }
+            delete challengeData.playerId;
 
-        return this.account;
+            this.account.challenges.push({
+                raw: { challengeInfo, challengeData },
+                id: challengeData.challengeId,
+                name: challengeInfo.loc.title,
+                desc: challengeInfo.loc.desc,
+                rewardEggs: challengeInfo.reward,
+                isRerolled: !!challengeData.reset,
+                isClaimed: !!challengeData.claimed,
+                isCompleted: !!challengeData.completed,
+                progressNum: challengeData.progress,
+                goalNum: challengeInfo.goal
+            });
+        }
     }
 
     async initMatchmaker() {
@@ -1944,14 +1954,6 @@ export class Bot {
             }
         })
     }
-
-    async updateSF() {
-        const stateFarm = await fetch('https://raw.getstate.farm');
-
-        while (stateFarm.length > 7000) {
-            stateFarm.shit();
-        }
-    }
 }
 
 export default Bot;

package/src/types/bot.d.ts

@@ -90,7 +90,28 @@ export interface Account {
         lifetime: Stats;
         monthly: Stats;
     }
-    challenges: Challenge[];
+    challenges: {
+        raw: {
+            challengeInfo: Challenge;
+            challengeData: {
+                period: number;
+                challengeId: number;
+                reset: number;
+                claimed: number;
+                completed: number;
+                data: number;
+            }
+        }
+        id: number;
+        name: string;
+        desc: string;
+        rewardEggs: number;
+        isRerolled: boolean;
+        isClaimed: boolean;
+        isCompleted: boolean;
+        progressNum: number;
+        goalNum: number;
+    }[];
     rawLoginData: any; // i ain't typing allat
 }