diff --git a/Webservice/Game.js b/Webservice/Game.js index ae8eae2..45082ac 100644 --- a/Webservice/Game.js +++ b/Webservice/Game.js @@ -10,7 +10,7 @@ class Game { ONGOING: 1, IS_DRAW: 2, IS_WON: 3 - } + }; constructor() { this.currentStatus = Game.STATUS.SETTING_UP; @@ -102,7 +102,7 @@ class Game { } removePlayerName(playerName) { - this.playerNames.splice(this.playerNames.indexOf(playerName), 1) + this.playerNames.splice(this.playerNames.indexOf(playerName), 1); } } diff --git a/Webservice/server.js b/Webservice/server.js index a8ac523..ed93c56 100644 --- a/Webservice/server.js +++ b/Webservice/server.js @@ -2,10 +2,10 @@ const Game = require('./Game'); const express = require('express'); const fs = require('fs'); -const { instrument } = require("@socket.io/admin-ui"); +const {instrument} = require("@socket.io/admin-ui"); const app = express(); const server = require('http').createServer(app); -const { Server } = require("socket.io"); +const {Server} = require("socket.io"); const io = new Server(server); let cards = JSON.parse(fs.readFileSync(__dirname + '/../data/fragen_10_06_21_final_new_format.json')); @@ -118,7 +118,7 @@ io.on('connection', socket => { if (game[socket.room].currentStatus !== Game.STATUS.ONGOING) return; if (game[socket.room].current_player_is(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); } else { @@ -151,17 +151,6 @@ io.on('connection', socket => { }); io.in(socket.room).emit('update Hunter', game[socket.room].hunter.getPosition()); - - switch (game[socket.room].currentStatus) { - case Game.STATUS.IS_WON: - console.log("FINISHED"); - break; - case Game.STATUS.IS_DRAW: - console.log("DRAW"); - break; - default: - break; - } }); }); diff --git a/public/js/Card.js b/public/js/Card.js index 4fe5906..e99eef9 100644 --- a/public/js/Card.js +++ b/public/js/Card.js @@ -68,12 +68,11 @@ function Card(game_board_size, question, answer_1, answer_2, answer_3, answer_4, this.card.addChild(header); if (difficulty === 0) { - if (game_state == 3) { + if (game_state === 3) { for (let i = 0; i < positions.length; i++) { if (positions[i] > 15) this.question = "Gewinner: " + playerNames[i]; } - } - else if (game_state == 2) { + } else if (game_state === 2) { this.question = "Unentschieden."; } } @@ -128,7 +127,7 @@ function Card(game_board_size, question, answer_1, answer_2, answer_3, answer_4, // OK-Button - if (game_state == 2 || game_state == 3) { + if (game_state === 2 || game_state === 3) { this.card.addChild(new Button(0xffffff, 0xcccccc, 0xffffff, this.card_width - 40, 100, this.card_x + 20, this.card_y + this.card_height - 120, "New Game", null, function () { window.location.reload(); }).getButton()); diff --git a/public/js/Sprite.js b/public/js/Sprite.js index b07113c..6f96ab4 100644 --- a/public/js/Sprite.js +++ b/public/js/Sprite.js @@ -1,7 +1,7 @@ function Sprite(x, y, slow) { - if(slow){ + if (slow) { this.sprite = PIXI.Sprite.from('/img/spriteSlow.jpg'); - }else{ + } else { this.sprite = PIXI.Sprite.from('/img/sprite.jpg'); } this.coord_x = x; diff --git a/public/js/game.js b/public/js/game.js index 1b8246c..f76903a 100644 --- a/public/js/game.js +++ b/public/js/game.js @@ -174,9 +174,9 @@ function start_game() { score_button.defaultCursor = 'pointer'; score_button.on('pointerdown', function () { card = new Card(game_board_size, "", - { "text": playerNames[0] ? playerNames[0] + ": " + positions[0] : ("Kein Spieler"), "status": false }, - { "text": playerNames[1] ? playerNames[1] + ": " + positions[1] : ("Kein Spieler"), "status": false }, - { "text": playerNames[2] ? playerNames[2] + ": " + positions[2] : ("Kein Spieler"), "status": false }, + {"text": playerNames[0] ? playerNames[0] + ": " + positions[0] : ("Kein Spieler"), "status": false}, + {"text": playerNames[1] ? playerNames[1] + ": " + positions[1] : ("Kein Spieler"), "status": false}, + {"text": playerNames[2] ? playerNames[2] + ": " + positions[2] : ("Kein Spieler"), "status": false}, { "text": playerNames[3] ? playerNames[3] + ": " + positions[3] : ("Kein Spieler"), "status": false @@ -268,12 +268,12 @@ function start_game() { break; } - if (data.state == 2 || data.state == 3) { + if (data.state === 2 || data.state === 3) { card = new Card(game_board_size, "", - { "text": playerNames[0] ? playerNames[0] + ": " + positions[0] : ("Kein Spieler"), "status": false }, - { "text": playerNames[1] ? playerNames[1] + ": " + positions[1] : ("Kein Spieler"), "status": false }, - { "text": playerNames[2] ? playerNames[2] + ": " + positions[2] : ("Kein Spieler"), "status": false }, - { "text": playerNames[3] ? playerNames[3] + ": " + positions[3] : ("Kein Spieler"), "status": false }, + {"text": playerNames[0] ? playerNames[0] + ": " + positions[0] : ("Kein Spieler"), "status": false}, + {"text": playerNames[1] ? playerNames[1] + ": " + positions[1] : ("Kein Spieler"), "status": false}, + {"text": playerNames[2] ? playerNames[2] + ": " + positions[2] : ("Kein Spieler"), "status": false}, + {"text": playerNames[3] ? playerNames[3] + ": " + positions[3] : ("Kein Spieler"), "status": false}, 0, false, data.state); red_border.clear(); card.showCard(); @@ -284,8 +284,8 @@ function start_game() { }); socket.on('update Hunter', function (position) { - x = sprites[position].coord_x; - y = sprites[position].coord_y; + let x = sprites[position].coord_x; + let y = sprites[position].coord_y; red_border.clear(); red_border = generate_red_border(new PIXI.Graphics(), x, y); app.stage.addChild(red_border);