DHBW/Projektmanagement-Game
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #33 from H4CK3R-01/fix_only_one_room_bug

Browse Source 
Create several rooms now
This commit is contained in:
Florian Kaiser 2021-06-17 08:35:51 +02:00 committed by GitHub
commit b87080c20a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Webservice/server.js
View File

@ -69,8 +69,7 @@ class Game {
} }
} }
} }
// todo: instantiate this for individual rooms let gameState = {}
let gameState = new Game();
let port = 5000; let port = 5000;
server.listen(port, function () { server.listen(port, function () {
@ -102,11 +101,15 @@ io.on('connection', socket => {
let addedUser = false; let addedUser = false;
socket.on('add user', function (data) { socket.on('add user', function (data) {
if (gameState.players.length < 4 && !gameState.started) { socket.username = data.username;
socket.username = data.username; socket.room = data.room_name;
socket.room = data.room_name;
gameState.players.push(new Player(socket.username)); if(gameState[socket.room] === undefined) {
gameState[socket.room] = new Game();
}
if (gameState[socket.room].players.length < 4 && !gameState[socket.room].started) {
gameState[socket.room].players.push(new Player(socket.username));
addedUser = true; addedUser = true;
socket.emit('login'); socket.emit('login');
@ -133,23 +136,23 @@ io.on('connection', socket => {
if (addedUser) { if (addedUser) {
socket.broadcast.to(socket.room).emit('user left', socket.username); socket.broadcast.to(socket.room).emit('user left', socket.username);
let index = -1; let index = -1;
for (let i = 0; i < gameState.players.length; i++) { for (let i = 0; i < gameState[socket.room].players.length; i++) {
if (gameState.players[i].socketUsername === socket.username) { if (gameState[socket.room].players[i].socketUsername === socket.username) {
index = i; index = i;
break; break;
} }
} }
if (index > -1) { if (index > -1) {
gameState.players.splice(index, 1); gameState[socket.room].players.splice(index, 1);
} }
socket.leave(socket.room); socket.leave(socket.room);
if (gameState.players.length === 0) { if (gameState[socket.room].players.length === 0) {
gameState.players = []; gameState[socket.room].players = [];
gameState.whosNext = 0; gameState[socket.room].whosNext = 0;
gameState.started = false; gameState[socket.room].started = false;
} }
} }
@ -159,8 +162,8 @@ io.on('connection', socket => {
// Game // Game
socket.on('roll dice', function () { socket.on('roll dice', function () {
if (gameState.players[gameState.whosNext].socketUsername === socket.username) { if (gameState[socket.room].players[gameState[socket.room].whosNext].socketUsername === socket.username) {
gameState.started = true; gameState[socket.room].started = true;
let sides = 3; let sides = 3;
let randomNumber = Math.floor(Math.random() * sides) + 1; let randomNumber = Math.floor(Math.random() * sides) + 1;
@ -173,7 +176,7 @@ io.on('connection', socket => {
}); });
socket.on('get card', function (difficulty) { socket.on('get card', function (difficulty) {
if (gameState.players[gameState.whosNext].socketUsername === socket.username) { if (gameState[socket.room].players[gameState[socket.room].whosNext].socketUsername === socket.username) {
io.in(socket.room).emit('card', {'username': socket.username, 'card': getRandomCard(difficulty)}); io.in(socket.room).emit('card', {'username': socket.username, 'card': getRandomCard(difficulty)});
generate_log_message(socket.room, socket.username, "CARD", difficulty); generate_log_message(socket.room, socket.username, "CARD", difficulty);
@ -183,9 +186,9 @@ io.on('connection', socket => {
}); });
socket.on('card finished', function (difficulty, answerIsCorrect) { socket.on('card finished', function (difficulty, answerIsCorrect) {
if (answerIsCorrect) gameState.players[gameState.whosNext].move(difficulty); if (answerIsCorrect) gameState[socket.room].players[gameState[socket.room].whosNext].move(difficulty);
io.in(socket.room).emit('card destroyed'); io.in(socket.room).emit('card destroyed');
gameState.finish_turn(); gameState[socket.room].finish_turn();
}); });
}); });