yolkbot 0.1.2-alpha.6 → 0.1.2-alpha.7

package/package.json

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

package/src/bot.js

@@ -69,8 +69,9 @@ export class Bot {
 
         // private information NOT FOR OTHER PLAYERS!!
         this.state = {
-            // kept for specifying socket open sequence
+            // kept for specifying various params
             name: '',
+            weaponIdx: 0,
 
             // tracking for dispatch checks
             reloading: false,
@@ -1469,7 +1470,7 @@ export class Bot {
             out.packString(this.game.raw.uuid);
 
             out.packInt8(0); // hidebadge
-            out.packInt8(0); // weapon idx
+            out.packInt8(this.state.weaponIdx || 0); // weapon idx
 
             out.packInt32(this.account.session);
             out.packString(this.account.firebaseId);
@@ -1496,6 +1497,7 @@ export class Bot {
         this.game.isPrivate = CommIn.unPackInt8U() == 1;
 
         // console.log('Successfully joined game.');
+
         this.state.joinedGame = true;
         this.lastDeathTime = Date.now();
 
@@ -1503,7 +1505,7 @@ export class Bot {
             const out = CommOut.getBuffer();
             out.packInt8(CommCode.clientReady);
             out.send(this.game.socket);
-            
+
             this.game.socket.onmessage = (msg) => this._packetQueue.push(msg.data);
         }
 

package/src/dispatches/SaveLoadoutDispatch.js

@@ -70,10 +70,12 @@ export class SaveLoadoutDispatch {
     }
 
     execute(bot) {
-        if (this.changes.classIdx && this.changes.classIdx !== bot.me.selectedGun) {
+        if (bot.me && this.changes.classIdx && this.changes.classIdx !== bot.me.selectedGun) {
             bot.me.weapons[0] = new GunList[this.changes.classIdx]();
         }
 
+        bot.state.weaponIdx = this.changes.classIdx || bot.state.weaponIdx;
+
         const loadout = {
             ...bot.account.loadout,
             ...this.changes
@@ -89,7 +91,7 @@ export class SaveLoadoutDispatch {
 
         bot.account.loadout = loadout;
 
-        saveLoadout.then(() => {
+        if (bot.me) saveLoadout.then(() => {
             if (bot.state.joinedGame) {
                 const out = CommOut.getBuffer();
                 out.packInt8(CommCode.changeCharacter);