From 11907c1452ae963f6e082e40f6204d67a5eaf3e2 Mon Sep 17 00:00:00 2001 From: Zutatensuppe Date: Mon, 7 Dec 2020 12:20:09 +0100 Subject: [PATCH] use player settings from last game --- common/GameCommon.js | 6 +++--- game/game.js | 31 ++++++++++++++++++++++++++----- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/common/GameCommon.js b/common/GameCommon.js index 6744f0b..197143d 100644 --- a/common/GameCommon.js +++ b/common/GameCommon.js @@ -23,9 +23,9 @@ function createPlayer(id, ts) { x: 0, y: 0, d: 0, // mouse down - name: 'anon', - color: '#ffffff', - bgcolor: '#222222', + name: null, // 'anon' + color: null, // '#ffffff' + bgcolor: null, // '#222222' points: 0, ts: ts, } diff --git a/game/game.js b/game/game.js index eb37876..2d28021 100644 --- a/game/game.js +++ b/game/game.js @@ -330,18 +330,39 @@ async function main() { -(Game.getTableHeight(gameId) - viewport.height) /2 ) - const evts = new EventAdapter(canvas, viewport) + const playerBgColor = () => { + return (Game.getPlayerBgColor(gameId, CLIENT_ID) + || localStorage.getItem('bg_color') + || '#222222') + } + const playerColor = () => { + return (Game.getPlayerColor(gameId, CLIENT_ID) + || localStorage.getItem('player_color') + || '#ffffff') + } + const playerName = () => { + return (Game.getPlayerName(gameId, CLIENT_ID) + || localStorage.getItem('player_name') + || 'anon') + } - bgColorPickerEl.value = Game.getPlayerBgColor(gameId, CLIENT_ID) + const evts = new EventAdapter(canvas, viewport) + bgColorPickerEl.value = playerBgColor() + evts.addEvent(['bg_color', bgColorPickerEl.value]) bgColorPickerEl.addEventListener('change', () => { + localStorage.setItem('bg_color', bgColorPickerEl.value) evts.addEvent(['bg_color', bgColorPickerEl.value]) }) - playerColorPickerEl.value = Game.getPlayerColor(gameId, CLIENT_ID) + playerColorPickerEl.value = playerColor() + evts.addEvent(['player_color', playerColorPickerEl.value]) playerColorPickerEl.addEventListener('change', () => { + localStorage.setItem('player_color', playerColorPickerEl.value) evts.addEvent(['player_color', playerColorPickerEl.value]) }) - nameChangeEl.value = Game.getPlayerName(gameId, CLIENT_ID) + nameChangeEl.value = playerName() + evts.addEvent(['player_name', nameChangeEl.value]) nameChangeEl.addEventListener('change', () => { + localStorage.setItem('player_name', nameChangeEl.value) evts.addEvent(['player_name', nameChangeEl.value]) }) @@ -431,7 +452,7 @@ async function main() { // CLEAR CTX // --------------------------------------------------------------- - ctx.fillStyle = Game.getPlayerBgColor(gameId, CLIENT_ID) || '#222222' + ctx.fillStyle = playerBgColor() ctx.fillRect(0, 0, canvas.width, canvas.height) if (DEBUG) Debug.checkpoint('clear done') // ---------------------------------------------------------------