teeworlds 2.3.8 → 2.4.0

package/README.md

@@ -6,7 +6,8 @@ https://www.npmjs.com/package/teeworlds
 
 # Usage
 Example file:
-```const teeworlds = require('teeworlds');
+```
+const teeworlds = require('teeworlds')
 let client = new teeworlds.Client("127.0.0.1", 8303, "nameless tee");
 
 client.connect();
@@ -16,83 +17,73 @@ client.on("connected", () => {
 })
 
 client.on("disconnect", reason => {
-	// if you got kicked from the server
+	// you got kicked from the server
 	console.log("Disconnected: " + reason);
 })
 
 client.on("message", message => {
 	/* {
-  team: 0,
-  client_id: 14,
-  message: 'a',
-  author: {
-    ClientInfo: {
-      name: 'Nudelsaft c:',
-      clan: '',
-      country: 276,
-      skin: 'coala_toptri',
-      use_custom_color: 0,
-      color_body: 4718592,
-      color_feet: 5046016
-    },
-    PlayerInfo: { local: 0, client_id: 4, team: 0, score: 36, latency: 0 }
-  }
-}
+		team: 0,
+		client_id: 14,
+		message: 'a',
+		author: {
+			ClientInfo: {
+			name: 'Nudelsaft c:',
+			clan: '',
+			country: 276,
+			skin: 'coala_toptri',
+			use_custom_color: 0,
+			color_body: 4718592,
+			color_feet: 5046016
+			},
+			PlayerInfo: { local: 0, client_id: 4, team: 0, score: 36, latency: 0 }
+		}
+		}
 	 */
 	console.log(message);
 })
 
 client.on("kill", info => {
 	/* {
-  killer_id: 14,
-  victim_id: 14,
-  weapon: -3,
-  special_mode: 0,
-  victim: {
-    ClientInfo: {
-      name: 'Nudelsaft c:',
-      clan: '',
-      country: 276,
-      skin: 'coala_toptri',
-      use_custom_color: 0,
-      color_body: 4718592,
-      color_feet: 5046016
-    },
-    PlayerInfo: { local: 0, client_id: 4, team: 0, score: 36, latency: 0 }
-  },
-  killer: {
-    ClientInfo: {
-      name: 'Nudelsaft c:',
-      clan: '',
-      country: 276,
-      skin: 'coala_toptri',
-      use_custom_color: 0,
-      color_body: 4718592,
-      color_feet: 5046016
-    },
-    PlayerInfo: { local: 0, client_id: 4, team: 0, score: 36, latency: 0 }
-  }
-}
+		killer_id: 14,
+		victim_id: 14,
+		weapon: -3,
+		special_mode: 0,
+		victim: {
+			ClientInfo: {
+			name: 'Nudelsaft c:',
+			clan: '',
+			country: 276,
+			skin: 'coala_toptri',
+			use_custom_color: 0,
+			color_body: 4718592,
+			color_feet: 5046016
+			},
+			PlayerInfo: { local: 0, client_id: 4, team: 0, score: 36, latency: 0 }
+		},
+		killer: {
+			ClientInfo: {
+			name: 'Nudelsaft c:',
+			clan: '',
+			country: 276,
+			skin: 'coala_toptri',
+			use_custom_color: 0,
+			color_body: 4718592,
+			color_feet: 5046016
+			},
+			PlayerInfo: { local: 0, client_id: 4, team: 0, score: 36, latency: 0 }
+		}
+	}
 	*/
 	console.log(info)
 })
 
 process.on("SIGINT", () => {
-	client.Disconnect(); // disconnect on ctrl + c
+	client.Disconnect().then(() => process.exit(0)); // disconnect on ctrl + c
+	// process.exit()
 })
 process.stdin.on("data", data => {
-	client.Say(data.toString()); // write input in chat
+	client.game.Say(data.toString()); // write input in chat
 	
 })
-
-function change() {
-	client.ChangePlayerInfo({
-		name: "new name",
-		clan: "new clan",
-		country: 12,
-		skin: "default",
-		use_custom_color: true,
-		color_body: 12,
-		color_feet: 1111
-	})
-}```
+```

package/lib/MsgUnpacker.js

