teeworlds 2.3.9 → 2.4.0

package/README.md

@@ -83,7 +83,7 @@ process.on("SIGINT", () => {
 	// process.exit()
 })
 process.stdin.on("data", data => {
-	client.Say(data.toString()); // write input in chat
+	client.game.Say(data.toString()); // write input in chat
 	
 })
 ```

package/lib/client.js

@@ -25,6 +25,7 @@ var movement_1 = __importDefault(require("./movement"));
 var MsgPacker_1 = require("./MsgPacker");
 var snapshot_1 = require("./snapshot");
 var huffman_1 = __importDefault(require("./huffman"));
+var game_1 = require("./components/game");
 var huff = new huffman_1.default();
 var States;
 (function (States) {
@@ -115,8 +116,6 @@ var Client = /** @class */ (function (_super) {
         _this.requestResend = false;
         if (options)
             _this.options = options;
-        _this.timer = 0;
-        _this.movement = new movement_1.default();
         _this.snaps = [];
         _this.sentChunkQueue = [];
         _this.queueChunkEx = [];
@@ -124,7 +123,6 @@ var Client = /** @class */ (function (_super) {
         _this.ack = 0; // ack of messages the client has received
         _this.clientAck = 0; // ack of messages the client has sent
         _this.receivedSnaps = 0; /* wait for 2 snaps before seeing self as connected */
-        _this.lastMsg = "";
         _this.socket = dgram_1.default.createSocket("udp4");
         _this.socket.bind();
         _this.TKEN = Buffer.from([255, 255, 255, 255]);
@@ -132,6 +130,8 @@ var Client = /** @class */ (function (_super) {
         _this.lastSendTime = new Date().getTime();
         _this.lastRecvTime = new Date().getTime();
         _this.lastSentMessages = [];
+        _this.movement = new movement_1.default();
+        _this.game = new game_1.Game(_this);
         return _this;
     }
     Client.prototype.ResendAfter = function (lastAck) {
@@ -183,6 +183,7 @@ var Client = /** @class */ (function (_super) {
         }
         return unpacked;
     };
+    /* Send a Control Msg to the server. (used for disconnect)*/
     Client.prototype.SendControlMsg = function (msg, ExtraMsg) {
         var _this = this;
         if (ExtraMsg === void 0) { ExtraMsg = ""; }
@@ -202,6 +203,7 @@ var Client = /** @class */ (function (_super) {
         */
         });
     };
+    /* Send a Msg (or Msg[]) to the server.*/
     Client.prototype.SendMsgEx = function (Msgs) {
         var _this = this;
         if (this.State == States.STATE_OFFLINE)
@@ -260,9 +262,11 @@ var Client = /** @class */ (function (_super) {
             return;
         this.socket.send(packet, 0, packet.length, this.port, this.host);
     };
+    /* Queue a chunk (It will get sent in the next packet). */
     Client.prototype.QueueChunkEx = function (Msg) {
         this.queueChunkEx.push(Msg);
     };
+    /* Send a Raw Buffer (as chunk) to the server. */
     Client.prototype.SendMsgRaw = function (chunks) {
         if (this.State == States.STATE_OFFLINE)
             return;
@@ -298,6 +302,7 @@ var Client = /** @class */ (function (_super) {
         });
         return chunk;
     };
+    /* Connect the client to the server. */
     Client.prototype.connect = function () {
         var _this = this;
         var _a;
@@ -348,15 +353,15 @@ var Client = /** @class */ (function (_super) {
         }, 5000);
         this.time = new Date().getTime() + 2000; // start sending keepalives after 2s
         if (this.socket)
-            this.socket.on("message", function (a, rinfo) {
+            this.socket.on("message", function (packet, rinfo) {
                 var _a, _b, _c, _d, _e, _f, _g, _h;
                 if (_this.State == 0 || rinfo.address != _this.host || rinfo.port != _this.port)
                     return;
                 clearInterval(connectInterval);
-                if (a.toJSON().data[0] == 0x10) {
-                    if (a.toString().includes("TKEN") || a.toJSON().data[3] == 0x2) {
+                if (packet.toJSON().data[0] == 0x10) {
+                    if (packet.toString().includes("TKEN") || packet.toJSON().data[3] == 0x2) {
                         clearInterval(connectInterval);
-                        _this.TKEN = Buffer.from(a.toJSON().data.slice(a.toJSON().data.length - 4, a.toJSON().data.length));
+                        _this.TKEN = Buffer.from(packet.toJSON().data.slice(packet.toJSON().data.length - 4, packet.toJSON().data.length));
                         _this.SendControlMsg(3);
                         _this.State = States.STATE_LOADING; // loading state
                         _this.receivedSnaps = 0;
@@ -378,42 +383,42 @@ var Client = /** @class */ (function (_super) {
                         }
                         _this.SendMsgEx([client_version, info]);
                     }
-                    else if (a.toJSON().data[3] == 0x4) {
+                    else if (packet.toJSON().data[3] == 0x4) {
                         // disconnected
                         _this.State = States.STATE_OFFLINE;
-                        var reason = (MsgUnpacker_1.unpackString(a.toJSON().data.slice(4)).result);
+                        var reason = (MsgUnpacker_1.unpackString(packet.toJSON().data.slice(4)).result);
                         _this.emit("disconnect", reason);
                     }
-                    if (a.toJSON().data[3] !== 0x0) { // keepalive
+                    if (packet.toJSON().data[3] !== 0x0) { // keepalive
                         _this.lastRecvTime = new Date().getTime();
                     }
                 }
                 else {
                     _this.lastRecvTime = new Date().getTime();
                 }
-                var unpacked = _this.Unpack(a);
-                unpacked.chunks = unpacked.chunks.filter(function (a) { return ((a.flags & 2) && (a.flags & 1)) ? a.seq > _this.ack : true; }); // filter out already received chunks
-                unpacked.chunks.forEach(function (a) {
-                    if (a.flags & 1 && (a.flags !== 15)) { // vital and not connless
-                        if (a.seq === (_this.ack + 1) % (1 << 10)) { // https://github.com/nobody-mb/twchatonly/blob/master/chatonly.cpp#L237
-                            _this.ack = a.seq;
+                var unpacked = _this.Unpack(packet);
+                unpacked.chunks = unpacked.chunks.filter(function (chunk) { return ((chunk.flags & 2) && (chunk.flags & 1)) ? chunk.seq > _this.ack : true; }); // filter out already received chunks
+                unpacked.chunks.forEach(function (chunk) {
+                    if (chunk.flags & 1 && (chunk.flags !== 15)) { // vital and not connless
+                        if (chunk.seq === (_this.ack + 1) % (1 << 10)) { // https://github.com/nobody-mb/twchatonly/blob/master/chatonly.cpp#L237
+                            _this.ack = chunk.seq;
                             _this.requestResend = false;
                         }
                         else { //IsSeqInBackroom (old packet that we already got)
                             var Bottom = (_this.ack - (1 << 10) / 2);
                             if (Bottom < 0) {
-                                if ((a.seq <= _this.ack) || (a.seq >= (Bottom + (1 << 10))))
+                                if ((chunk.seq <= _this.ack) || (chunk.seq >= (Bottom + (1 << 10))))
                                     return;
                             }
                             else {
-                                if (a.seq <= _this.ack && a.seq >= Bottom)
+                                if (chunk.seq <= _this.ack && chunk.seq >= Bottom)
                                     return;
                             }
                             _this.requestResend = true;
                         }
                     }
                 });
-                unpacked.chunks.filter(function (a) { return a.msgid == NETMSGTYPE.SV_BROADCAST && a.type == 'game'; }).forEach(function (a) {
+                unpacked.chunks.filter(function (chunk) { return chunk.msgid == NETMSGTYPE.SV_BROADCAST && chunk.type == 'game'; }).forEach(function (a) {
                     var unpacker = new MsgUnpacker_1.MsgUnpacker(a.raw.toJSON().data);
                     _this.emit("broadcast", unpacker.unpackString());
                 });
@@ -426,10 +431,8 @@ var Client = /** @class */ (function (_super) {
                 });
                 var snapChunks = [];
                 if (((_g = _this.options) === null || _g === void 0 ? void 0 : _g.lightweight) !== true)
-                    snapChunks = unpacked.chunks.filter(function (a) { return a.msg === "SNAP" || a.msg === "SNAP_SINGLE" || a.msg === "SNAP_EMPTY"; });
+                    snapChunks = unpacked.chunks.filter(function (chunk) { return chunk.msg === "SNAP" || chunk.msg === "SNAP_SINGLE" || chunk.msg === "SNAP_EMPTY"; });
                 if (snapChunks.length > 0) {
-                    var part = 0;
-                    var num_parts = 1;
                     if (Math.abs(_this.PredGameTick - _this.AckGameTick) > 10)
                         _this.PredGameTick = _this.AckGameTick + 1;
                     snapChunks.forEach(function (chunk) {
@@ -474,6 +477,9 @@ var Client = /** @class */ (function (_super) {
                     });
                 }
                 var chunkMessages = unpacked.chunks.map(function (a) { return a.msg; });
+                if (unpacked.chunks.findIndex(function (chunk) { return chunk.msgid == 23 && chunk.type == "sys"; }) !== -1) {
+                    _this.game._ping_resolve(new Date().getTime());
+                }
                 if (chunkMessages.includes("SV_CHAT")) {
                     var chat = unpacked.chunks.filter(function (a) { return a.msg == "SV_CHAT"; });
                     chat.forEach(function (a) {
@@ -494,7 +500,7 @@ var Client = /** @class */ (function (_super) {
                         }
                     });
                 }
-                var chat = unpacked.chunks.filter(function (a) { return a.msg == "SV_KILL_MSG" || a.msg == "SV_MOTD"; });
+                var chat = unpacked.chunks.filter(function (chunk) { return chunk.msg == "SV_KILL_MSG" || chunk.msg == "SV_MOTD"; });
                 chat.forEach(function (a) {
                     if (a.msg == "SV_KILL_MSG") {
                         var unpacked = {};
@@ -567,6 +573,7 @@ var Client = /** @class */ (function (_super) {
                 }
             });
     };
+    /* Sending the input. (automatically done unless options.lightweight is on) */
     Client.prototype.sendInput = function (input) {
         if (input === void 0) { input = this.movement.input; }
         if (this.State != States.STATE_ONLINE)
@@ -599,6 +606,7 @@ var Client = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    /* Disconnect the client. */
     Client.prototype.Disconnect = function () {
         var _this = this;
         return new Promise(function (resolve) {
@@ -611,71 +619,11 @@ var Client = /** @class */ (function (_super) {
             });
         });
     };
-    Client.prototype.Say = function (message, team) {
-        var _a;
-        if (team === void 0) { team = false; }
-        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_SAY, false, 1);
-        packer.AddInt(team ? 1 : 0); // team
-        packer.AddString(message);
-        if (!((_a = this.options) === null || _a === void 0 ? void 0 : _a.lightweight))
-            this.QueueChunkEx(packer);
-        else
-            this.SendMsgEx(packer);
-    };
-    Client.prototype.Vote = function (vote) {
-        var _a;
-        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_VOTE, false, 1);
-        packer.AddInt(vote ? 1 : -1);
-        if (!((_a = this.options) === null || _a === void 0 ? void 0 : _a.lightweight))
-            this.QueueChunkEx(packer);
-        else
-            this.SendMsgEx(packer);
-    };
-    Client.prototype.ChangePlayerInfo = function (playerInfo) {
-        var _a;
-        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_CHANGEINFO, false, 1);
-        packer.AddString(playerInfo.name); //m_pName);
-        packer.AddString(playerInfo.clan); //m_pClan);
-        packer.AddInt(playerInfo.country); //m_Country);
-        packer.AddString(playerInfo.skin); //m_pSkin);
-        packer.AddInt(playerInfo.use_custom_color ? 1 : 0); //m_UseCustomColor);
-        packer.AddInt(playerInfo.color_body); //m_ColorBody);
-        packer.AddInt(playerInfo.color_feet); //m_ColorFeet);
-        if (!((_a = this.options) === null || _a === void 0 ? void 0 : _a.lightweight))
-            this.QueueChunkEx(packer);
-        else
-            this.SendMsgEx(packer);
-    };
-    Client.prototype.Kill = function () {
-        var _a;
-        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_KILL, false, 1);
-        if (!((_a = this.options) === null || _a === void 0 ? void 0 : _a.lightweight))
-            this.QueueChunkEx(packer);
-        else
-            this.SendMsgEx(packer);
-    };
-    Client.prototype.ChangeTeam = function (team) {
-        var _a;
-        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_SETTEAM, false, 1);
-        packer.AddInt(team);
-        if (!((_a = this.options) === null || _a === void 0 ? void 0 : _a.lightweight))
-            this.QueueChunkEx(packer);
-        else
-            this.SendMsgEx(packer);
-    };
-    Client.prototype.Emote = function (emote) {
-        var _a;
-        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_EMOTICON, false, 1);
-        packer.AddInt(emote);
-        if (!((_a = this.options) === null || _a === void 0 ? void 0 : _a.lightweight))
-            this.QueueChunkEx(packer);
-        else
-            this.SendMsgEx(packer);
-    };
+    /* Get the client_info from a specific player id. */
     Client.prototype.client_info = function (id) {
-        var delta = this.SnapUnpacker.deltas.filter(function (a) {
-            return a.type_id == 11
-                && a.id == id;
+        var delta = this.SnapUnpacker.deltas.filter(function (_delta) {
+            return _delta.type_id == 11
+                && _delta.id == id;
         });
         if (delta.length == 0)
             return undefined;
@@ -684,28 +632,31 @@ var Client = /** @class */ (function (_super) {
         // .map(a => a.parsed as ClientInfo);
     };
     Object.defineProperty(Client.prototype, "client_infos", {
+        /* Get all client infos. */
         get: function () {
-            return this.SnapUnpacker.deltas.filter(function (a) { return a.type_id == 11; })
+            return this.SnapUnpacker.deltas.filter(function (_delta) { return _delta.type_id == 11; })
                 .sort(function (a, b) { return a.id - b.id; })
                 .map(function (a) { return a.parsed; });
         },
         enumerable: false,
         configurable: true
     });
+    /* Get the player info from a specific player id. */
     Client.prototype.player_info = function (id) {
-        var delta = this.SnapUnpacker.deltas.filter(function (a) {
-            return a.type_id == 10
-                && a.id == id;
+        var delta = this.SnapUnpacker.deltas.filter(function (_delta) {
+            return _delta.type_id == 10
+                && _delta.id == id;
         });
         if (delta.length == 0)
             return undefined;
         return delta[0].parsed;
     };
     Object.defineProperty(Client.prototype, "player_infos", {
+        /* Get all player infos. */
         get: function () {
-            return this.SnapUnpacker.deltas.filter(function (a) { return a.type_id == 10; })
+            return this.SnapUnpacker.deltas.filter(function (_delta) { return _delta.type_id == 10; })
                 .sort(function (a, b) { return a.id - b.id; })
-                .map(function (a) { return a.parsed; });
+                .map(function (player) { return player.parsed; });
         },
         enumerable: false,
         configurable: true

package/lib/client.ts

@@ -10,6 +10,7 @@ import Movement from './movement';
 import { MsgPacker } from './MsgPacker';
 import { Snapshot } from './snapshot';
 import Huffman from "./huffman";
+import { Game } from "./components/game";
 
 const huff = new Huffman();
 
@@ -146,41 +147,7 @@ declare interface iOptions {
 }
 
 export declare interface Client {
-	host: string;
-	port: number;
-	name: string;
-	State: number; // 0 = offline; 1 = STATE_CONNECTING = 1, STATE_LOADING = 2, STATE_ONLINE = 3
-	ack: number;
-	clientAck: number;
-	receivedSnaps: number; /* wait for 2 ss before seeing self as connected */
-	lastMsg: string;
-	socket: net.Socket | undefined;
-	TKEN: Buffer;
-	time: number;
-	SnapUnpacker: Snapshot;
-
-	timer: number;
-	PredGameTick: number;
-	AckGameTick: number;
 	
-	SnapshotParts: number;
-	currentSnapshotGameTick: number;
-
-	movement: Movement;
-
-	snaps: Buffer[];
-
-	sentChunkQueue: Buffer[];
-	queueChunkEx: MsgPacker[];
-	lastSendTime: number;
-	lastRecvTime: number;
-
-	lastSentMessages: {msg: MsgPacker, ack: number}[];
-
-	// eSnapHolder: eSnap[];
-
-
-	options?: iOptions;
 
 	on(event: 'connected', listener: () => void): this;
 	on(event: 'disconnect', listener: (reason: string) => void): this;
@@ -190,15 +157,49 @@ export declare interface Client {
 	on(event: 'kill', listener: (kill: iKillMsg) => void): this;
 	on(event: 'motd', listener: (message: string) => void): this;
 	
-	requestResend: boolean;
 }
 
+export class Client extends EventEmitter {
 
+	private host: string;
+	private port: number;
+	private name: string;
+	private State: number; // 0 = offline; 1 = STATE_CONNECTING = 1, STATE_LOADING = 2, STATE_ONLINE = 3
+	private ack: number;
+	private clientAck: number;
+	private receivedSnaps: number; /* wait for 2 ss before seeing self as connected */
+	private socket: net.Socket | undefined;
+	private TKEN: Buffer;
+	private time: number;
+	private SnapUnpacker: Snapshot;
+
+	private PredGameTick: number;
+	private AckGameTick: number;
+	
+	private SnapshotParts: number;
+	private currentSnapshotGameTick: number;
 
-export class Client extends EventEmitter {
+	
+	private snaps: Buffer[];
+	
+	private sentChunkQueue: Buffer[];
+	private queueChunkEx: MsgPacker[];
+	private lastSendTime: number;
+	private lastRecvTime: number;
+
+	private lastSentMessages: {msg: MsgPacker, ack: number}[];
+	
+
+	public movement: Movement;
+	public game: Game;
+
+	// eSnapHolder: eSnap[];
 
 
+	public readonly options?: iOptions;
+	private requestResend: boolean;
 
+  
 	constructor(ip: string, port: number, nickname: string, options?: iOptions) {
 		super();
 		this.host = ip;
@@ -217,10 +218,7 @@ export class Client extends EventEmitter {
 		if (options) 			
 			this.options = options;
 
-		this.timer = 0;
-
-		this.movement = new Movement();
-
+			
 		this.snaps = [];
 
 		this.sentChunkQueue = [];
@@ -230,8 +228,7 @@ export class Client extends EventEmitter {
 		this.ack = 0; // ack of messages the client has received
 		this.clientAck = 0; // ack of messages the client has sent
 		this.receivedSnaps = 0; /* wait for 2 snaps before seeing self as connected */
-		this.lastMsg = "";
-		this.socket = net.createSocket("udp4")
+		this.socket = net.createSocket("udp4");
 		this.socket.bind();
 
 		this.TKEN = Buffer.from([255, 255, 255, 255])
@@ -240,10 +237,14 @@ export class Client extends EventEmitter {
 		this.lastRecvTime = new Date().getTime();
 
 		this.lastSentMessages = [];
+		this.movement = new Movement();
+		
+		this.game = new Game(this);
+
 
 	}
 
-	ResendAfter(lastAck: number) {
+	private ResendAfter(lastAck: number) {
 		this.clientAck = lastAck;
 		
 
@@ -256,7 +257,7 @@ export class Client extends EventEmitter {
 		this.SendMsgEx(toResend);
 	}
 
-	Unpack(packet: Buffer): _packet {
+	private Unpack(packet: Buffer): _packet {
 		var unpacked: _packet = { twprotocol: { flags: packet[0] >> 4, ack: ((packet[0]&0xf)<<8) | packet[1], chunkAmount: packet[2], size: packet.byteLength - 3 }, chunks: [] }
 
 
@@ -301,6 +302,8 @@ export class Client extends EventEmitter {
 		}
 		return unpacked
 	}
+
+	/* Send a Control Msg to the server. (used for disconnect)*/
 	SendControlMsg(msg: number, ExtraMsg: string = "") {
 		this.lastSendTime = new Date().getTime();
 		return new Promise((resolve, reject) => {
@@ -320,6 +323,7 @@ export class Client extends EventEmitter {
 		})
 	}
 
+	/* Send a Msg (or Msg[]) to the server.*/
 	SendMsgEx(Msgs: MsgPacker[] | MsgPacker) {
 		if (this.State == States.STATE_OFFLINE)
 			return; 
@@ -378,11 +382,11 @@ export class Client extends EventEmitter {
 			return;
 		this.socket.send(packet, 0, packet.length, this.port, this.host)
 	}
-
+	/* Queue a chunk (It will get sent in the next packet). */
 	QueueChunkEx(Msg: MsgPacker) {
 		this.queueChunkEx.push(Msg);
 	}
-
+	/* Send a Raw Buffer (as chunk) to the server. */
 	SendMsgRaw(chunks: Buffer[]) {
 		if (this.State == States.STATE_OFFLINE)
 			return;
@@ -399,7 +403,7 @@ export class Client extends EventEmitter {
 		this.socket.send(packet, 0, packet.length, this.port, this.host)
 	}
 
-	MsgToChunk(packet: Buffer) {
+	private MsgToChunk(packet: Buffer) {
 		var chunk: chunk = {} as chunk;
 		chunk.bytes = ((packet[0] & 0x3f) << 4) | (packet[1] & ((1 << 4) - 1));
 		chunk.flags = (packet[0] >> 6) & 3;
@@ -423,6 +427,7 @@ export class Client extends EventEmitter {
 		return chunk;
 	}
 
+	/* Connect the client to the server. */
 	connect() {
 		this.State = States.STATE_CONNECTING;
 
@@ -475,14 +480,15 @@ export class Client extends EventEmitter {
 		this.time = new Date().getTime() + 2000; // start sending keepalives after 2s
 
 		if (this.socket)
-			this.socket.on("message", (a, rinfo) => {
+			this.socket.on("message", (packet, rinfo) => {
 				if (this.State == 0 || rinfo.address != this.host || rinfo.port != this.port)
 					return;
 				clearInterval(connectInterval)
-				if (a.toJSON().data[0] == 0x10) {
-					if (a.toString().includes("TKEN") || a.toJSON().data[3] == 0x2) {
+				
+				if (packet.toJSON().data[0] == 0x10) {
+					if (packet.toString().includes("TKEN") || packet.toJSON().data[3] == 0x2) {
 						clearInterval(connectInterval);
-						this.TKEN = Buffer.from(a.toJSON().data.slice(a.toJSON().data.length - 4, a.toJSON().data.length))
+						this.TKEN = Buffer.from(packet.toJSON().data.slice(packet.toJSON().data.length - 4, packet.toJSON().data.length))
 						this.SendControlMsg(3);
 						this.State = States.STATE_LOADING; // loading state
 						this.receivedSnaps = 0;
@@ -507,28 +513,26 @@ export class Client extends EventEmitter {
 						}
 		
 						this.SendMsgEx([client_version, info])
-					} else if (a.toJSON().data[3] == 0x4) {
+					} else if (packet.toJSON().data[3] == 0x4) {
 						// disconnected
 						this.State = States.STATE_OFFLINE;
-						let reason: string = (unpackString(a.toJSON().data.slice(4)).result);
+						let reason: string = (unpackString(packet.toJSON().data.slice(4)).result);
 						this.emit("disconnect", reason);
 					} 
-					if (a.toJSON().data[3] !== 0x0) { // keepalive
+					if (packet.toJSON().data[3] !== 0x0) { // keepalive
 						this.lastRecvTime = new Date().getTime();
 					}
 				} else {
 					this.lastRecvTime = new Date().getTime();
-
 				}
-
 				
-				var unpacked: _packet = this.Unpack(a);
-				unpacked.chunks = unpacked.chunks.filter(a => ((a.flags & 2) && (a.flags & 1)) ? a.seq! > this.ack : true); // filter out already received chunks
-
-				unpacked.chunks.forEach(a => {
-					if (a.flags & 1 && (a.flags !== 15)) { // vital and not connless
-						if (a.seq === (this.ack+1)%(1<<10)) { // https://github.com/nobody-mb/twchatonly/blob/master/chatonly.cpp#L237
-							this.ack = a.seq!;
+				var unpacked: _packet = this.Unpack(packet);
+				unpacked.chunks = unpacked.chunks.filter(chunk => ((chunk.flags & 2) && (chunk.flags & 1)) ? chunk.seq! > this.ack : true); // filter out already received chunks
+				
+				unpacked.chunks.forEach(chunk => {
+					if (chunk.flags & 1 && (chunk.flags !== 15)) { // vital and not connless
+						if (chunk.seq === (this.ack+1)%(1<<10)) { // https://github.com/nobody-mb/twchatonly/blob/master/chatonly.cpp#L237
+							this.ack = chunk.seq!;
 							
 							this.requestResend = false;
 						}
@@ -536,10 +540,10 @@ export class Client extends EventEmitter {
 							let Bottom = (this.ack - (1<<10)/2);
 							
 							if(Bottom < 0) {
-								if((a.seq! <= this.ack) || (a.seq! >= (Bottom + (1<<10))))
+								if((chunk.seq! <= this.ack) || (chunk.seq! >= (Bottom + (1<<10))))
 									return;
 							} else {
-								if(a.seq! <= this.ack && a.seq! >= Bottom)
+								if(chunk.seq! <= this.ack && chunk.seq! >= Bottom)
 									return;
 							}
 							this.requestResend = true;
@@ -548,7 +552,7 @@ export class Client extends EventEmitter {
 					}
 
 				})
-				unpacked.chunks.filter(a => a.msgid == NETMSGTYPE.SV_BROADCAST && a.type == 'game').forEach(a => {
+				unpacked.chunks.filter(chunk => chunk.msgid == NETMSGTYPE.SV_BROADCAST && chunk.type == 'game').forEach(a => {
 					let unpacker = new MsgUnpacker(a.raw.toJSON().data);
 
 					this.emit("broadcast", unpacker.unpackString());
@@ -562,10 +566,8 @@ export class Client extends EventEmitter {
 				})
 				let snapChunks: chunk[] = [];
 				if (this.options?.lightweight !== true) 
-					snapChunks = unpacked.chunks.filter(a => a.msg === "SNAP" || a.msg === "SNAP_SINGLE" || a.msg === "SNAP_EMPTY");
+					snapChunks = unpacked.chunks.filter(chunk => chunk.msg === "SNAP" || chunk.msg === "SNAP_SINGLE" || chunk.msg === "SNAP_EMPTY");
 				if (snapChunks.length > 0) {
-					let part = 0;
-					let num_parts = 1;
 					if (Math.abs(this.PredGameTick - this.AckGameTick) > 10)
 						this.PredGameTick = this.AckGameTick + 1;
 
@@ -625,7 +627,11 @@ export class Client extends EventEmitter {
 					
 					})
 				}
+				
 				var chunkMessages = unpacked.chunks.map(a => a.msg)
+				if (unpacked.chunks.findIndex(chunk => chunk.msgid == 23 && chunk.type == "sys") !== -1) {
+					this.game._ping_resolve(new Date().getTime())
+				}
 				if (chunkMessages.includes("SV_CHAT")) {
 					var chat = unpacked.chunks.filter(a => a.msg == "SV_CHAT");
 					chat.forEach(a => {
@@ -647,7 +653,7 @@ export class Client extends EventEmitter {
 						}
 					})
 				}
-					var chat = unpacked.chunks.filter(a => a.msg == "SV_KILL_MSG" || a.msg == "SV_MOTD");
+					var chat = unpacked.chunks.filter(chunk => chunk.msg == "SV_KILL_MSG" || chunk.msg == "SV_MOTD");
 					chat.forEach(a => {
 						if (a.msg == "SV_KILL_MSG") {
 							var unpacked: iKillMsg = {} as iKillMsg;
@@ -723,6 +729,7 @@ export class Client extends EventEmitter {
 			})
 	}
 
+	/* Sending the input. (automatically done unless options.lightweight is on) */
 	sendInput(input = this.movement.input) {
 		if (this.State != States.STATE_ONLINE)
 			return;
@@ -754,6 +761,7 @@ export class Client extends EventEmitter {
 		return this.movement.input;
 	}
 
+	/* Disconnect the client. */
 	Disconnect() {
 		return new Promise((resolve) => {
 			this.SendControlMsg(4).then(() => {
@@ -766,64 +774,11 @@ export class Client extends EventEmitter {
 		})
 	}
 
-	Say(message: string, team = false) {
-		var packer = new MsgPacker(NETMSGTYPE.CL_SAY, false, 1);
-		packer.AddInt(team ? 1 : 0); // team
-		packer.AddString(message);
-		if (!this.options?.lightweight)
-			this.QueueChunkEx(packer);
-		else
-			this.SendMsgEx(packer);
-	}
-	Vote(vote: boolean) {
-		var packer = new MsgPacker(NETMSGTYPE.CL_VOTE, false, 1);
-		packer.AddInt(vote ? 1 : -1);
-		if (!this.options?.lightweight)
-			this.QueueChunkEx(packer);
-		else
-			this.SendMsgEx(packer);
-	}
-	ChangePlayerInfo(playerInfo: ClientInfo) {
-		var packer = new MsgPacker(NETMSGTYPE.CL_CHANGEINFO, false, 1);
-		packer.AddString(playerInfo.name); //m_pName);
-		packer.AddString(playerInfo.clan); //m_pClan);
-		packer.AddInt(playerInfo.country); //m_Country);
-		packer.AddString(playerInfo.skin); //m_pSkin);
-		packer.AddInt(playerInfo.use_custom_color ? 1 : 0); //m_UseCustomColor);
-		packer.AddInt(playerInfo.color_body); //m_ColorBody);
-		packer.AddInt(playerInfo.color_feet); //m_ColorFeet);
-		if (!this.options?.lightweight)
-			this.QueueChunkEx(packer);
-		else
-			this.SendMsgEx(packer);
-	}
-	Kill() {
-		var packer = new MsgPacker(NETMSGTYPE.CL_KILL, false, 1);
-		if (!this.options?.lightweight)
-			this.QueueChunkEx(packer);
-		else
-			this.SendMsgEx(packer);
-	}
-	ChangeTeam(team: number) {
-		var packer = new MsgPacker(NETMSGTYPE.CL_SETTEAM, false, 1);
-		packer.AddInt(team);
-		if (!this.options?.lightweight)
-			this.QueueChunkEx(packer);
-		else
-			this.SendMsgEx(packer);
-	}
-	Emote(emote: number) {
-		var packer = new MsgPacker(NETMSGTYPE.CL_EMOTICON, false, 1);
-		packer.AddInt(emote);
-		if (!this.options?.lightweight)
-			this.QueueChunkEx(packer);
-		else
-			this.SendMsgEx(packer);
-	}
+	/* Get the client_info from a specific player id. */
 	client_info(id: number) {
-		let delta = this.SnapUnpacker.deltas.filter(a => 
-			a.type_id == 11 
-			&& a.id == id
+		let delta = this.SnapUnpacker.deltas.filter(_delta => 
+			_delta.type_id == 11 
+			&& _delta.id == id
 		);
 
 		if (delta.length == 0)
@@ -832,25 +787,29 @@ export class Client extends EventEmitter {
 			// .sort((a, b) => a.id - b.id)
 			// .map(a => a.parsed as ClientInfo);
 	}
+
+	/* Get all client infos. */
 	get client_infos(): ClientInfo[] {
 		
-		return this.SnapUnpacker.deltas.filter(a => a.type_id == 11)
-			.sort((a, b) => a.id - b.id)
-			.map(a => a.parsed as ClientInfo) ;
+		return this.SnapUnpacker.deltas.filter(_delta => _delta.type_id == 11)
+		.sort((a, b) => a.id - b.id)
+		.map(a => a.parsed as ClientInfo);
 	}
+	/* Get the player info from a specific player id. */
 	player_info(id: number) {
-		let delta = this.SnapUnpacker.deltas.filter(a => 
-			a.type_id == 10
-			&& a.id == id
+		let delta = this.SnapUnpacker.deltas.filter(_delta => 
+			_delta.type_id == 10
+			&& _delta.id == id
 		);
 
 		if (delta.length == 0)
 			return undefined;
 		return delta[0].parsed as PlayerInfo;
 	}
+	/* Get all player infos. */
 	get player_infos(): PlayerInfo[] {
-		return this.SnapUnpacker.deltas.filter(a => a.type_id == 10)
+		return this.SnapUnpacker.deltas.filter(_delta => _delta.type_id == 10)
 			.sort((a, b) => a.id - b.id)
-			.map(a => a.parsed as PlayerInfo);
+			.map(player => player.parsed as PlayerInfo);
 	}
 }

package/lib/components/game.js

@@ -0,0 +1,143 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Game = void 0;
+var MsgPacker_1 = require("../MsgPacker");
+var NETMSGTYPE;
+(function (NETMSGTYPE) {
+    NETMSGTYPE[NETMSGTYPE["EX"] = 0] = "EX";
+    NETMSGTYPE[NETMSGTYPE["SV_MOTD"] = 1] = "SV_MOTD";
+    NETMSGTYPE[NETMSGTYPE["SV_BROADCAST"] = 2] = "SV_BROADCAST";
+    NETMSGTYPE[NETMSGTYPE["SV_CHAT"] = 3] = "SV_CHAT";
+    NETMSGTYPE[NETMSGTYPE["SV_KILLMSG"] = 4] = "SV_KILLMSG";
+    NETMSGTYPE[NETMSGTYPE["SV_SOUNDGLOBAL"] = 5] = "SV_SOUNDGLOBAL";
+    NETMSGTYPE[NETMSGTYPE["SV_TUNEPARAMS"] = 6] = "SV_TUNEPARAMS";
+    NETMSGTYPE[NETMSGTYPE["SV_EXTRAPROJECTILE"] = 7] = "SV_EXTRAPROJECTILE";
+    NETMSGTYPE[NETMSGTYPE["SV_READYTOENTER"] = 8] = "SV_READYTOENTER";
+    NETMSGTYPE[NETMSGTYPE["SV_WEAPONPICKUP"] = 9] = "SV_WEAPONPICKUP";
+    NETMSGTYPE[NETMSGTYPE["SV_EMOTICON"] = 10] = "SV_EMOTICON";
+    NETMSGTYPE[NETMSGTYPE["SV_VOTECLEAROPTIONS"] = 11] = "SV_VOTECLEAROPTIONS";
+    NETMSGTYPE[NETMSGTYPE["SV_VOTEOPTIONLISTADD"] = 12] = "SV_VOTEOPTIONLISTADD";
+    NETMSGTYPE[NETMSGTYPE["SV_VOTEOPTIONADD"] = 13] = "SV_VOTEOPTIONADD";
+    NETMSGTYPE[NETMSGTYPE["SV_VOTEOPTIONREMOVE"] = 14] = "SV_VOTEOPTIONREMOVE";
+    NETMSGTYPE[NETMSGTYPE["SV_VOTESET"] = 15] = "SV_VOTESET";
+    NETMSGTYPE[NETMSGTYPE["SV_VOTESTATUS"] = 16] = "SV_VOTESTATUS";
+    NETMSGTYPE[NETMSGTYPE["CL_SAY"] = 17] = "CL_SAY";
+    NETMSGTYPE[NETMSGTYPE["CL_SETTEAM"] = 18] = "CL_SETTEAM";
+    NETMSGTYPE[NETMSGTYPE["CL_SETSPECTATORMODE"] = 19] = "CL_SETSPECTATORMODE";
+    NETMSGTYPE[NETMSGTYPE["CL_STARTINFO"] = 20] = "CL_STARTINFO";
+    NETMSGTYPE[NETMSGTYPE["CL_CHANGEINFO"] = 21] = "CL_CHANGEINFO";
+    NETMSGTYPE[NETMSGTYPE["CL_KILL"] = 22] = "CL_KILL";
+    NETMSGTYPE[NETMSGTYPE["CL_EMOTICON"] = 23] = "CL_EMOTICON";
+    NETMSGTYPE[NETMSGTYPE["CL_VOTE"] = 24] = "CL_VOTE";
+    NETMSGTYPE[NETMSGTYPE["CL_CALLVOTE"] = 25] = "CL_CALLVOTE";
+    NETMSGTYPE[NETMSGTYPE["CL_ISDDNETLEGACY"] = 26] = "CL_ISDDNETLEGACY";
+    NETMSGTYPE[NETMSGTYPE["SV_DDRACETIMELEGACY"] = 27] = "SV_DDRACETIMELEGACY";
+    NETMSGTYPE[NETMSGTYPE["SV_RECORDLEGACY"] = 28] = "SV_RECORDLEGACY";
+    NETMSGTYPE[NETMSGTYPE["UNUSED"] = 29] = "UNUSED";
+    NETMSGTYPE[NETMSGTYPE["SV_TEAMSSTATELEGACY"] = 30] = "SV_TEAMSSTATELEGACY";
+    NETMSGTYPE[NETMSGTYPE["CL_SHOWOTHERSLEGACY"] = 31] = "CL_SHOWOTHERSLEGACY";
+    NETMSGTYPE[NETMSGTYPE["NUM"] = 32] = "NUM";
+})(NETMSGTYPE || (NETMSGTYPE = {}));
+;
+var Game = /** @class */ (function () {
+    function Game(_client) {
+        // this.SendMsgEx = callback;
+        this._client = _client;
+        this._ping_resolve = function () { };
+    }
+    Game.prototype.send = function (packer) {
+        var _a;
+        if (!((_a = this._client.options) === null || _a === void 0 ? void 0 : _a.lightweight))
+            this._client.QueueChunkEx(packer);
+        else
+            this._client.SendMsgEx(packer);
+    };
+    Game.prototype.Say = function (message, team) {
+        if (team === void 0) { team = false; }
+        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_SAY, false, 1);
+        packer.AddInt(team ? 1 : 0); // team
+        packer.AddString(message);
+        this.send(packer);
+    };
+    /* Set the team of an bot. (-1 spectator team, 0 team red/normal team, 1 team blue) */
+    Game.prototype.SetTeam = function (team) {
+        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_SETTEAM, false, 1);
+        packer.AddInt(team);
+        this.send(packer);
+    };
+    /* Spectate an player, taking their id as parameter. pretty useless */
+    Game.prototype.SpectatorMode = function (SpectatorID) {
+        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_SETSPECTATORMODE, false, 1);
+        packer.AddInt(SpectatorID);
+        this.send(packer);
+    };
+    /* Change the player info */
+    Game.prototype.ChangePlayerInfo = function (playerInfo) {
+        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_CHANGEINFO, false, 1);
+        packer.AddString(playerInfo.name);
+        packer.AddString(playerInfo.clan);
+        packer.AddInt(playerInfo.country);
+        packer.AddString(playerInfo.skin);
+        packer.AddInt(playerInfo.use_custom_color ? 1 : 0);
+        packer.AddInt(playerInfo.color_body);
+        packer.AddInt(playerInfo.color_feet);
+        this.send(packer);
+    };
+    /* Kill */
+    Game.prototype.Kill = function () {
+        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_KILL, false, 1);
+        this.send(packer);
+    };
+    /* Send emote */
+    Game.prototype.Emote = function (emote) {
+        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_EMOTICON, false, 1);
+        packer.AddInt(emote);
+        this.send(packer);
+    };
+    /* Vote for an already running vote (f3 / f4) */
+    Game.prototype.Vote = function (vote) {
+        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_VOTE, false, 1);
+        packer.AddInt(vote ? 1 : -1);
+        this.send(packer);
+    };
+    Game.prototype.CallVote = function (Type, Value, Reason) {
+        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_CALLVOTE, false, 1);
+        packer.AddString(Type);
+        packer.AddString(String(Value));
+        packer.AddString(Reason);
+        this.send(packer);
+    };
+    /* Call a vote for an server option (for example ddnet maps) */
+    Game.prototype.CallVoteOption = function (Value, Reason) {
+        this.CallVote("option", Value, Reason);
+    };
+    /* Call a vote to kick a player. Requires the player id */
+    Game.prototype.CallVoteKick = function (PlayerID, Reason) {
+        this.CallVote("kick", PlayerID, Reason);
+    };
+    /* Call a vote to set a player in spectator mode. Requires the player id */
+    Game.prototype.CallVoteSpectate = function (PlayerID, Reason) {
+        this.CallVote("spectate", PlayerID, Reason);
+    };
+    /** probably some verification of using ddnet client.*/
+    Game.prototype.IsDDNetLegacy = function () {
+        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_ISDDNETLEGACY, false, 1);
+        this.send(packer);
+    };
+    /* returns the ping in ms */
+    Game.prototype.Ping = function () {
+        var _this = this;
+        return new Promise(function (resolve, reject) {
+            var packer = new MsgPacker_1.MsgPacker(22, true, 0);
+            var startTime = new Date().getTime();
+            _this.send(packer);
+            var callback = function (_time) {
+                resolve(_time - startTime);
+                _this._ping_resolve = function () { };
+            };
+            _this._ping_resolve = callback;
+        });
+    };
+    return Game;
+}());
+exports.Game = Game;

package/lib/components/game.ts

@@ -0,0 +1,122 @@
+
+import { MsgPacker } from "../MsgPacker";
+
+import { Client } from "../client";
+enum NETMSGTYPE { EX, SV_MOTD, SV_BROADCAST, SV_CHAT, SV_KILLMSG, SV_SOUNDGLOBAL, SV_TUNEPARAMS, SV_EXTRAPROJECTILE, SV_READYTOENTER, SV_WEAPONPICKUP, SV_EMOTICON, SV_VOTECLEAROPTIONS, SV_VOTEOPTIONLISTADD, SV_VOTEOPTIONADD, SV_VOTEOPTIONREMOVE, SV_VOTESET, SV_VOTESTATUS, CL_SAY, CL_SETTEAM, CL_SETSPECTATORMODE, CL_STARTINFO, CL_CHANGEINFO, CL_KILL, CL_EMOTICON, CL_VOTE, CL_CALLVOTE, CL_ISDDNETLEGACY, SV_DDRACETIMELEGACY, SV_RECORDLEGACY, UNUSED, SV_TEAMSSTATELEGACY, CL_SHOWOTHERSLEGACY, NUM };
+
+export class Game {
+	// SendMsgEx: (Msgs: MsgPacker[] | MsgPacker) => void;
+	private _client: Client;
+	_ping_resolve: (_time: number) => void;
+	constructor(_client: Client) {
+		// this.SendMsgEx = callback;
+		this._client = _client;
+		this._ping_resolve = () => {};
+	
+	}
+	private send(packer: MsgPacker) {
+		if (!this._client.options?.lightweight)
+			this._client.QueueChunkEx(packer);
+		else
+			this._client.SendMsgEx(packer);
+
+	}
+
+	Say(message: string, team = false) {
+		var packer = new MsgPacker(NETMSGTYPE.CL_SAY, false, 1);
+		packer.AddInt(team ? 1 : 0); // team
+		packer.AddString(message);
+		this.send(packer);
+	}
+
+	/* Set the team of an bot. (-1 spectator team, 0 team red/normal team, 1 team blue) */
+	SetTeam(team: number) {
+		var packer = new MsgPacker(NETMSGTYPE.CL_SETTEAM, false, 1);
+		packer.AddInt(team);
+		this.send(packer);
+	}
+	
+	/* Spectate an player, taking their id as parameter. pretty useless */
+	SpectatorMode(SpectatorID: number) {
+		var packer = new MsgPacker(NETMSGTYPE.CL_SETSPECTATORMODE, false, 1);
+		packer.AddInt(SpectatorID);
+		this.send(packer);
+	}
+
+	
+	/* Change the player info */
+	ChangePlayerInfo(playerInfo: ClientInfo) {
+		var packer = new MsgPacker(NETMSGTYPE.CL_CHANGEINFO, false, 1);
+		packer.AddString(playerInfo.name); 
+		packer.AddString(playerInfo.clan); 
+		packer.AddInt(playerInfo.country);
+		packer.AddString(playerInfo.skin); 
+		packer.AddInt(playerInfo.use_custom_color ? 1 : 0); 
+		packer.AddInt(playerInfo.color_body); 
+		packer.AddInt(playerInfo.color_feet); 
+		this.send(packer);
+	}
+
+	/* Kill */
+	Kill() {
+		var packer = new MsgPacker(NETMSGTYPE.CL_KILL, false, 1);
+		this.send(packer);
+	}
+
+	/* Send emote */
+	Emote(emote: number) {
+		var packer = new MsgPacker(NETMSGTYPE.CL_EMOTICON, false, 1);
+		packer.AddInt(emote);
+		this.send(packer);
+	}
+
+	/* Vote for an already running vote (f3 / f4) */
+	Vote(vote: boolean) {
+		var packer = new MsgPacker(NETMSGTYPE.CL_VOTE, false, 1);
+		packer.AddInt(vote ? 1 : -1);
+		this.send(packer);
+	}
+
+	private CallVote(Type: "option" | "kick" | "spectate", Value: string|number, Reason: string) { 
+		var packer = new MsgPacker(NETMSGTYPE.CL_CALLVOTE, false, 1);
+		packer.AddString(Type); 
+		packer.AddString(String(Value));
+		packer.AddString(Reason);
+		this.send(packer);
+	}
+	/* Call a vote for an server option (for example ddnet maps) */
+	CallVoteOption(Value: string, Reason: string) {
+		this.CallVote("option", Value, Reason)
+	}
+	/* Call a vote to kick a player. Requires the player id */
+	CallVoteKick(PlayerID: string|number, Reason: string) {
+		this.CallVote("kick", PlayerID, Reason)
+	}
+	/* Call a vote to set a player in spectator mode. Requires the player id */
+	CallVoteSpectate(PlayerID: string|number, Reason: string) {
+		this.CallVote("spectate", PlayerID, Reason)
+	}
+
+
+	/** probably some verification of using ddnet client.*/
+	IsDDNetLegacy() { 
+		var packer = new MsgPacker(NETMSGTYPE.CL_ISDDNETLEGACY, false, 1);
+		this.send(packer);
+	}
+	/* returns the ping in ms */
+	Ping(): Promise<number> {
+		return new Promise((resolve, reject) => {
+			var packer = new MsgPacker(22, true, 0);
+			let startTime = new Date().getTime();
+			this.send(packer);
+
+			let callback = (_time: number) => {
+				resolve(_time - startTime);
+				this._ping_resolve = () => {};
+			}
+			this._ping_resolve = callback;
+		})
+	}
+	
+
+}

package/lib/movement.js

@@ -19,7 +19,7 @@ var Movement = /** @class */ (function () {
         this.input.m_Jump = state ? 1 : 0;
     };
     Movement.prototype.Fire = function () {
-        this.input.m_Fire = 1;
+        this.input.m_Fire++;
     };
     Movement.prototype.Hook = function (state) {
         if (state === void 0) { state = true; }

package/lib/movement.ts

@@ -30,7 +30,7 @@ class Movement {
 		this.input.m_Jump = state ? 1 : 0;
 	}
 	Fire() {
-		this.input.m_Fire = 1;
+		this.input.m_Fire++;
 	}
 	Hook(state = true) {
 		this.input.m_Hook = state ? 1 : 0;

package/lib/snapshot.js

@@ -74,7 +74,7 @@ var Snapshot = /** @class */ (function () {
         pStr = pStr.replace(/\0.*/g, ''); // Remove content from first null char to end.
         return pStr;
     };
-    Snapshot.prototype.parseItem = function (data, Type) {
+    Snapshot.prototype.parseItem = function (data, Type, id) {
         var _item = {};
         switch (Type) {
             case items.OBJ_EX:
@@ -212,6 +212,7 @@ var Snapshot = /** @class */ (function () {
                     use_custom_color: Number(data.slice(14, 15)),
                     color_body: Number(data.slice(15, 16)),
                     color_feet: Number(data.slice(16, 17)),
+                    id: id
                 };
                 break;
             case items.OBJ_SPECTATOR_INFO:
@@ -381,7 +382,7 @@ var Snapshot = /** @class */ (function () {
                     data = out;
                 } // else no previous, use new data
             }
-            var parsed = this_2.parseItem(data, type_id);
+            var parsed = this_2.parseItem(data, type_id, id);
             this_2.eSnapHolder.push({ Snapshot: { Data: data, Key: key }, ack: recvTick });
             items.items.push({ data: data, parsed: parsed, type_id: type_id, id: id, key: key });
         };
@@ -396,11 +397,11 @@ var Snapshot = /** @class */ (function () {
             if (deltatick > -1) {
                 var ____index = this_3.deltas.findIndex(function (delta) { return delta.key == newSnap.Snapshot.Key; });
                 if (____index > -1) {
-                    this_3.deltas[____index] = { data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this_3.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff)) };
+                    this_3.deltas[____index] = { data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this_3.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff), ((newSnap.Snapshot.Key) & 0xffff)) };
                     return "continue";
                 }
             } // else
-            this_3.deltas.push({ data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this_3.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff)) });
+            this_3.deltas.push({ data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this_3.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff), ((newSnap.Snapshot.Key) & 0xffff)) });
         };
         var this_3 = this;
         for (var _i = 0, newSnaps_1 = newSnaps; _i < newSnaps_1.length; _i++) {

package/lib/snapshot.ts

@@ -77,7 +77,7 @@ export class Snapshot {
     	pStr = pStr.replace(/\0.*/g, ''); // Remove content from first null char to end.
 		return pStr;
 	}
-	private parseItem(data: number[], Type: number): Item {
+	private parseItem(data: number[], Type: number, id: number): Item {
 		var _item = {} as Item; 
 		switch (Type) {
 			case items.OBJ_EX:
@@ -216,6 +216,7 @@ export class Snapshot {
 					use_custom_color: Number(data.slice(14, 15)),
 					color_body: Number(data.slice(15, 16)),
 					color_feet: Number(data.slice(16, 17)),
+					id: id
 				} as ClientInfo
 				break;
 			case items.OBJ_SPECTATOR_INFO:
@@ -375,7 +376,7 @@ export class Snapshot {
 			} else
 				_size = unpacker.unpackInt();
 
-			let data = [];
+			let data: number[] = [];
 			for (let j = 0; j < _size; j++) {
 				if (unpacker.remaining.length > 0) 
 					data.push(unpacker.unpackInt());
@@ -393,7 +394,7 @@ export class Snapshot {
 				} // else no previous, use new data
 			} 
 
-			let parsed = this.parseItem(data, type_id)
+			let parsed = this.parseItem(data, type_id, id)
 			this.eSnapHolder.push({Snapshot: {Data: data, Key: key}, ack: recvTick});
 
 			items.items.push({data, parsed, type_id, id, key})
@@ -409,11 +410,11 @@ export class Snapshot {
 				let ____index = this.deltas.findIndex(delta => delta.key == newSnap.Snapshot.Key)
 				
 				if (____index > -1) {
-					this.deltas[____index] = {data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff))};
+					this.deltas[____index] = {data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff), ((newSnap.Snapshot.Key) & 0xffff))};
 					continue;
 				} 
 			} // else
-			this.deltas.push({data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff))});
+			this.deltas.push({data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff), ((newSnap.Snapshot.Key) & 0xffff))});
 		}
 		
 		

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "teeworlds",
-	"version": "2.3.9",
+	"version": "2.4.0",
 	"description": "Library for (ingame) teeworlds bots.",
 	"license": "MIT",
 	"main": "index.js",