diff --git a/Webservice/Player.js b/Webservice/Player.js index f04a288..87d1c55 100644 --- a/Webservice/Player.js +++ b/Webservice/Player.js @@ -1,3 +1,5 @@ +var maxField = 15; + class Player { constructor(name) { this.name = name; @@ -6,7 +8,13 @@ class Player { } move_by(amount) { - this.position += amount; + if(this.position > 11){ + this.position++; + }else if(this.position+amount > 11){ + this.position = 12; + }else{ + this.position += amount; + } } } diff --git a/public/img/spriteSlow.jpg b/public/img/spriteSlow.jpg new file mode 100644 index 0000000..812774c Binary files /dev/null and b/public/img/spriteSlow.jpg differ diff --git a/public/js/Card.js b/public/js/Card.js index e3c66d3..0a07786 100644 --- a/public/js/Card.js +++ b/public/js/Card.js @@ -121,10 +121,10 @@ function Card(game_board_size, s, a1, a2, a3, a4, d, your_turn) { if (answer !== null) { if (_this.right_answer === answer) { //TODO: do this in backend instead to prevent cheating console.log("Richtig"); - socket.emit('card finished', d, true); + socket.emit('card finished', d, true); } else { console.log("Falsch"); - socket.emit('card finished', d, false); + socket.emit('card finished', d, false); } show_card = false; answer = null; diff --git a/public/js/Sprite.js b/public/js/Sprite.js index 2d588b3..b07113c 100644 --- a/public/js/Sprite.js +++ b/public/js/Sprite.js @@ -1,5 +1,9 @@ -function Sprite(x, y) { - this.sprite = PIXI.Sprite.from('/img/sprite.jpg'); +function Sprite(x, y, slow) { + if(slow){ + this.sprite = PIXI.Sprite.from('/img/spriteSlow.jpg'); + }else{ + this.sprite = PIXI.Sprite.from('/img/sprite.jpg'); + } this.coord_x = x; this.coord_y = y; @@ -14,4 +18,4 @@ function Sprite(x, y) { sprite.width = size * 1.5; sprite.height = size * 1.5; }; -} \ No newline at end of file +} diff --git a/public/js/game.js b/public/js/game.js index 07a2a11..310a991 100644 --- a/public/js/game.js +++ b/public/js/game.js @@ -24,22 +24,22 @@ let sprite_size = Math.floor(game_board_size / 11); // fields let sprites = [ - new Sprite(9, 9), // lower right - new Sprite(7, 9), - new Sprite(5, 9), - new Sprite(3, 9), - new Sprite(1, 9), // upper right - new Sprite(1, 7), - new Sprite(1, 5), - new Sprite(1, 3), - new Sprite(1, 1), // upper left - new Sprite(3, 1), - new Sprite(5, 1), - new Sprite(7, 1), - new Sprite(9, 1), // lower left - new Sprite(9, 3), - new Sprite(9, 5), - new Sprite(9, 7) + new Sprite(1, 9, false), // lower left + new Sprite(1, 7, false), + new Sprite(1, 5, false), + new Sprite(1, 3, false), + new Sprite(1, 1, false), // upper left + new Sprite(3, 1, false), + new Sprite(5, 1, false), + new Sprite(7, 1, false), + new Sprite(9, 1, false), // upper right + new Sprite(9, 3, false), + new Sprite(9, 5, false), + new Sprite(9, 7, false), + new Sprite(9, 9, true), // lower right + new Sprite(7, 9, true), + new Sprite(5, 9, true), + new Sprite(3, 9, true) ]; function start_game() { @@ -59,17 +59,17 @@ function start_game() { app.stage.addChild(red_border); - // White circles - let player_a = generate_circle(new PIXI.Graphics(), 9, 9, 'yellow', 1); + // Player circles + let player_a = generate_circle(new PIXI.Graphics(), 1, 9, 'yellow', 1); app.stage.addChild(player_a); - let player_b = generate_circle(new PIXI.Graphics(), 9, 9, 'blue', 2); + let player_b = generate_circle(new PIXI.Graphics(), 1, 9, 'blue', 2); app.stage.addChild(player_b); - let player_c = generate_circle(new PIXI.Graphics(), 9, 9, 'green', 3); + let player_c = generate_circle(new PIXI.Graphics(), 1, 9, 'green', 3); app.stage.addChild(player_c); - let player_d = generate_circle(new PIXI.Graphics(), 9, 9, 'red', 4); + let player_d = generate_circle(new PIXI.Graphics(), 1, 9, 'red', 4); app.stage.addChild(player_d); @@ -172,10 +172,10 @@ function start_game() { score_button.defaultCursor = 'pointer'; score_button.on('pointerdown', function () { card = new Card(game_board_size, "", - {"text": "Spieler 1: " + positions[0], "status": false}, - {"text": "Spieler 2: " + positions[1], "status": false}, - {"text": "Spieler 3: " + positions[2], "status": false}, - {"text": "Spieler 4: " + positions[3], "status": false}, 0, false); + { "text": "Spieler 1: " + positions[0], "status": false }, + { "text": "Spieler 2: " + positions[1], "status": false }, + { "text": "Spieler 3: " + positions[2], "status": false }, + { "text": "Spieler 4: " + positions[3], "status": false }, 0, false); card.showCard(); show_card = true; }); @@ -230,25 +230,25 @@ function start_game() { case 0: positions[0] = data.position; player_a.clear(); - player_a = generate_circle(new PIXI.Graphics(), y, x, 'yellow', 1); + player_a = generate_circle(new PIXI.Graphics(), x, y, 'yellow', 1); app.stage.addChild(player_a); break; case 1: positions[1] = data.position; player_b.clear(); - player_b = generate_circle(new PIXI.Graphics(), y, x, 'blue', 2); + player_b = generate_circle(new PIXI.Graphics(), x, y, 'blue', 2); app.stage.addChild(player_b); break; case 2: positions[2] = data.position; player_c.clear(); - player_c = generate_circle(new PIXI.Graphics(), y, x, 'green', 3); + player_c = generate_circle(new PIXI.Graphics(), x, y, 'green', 3); app.stage.addChild(player_c); break; case 3: positions[3] = data.position; player_d.clear(); - player_d = generate_circle(new PIXI.Graphics(), y, x, 'red', 4); + player_d = generate_circle(new PIXI.Graphics(), x, y, 'red', 4); app.stage.addChild(player_d); break; } @@ -273,7 +273,7 @@ function generate_card_stack(sprite, x, y, onclick) { function generate_red_border(graphics) { graphics.lineStyle(sprite_size * 0.10, 0x862323, 1); - graphics.drawRect(sprite_size * 9 - sprite_size * 0.2, sprite_size * 9 - sprite_size * 0.2, sprite_size * 1.5, sprite_size * 1.5); + graphics.drawRect(sprite_size * 1 - sprite_size * 0.2, sprite_size * 9 - sprite_size * 0.2, sprite_size * 1.5, sprite_size * 1.5); return graphics; } @@ -292,6 +292,9 @@ function generate_circle(graphics, x, y, color, offset) { case 'blue': graphics.beginFill(0x4169E1, 1); break; + case 'white': + graphics.beginFill(0xFFFFFF, 1); + break; } switch (offset) { case 1: