diff --git a/client/public/scrabble/events.js b/client/public/scrabble/events.js index 6d55dc8..71433b4 100644 --- a/client/public/scrabble/events.js +++ b/client/public/scrabble/events.js @@ -29,7 +29,11 @@ document.addEventListener('touchmove', mouseMove); document.addEventListener('mouseup', mouseUp); document.addEventListener('touchend', mouseUp); -document.querySelectorAll('piece').forEach(element => { - element.addEventListener('mousedown', e => mouseDown(e, element)); - element.addEventListener('touchstart', e => mouseDown(e, element)); -}); +function updatePieceEventListeners() +{ + document.querySelectorAll('piece').forEach(element => { + element.addEventListener('mousedown', e => mouseDown(e, element)); + element.addEventListener('touchstart', e => mouseDown(e, element)); + }); +} +updatePieceEventListeners(); diff --git a/client/public/scrabble/game.js b/client/public/scrabble/game.js index 6780de2..a81ff90 100644 --- a/client/public/scrabble/game.js +++ b/client/public/scrabble/game.js @@ -7,8 +7,18 @@ function computeTurn() } -function initGame(boardstate, myplayer, players) +function initGame(boardstate, tileset, myplayer, players) { + + // construct piece array + // structure [{letter: '', score: int}] + let drawerStructure = []; + for (const tile of myplayer.activetiles) + { + console.log(tile); + } + + addPiecesToDrawer(); return true; } diff --git a/client/public/scrabble/network.js b/client/public/scrabble/network.js index bec5a52..39b7cfa 100644 --- a/client/public/scrabble/network.js +++ b/client/public/scrabble/network.js @@ -175,16 +175,17 @@ function onGameBegin(socket, args) console.log(args); const boardstate = args.game.gamestates[args.game.gamestates.length-1]; + const tileset = args.game.tileset; const myplayer = args.gameuser; const players = args.game.players; - if (!boardstate || !myplayer || !players) + if (!boardstate || !myplayer || !players || !tileset) { ConnectionState.innerHTML = localeString('error-game-begin'); return; } - const status = initGame(boardstate, myplayer, players); + const status = initGame(boardstate, tileset, myplayer, players); if (!status) { diff --git a/client/public/scrabble/pieces.js b/client/public/scrabble/pieces.js index aa74a69..3427473 100644 --- a/client/public/scrabble/pieces.js +++ b/client/public/scrabble/pieces.js @@ -41,6 +41,7 @@ function addPiecesToDrawer(pieces) Drawer.appendChild(piece); setupPieces(); + updatePieceEventListeners(); } // Removes regardless of vadility diff --git a/server/src/socketserver.js b/server/src/socketserver.js index 52a77aa..1cfb4c3 100644 --- a/server/src/socketserver.js +++ b/server/src/socketserver.js @@ -2,6 +2,7 @@ const Logger = require('./logger.js'); const WebServer = require('./webserver.js'); const Game = require('./game.js'); const Error = require('./error.js'); +const Dist = require('./letter-distributions.js'); let io = {}; @@ -460,6 +461,7 @@ function EmitGameBegin(game) // getsafegame function is needed io.to(gameuserconnection).emit('game-begin', { game: game, + tileset: Dist.GetDist(game.locale).dist, gameuser: gameuser }); } @@ -478,6 +480,7 @@ function EmitGameReconnect(user, game) io.to(gameuserconnection).emit('game-begin', { game: game, + tileset: Dist.GetDist(game.locale).dist, gameuser: gameuser });