From: Benjamin Auder Date: Wed, 29 May 2019 10:21:02 +0000 (+0200) Subject: Move some bits of code from Hall to storage; finish game init function X-Git-Url: https://git.auder.net/game/current/app_dev.php/doc/index.css?a=commitdiff_plain;h=6d01bb17467be0c25cf826bf0dcc66888a55e367;p=vchess.git Move some bits of code from Hall to storage; finish game init function --- diff --git a/client/src/utils/storage.js b/client/src/utils/storage.js index ab459662..5324003c 100644 --- a/client/src/utils/storage.js +++ b/client/src/utils/storage.js @@ -2,37 +2,39 @@ // https://developer.mozilla.org/fr/docs/Web/API/API_IndexedDB // https://dexie.org/ -import { storageState } from "@/store"; +import { extractTime } from "@/utils/timeControl"; +import { shuffle } from "@/utils/alea"; export const GameStorage = { - init: function(myid, oppid, gameId, variant, mycolor, fenStart, mode) + init: function(o) { - localStorage.setItem("myid", myid); - localStorage.setItem("gameId", gameId); - localStorage.setItem("vname", variant); - localStorage.setItem("mycolor", mycolor); - localStorage.setItem("fenStart", fenStart); - localStorage.setItem("moves", []); - - - - game.score = localStorage.getItem("score"); - game.mycolor = localStorage.getItem("mycolor"); - game.fenStart = localStorage.getItem("fenStart"); - game.fen = localStorage.getItem("fen"); - game.moves = JSON.parse(localStorage.getItem("moves")); - game.players = JSON.parse(localStorage.getItem("players")); - game.started = JSON.parse(localStorage.getItem("started")); - game.clocks = JSON.parse(localStorage.getItem("clocks")); - game.timeControl = localStorage.getItem("timeControl"); - game.increment = localStorage.getItem("increment"); - game.vname = localStorage.getItem("vname"); - game.mode = "live"; + localStorage.setItem("gameId", o.gameId); + localStorage.setItem("vname", o.vname); + localStorage.setItem("mycolor", mycolor); //TODO: shuffle ["w","b"] + localStorage.setItem("fenStart", o.fenStart); + localStorage.setItem("fen", o.fenStart); + localStorage.setItem("moves", JSON.stringify([])); + // Shuffle players order (white then black then other colors). + localStorage.setItem("players", JSON.stringify(shuffle(players)); + // Extract times (in [milli]seconds), set clocks, store in localStorage + const tc = extractTime(o.timeControl); + localStorage.setItem("timeControl", o.timeControl); + localStorage.setItem("clocks", JSON.stringify( + [...Array(o.players.length)].fill(tc.mainTime)); + localStorage.setItem("increment", tc.increment; + localStorage.setItem("started", JSON.stringify( + [...Array(o.players.length)].fill(false)); + localStorage.setItem("score", "*"); + localStorage.setItem("started", JSON.stringify( + [...Array(o.players.length)].fill(false))); + localStorage.setItem("clocks", JSON.stringify( + [...Array(o.players.length)].fill(0))); + localStorage.SetItem("mode", "live"); //function for live games only }, // TODO: also option to takeback a move ? - update: function(move) + update: function(move) //TODO: take game ID also, and update according to mode? { let moves = JSON.parse(localStorage.getItem("moves")); moves.push(move); @@ -52,7 +54,7 @@ export const GameStorage = delete localStorage["moves"]; }, - // TODO: game or gameInfo ?! + // TODO: game or gameInfo ?! --> when moves are played, it's a game, otherwise info get: function(gameRef) { const gid = gameRef.id; diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue index 9b891d75..94e49a11 100644 --- a/client/src/views/Hall.vue +++ b/client/src/views/Hall.vue @@ -78,8 +78,7 @@ import { NbPlayers } from "@/data/nbPlayers"; import { checkChallenge } from "@/data/challengeCheck"; import { ArrayFun } from "@/utils/array"; import { ajax } from "@/utils/ajax"; -import { getRandString, shuffle } from "@/utils/alea"; -import { extractTime } from "@/utils/timeControl"; +import { getRandString } from "@/utils/alea"; import GameList from "@/components/GameList.vue"; import ChallengeList from "@/components/ChallengeList.vue"; export default { @@ -567,9 +566,8 @@ export default { let gameInfo = { fen: c.fen || V.GenRandInitFen(), - // Shuffle players order (white then black then other colors). // Players' names may be required if game start when a player is offline - players: shuffle(players).map(p => { return {name:p.name, sid:p.sid} }), + players: players.map(p => { return {name:p.name, sid:p.sid} }), vid: c.vid, timeControl: c.timeControl, }; @@ -584,20 +582,13 @@ export default { }, // NOTE: for live games only (corr games are launched on server) newGame: function(gameInfo) { - GameStorage.init(); //TODO here - - localStorage["gid"] = getRandString(); - // Extract times (in [milli]seconds), set clocks, store in localStorage - const tc = extractTime(gameInfo.timeControl); - localStorage["timeControl"] = gameInfo.timeControl; - localStorage["clocks"] = JSON.stringify( - [...Array(gameInfo.players.length)].fill(tc.mainTime)); - localStorage["increment"] = tc.increment; - localStorage["started"] = JSON.stringify( - [...Array(gameInfo.players.length)].fill(false)); - localStorage["vname"] = this.getVname(gameInfo.vid); - localStorage["fenInit"] = gameInfo.fen; - localStorage["players"] = JSON.stringify(gameInfo.players); + GameStorage.init({ + gameId: getRandString(), + vname: this.getVname(gameInfo.vid), + fenStart: gameInfo.fen, + players: gameInfo.players, + timeControl: gameInfo.timeControl, + }); if (this.st.settings.sound >= 1) new Audio("/sounds/newgame.mp3").play().catch(err => {}); // TODO: redirect to game