X-Git-Url: https://git.auder.net/doc/screen_ranking.png?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fcomponents%2FBaseGame.vue;h=1ea862fbe05264fd7de870a3c18984ea41c44d94;hb=63ca2b89cfe577efd168c6b2e26750cb01b66d64;hp=3b15742dc2bb29644659480c0851883a883cc521;hpb=f21cd6d9c23da37d729f20ea4c08e56b1a7b10a1;p=vchess.git
diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index 3b15742d..1ea862fb 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -1,29 +1,28 @@
-.row
- .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
- input#modalEog.modal(type="checkbox")
- div(role="dialog" aria-labelledby="eogMessage")
- .card.smallpad.small-modal.text-center
- label.modal-close(for="modalEog")
- h3#eogMessage.section {{ endgameMessage }}
- // TODO: or "BoardHex" if this.game.vname in "Hexagonal..."
- Board(:vr="vr" :last-move="lastMove" :analyze="analyze"
- :user-color="game.mycolor" :orientation="orientation"
- :vname="game.vname" @play-move="play")
- .button-group
- button(@click="() => play()") Play
- button(@click="() => undo()") Undo
- button(@click="flip") Flip
- button(@click="gotoBegin") GotoBegin
- button(@click="gotoEnd") GotoEnd
- #messageDiv.section-content(v-if="game.type=='corr'") {{ curMoveMessage() }}
- #fenDiv.section-content(v-if="showFen && !!vr")
- p#fenString.text-center {{ vr.getFen() }}
- #pgnDiv.section-content
- a#download(href="#")
- button#downloadBtn(@click="download") {{ st.tr["Download PGN"] }}
- div#movesList
- MoveList(v-if="showMoves"
+div#baseGame(tabindex=-1 @click="() => focusBg()" @keydown="handleKeys")
+ input#modalEog.modal(type="checkbox")
+ div(role="dialog" aria-labelledby="eogMessage")
+ .card.smallpad.small-modal.text-center
+ label.modal-close(for="modalEog")
+ h3#eogMessage.section {{ endgameMessage }}
+ .row
+ #boardContainer.col-sm-12.col-md-9
+ Board(:vr="vr" :last-move="lastMove" :analyze="game.mode=='analyze'"
+ :user-color="game.mycolor" :orientation="orientation"
+ :vname="game.vname" @play-move="play")
+ #controls
+ button(@click="gotoBegin") <<
+ button(@click="() => undo()") <
+ button(@click="flip") ⇅
+ button(@click="() => play()") >
+ button(@click="gotoEnd") >>
+ #pgnDiv
+ a#download(href="#")
+ button(@click="download") {{ st.tr["Download PGN"] }}
+ button(v-if="game.mode!='analyze'" @click="analyzePosition")
+ | {{ st.tr["Analyze"] }}
+ .col-sm-12.col-md-3
+ MoveList(v-if="showMoves" :score="game.score" :message="game.scoreMsg"
:moves="moves" :cursor="cursor" @goto-move="gotoMove")
@@ -59,17 +58,15 @@ export default {
"game.fenStart": function() {
this.re_setVariables();
},
+ // Received a new move to play:
+ "game.moveToPlay": function(newMove) {
+ if (!!newMove) //if stop + launch new game, get undefined move
+ this.play(newMove, "receive");
+ },
},
computed: {
showMoves: function() {
- return true;
- //return window.innerWidth >= 768;
- },
- showFen: function() {
- return this.game.vname != "Dark" || this.score != "*";
- },
- analyze: function() {
- return this.game.mode == "analyze" || this.game.score != "*";
+ return this.game.vname != "Dark" || this.game.mode=="analyze";
},
},
created: function() {
@@ -77,10 +74,35 @@ export default {
this.re_setVariables();
},
methods: {
+ focusBg: function() {
+ // TODO: small blue border appears...
+ document.getElementById("baseGame").focus();
+ },
+ handleKeys: function(e) {
+ if ([32,37,38,39,40].includes(e.keyCode))
+ e.preventDefault();
+ switch (e.keyCode)
+ {
+ case 37:
+ this.undo();
+ break;
+ case 39:
+ this.play();
+ break;
+ case 38:
+ this.gotoBegin();
+ break;
+ case 40:
+ this.gotoEnd();
+ break;
+ case 32:
+ this.flip();
+ break;
+ }
+ },
re_setVariables: function() {
this.endgameMessage = "";
this.orientation = this.game.mycolor || "w"; //default orientation for observed games
- this.score = this.game.score || "*"; //mutable (if initially "*")
this.moves = JSON.parse(JSON.stringify(this.game.moves || []));
// Post-processing: decorate each move with color + current FEN:
// (to be able to jump to any position quickly)
@@ -93,18 +115,21 @@ export default {
vr_tmp.play(move);
move.fen = vr_tmp.getFen();
});
+ if (this.game.fenStart.indexOf(" b ") >= 0 ||
+ (this.moves.length > 0 && this.moves[0].color == "b"))
+ {
+ // 'end' is required for Board component to check lastMove for e.p.
+ this.moves.unshift({color: "w", notation: "...", end: {x:-1,y:-1}});
+ }
const L = this.moves.length;
this.cursor = L-1;
this.lastMove = (L > 0 ? this.moves[L-1] : null);
},
- // For corr games, potential message with each move sent
- curMoveMessage: function() {
- if (this.cursor < 0)
- return "";
- return this.game.moves[this.cursor].message || "";
- },
- setCurrentMessage: function(message) {
- this.game.moves[this.game.moves.length-1].message = message;
+ analyzePosition: function() {
+ const newUrl = "/analyze/" + this.game.vname +
+ "/?fen=" + this.vr.getFen().replace(/ /g, "_");
+ //window.open("#" + newUrl); //to open in a new tab
+ this.$router.push(newUrl); //better
},
download: function() {
const content = this.getPgn();
@@ -122,7 +147,7 @@ export default {
pgn += '[White "' + this.game.players[0].name + '"]\n';
pgn += '[Black "' + this.game.players[1].name + '"]\n';
pgn += '[Fen "' + this.game.fenStart + '"]\n';
- pgn += '[Result "' + this.score + '"]\n\n';
+ pgn += '[Result "' + this.game.score + '"]\n\n';
let counter = 1;
let i = 0;
while (i < this.moves.length)
@@ -164,14 +189,7 @@ export default {
modalBox.checked = true;
setTimeout(() => { modalBox.checked = false; }, 2000);
},
- endGame: function(score, message) {
- this.score = score;
- if (!message)
- message = this.getScoreMessage(score);
- this.showEndgameMsg(score + " . " + message);
- this.$emit("gameover", score);
- },
- animateMove: function(move) {
+ animateMove: function(move, callback) {
let startSquare = document.getElementById(getSquareId(move.start));
let endSquare = document.getElementById(getSquareId(move.end));
let rectStart = startSquare.getBoundingClientRect();
@@ -196,69 +214,65 @@ export default {
for (let i=0; i {
+ if (!!receive && this.cursor < this.moves.length-1)
this.gotoEnd(); //required to play the move
- return this.animateMove(move);
- }
- if (!navigate)
- {
- move.color = this.vr.turn;
- move.notation = this.vr.getNotation(move);
- }
- // Not programmatic, or animation is over
- this.vr.play(move);
- this.cursor++;
- this.lastMove = move;
- if (this.st.settings.sound == 2)
- new Audio("/sounds/move.mp3").play().catch(err => {});
- if (!navigate)
- {
- move.fen = this.vr.getFen();
- if (this.score == "*" || this.analyze)
+ if (navigate)
+ {
+ if (this.cursor == this.moves.length-1)
+ return; //no more moves
+ move = this.moves[this.cursor+1];
+ }
+ else
+ {
+ move.color = this.vr.turn;
+ move.notation = this.vr.getNotation(move);
+ }
+ this.vr.play(move);
+ this.cursor++;
+ this.lastMove = move;
+ if (this.st.settings.sound == 2)
+ new Audio("/sounds/move.mp3").play().catch(err => {});
+ if (!navigate)
{
+ move.fen = this.vr.getFen();
// Stack move on movesList at current cursor
if (this.cursor == this.moves.length)
this.moves.push(move);
else
this.moves = this.moves.slice(0,this.cursor).concat([move]);
}
- }
- if (!this.analyze)
- this.$emit("newmove", move); //post-processing (e.g. computer play)
- // Is opponent in check?
- this.incheck = this.vr.getCheckSquares(this.vr.turn);
- const score = this.vr.getCurrentScore();
- if (score != "*")
- {
- if (!this.analyze)
- this.endGame(score);
- else
+ if (this.game.mode != "analyze")
+ this.$emit("newmove", move); //post-processing (e.g. computer play)
+ // Is opponent in check?
+ this.incheck = this.vr.getCheckSquares(this.vr.turn);
+ const score = this.vr.getCurrentScore();
+ if (score != "*")
{
- // Just show score on screen (allow undo)
const message = this.getScoreMessage(score);
- this.showEndgameMsg(score + " . " + message);
+ if (this.game.mode != "analyze")
+ this.$emit("gameover", score, message);
+ else //just show score on screen (allow undo)
+ this.showEndgameMsg(score + " . " + message);
}
- }
+ };
+ if (!!receive && this.game.vname != "Dark")
+ this.animateMove(move, doPlayMove);
+ else
+ doPlayMove();
},
undo: function(move) {
const navigate = !move;
@@ -284,8 +298,16 @@ export default {
},
gotoBegin: function() {
this.vr.re_init(this.game.fenStart);
- this.cursor = -1;
- this.lastMove = null;
+ if (this.moves.length > 0 && this.moves[0].notation == "...")
+ {
+ this.cursor = 0;
+ this.lastMove = this.moves[0];
+ }
+ else
+ {
+ this.cursor = -1;
+ this.lastMove = null;
+ }
},
gotoEnd: function() {
this.gotoMove(this.moves.length-1);
@@ -296,3 +318,29 @@ export default {
},
};
+
+