@@ -3,20 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MsgUnpacker = exports.unpackString = exports.unpackInt = void 0;
 var decoder = new TextDecoder('utf-8');
 function unpackInt(pSrc) {
-    var result = 0;
-    // var iter = pSrc[Symbol.iterator]()
-    // var src: any = iter.next()
-    // src = src.value
     var srcIndex = 0;
     var sign = ((pSrc[srcIndex] >> 6) & 1);
-    result |= (pSrc[srcIndex] & 63);
-    for (var i = 0; i < 4; i++) {
+    var result = (pSrc[srcIndex] & 63);
+    while (srcIndex <= 4) {
         if ((pSrc[srcIndex] & 128) === 0)
             break;
-        // src = iter.next()
-        // src = src.value;
         srcIndex++;
-        result |= ((pSrc[srcIndex] & 127)) << (6 + 7 * i);
+        result |= ((pSrc[srcIndex] & 127)) << (6 + 7 * (srcIndex - 1));
     }
     result ^= -sign;
     return { result: result, remaining: pSrc.slice(srcIndex + 1) };

package/lib/MsgUnpacker.ts

@@ -1,23 +1,17 @@
 const decoder = new TextDecoder('utf-8');
 export function unpackInt(pSrc: number[]): {result: number, remaining: number[]} {
-	var result = 0;
 	
-	// var iter = pSrc[Symbol.iterator]()
-	// var src: any = iter.next()
-	// src = src.value
-	let srcIndex = 0;
-	var sign = ((pSrc[srcIndex] >> 6) & 1)
+	var srcIndex = 0;
+	const sign = ((pSrc[srcIndex] >> 6) & 1)
 	
-	result |= (pSrc[srcIndex] & 0b0011_1111)
-	for (let i = 0; i < 4; i++) {
+	var result = (pSrc[srcIndex] & 0b0011_1111)
+	while (srcIndex <= 4) {
 		
 		if ((pSrc[srcIndex] & 0b1000_0000) === 0)
 			break;
-		// src = iter.next()
 
-		// src = src.value;
 		srcIndex++;
-		result |= ((pSrc[srcIndex] & 0b0111_1111)) << (6+7*i)
+		result |= ((pSrc[srcIndex] & 0b0111_1111)) << (6+7*(srcIndex-1))
 		
 	}
 	result ^= -sign;

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) {
@@ -108,13 +109,13 @@ var Client = /** @class */ (function (_super) {
         _this.name = nickname;
         _this.AckGameTick = 0;
         _this.PredGameTick = 0;
+        _this.currentSnapshotGameTick = 0;
+        _this.SnapshotParts = 0;
         _this.SnapUnpacker = new snapshot_1.Snapshot();
         // this.eSnapHolder = [];
         _this.requestResend = false;
         if (options)
             _this.options = options;
-        _this.timer = 0;
-        _this.movement = new movement_1.default();
         _this.snaps = [];
         _this.sentChunkQueue = [];
         _this.queueChunkEx = [];
@@ -122,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]);
@@ -130,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) {
@@ -181,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 = ""; }
@@ -200,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)
@@ -258,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;
@@ -296,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;
@@ -346,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;
@@ -376,41 +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.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());
                 });
@@ -423,52 +431,55 @@ 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) {
                         var unpacker = new MsgUnpacker_1.MsgUnpacker(chunk.raw.toJSON().data);
-                        var AckGameTick = unpacker.unpackInt();
-                        var DeltaTick = AckGameTick - unpacker.unpackInt();
-                        if (AckGameTick >= _this.AckGameTick) {
-                            if (_this.AckGameTick == -1) { // reset ack
-                                if (DeltaTick == -1) { // acked reset
-                                    _this.AckGameTick = AckGameTick;
-                                }
-                            }
-                            else
-                                _this.AckGameTick = AckGameTick;
-                            if (Math.abs(_this.PredGameTick - _this.AckGameTick) > 10)
-                                _this.PredGameTick = AckGameTick + 1;
-                            var num_parts_1 = 1;
-                            var part_1 = 0;
-                            if (chunk.msg === "SNAP") {
-                                num_parts_1 = unpacker.unpackInt();
-                                part_1 = unpacker.unpackInt();
-                            }
-                            var crc = 0;
-                            var part_size = 0;
-                            if (chunk.msg != "SNAP_EMPTY") {
-                                crc = unpacker.unpackInt(); // crc
-                                part_size = unpacker.unpackInt();
-                            }
-                            if (part_1 === 0 || _this.snaps.length > 30) {
+                        var NumParts = 1;
+                        var Part = 0;
+                        var GameTick = unpacker.unpackInt();
+                        var DeltaTick = GameTick - unpacker.unpackInt();
+                        var PartSize = 0;
+                        var Crc = 0;
+                        var CompleteSize = 0;
+                        if (chunk.msg == "SNAP") {
+                            NumParts = unpacker.unpackInt();
+                            Part = unpacker.unpackInt();
+                        }
+                        if (chunk.msg != "SNAP_EMPTY") {
+                            Crc = unpacker.unpackInt();
+                            PartSize = unpacker.unpackInt();
+                        }
+                        if (PartSize < 1 || NumParts > 64 || Part < 0 || Part >= NumParts || PartSize <= 0 || PartSize > 900)
+                            return;
+                        if (GameTick >= _this.currentSnapshotGameTick) {
+                            if (GameTick != _this.currentSnapshotGameTick) {
                                 _this.snaps = [];
+                                _this.SnapshotParts = 0;
+                                _this.currentSnapshotGameTick = GameTick;
                             }
-                            chunk.raw = Buffer.from(unpacker.remaining);
-                            _this.snaps.push(chunk.raw);
-                            if ((num_parts_1 - 1) === part_1 && _this.snaps.length === num_parts_1) {
+                            // chunk.raw = Buffer.from(unpacker.remaining);
+                            _this.snaps[Part] = Buffer.from(unpacker.remaining);
+                            _this.SnapshotParts |= 1 << Part;
+                            if (_this.SnapshotParts == ((1 << NumParts) - 1)) {
                                 var mergedSnaps = Buffer.concat(_this.snaps);
-                                var snapUnpacked = _this.SnapUnpacker.unpackSnapshot(mergedSnaps.toJSON().data, DeltaTick, AckGameTick);
-                                _this.AckGameTick = snapUnpacked.recvTick;
+                                _this.SnapshotParts = 0;
+                                var snapUnpacked = _this.SnapUnpacker.unpackSnapshot(mergedSnaps.toJSON().data, DeltaTick, GameTick);
                                 _this.emit("snapshot");
+                                _this.AckGameTick = snapUnpacked.recvTick;
+                                if (Math.abs(_this.PredGameTick - _this.AckGameTick) > 10)
+                                    _this.PredGameTick = _this.AckGameTick + 1;
                                 _this.sendInput();
                             }
                         }
                     });
                 }
                 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) {
@@ -489,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 = {};
@@ -562,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)
@@ -594,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) {
@@ -606,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;
@@ -679,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