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

Merge pull request #35 from H4CK3R-01/fix_server

Browse Source 
Try to fix server
This commit is contained in:
Florian Kaiser 2021-06-17 10:02:23 +02:00 committed by GitHub
commit 7c8cc11068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Webservice/server.js
View File

@ -65,16 +65,18 @@ io.on('connection', socket => {
}); });
socket.on('new message', function (data) { socket.on('new message', function (data) {
socket.broadcast.to(socket.room).emit('new message', { if (gameState[socket.room] !== undefined && addedUser) {
username: socket.username, socket.broadcast.to(socket.room).emit('new message', {
message: data username: socket.username,
}); message: data
});
generate_log_message(socket.room, socket.username, "MESSAGE", data); generate_log_message(socket.room, socket.username, "MESSAGE", data);
}
}); });
socket.on('disconnect', function () { socket.on('disconnect', function () {
if (addedUser) { if (gameState[socket.room] !== undefined && 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[socket.room].players.length; i++) { for (let i = 0; i < gameState[socket.room].players.length; i++) {
@ -102,34 +104,39 @@ io.on('connection', socket => {
// Game // Game
socket.on('roll dice', function () { socket.on('roll dice', function () {
if (gameState[socket.room] !== undefined && addedUser) {
if (gameState[socket.room].players[gameState[socket.room].whosNext].socketUsername === socket.username) {
gameState[socket.room].started = true;
let sides = 3;
let randomNumber = Math.floor(Math.random() * sides) + 1;
if (gameState[socket.room].players[gameState[socket.room].whosNext].socketUsername === socket.username) { io.in(socket.room).emit('dice', randomNumber);
gameState[socket.room].started = true;
let sides = 3;
let randomNumber = Math.floor(Math.random() * sides) + 1;
io.in(socket.room).emit('dice', randomNumber); generate_log_message(socket.room, socket.username, "DICE", randomNumber);
} else {
generate_log_message(socket.room, socket.username, "DICE", randomNumber); // TODO
} else { }
// TODO
} }
}); });
socket.on('get card', function (difficulty) { socket.on('get card', function (difficulty) {
if (gameState[socket.room].players[gameState[socket.room].whosNext].socketUsername === socket.username) { if (gameState[socket.room] !== undefined && addedUser) {
io.in(socket.room).emit('card', {'username': socket.username, 'card': getRandomCard(difficulty)}); if (gameState[socket.room].players[gameState[socket.room].whosNext].socketUsername === socket.username) {
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);
} else { } else {
// TODO // TODO
}
} }
}); });
socket.on('card finished', function (difficulty, answerIsCorrect) { socket.on('card finished', function (difficulty, answerIsCorrect) {
if (answerIsCorrect) gameState[socket.room].players[gameState[socket.room].whosNext].move(difficulty); if (gameState[socket.room] !== undefined && addedUser) {
io.in(socket.room).emit('card destroyed'); if (answerIsCorrect) gameState[socket.room].players[gameState[socket.room].whosNext].move(difficulty);
gameState[socket.room].finish_turn(); io.in(socket.room).emit('card destroyed');
gameState[socket.room].finish_turn();
}
}); });
}); });