버그픽스

Author: HelloWorld017

package.json

@@ -16,6 +16,7 @@
     "express-session": "^1.14.1",
     "express-socket.io-session": "^1.3.1",
     "fibers": "^1.0.14",
+    "mongodb": "^2.2.10",
     "morgan": "~1.6.1",
     "serve-favicon": "~2.3.0",
     "socket.io": "^1.4.8"

public/resources/js/render.js

@@ -103,14 +103,18 @@ socket.on('throw yut', function(){
 
 socket.on('chat team', function(data){
 	addToTeamChat(data);
+	teamchat.animate({ scrollTop: teamchat[0].scrollHeight}, 100);
 });
 
 socket.on('chat all', function(data){
 	addToAllChat(data);
+	allchat.animate({ scrollTop: allchat[0].scrollHeight}, 100);
 });
 
 socket.on('finished piece', function(data){
-
+	var piece = players[data.player].pieces[data.id];
+	piece.finished = true;
+	drawnPieces[piece.key].finished = true;
 });
 
 socket.on('piece move', function(data){
@@ -140,15 +144,15 @@ socket.emit('log all');
 if(permission) socket.emit('log team');
 
 function addThrowView(){
-	selectView.innerHTML = '<div class="row">' +
+	selectView[0].innerHTML = '<div class="row">' +
 		'<button type="button" onclick="throwYut(true)" class="btn"><img src="/resources/img/yut-stick-front.svg" style="height: 100px;"></button>' +
 		'<button type="button" onclick="throwYut(false)" class="btn"><img src="/resources/img/yut-stick-back.svg" style="height: 100px;"></button>' +
 	'</div>';
 }
 
 function addSelectView(data){
 	doRender = false;
-	var myColor = players[username].color;
+	var myColor = players[myName].color;
 	ctx.clearRect(0, 0, canvas.width, canvas.height);
 	drawBoard();
 	players[myName].pieces.forEach(function(v){
@@ -161,15 +165,15 @@ function addSelectView(data){
 	});
 
 	var htmlString = '<div class="row">';
-	data.forEach(function(v){
+	data.data.forEach(function(v){
 		htmlString += '<button type="button" onclick="selectPiece(' + v.id + ')" class="btn"><img src="/piece/' + myColor + '/for/' + v.id + '" style="height: 100px;"></button>'
 	});
 	if(data.groupnizable) htmlString += '</div><div class="row">' +
 		'<button type="button" onclick="selectPiece(2)" class="btn">' +
 			'<img src="/piece/' + myColor + '/for/0" style="height: 100px;">' +
 			'<img src="/piece/' + myColor + '/for/1" style="height: 100px;"></button>'
 
-	selectView.innerHTML = htmlString + '</div>';
+	selectView[0].innerHTML = htmlString + '</div>';
 }
 
 function selectPiece(num){
@@ -180,7 +184,7 @@ function selectPiece(num){
 
 function removeSelectView(){
 	doRender = true;
-	selectView.innerHTML = '';
+	selectView[0].innerHTML = '';
 }
 
 function throwYut(isFront){

src/game.js

@@ -160,10 +160,18 @@ class Game{
 			1: []
 		};
 		this.sockets = {};
+		this.status = 'wait-for-player';
+		this.processTurn();
 	}
 
 	attachPlayerAndSocket(playerName, socket){
 		this.players[playerName].socket = socket;
+		if(this.status === 'wait-for-player') return;
+		if(typeof this.status === 'string') socket.emit(this.status);
+		else{
+			if(this.status.name !== undefined && this.status.name !== playerName) return;
+			socket.emit(this.status.content, this.status.data);
+		}
 	}
 
 	detachPlayerAndSocket(playerName, socket){
@@ -181,7 +189,7 @@ class Game{
 	}
 
 	getPieceInTile(piecePosition){
-		this.players.map((v) => v.pieces).map((v) => {
+		return Object.keys(this.players).map((v) => this.players[v].pieces).map((v) => {
 			return v.filter((v) => {
 				return !v.finished && v.pos === piecePosition;
 			});
@@ -249,7 +257,7 @@ class Game{
 				sleep(500);
 			}
 			var movementPoint = 1;
-			while(movementPoint !== 1){
+			while(movementPoint >= 1){
 				this.requestThrowYut();
 
 				var frontStatus = 0;
@@ -280,17 +288,8 @@ class Game{
 					this.players[k].yutStatus = undefined;
 				});
 
-				var turnPlayer = Object.keys(this.players)[this.turn];
+				var turnPlayer = this.players[Object.keys(this.players)[this.turn]];
 				var groupnizable = (turnPlayer.getAvailablePieces().length === 2) && (turnPlayer.pieces[0].pos === turnPlayer.pieces[1].pos) && turnPlayer.pieces[0].pos !== 0;
-				if(turnPlayer.socket !== undefined) turnPlayer.socket.emit('select piece', {
-					data: turnPlayer.getAvailablePieces().map((v) => {
-						return {
-							id: v.pieceId,
-							pos: v.pos
-						};
-					}),
-					groupnizable: groupnizable
-				});
 
 				var waitAmount = 0;
 
@@ -301,15 +300,42 @@ class Game{
 					turnPlayer.selectedPiece = turnPlayer.getAvailablePieces()[0].pieceIndex;
 				}
 
-				while(turnPlayer.selectedPiece !== undefined){
+				this.status = {
+					name: turnPlayer,
+					content: 'select piece',
+					data: {
+						data: turnPlayer.getAvailablePieces().map((v) => {
+							return {
+								id: v.pieceId,
+								pos: v.pos
+							};
+						}),
+						groupnizable: groupnizable
+					}
+				};
+
+				if(turnPlayer.socket !== undefined) turnPlayer.socket.emit('select piece', {
+					data: turnPlayer.getAvailablePieces().map((v) => {
+						return {
+							id: v.pieceId,
+							pos: v.pos
+						};
+					}),
+					groupnizable: groupnizable
+				});
+
+				var selectWait = 0;
+				while(turnPlayer.selectedPiece === undefined){
 					sleep(500);
-					waitAmount++;
-					if(waitAmount > 40){
+					selectWait++;
+					if(selectWait > 40){
 						turnPlayer.selectedPiece = Math.round(Math.random());
 						break;
 					}
 				}
 
+				this.status = 'wait-for-player';
+
 				if(!(turnPlayer.selectedPiece === 2 && groupnizable) && turnPlayer.pieces[turnPlayer.selectedPiece] === undefined){
 					turnPlayer.selectedPiece = turnPlayer.getAvailablePieces()[0].pieceIndex;
 				}
@@ -323,7 +349,8 @@ class Game{
 				})[0];
 
 				var handleMovement = (nextTile, piece) => {
-					piece.pos = nextTile.getId();
+					piece.pos = nextTile;
+					nextTile = this.map[nextTile];
 					piece.movementStack.push(piece.pos);
 					this.broadcastPacket('piece move', {
 						player: turnPlayer.name,
@@ -342,6 +369,7 @@ class Game{
 					return false;
 				};
 
+				var currTile = this.map[piece.pos];
 				if(movementAmount >= 1){
 					handleMovement(currTile.getConnected(piece.movementStack.slice(-1).pop()), piece);
 					if(group) handleMovement(currTile.getBack(piece.movementStack.slice(-1).pop()), anotherPiece);
@@ -355,7 +383,6 @@ class Game{
 					sleep(1000);
 				}
 
-				var currTile = this.map[piece.pos];
 				if(movementAmount === -1){
 					handleMovement(currTile.getBack(piece.movementStack.slice(-1).pop()), piece);
 					if(group) handleMovement(currTile.getBack(piece.movementStack.slice(-1).pop()), anotherPiece);
@@ -383,7 +410,7 @@ class Game{
 
 			this.turn++;
 			setTimeout(this.processTurn, 0);
-		});
+		}).run();
 	}
 
 	getAnotherTeamPlayer(player){
@@ -400,6 +427,7 @@ class Game{
 	}
 
 	requestThrowYut(){
+		this.status = 'throw yut';
 		this.broadcastPacketToPlayers('throw yut');
 		while(!this.allThrowed()){
 			sleep(500);
@@ -408,15 +436,20 @@ class Game{
 
 	save(){
 		var saveData = {};
+		var sockets = {};
 		Object.keys(this.players).forEach((k) => {
 			var v = this.players[k];
 			v.pieces.forEach((v) => {
 				v.player = undefined;
 			});
+			sockets[k] = this.players[k].socket;
+			this.players[k].socket = undefined;
 		});
+
 		saveData.players = JSON.stringify(this.players);
 		Object.keys(this.players).forEach((k) => {
 			var v = this.players[k];
+			this.players[k].socket = sockets[k];
 			v.pieces.forEach((v2) => {
 				v2.player = v;
 			});

src/network/select-piece.js

@@ -4,7 +4,7 @@ class SelectPiecePacket extends PlayerPacket{
 	constructor(){
 		super('select piece', (username, socket, data) => {
 			if(game.players[username] === undefined) return;
-			if(typeof data !== number) return;
+			if(typeof data !== 'number') return;
 			game.handleSelect(username, data);
 		});
 	}

src/network/throw-yut.js

@@ -4,7 +4,7 @@ class ThrowYutPacket extends PlayerPacket{
 	constructor(){
 		super('throw yut', (username, socket, data) => {
 			if(game.players[username] === undefined) return;
-			if(typeof data !== boolean) return;
+			if(typeof data !== 'boolean') return;
 			game.handleThrow(username, data);
 		});
 	}

src/start.js

@@ -82,9 +82,17 @@ MongoClient.connect(url, (err, client) => {
 			new v().listenToSocket(socket);
 		});
 
-		var socketId = game.addSocket(socket);
-		socket.on('disconnect', () => {
-			game.removeSocket(socketId);
-		});
+		var username = socket.handshake.session.username;
+		if(socket.handshake.session.permission && game.players[username] !== undefined){
+			game.attachPlayerAndSocket(username, socket);
+			socket.on('disconnect', () => {
+				game.detachPlayerAndSocket(username, socket);
+			});
+		}else{
+			var socketId = game.addSocket(socket);
+			socket.on('disconnect', () => {
+				game.removeSocket(socketId);
+			});
+		}
 	});
 });