teeworlds 2.3.9 → 2.4.1

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();
 
@@ -24,7 +25,7 @@ enum States {
 }
 
 
-enum NETMSGTYPE {
+enum NETMSG_Game {
 	EX,
 	SV_MOTD,
 	SV_BROADCAST,
@@ -60,12 +61,58 @@ enum NETMSGTYPE {
 	NUM
 }
 
+enum NETMSG_Sys {
+	NETMSG_EX = 0,
+
+	// the first thing sent by the client
+	// contains the version info for the client
+	NETMSG_INFO = 1,
+
+	// sent by server
+	NETMSG_MAP_CHANGE, // sent when client should switch map
+	NETMSG_MAP_DATA, // map transfer, contains a chunk of the map file
+	NETMSG_CON_READY, // connection is ready, client should send start info
+	NETMSG_SNAP, // normal snapshot, multiple parts
+	NETMSG_SNAPEMPTY, // empty snapshot
+	NETMSG_SNAPSINGLE, // ?
+	NETMSG_SNAPSMALL, //
+	NETMSG_INPUTTIMING, // reports how off the input was
+	NETMSG_RCON_AUTH_STATUS, // result of the authentication
+	NETMSG_RCON_LINE, // line that should be printed to the remote console
+
+	NETMSG_AUTH_CHALLANGE, //
+	NETMSG_AUTH_RESULT, //
+
+	// sent by client
+	NETMSG_READY, //
+	NETMSG_ENTERGAME,
+	NETMSG_INPUT, // contains the inputdata from the client
+	NETMSG_RCON_CMD, //
+	NETMSG_RCON_AUTH, //
+	NETMSG_REQUEST_MAP_DATA, //
+
+	NETMSG_AUTH_START, //
+	NETMSG_AUTH_RESPONSE, //
+
+	// sent by both
+	NETMSG_PING,
+	NETMSG_PING_REPLY,
+	NETMSG_ERROR,
+
+	// sent by server (todo: move it up)
+	NETMSG_RCON_CMD_ADD,
+	NETMSG_RCON_CMD_REM,
+
+	NUM_NETMSGS,
+}
+
 interface chunk {
 	bytes: number,
 	flags: number,
 	sequence?: number,
 	seq?: number,
-	type: 'sys' | 'game',
+	// type: 'sys' | 'game',
+	sys: Boolean,
 	msgid: number,
 	msg: string,
 	raw: Buffer,
@@ -127,6 +174,12 @@ declare interface iMessage {
 	message: string
 }
 
+declare interface iEmoticon {
+	client_id: number,
+	emoticon: number,
+	author?: { ClientInfo?: ClientInfo, PlayerInfo?: PlayerInfo }
+}
+
 declare interface iKillMsg {
 	killer_id: number,
 	killer?: { ClientInfo?: ClientInfo, PlayerInfo?: PlayerInfo },
@@ -146,59 +199,61 @@ 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;
 
+	on(event: 'emote', listener: (message: iEmoticon) => void): this;
 	on(event: 'message', listener: (message: iMessage) => void): this;
 	on(event: 'broadcast', listener: (message: string) => void): this;
 	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;
+
+	private VoteList: string[];
+	// eSnapHolder: eSnap[];
 
 
+	public readonly options?: iOptions;
+	private requestResend: boolean;
 
+  
 	constructor(ip: string, port: number, nickname: string, options?: iOptions) {
 		super();
 		this.host = ip;
@@ -214,13 +269,12 @@ export class Client extends EventEmitter {
 		// this.eSnapHolder = [];
 		this.requestResend = false;
 		
+		this.VoteList = [];
+
 		if (options) 			
 			this.options = options;
 
-		this.timer = 0;
-
-		this.movement = new Movement();
-
+			
 		this.snaps = [];
 
 		this.sentChunkQueue = [];
@@ -230,8 +284,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 +293,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 +313,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: [] }
 
 
@@ -285,7 +342,8 @@ export class Client extends EventEmitter {
 				packet = packet.slice(3) // remove flags & size
 			} else
 				packet = packet.slice(2)
-			chunk.type = packet[0] & 1 ? "sys" : "game"; // & 1 = binary, ****_***1. e.g 0001_0111 sys, 0001_0110 game
+			// chunk.type = packet[0] & 1 ? "sys" : "game"; // & 1 = binary, ****_***1. e.g 0001_0111 sys, 0001_0110 game
+			chunk.sys = Boolean(packet[0] & 1); // & 1 = binary, ****_***1. e.g 0001_0111 sys, 0001_0110 game
 			chunk.msgid = (packet[0] - (packet[0] & 1)) / 2;
 			chunk.msg = messageTypes[packet[0] & 1][chunk.msgid];
 			chunk.raw = packet.slice(1, chunk.bytes)
@@ -301,6 +359,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 +380,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 +439,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 +460,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;
@@ -410,7 +471,8 @@ export class Client extends EventEmitter {
 			packet = packet.slice(3) // remove flags & size
 		} else
 			packet = packet.slice(2)
-		chunk.type = packet[0] & 1 ? "sys" : "game"; // & 1 = binary, ****_***1. e.g 0001_0111 sys, 0001_0110 game
+		// chunk.type = packet[0] & 1 ? "sys" : "game"; // & 1 = binary, ****_***1. e.g 0001_0111 sys, 0001_0110 game
+		chunk.sys = Boolean(packet[0] & 1); // & 1 = binary, ****_***1. e.g 0001_0111 sys, 0001_0110 game
 		chunk.msgid = (packet[0]-(packet[0]&1))/2;
 		chunk.msg = messageTypes[packet[0]&1][chunk.msgid];
 		chunk.raw = packet.slice(1, chunk.bytes)
@@ -423,6 +485,7 @@ export class Client extends EventEmitter {
 		return chunk;
 	}
 
+	/* Connect the client to the server. */
 	connect() {
 		this.State = States.STATE_CONNECTING;
 
@@ -475,14 +538,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 +571,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 +598,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,11 +610,6 @@ export class Client extends EventEmitter {
 					}
 
 				})
-				unpacked.chunks.filter(a => a.msgid == NETMSGTYPE.SV_BROADCAST && a.type == 'game').forEach(a => {
-					let unpacker = new MsgUnpacker(a.raw.toJSON().data);
-
-					this.emit("broadcast", unpacker.unpackString());
-				})
 				this.sentChunkQueue.forEach((buff, i) => {
 					let chunk = this.MsgToChunk(buff);
 					if (chunk.flags & 1) {
@@ -560,16 +617,61 @@ export class Client extends EventEmitter {
 							this.sentChunkQueue.splice(i, 1);
 					} 
 				})
-				let snapChunks: chunk[] = [];
-				if (this.options?.lightweight !== true) 
-					snapChunks = unpacked.chunks.filter(a => a.msg === "SNAP" || a.msg === "SNAP_SINGLE" || a.msg === "SNAP_EMPTY");
-				if (snapChunks.length > 0) {
-					let part = 0;
-					let num_parts = 1;
-					if (Math.abs(this.PredGameTick - this.AckGameTick) > 10)
+				
+				
+				unpacked.chunks.forEach((chunk, index) => {
+					if (chunk.sys) { 
+						// system messages
+						if (chunk.msgid == NETMSG_Sys.NETMSG_PING) { // ping
+							let packer = new MsgPacker(NETMSG_Sys.NETMSG_PING_REPLY, true, 0);
+
+							this.SendMsgEx(packer); // send ping reply
+						} else if (chunk.msgid == NETMSG_Sys.NETMSG_PING_REPLY) { // Ping reply
+							this.game._ping_resolve(new Date().getTime())
+						} 
+
+						// packets neccessary for connection
+						// https://ddnet.org/docs/libtw2/connection/
+
+						if (chunk.msgid == NETMSG_Sys.NETMSG_MAP_CHANGE) {
+							var Msg = new MsgPacker(NETMSG_Sys.NETMSG_READY, true, 1); /* ready */
+							this.SendMsgEx(Msg);		
+						} else if (chunk.msgid == NETMSG_Sys.NETMSG_CON_READY) {
+							var info = new MsgPacker(NETMSG_Game.CL_STARTINFO, false, 1);
+							if (this.options?.identity) {
+								info.AddString(this.options.identity.name); 
+								info.AddString(this.options.identity.clan); 
+								info.AddInt(this.options.identity.country); 
+								info.AddString(this.options.identity.skin); 
+								info.AddInt(this.options.identity.use_custom_color);
+								info.AddInt(this.options.identity.color_body); 
+								info.AddInt(this.options.identity.color_feet); 
+							} else {
+								info.AddString(this.name); /* name */
+								info.AddString(""); /* clan */
+								info.AddInt(-1); /* country */
+								info.AddString("greyfox"); /* skin */
+								info.AddInt(1); /* use custom color */
+								info.AddInt(10346103); /* color body */
+								info.AddInt(65535); /* color feet */
+
+							}
+							var crashmeplx = new MsgPacker(17, true, 1); // rcon
+							crashmeplx.AddString("crashmeplx"); // 64 player support message
+							this.SendMsgEx([info, crashmeplx]);
+						} 
+
+						if (chunk.msgid >= NETMSG_Sys.NETMSG_SNAP && chunk.msgid <= NETMSG_Sys.NETMSG_SNAPSINGLE) {
+							this.receivedSnaps++; /* wait for 2 ss before seeing self as connected */
+							if (this.receivedSnaps == 2) {
+								if (this.State != States.STATE_ONLINE)
+									this.emit('connected')
+								this.State = States.STATE_ONLINE;
+							}
+							if (Math.abs(this.PredGameTick - this.AckGameTick) > 10)
 						this.PredGameTick = this.AckGameTick + 1;
 
-					snapChunks.forEach(chunk => {
+					// snapChunks.forEach(chunk => {
 						let unpacker = new MsgUnpacker(chunk.raw.toJSON().data);
 			
 						let NumParts = 1;
@@ -623,15 +725,65 @@ export class Client extends EventEmitter {
 						} 
 
 					
-					})
+					// })
+
+
 				}
-				var chunkMessages = unpacked.chunks.map(a => a.msg)
-				if (chunkMessages.includes("SV_CHAT")) {
-					var chat = unpacked.chunks.filter(a => a.msg == "SV_CHAT");
-					chat.forEach(a => {
-						if (a.msg == "SV_CHAT") {
-							let unpacker = new MsgUnpacker(a.raw.toJSON().data);
-							var unpacked: iMessage = {
+					} else { 
+						// game messages
+
+						// vote list:
+						if (chunk.msgid == NETMSG_Game.SV_VOTECLEAROPTIONS) {
+							this.VoteList = [];
+						} else if (chunk.msgid == NETMSG_Game.SV_VOTEOPTIONLISTADD) {
+							let unpacker = new MsgUnpacker(chunk.raw.toJSON().data)
+							let NumOptions = unpacker.unpackInt()
+							let list: string[] = [];
+							for (let i = 0; i < 15; i++) {
+								list.push(unpacker.unpackString());
+							}
+							list = list.slice(NumOptions);
+
+							this.VoteList.push(...list);
+						} else if (chunk.msgid == NETMSG_Game.SV_VOTEOPTIONADD) {
+							let unpacker = new MsgUnpacker(chunk.raw.toJSON().data)
+							
+							this.VoteList.push(unpacker.unpackString());
+						} else if (chunk.msgid == NETMSG_Game.SV_VOTEOPTIONREMOVE) {
+							let unpacker = new MsgUnpacker(chunk.raw.toJSON().data)
+							
+							let index = this.VoteList.indexOf(unpacker.unpackString());
+
+							if (index > -1)
+								this.VoteList = this.VoteList.splice(index, 1);
+							
+						}
+
+						// events
+						if (chunk.msgid == NETMSG_Game.SV_EMOTICON) {
+							let unpacker = new MsgUnpacker(chunk.raw.toJSON().data);
+							let unpacked = {
+								client_id: unpacker.unpackInt(),
+								emoticon: unpacker.unpackInt()
+							} as iEmoticon;
+
+							if (unpacked.client_id != -1) {
+								unpacked.author = { 
+									ClientInfo: this.client_info(unpacked.client_id), 
+									PlayerInfo: this.player_info(unpacked.client_id) 
+								}
+							}
+							this.emit("emote", unpacked)
+
+							
+
+						} else if (chunk.msgid == NETMSG_Game.SV_BROADCAST) {
+							let unpacker = new MsgUnpacker(chunk.raw.toJSON().data);
+
+							this.emit("broadcast", unpacker.unpackString());
+						} if (chunk.msgid == NETMSG_Game.SV_CHAT) {
+							let unpacker = new MsgUnpacker(chunk.raw.toJSON().data);
+							let unpacked: iMessage = {
 								team: unpacker.unpackInt(),
 								client_id: unpacker.unpackInt(),
 								message: unpacker.unpackString()
@@ -644,14 +796,9 @@ export class Client extends EventEmitter {
 								}
 							}
 							this.emit("message", unpacked)
-						}
-					})
-				}
-					var chat = unpacked.chunks.filter(a => a.msg == "SV_KILL_MSG" || a.msg == "SV_MOTD");
-					chat.forEach(a => {
-						if (a.msg == "SV_KILL_MSG") {
-							var unpacked: iKillMsg = {} as iKillMsg;
-							let unpacker = new MsgUnpacker(a.raw.toJSON().data);
+						} else if (chunk.msgid == NETMSG_Game.SV_KILLMSG) {
+							let unpacked: iKillMsg = {} as iKillMsg;
+							let unpacker = new MsgUnpacker(chunk.raw.toJSON().data);
 							unpacked.killer_id = unpacker.unpackInt();
 							unpacked.victim_id = unpacker.unpackInt();
 							unpacked.weapon = unpacker.unpackInt();
@@ -663,59 +810,22 @@ export class Client extends EventEmitter {
 							if (unpacked.killer_id != -1 && unpacked.killer_id < 64)
 								unpacked.killer = { ClientInfo: this.client_info(unpacked.killer_id), PlayerInfo: this.player_info(unpacked.killer_id) }
 							this.emit("kill", unpacked)
-						} else if (a.msg == "SV_MOTD") {
-							let unpacker = new MsgUnpacker(a.raw.toJSON().data);
+						} else if (chunk.msgid == NETMSG_Game.SV_MOTD) {
+							let unpacker = new MsgUnpacker(chunk.raw.toJSON().data);
 							let message = unpacker.unpackString();
 							this.emit("motd", message);
 						}
-					})
-
-				if (unpacked.chunks[0] && chunkMessages.includes("SV_READY_TO_ENTER")) {
-					var Msg = new MsgPacker(15, true, 1); /* entergame */
-					this.SendMsgEx(Msg);
-				} else if ((unpacked.chunks[0] && chunkMessages.includes("CAPABILITIES") || unpacked.chunks[0] && chunkMessages.includes("MAP_CHANGE"))) {
-					// send ready
-					var Msg = new MsgPacker(14, true, 1); /* ready */
-					this.SendMsgEx(Msg);
-				} else if ((unpacked.chunks[0] && chunkMessages.includes("CON_READY"))) {
-					var info = new MsgPacker(20, false, 1);
-					if (this.options?.identity) {
-						info.AddString(this.options.identity.name); 
-						info.AddString(this.options.identity.clan); 
-						info.AddInt(this.options.identity.country); 
-						info.AddString(this.options.identity.skin); 
-						info.AddInt(this.options.identity.use_custom_color);
-						info.AddInt(this.options.identity.color_body); 
-						info.AddInt(this.options.identity.color_feet); 
-					} else {
-						info.AddString(this.name); /* name */
-						info.AddString(""); /* clan */
-						info.AddInt(-1); /* country */
-						info.AddString("greyfox"); /* skin */
-						info.AddInt(1); /* use custom color */
-						info.AddInt(10346103); /* color body */
-						info.AddInt(65535); /* color feet */
 
+						// packets neccessary for connection
+						// https://ddnet.org/docs/libtw2/connection/
+						if (chunk.msgid == NETMSG_Game.SV_READYTOENTER) {
+							var Msg = new MsgPacker(15, true, 1); /* entergame */
+							this.SendMsgEx(Msg);
+						}
 					}
-					var crashmeplx = new MsgPacker(17, true, 1); // rcon
-					crashmeplx.AddString("crashmeplx"); // 64 player support message
-					this.SendMsgEx([info, crashmeplx]);
-
-
-
-				} else if (unpacked.chunks[0] && chunkMessages.includes("PING")) {
-					var info = new MsgPacker(23, true, 1);
-					this.SendMsgEx(info)
-				}
-				if (chunkMessages.includes("SNAP") || chunkMessages.includes("SNAP_EMPTY") || chunkMessages.includes("SNAP_SINGLE")) {
-					this.receivedSnaps++; /* wait for 2 ss before seeing self as connected */
-					if (this.receivedSnaps == 2) {
-						if (this.State != States.STATE_ONLINE)
-							this.emit('connected')
-						this.State = States.STATE_ONLINE;
-					}
+				})
 
-				}
+				
 				if (new Date().getTime() - this.time >= 1000 && this.State == States.STATE_ONLINE) {
 					this.time = new Date().getTime();
 					this.SendControlMsg(0);
@@ -723,6 +833,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 +865,7 @@ export class Client extends EventEmitter {
 		return this.movement.input;
 	}
 
+	/* Disconnect the client. */
 	Disconnect() {
 		return new Promise((resolve) => {
 			this.SendControlMsg(4).then(() => {
@@ -766,64 +878,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 +891,33 @@ 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);
+	}
+
+	get VoteOptionList(): string[] {
+		return this.VoteList;
 	}
 }