From 13aa5a44fe3da4eac5ab04f0120ccbd5927f91c1 Mon Sep 17 00:00:00 2001 From: Benjamin Auder Date: Fri, 17 May 2019 19:29:24 +0200 Subject: [PATCH] Simplify game variables passed to BaseGame component --- client/src/components/BaseGame.vue | 10 ++++++---- client/src/components/Board.vue | 5 +---- client/src/components/ComputerGame.vue | 26 +++++++++++++------------- client/src/views/Rules.vue | 2 +- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue index aa19b477..1e7a83bb 100644 --- a/client/src/components/BaseGame.vue +++ b/client/src/components/BaseGame.vue @@ -38,13 +38,15 @@ export default { //MoveList, }, // "vr": VariantRules object, describing the game state + rules - props: ["vname","analyze","vr","fenStart","players","mycolor"], + // fenStart, players, mycolor + props: ["vname","analyze","vr","gameInfo"], data: function() { return { st: store.state, // NOTE: all following variables must be reset at the beginning of a game endgameMessage: "", orientation: "w", + // TODO: score and moves could be also in gameInfo (when resuming) score: "*", //'*' means 'unfinished' moves: [], cursor: -1, //index of the move just played @@ -56,7 +58,7 @@ export default { fenStart: function() { // Reset all variables this.endgameMessage = ""; - this.orientation = this.mycolor; + this.orientation = this.gameInfo.mycolor || "w"; this.score = "*"; this.moves = []; this.cursor = -1; @@ -112,8 +114,8 @@ export default { pgn += '[Site "vchess.club"]\n'; pgn += '[Variant "' + this.vname + '"]\n'; pgn += '[Date "' + getDate(new Date()) + '"]\n'; - pgn += '[White "' + this.players[0] + '"]\n'; - pgn += '[Black "' + this.players[1] + '"]\n'; + pgn += '[White "' + this.game.players[0] + '"]\n'; + pgn += '[Black "' + this.game.players[1] + '"]\n'; pgn += '[Fen "' + this.fenStart + '"]\n'; pgn += '[Result "' + this.score + '"]\n\n'; let counter = 1; diff --git a/client/src/components/Board.vue b/client/src/components/Board.vue index 8b1055bd..ff50b121 100644 --- a/client/src/components/Board.vue +++ b/client/src/components/Board.vue @@ -1,8 +1,5 @@