teeworlds 2.3.8 → 2.4.0

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

@@ -57,24 +57,24 @@ var Snapshot = /** @class */ (function () {
     }
     Snapshot.prototype.IntsToStr = function (pInts) {
         var pIntz = [];
-        var pStr = '';
+        // var pStr = ''
         for (var _i = 0, pInts_1 = pInts; _i < pInts_1.length; _i++) {
             var x = pInts_1[_i];
-            pStr += String.fromCharCode((((x) >> 24) & 0xff) - 128);
+            // pStr += String.fromCharCode((((x) >> 24) & 0xff) - 128);
             pIntz.push((((x) >> 24) & 0xff) - 128);
-            pStr += String.fromCharCode((((x) >> 16) & 0xff) - 128);
+            // pStr += String.fromCharCode((((x) >> 16) & 0xff) - 128);
             pIntz.push((((x) >> 16) & 0xff) - 128);
-            pStr += String.fromCharCode((((x) >> 8) & 0xff) - 128);
+            // pStr += String.fromCharCode((((x) >> 8) & 0xff) - 128);
             pIntz.push((((x) >> 8) & 0xff) - 128);
-            pStr += String.fromCharCode(((x) & 0xff) - 128);
+            // pStr += String.fromCharCode(((x) & 0xff) - 128);
             pIntz.push(((x) & 0xff) - 128);
         }
         pIntz.splice(-1, 1);
-        pStr = decoder.decode(new Uint8Array(pIntz));
+        var pStr = decoder.decode(new Uint8Array(pIntz));
         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:
@@ -302,8 +303,9 @@ var Snapshot = /** @class */ (function () {
         }
         if (snap.length == 0) {
             // empty snap, copy old one into new ack
-            this.eSnapHolder.filter(function (a) { return a.ack == deltatick; }).forEach(function (snap) {
-                _this.eSnapHolder.push({ Snapshot: snap.Snapshot, ack: recvTick });
+            this.eSnapHolder.forEach(function (snap) {
+                if (snap.ack == deltatick)
+                    _this.eSnapHolder.push({ Snapshot: snap.Snapshot, ack: recvTick });
             });
             return { items: [], recvTick: recvTick };
         }
@@ -316,15 +318,6 @@ var Snapshot = /** @class */ (function () {
         var num_removed_items = unpacker.unpackInt();
         var num_item_deltas = unpacker.unpackInt();
         unpacker.unpackInt(); // _zero padding
-        var _loop_1 = function (i) {
-            var deleted_key = unpacker.unpackInt(); // removed_item_keys
-            var index = this_1.deltas.map(function (delta) { return delta.key; }).indexOf(deleted_key);
-            // console.log("deleting ", deleted_key, index)
-            if (index > -1)
-                this_1.deltas.splice(index, 1);
-            this_1.eSnapHolder = this_1.eSnapHolder.filter(function (a) { return a.Snapshot.Key !== deleted_key; });
-        };
-        var this_1 = this;
         /*snapshot_delta:
             [ 4] num_removed_items
             [ 4] num_item_deltas
@@ -332,9 +325,22 @@ var Snapshot = /** @class */ (function () {
             [*4] removed_item_keys
             [  ] item_deltas
         */
+        var deleted = [];
+        var _loop_1 = function (i) {
+            var deleted_key = unpacker.unpackInt(); // removed_item_keys
+            // let index = this.deltas.map(delta => delta.key).indexOf(deleted_key);
+            var index = this_1.deltas.findIndex(function (delta) { return delta.key === deleted_key; });
+            // console.log("deleting ", deleted_key, index)
+            if (index > -1)
+                this_1.deltas.splice(index, 1);
+            deleted.push(deleted_key);
+        };
+        var this_1 = this;
         for (var i = 0; i < num_removed_items; i++) {
             _loop_1(i);
         }
+        if (deleted.length)
+            this.eSnapHolder = this.eSnapHolder.filter(function (a) { return !deleted.includes(a.Snapshot.Key); });
         /*item_delta:
             [ 4] type_id
             [ 4] id
@@ -350,7 +356,7 @@ var Snapshot = /** @class */ (function () {
         deltaSnaps.forEach(function (a) {
             newSnaps.push({ Snapshot: a.Snapshot, ack: recvTick });
         });
-        for (var i = 0; i < num_item_deltas; i++) {
+        var _loop_2 = function (i) {
             var type_id = unpacker.unpackInt();
             var id = unpacker.unpackInt();
             var key = (((type_id) << 16) | (id));
@@ -369,31 +375,38 @@ var Snapshot = /** @class */ (function () {
             }
             // console.log(index, deltatick)
             if (deltatick >= 0) {
-                var index = deltaSnaps.map(function (delta) { return delta.Snapshot.Key; }).indexOf(key);
+                // let index = deltaSnaps.map(delta => delta.Snapshot.Key).indexOf(key)
+                var index = deltaSnaps.findIndex(function (delta) { return delta.Snapshot.Key === key; });
                 if (index > -1) {
                     var out = UndiffItem(deltaSnaps[index].Snapshot.Data, data);
                     data = out;
                 } // else no previous, use new data
             }
-            var parsed = this.parseItem(data, type_id);
-            this.eSnapHolder.push({ Snapshot: { Data: data, Key: key }, ack: recvTick });
+            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 });
+        };
+        var this_2 = this;
+        for (var i = 0; i < num_item_deltas; i++) {
+            _loop_2(i);
         }
-        var _loop_2 = function (newSnap) {
-            if (this_2.eSnapHolder.filter(function (a) { return a.ack == newSnap.ack && a.Snapshot.Key == newSnap.Snapshot.Key; }).length === 0) { // ugly copy new snap to eSnapHolder (if it isnt pushed already)
-                this_2.eSnapHolder.push({ Snapshot: { Data: newSnap.Snapshot.Data, Key: newSnap.Snapshot.Key }, ack: recvTick });
-            }
-            var ____index = this_2.deltas.map(function (delta) { return delta.key; }).indexOf(newSnap.Snapshot.Key);
-            if (____index > -1 && deltatick > -1) {
-                this_2.deltas[____index] = { data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this_2.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff)) };
+        var _loop_3 = function (newSnap) {
+            if (this_3.eSnapHolder.findIndex(function (a) { return a.ack == newSnap.ack && a.Snapshot.Key == newSnap.Snapshot.Key; }) === -1) { // ugly copy new snap to eSnapHolder (if it isnt pushed already)
+                this_3.eSnapHolder.push({ Snapshot: { Data: newSnap.Snapshot.Data, Key: newSnap.Snapshot.Key }, ack: recvTick });
             }
-            else
-                this_2.deltas.push({ data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this_2.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff)) });
+            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), ((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), ((newSnap.Snapshot.Key) & 0xffff)) });
         };
-        var this_2 = this;
+        var this_3 = this;
         for (var _i = 0, newSnaps_1 = newSnaps; _i < newSnaps_1.length; _i++) {
             var newSnap = newSnaps_1[_i];
-            _loop_2(newSnap);
+            _loop_3(newSnap);
         }
         return { items: items, recvTick: recvTick };
     };

package/lib/snapshot.ts

@@ -60,24 +60,24 @@ export class Snapshot {
 
 	private IntsToStr(pInts: number[]): string {
 		var pIntz: number[] = [];
-		var pStr = ''
+		// var pStr = ''
 		for (let x of pInts) {
-			pStr += String.fromCharCode((((x) >> 24) & 0xff) - 128);
+			// pStr += String.fromCharCode((((x) >> 24) & 0xff) - 128);
 			pIntz.push((((x) >> 24) & 0xff) - 128);
-			pStr += String.fromCharCode((((x) >> 16) & 0xff) - 128);
+			// pStr += String.fromCharCode((((x) >> 16) & 0xff) - 128);
 			pIntz.push((((x) >> 16) & 0xff) - 128);
-			pStr += String.fromCharCode((((x) >> 8) & 0xff) - 128);
+			// pStr += String.fromCharCode((((x) >> 8) & 0xff) - 128);
 			pIntz.push((((x) >> 8) & 0xff) - 128);
-			pStr += String.fromCharCode(((x) & 0xff) - 128);
+			// pStr += String.fromCharCode(((x) & 0xff) - 128);
 			pIntz.push(((x) & 0xff) - 128);
 		}
 		pIntz.splice(-1, 1)
-		pStr = decoder.decode(new Uint8Array(pIntz));
+		let pStr = decoder.decode(new Uint8Array(pIntz));
 
     	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:
@@ -306,7 +307,8 @@ export class Snapshot {
 		}
 		if (snap.length == 0) {
 			// empty snap, copy old one into new ack
-			this.eSnapHolder.filter(a => a.ack == deltatick).forEach(snap => {
+			this.eSnapHolder.forEach(snap => {
+				if (snap.ack == deltatick)
 				this.eSnapHolder.push({Snapshot: snap.Snapshot, ack: recvTick});
 
 			})
@@ -330,14 +332,19 @@ export class Snapshot {
 			[  ] item_deltas
 		*/
 
+		var deleted: number[] = [];
 		for (let i = 0; i < num_removed_items; i++) {
 			let deleted_key = unpacker.unpackInt(); // removed_item_keys
-			let index = this.deltas.map(delta => delta.key).indexOf(deleted_key);
+			// let index = this.deltas.map(delta => delta.key).indexOf(deleted_key);
+			let index = this.deltas.findIndex(delta => delta.key === deleted_key);
 			// console.log("deleting ", deleted_key, index)
 			if (index > -1)
 				this.deltas.splice(index, 1);
-			this.eSnapHolder = this.eSnapHolder.filter(a => a.Snapshot.Key !== deleted_key);
+			deleted.push(deleted_key)
 		}
+		if (deleted.length)
+			this.eSnapHolder = this.eSnapHolder.filter(a => !deleted.includes(a.Snapshot.Key));
+		
 		/*item_delta:
 			[ 4] type_id
 			[ 4] id
@@ -369,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());
@@ -378,7 +385,8 @@ export class Snapshot {
 			}
 			// console.log(index, deltatick)
 			if (deltatick >= 0) { 
-				let index = deltaSnaps.map(delta => delta.Snapshot.Key).indexOf(key)
+				// let index = deltaSnaps.map(delta => delta.Snapshot.Key).indexOf(key)
+				let index = deltaSnaps.findIndex(delta => delta.Snapshot.Key === key);
 				if (index > -1) {
 				
 					let out = UndiffItem(deltaSnaps[index].Snapshot.Data, data)
@@ -386,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})
@@ -395,21 +403,25 @@ export class Snapshot {
 
 		}
 		for (let newSnap of newSnaps) {
-			if (this.eSnapHolder.filter(a => a.ack == newSnap.ack && a.Snapshot.Key == newSnap.Snapshot.Key).length === 0) { // ugly copy new snap to eSnapHolder (if it isnt pushed already)
+			if (this.eSnapHolder.findIndex(a => a.ack == newSnap.ack && a.Snapshot.Key == newSnap.Snapshot.Key) === -1) { // ugly copy new snap to eSnapHolder (if it isnt pushed already)
 				this.eSnapHolder.push({Snapshot: {Data: newSnap.Snapshot.Data, Key: newSnap.Snapshot.Key}, ack: recvTick});
 			}
-			let ____index = this.deltas.map(delta => delta.key).indexOf(newSnap.Snapshot.Key);
-
-			if (____index > -1 && deltatick > -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))};
-			} 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))});
+			if (deltatick > -1) {
+				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), ((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), ((newSnap.Snapshot.Key) & 0xffff))});
 		}
 		
 		
 		return {items, recvTick};
 	}
 }
+
 function UndiffItem(oldItem: number[], newItem: number[]): number[] {
 	let out: number[] = newItem;
 	if (JSON.stringify(newItem) === JSON.stringify(oldItem))

package/package.json

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