yolkbot 0.1.0-alpha.59 → 0.1.0-alpha.60

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "yolkbot",
     "description": "create a shell shockers (self) bot in under 10 lines.",
-    "version": "0.1.0-alpha.59",
+    "version": "0.1.0-alpha.60",
     "keywords": [
         "shell shockers",
         "shellshock.io",

package/src/bot.js

@@ -222,6 +222,22 @@ export class Bot {
             activeNode: null,
             activeNodeIdx: 0
         }
+
+        if (this.intents.includes(this.Intents.PLAYER_HEALTH)) this.healthIntervalId = setInterval(() => {
+            if (!this.players) return;
+
+            for (const player of Object.values(this.players)) {
+                if (player.playing && player.hp > 0) {
+                    const regenSpeed = 0.1 * (this.game.isPrivate ? this.game.options.healthRegen : 1);
+
+                    if (player.streakRewards.includes(ShellStreaks.OverHeal)) {
+                        player.hp = Math.max(100, player.hp - regenSpeed);
+                    } else {
+                        player.hp = Math.min(100, player.hp + regenSpeed);
+                    }
+                }
+            }
+        }, 33);
     }
 
     dispatch(disp) {
@@ -259,12 +275,12 @@ export class Bot {
 
     #processLoginData(loginData) {
         if (typeof loginData == 'string') {
-            this.#emit('authFail', loginData);
+            this.emit('authFail', loginData);
             return false;
         }
 
         if (loginData.banRemaining) {
-            this.#emit('banned', loginData.banRemaining);
+            this.emit('banned', loginData.banRemaining);
             return false;
         }
 
@@ -299,7 +315,7 @@ export class Bot {
                 instance: this.instance
             });
 
-            this.matchmaker.on('authFail', (data) => this.#emit('authFail', data));
+            this.matchmaker.on('authFail', (data) => this.emit('authFail', data));
 
             await this.matchmaker.getRegions();
         }
@@ -519,7 +535,7 @@ export class Bot {
 
         this.game.socket.onclose = (e) => {
             // console.log('Game socket closed:', e.code, Object.entries(CloseCode).filter(([, v]) => v == e.code));
-            this.#emit('close', e.code);
+            this.emit('close', e.code);
         }
     }
 
@@ -606,7 +622,7 @@ export class Bot {
         // process syncMe
         const now = Date.now();
         if (now - this.lastUpdateTime >= 50) {
-            this.#emit('tick');
+            this.emit('tick');
 
             // Send out update packet
             const out = CommOut.getBuffer();
@@ -644,7 +660,7 @@ export class Bot {
     // these are auth-related codes (liveCallbacks doesn't run during auth)
     #mustBeInstant = ['authFail', 'banned'];
 
-    #emit(event, ...args) {
+    emit(event, ...args) {
         if (this._hooks[event]) {
             for (const cb of this._hooks[event]) {
                 if (this.#mustBeInstant.includes(event)) cb(...args);
@@ -753,7 +769,7 @@ export class Bot {
         const player = this.players[Object.keys(this.players).find(p => this.players[p].id == id)];
         // console.log(`Player ${player.name}: ${text} (flags: ${msgFlags})`);
         // console.log(`Their position: ${player.position.x}, ${player.position.y}, ${player.position.z}`);
-        this.#emit('chat', player, text, msgFlags);
+        this.emit('chat', player, text, msgFlags);
     }
 
     #processAddPlayerPacket() {
@@ -811,31 +827,14 @@ export class Bot {
         playerData.gameData_.private = CommIn.unPackInt8U();
         playerData.gameData_.gameType = CommIn.unPackInt8U();
 
-        if (!this.players[playerData.id_]) {
+        if (!this.players[playerData.id_])
             this.players[playerData.id_] = new GamePlayer(playerData.id_, playerData.team_, playerData);
 
-            const player = this.players[playerData.id_];
-
-            if (player.playing && this.intents.includes(this.Intents.PLAYER_HEALTH)) {
-                player.healthInterval = setInterval(() => {
-                    if (player.hp < 1) return;
-
-                    const regenSpeed = 0.1 * (this.game.isPrivate ? this.game.options.healthRegen : 1);
-
-                    if (player.streakRewards.includes(ShellStreaks.OverHeal)) {
-                        player.hp = Math.max(100, player.hp - regenSpeed);
-                    } else {
-                        player.hp = Math.min(100, player.hp + regenSpeed);
-                    }
-                }, 33);
-            }
-        }
-
         if (this.me.id == playerData.id_) {
             this.me = this.players[playerData.id_];
         }
 
-        this.#emit('playerJoin', this.players[playerData.id_]);
+        this.emit('playerJoin', this.players[playerData.id_]);
     }
 
     #processRespawnPacket() {
@@ -862,24 +861,7 @@ export class Bot {
             player.grenades = grenades;
             player.position = { x: x, y: y, z: z };
             // console.log(`Player ${player.name} respawned at ${x}, ${y}, ${z}`);
-            this.#emit('playerRespawn', player);
-
-            if (this.intents.includes(this.Intents.PLAYER_HEALTH)) {
-                if (player.healthInterval)
-                    clearInterval(player.healthInterval);
-
-                player.healthInterval = setInterval(() => {
-                    if (player.hp < 1) return;
-
-                    const regenSpeed = 0.1 * (this.game.isPrivate ? this.game.options[GameOptionFlags.healthRegen] : 1);
-
-                    if (player.streakRewards.includes(ShellStreaks.OverHeal)) {
-                        player.hp = Math.max(100, player.hp - regenSpeed);
-                    } else {
-                        player.hp = Math.min(100, player.hp + regenSpeed);
-                    }
-                }, 33);
-            }
+            this.emit('playerRespawn', player);
         } else {
             // console.log(`Player ${id} not found. (me: ${this.me.id}) (respawn)`);
         }
@@ -947,7 +929,7 @@ export class Bot {
         const player = this.players[id];
         if (player) {
             player.playing = false;
-            this.#emit('playerPause', player);
+            this.emit('playerPause', player);
         }
     }
 
@@ -958,7 +940,7 @@ export class Bot {
         const player = this.players[id];
         if (player) {
             player.activeGun = newWeaponId;
-            this.#emit('playerSwapWeapon', player, newWeaponId);
+            this.emit('playerSwapWeapon', player, newWeaponId);
         }
     }
 
@@ -983,7 +965,7 @@ export class Bot {
         if (killer) { killer.kills++; }
         // console.log(`Player ${killer.name} is on a streak of ${killer.kills} kills.`);
 
-        this.#emit('playerDeath', killed, killer); // killed, killer
+        this.emit('playerDeath', killed, killer); // killed, killer
     }
 
     #processFirePacket() {
@@ -997,7 +979,7 @@ export class Bot {
 
         if (playerWeapon && playerWeapon.ammo) {
             playerWeapon.ammo.rounds--;
-            this.#emit('playerFire', player, playerWeapon);
+            this.emit('playerFire', player, playerWeapon);
         }
     }
 
@@ -1010,7 +992,7 @@ export class Bot {
 
         this.game.collectables[type].push({ id, x, y, z });
 
-        this.#emit('spawnItem', type, id, { x, y, z });
+        this.emit('spawnItem', type, id, { x, y, z });
     }
 
     #processCollectPacket() {
@@ -1027,7 +1009,7 @@ export class Bot {
             const playerWeapon = player.weapons[applyToWeaponIdx];
             if (playerWeapon && playerWeapon.ammo) {
                 playerWeapon.ammo.store = Math.min(playerWeapon.ammo.storeMax, playerWeapon.ammo.store + playerWeapon.ammo.pickup);
-                this.#emit('collectAmmo', player, playerWeapon);
+                this.emit('collectAmmo', player, playerWeapon);
             }
         }
 
@@ -1035,7 +1017,7 @@ export class Bot {
             player.grenades++;
             if (player.grenades > 3) player.grenades = 3
 
-            this.#emit('collectGrenade', player);
+            this.emit('collectGrenade', player);
         }
     }
 
@@ -1049,7 +1031,7 @@ export class Bot {
         const oldHP = player.hp;
         player.hp = hp;
 
-        this.#emit('playerDamaged', player, oldHP, player.hp);
+        this.emit('playerDamaged', player, oldHP, player.hp);
     }
 
     #processHitMePacket() {
@@ -1061,7 +1043,7 @@ export class Bot {
         const oldHp = this.me.hp;
         this.me.hp = hp;
 
-        this.#emit('selfDamaged', oldHp, this.me.hp);
+        this.emit('selfDamaged', oldHp, this.me.hp);
     }
 
     #processSyncMePacket() {
@@ -1091,7 +1073,7 @@ export class Bot {
         player.position.z = newZ;
 
         if (oldX != newX || oldY != newY || oldZ != newZ) {
-            this.#emit('selfMoved', player, { x: oldX, y: oldY, z: oldZ }, { x: newX, y: newY, z: newZ });
+            this.emit('selfMoved', player, { x: oldX, y: oldY, z: oldZ }, { x: newX, y: newY, z: newZ });
         }
     }
 
@@ -1107,7 +1089,7 @@ export class Bot {
 
         delete this.players[id.toString()];
 
-        this.#emit('playerLeave', removedPlayer);
+        this.emit('playerLeave', removedPlayer);
     }
 
     #processGameStatePacket() {
@@ -1130,7 +1112,7 @@ export class Bot {
                 controlledByTeam: controlledByTeam
             };
 
-            this.#emit('gameStateChange', this.game);
+            this.emit('gameStateChange', this.game);
         } else if (this.game.gameModeId == GameModes.kotc) {
             this.game.stage = CommIn.unPackInt8U(); // constants.CoopStates
             this.game.zoneNumber = CommIn.unPackInt8U(); // a number to represent which 'active zone' kotc is using
@@ -1145,7 +1127,7 @@ export class Bot {
             this.game.capturePercent = this.game.captureProgress / 1000; // progress of the capture as a percentage
             this.game.activeZone = this.game.map.zones ? this.game.map.zones[this.game.zoneNumber - 1] : null;
 
-            this.#emit('gameStateChange', this.game);
+            this.emit('gameStateChange', this.game);
         } else if (this.game.gameModeId == GameModes.team) {
             this.game.teamScore[1] = CommIn.unPackInt16U();
             this.game.teamScore[2] = CommIn.unPackInt16U();
@@ -1217,7 +1199,7 @@ export class Bot {
                 break;
         }
 
-        this.#emit('playerBeginStreak', player, ksType);
+        this.emit('playerBeginStreak', player, ksType);
     }
 
     #processEndStreakPacket() {
@@ -1236,7 +1218,7 @@ export class Bot {
             player.streakRewards = player.streakRewards.filter((r) => r != ksType);
         }
 
-        this.#emit('playerEndStreak', ksType, player);
+        this.emit('playerEndStreak', ksType, player);
     }
 
     #processHitShieldPacket() {
@@ -1251,9 +1233,9 @@ export class Bot {
 
         if (this.me.hpShield <= 0) {
             this.me.streakRewards = this.me.streakRewards.filter((r) => r != ShellStreaks.HardBoiled);
-            this.#emit('selfShieldLost');
+            this.emit('selfShieldLost');
         } else {
-            this.#emit('selfShieldHit', this.me.hpShield);
+            this.emit('selfShieldHit', this.me.hpShield);
         }
     }
 
@@ -1282,7 +1264,7 @@ export class Bot {
         this.game.options.weaponsDisabled = Array.from({ length: 7 }, () => CommIn.unPackInt8U() === 1);
         this.game.options.mustUseSecondary = this.game.options.weaponsDisabled.every((v) => v);
 
-        this.#emit('gameOptionsChange', oldOptions, this.game.options);
+        this.emit('gameOptionsChange', oldOptions, this.game.options);
         return false;
     }
 
@@ -1291,7 +1273,7 @@ export class Bot {
 
         if (action == GameActions.pause) {
             // console.log('settings changed, gameOwner changed game settings, force paused');
-            this.#emit('gameForcePause');
+            this.emit('gameForcePause');
             setTimeout(() => this.me.playing = false, 3000);
         }
 
@@ -1319,7 +1301,7 @@ export class Bot {
                 this.game.capturePercent = 0.0;
             }
 
-            this.#emit('gameReset');
+            this.emit('gameReset');
         }
     }
 
@@ -1330,7 +1312,7 @@ export class Bot {
 
         this.ping = Date.now() - this.lastPingTime;
 
-        this.#emit('pingUpdate', oldPing, this.ping);
+        this.emit('pingUpdate', oldPing, this.ping);
 
         setTimeout(() => {
             const out = CommOut.getBuffer();
@@ -1352,7 +1334,7 @@ export class Bot {
         player.team = toTeam;
         player.kills = 0;
 
-        this.#emit('playerSwitchTeam', player, oldTeam, toTeam);
+        this.emit('playerSwitchTeam', player, oldTeam, toTeam);
     }
 
     #processChangeCharacterPacket() {
@@ -1396,8 +1378,8 @@ export class Bot {
             player.selectedGun = weaponIndex;
             player.weapons[0] = new GunList[weaponIndex]();
 
-            if (oldWeaponIdx !== player.selectedGun) this.#emit('playerChangeGun', player, oldWeaponIdx, player.selectedGun);
-            if (oldCharacter !== player.character) this.#emit('playerChangeCharacter', player, oldCharacter, player.character);
+            if (oldWeaponIdx !== player.selectedGun) this.emit('playerChangeGun', player, oldWeaponIdx, player.selectedGun);
+            if (oldCharacter !== player.character) this.emit('playerChangeCharacter', player, oldCharacter, player.character);
         }
     }
 
@@ -1406,28 +1388,23 @@ export class Bot {
         const oldBalance = this.account.eggBalance;
 
         this.account.eggBalance = newBalance;
-        this.#emit('balanceUpdate', newBalance - oldBalance, newBalance);
+        this.emit('balanceUpdate', newBalance - oldBalance, newBalance);
     }
 
     #processRespawnDeniedPacket() {
         this.me.playing = false;
-        this.#emit('selfRespawnFail');
+        this.emit('selfRespawnFail');
     }
 
     #processMeleePacket() {
         const id = CommIn.unPackInt8U();
         const player = this.players[id];
 
-        if (player) this.#emit('playerMelee', player);
+        if (player) this.emit('playerMelee', player);
     }
 
-    // we do this since reload doesn't get emitted for the bot itself
-    // so we simulate it when calling a reload dispatch
-    processReloadPacket(customPlayer, iUnderstandThisIsForInternalUseOnlyAndIShouldNotBeCallingThis) {
-        if (!iUnderstandThisIsForInternalUseOnlyAndIShouldNotBeCallingThis)
-            throw new Error('processReloadPacket is exposed for internal use only. do not call it.');
-
-        const id = customPlayer || CommIn.unPackInt8U();
+    #processReloadPacket() {
+        const id = CommIn.unPackInt8U();
         const player = this.players[id];
 
         if (!player) return;
@@ -1444,7 +1421,7 @@ export class Bot {
             playerActiveWeapon.ammo.store -= newRounds;
         }
 
-        this.#emit('playerReload', player, playerActiveWeapon);
+        this.emit('playerReload', player, playerActiveWeapon);
     }
 
     #processGameRequestOptionsPacket() {
@@ -1478,8 +1455,8 @@ export class Bot {
         if (this.intents.includes(this.Intents.COSMETIC_DATA))
             item = findItemById(item);
 
-        if (itemType == ItemTypes.Grenade) this.#emit('grenadeExploded', item, { x, y, z }, damage, radius);
-        else this.#emit('rocketHit', { x, y, z }, damage, radius);
+        if (itemType == ItemTypes.Grenade) this.emit('grenadeExploded', item, { x, y, z }, damage, radius);
+        else this.emit('rocketHit', { x, y, z }, damage, radius);
     }
 
     #processThrowGrenadePacket() {
@@ -1495,7 +1472,7 @@ export class Bot {
 
         if (player) {
             player.grenades--;
-            this.#emit('playerThrowGrenade', player, { x, y, z }, { x: dx, y: dy, z: dz });
+            this.emit('playerThrowGrenade', player, { x, y, z }, { x: dx, y: dy, z: dz });
         }
     }
 
@@ -1598,7 +1575,7 @@ export class Bot {
                     break;
 
                 case CommCode.reload:
-                    this.processReloadPacket(null, true);
+                    this.#processReloadPacket();
                     break;
 
                 case CommCode.explode:
@@ -1849,6 +1826,23 @@ export class Bot {
 
         return result;
     }
+
+    quit(noCleanup = false) {
+        if (this.intents.includes(this.Intents.PLAYER_HEALTH))
+            clearInterval(this.healthIntervalId);
+
+        clearInterval(this.updateInterval);
+
+        this.game.socket.close();
+        this.matchmaker.close();
+
+        if (!noCleanup) {
+            delete this.account;
+            delete this.game;
+            delete this.me;
+            delete this.players;
+        }
+    }
 }
 
 export default Bot;

package/src/dispatches/ReloadDispatch.js

@@ -8,7 +8,19 @@ export class ReloadDispatch {
     execute(bot) {
         new packet.ReloadPacket().execute(bot.game.socket);
 
-        bot.processReloadPacket(bot.me.id, true);
+        const playerActiveWeapon = bot.me.weapons[bot.me.activeGun];
+
+        if (playerActiveWeapon.ammo) {
+            const newRounds = Math.min(
+                Math.min(playerActiveWeapon.ammo.capacity, playerActiveWeapon.ammo.reload) - playerActiveWeapon.ammo.rounds,
+                playerActiveWeapon.ammo.store
+            );
+
+            playerActiveWeapon.ammo.rounds += newRounds;
+            playerActiveWeapon.ammo.store -= newRounds;
+        }
+
+        bot.emit('playerReload', bot.me, playerActiveWeapon);
 
         const activeWeapon = bot.me.weapons[bot.me.activeGun];
         const isLongTime = activeWeapon.ammo.rounds < 1;