owen/AirHockey
1
0
Fork 0
mirror of https://github.com/owenlejeune/AirHockey.git synced 2025-11-08 08:32:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Spectators can now claim free paddles

Browse Source
This commit is contained in:
Owen LeJeune
2018-03-07 21:17:18 -05:00
parent 22027ca315
commit df501d9d4a
2 changed files with 55 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
app.js
View File

@@ -111,25 +111,25 @@ io.on("connection", (socket) => {
});
socket.on("newPlayerRequest", (data) => {
var receivedData = JSON.parse(data);
var name = receivedData.name;
if(PLAYERS_AVAILABLE.p1){
PLAYERS_AVAILABLE.p1 = false;
player1.colour = PLAYER_1_COLOUR;
player1.name = name;
var responseObj = {id: receivedData.id, player: player1};
io.emit("newPlayerResponse", JSON.stringify(responseObj));
}else if(PLAYERS_AVAILABLE.p2){
PLAYERS_AVAILABLE.p2 = false;
player2.colour = PLAYER_2_COLOUR;
player2.name = name;
var responseObj = {id: receivedData.id, player:player2};
io.emit("newPlayerResponse", JSON.stringify(responseObj));
}else{
spectators.push({id: receivedData.id, name: name});
console.log(`Spectators ${spectators}`);
io.emit("newPlayerResponse", JSON.stringify({id: receivedData.id, player: SPECTATOR_STATE, names: spectators}));
}
startGame();
findPlayerPosition(receivedData.name, receivedData.id);
// if(PLAYERS_AVAILABLE.p1){
// PLAYERS_AVAILABLE.p1 = false;
// player1.colour = PLAYER_1_COLOUR;
// player1.name = name;
// var responseObj = {id: receivedData.id, player: player1};
// io.emit("newPlayerResponse", JSON.stringify(responseObj));
// }else if(PLAYERS_AVAILABLE.p2){
// PLAYERS_AVAILABLE.p2 = false;
// player2.colour = PLAYER_2_COLOUR;
// player2.name = name;
// var responseObj = {id: receivedData.id, player:player2};
// io.emit("newPlayerResponse", JSON.stringify(responseObj));
// }else{
// spectators.push({id: receivedData.id, name: name});
// console.log(`Spectators ${spectators}`);
// io.emit("newPlayerResponse", JSON.stringify({id: receivedData.id, player: SPECTATOR_STATE, names: spectators}));
// }
// startGame();
});
socket.on("playerLeaveGame", (data) => {
var receivedData = JSON.parse(data);
@@ -150,8 +150,42 @@ io.on("connection", (socket) => {
io.emit("spectatorLeft", JSON.stringify({spectators: spectators}));
}
});
socket.on("spectatorJoinRequest", (data) => {
var receivedData = JSON.parse(data);
var id = receivedData.id;
var name;
for(let spectator of spectators){
if(id === spectator.id){
name = spectator.name;
spectators.splice(spectator, 1);
break;
}
}
io.emit("spectatorLeft", JSON.stringify({spectators: spectators}));
findPlayerPosition(name, id);
});
});
function findPlayerPosition(name, id){
if(PLAYERS_AVAILABLE.p1){
PLAYERS_AVAILABLE.p1 = false;
player1.colour = PLAYER_1_COLOUR;
player1.name = name;
var responseObj = {id: id, player: player1};
io.emit("newPlayerResponse", JSON.stringify(responseObj));
}else if(PLAYERS_AVAILABLE.p2){
PLAYERS_AVAILABLE.p2 = false;
player2.colour = PLAYER_2_COLOUR;
player2.name = name;
var responseObj = {id: id, player:player2};
io.emit("newPlayerResponse", JSON.stringify(responseObj));
}else{
spectators.push({id: id, name: name});
io.emit("newPlayerResponse", JSON.stringify({id: id, player: SPECTATOR_STATE, names: spectators}));
}
startGame();
}
function resetPlayer(player){
player1.x = PLAYER_1_DEFAULT_X;
player1.y = PLAYER_DEFAULT_Y;

2
html/game.js
View File

@@ -232,6 +232,8 @@ function joinGame(){
var name = prompt("Please enter your name", "");
socket.emit("newPlayerRequest", JSON.stringify({id: id, name: name}));
joined = true;
}else{
socket.emit("spectatorJoinRequest", JSON.stringify({id: id}));
}
}