Oliver/Secret-Hitler-Online-Server
0
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Add processing to allow re-joining the game.

Browse source
This commit is contained in:
Oliver-Akins 2020-10-23 23:41:24 -06:00
parent 5d686afe5b
commit ac5b20b8a8
1 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/events/JoinGame.ts
View file

@ -25,21 +25,40 @@ export const JoinGame = (io: Server, socket: Socket, data: JoinGame) => {
let game = active_games[data.game_code]; let game = active_games[data.game_code];
if (game.status !== `lobby`) {
log.warn(`Cannot join the game ${game.code}. (state=${game.status})`); // Ensure username is not already taken
if (game.players[data.username] != null && game.status === `lobby`) {
log.info(`${data.username} tried joining game ${game.code} but the name is already taken.`);
socket.emit(`GameJoined`, { socket.emit(`GameJoined`, {
success: false, success: false,
message: `That game cannot be joined because it is not in the lobby.`, message: `That username is already taken, please try another.`,
}); });
return; return;
}; };
// Ensure username is not already taken
if (Object.keys(game.players).includes(data.username)) { // Check if the user can join the game
log.warn(`${data.username} tried joining game ${game.code} but the name is already taken.`); if (game.status !== `lobby`) {
// Re-joining a game
if (game.players[data.username] != null) {
log.info(`${data.username} rejoined game ${game.code}`);
// Update all the info that we save about the player
game.update_socket(data.username, socket.id);
socket.join(game.code);
socket.emit(`GameJoined`, {
success: true,
rejoin: true,
uuid: game.players[data.username].id,
});
return;
};
log.info(`${data.username} could not join game ${game.code}(status=${game.status})`);
socket.emit(`GameJoined`, { socket.emit(`GameJoined`, {
success: false, success: false,
message: `That username is already taken, please try another.`, message: `Cannot join a game that isn't in the lobby.`,
}); });
return; return;
}; };
@ -60,6 +79,7 @@ export const JoinGame = (io: Server, socket: Socket, data: JoinGame) => {
// Alert player who joined // Alert player who joined
socket.emit(`GameJoined`, { socket.emit(`GameJoined`, {
success: true, success: true,
rejoin: false,
uuid: uuid, uuid: uuid,
}); });