X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fgame.js;h=44786ff9ff648d051c24ffec0fed540e08f274d4;hb=389b46247f6d0c08fc86eccc4496d7f6601dc064;hp=2897b1cd00f6abd5d0c61d8e488075f71be54dab;hpb=1221ac47836806efb287b0323b92957d9129c653;p=vchess.git
diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js
index 2897b1cd..44786ff9 100644
--- a/public/javascripts/components/game.js
+++ b/public/javascripts/components/game.js
@@ -1,27 +1,28 @@
+// Game logic on a variant page
Vue.component('my-game', {
data: function() {
return {
vr: null, //object to check moves, store them, FEN..
mycolor: "w",
possibleMoves: [], //filled after each valid click/dragstart
- choices: [], //promotion pieces, or checkered captures... (contain possible pieces)
+ choices: [], //promotion pieces, or checkered captures... (as moves)
start: {}, //pixels coordinates + id of starting square (click or drag)
selectedPiece: null, //moving piece (or clicked piece)
- conn: null, //socket messages
+ conn: null, //socket connection
score: "*", //'*' means 'unfinished'
- mode: "idle", //human, computer or idle (when not playing)
+ mode: "idle", //human, friend, computer or idle (when not playing)
oppid: "", //opponent ID in case of HH game
oppConnected: false,
seek: false,
fenStart: "",
incheck: [],
pgnTxt: "",
- expert: document.cookie.length>0 ? document.cookie.substr(-1)=="1" : false,
- gameId: "", //used to limit computer moves' time
+ expert: (getCookie("expert") === "1" ? true : false),
};
},
render(h) {
const [sizeX,sizeY] = VariantRules.size;
+ const smallScreen = (screen.width <= 420);
// Precompute hints squares to facilitate rendering
let hintSquares = doubleArray(sizeX, sizeY, false);
this.possibleMoves.forEach(m => { hintSquares[m.end.x][m.end.y] = true; });
@@ -29,33 +30,56 @@ Vue.component('my-game', {
let incheckSq = doubleArray(sizeX, sizeY, false);
this.incheck.forEach(sq => { incheckSq[sq[0]][sq[1]] = true; });
let elementArray = [];
- const playingHuman = (this.mode == "human");
- const playingComp = (this.mode == "computer");
- let actionArray = [
+ let actionArray = [];
+ actionArray.push(
h('button',
- {
- on: { click: this.clickGameSeek },
- attrs: { "aria-label": 'New game VS human' },
- 'class': {
- "tooltip": true,
- "bottom": true, //display below
- "seek": this.seek,
- "playing": playingHuman,
- },
+ {
+ on: { click: this.clickGameSeek },
+ attrs: { "aria-label": 'New online game' },
+ 'class': {
+ "tooltip": true,
+ "bottom": true, //display below
+ "seek": this.seek,
+ "playing": this.mode == "human",
+ "small": smallScreen,
},
- [h('i', { 'class': { "material-icons": true } }, "accessibility")]),
- h('button',
+ },
+ [h('i', { 'class': { "material-icons": true } }, "accessibility")])
+ );
+ if (["idle","computer"].includes(this.mode))
+ {
+ actionArray.push(
+ h('button',
{
on: { click: this.clickComputerGame },
attrs: { "aria-label": 'New game VS computer' },
'class': {
"tooltip":true,
"bottom": true,
- "playing": playingComp,
+ "playing": this.mode == "computer",
+ "small": smallScreen,
},
},
[h('i', { 'class': { "material-icons": true } }, "computer")])
- ];
+ );
+ }
+ if (["idle","friend"].includes(this.mode))
+ {
+ actionArray.push(
+ h('button',
+ {
+ on: { click: this.clickFriendGame },
+ attrs: { "aria-label": 'New IRL game' },
+ 'class': {
+ "tooltip":true,
+ "bottom": true,
+ "playing": this.mode == "friend",
+ "small": smallScreen,
+ },
+ },
+ [h('i', { 'class': { "material-icons": true } }, "people")])
+ );
+ }
if (!!this.vr)
{
const square00 = document.getElementById("sq-0-0");
@@ -109,9 +133,10 @@ Vue.component('my-game', {
"indic-right": true,
"expert-switch": true,
"expert-mode": this.expert,
+ "small": smallScreen,
},
},
- [h('i', { 'class': { "material-icons": true } }, "remove_red_eye")]
+ [h('i', { 'class': { "material-icons": true } }, "visibility_off")]
);
elementArray.push(expertSwitch);
let choices = h('div',
@@ -202,17 +227,18 @@ Vue.component('my-game', {
);
}
const lm = this.vr.lastMove;
- const highlight = !!lm && _.isMatch(lm.end, {x:ci,y:cj});
+ const showLight = !this.expert &&
+ (this.mode!="idle" || this.cursor==this.vr.moves.length);
return h(
'div',
{
'class': {
'board': true,
['board'+sizeY]: true,
- 'light-square': (i+j)%2==0 && (this.expert || !highlight),
- 'dark-square': (i+j)%2==1 && (this.expert || !highlight),
- 'highlight': !this.expert && highlight,
- 'incheck': !this.expert && incheckSq[ci][cj],
+ 'light-square': (i+j)%2==0,
+ 'dark-square': (i+j)%2==1,
+ 'highlight': showLight && !!lm && _.isMatch(lm.end, {x:ci,y:cj}),
+ 'incheck': showLight && incheckSq[ci][cj],
},
attrs: {
id: this.getSquareId({x:ci,y:cj}),
@@ -234,44 +260,136 @@ Vue.component('my-game', {
'class': {
"tooltip":true,
"bottom": true,
+ "small": smallScreen,
},
},
[h('i', { 'class': { "material-icons": true } }, "flag")])
);
}
+ else if (this.vr.moves.length > 0)
+ {
+ // A game finished, and another is not started yet: allow navigation
+ actionArray = actionArray.concat([
+ h('button',
+ {
+ on: { click: e => this.undo() },
+ attrs: { "aria-label": 'Undo' },
+ "class": {
+ "small": smallScreen,
+ "marginleft": true,
+ },
+ },
+ [h('i', { 'class': { "material-icons": true } }, "fast_rewind")]),
+ h('button',
+ {
+ on: { click: e => this.play() },
+ attrs: { "aria-label": 'Play' },
+ "class": { "small": smallScreen },
+ },
+ [h('i', { 'class': { "material-icons": true } }, "fast_forward")]),
+ ]
+ );
+ }
+ if (this.mode == "friend")
+ {
+ actionArray = actionArray.concat(
+ [
+ h('button',
+ {
+ on: { click: this.undoInGame },
+ attrs: { "aria-label": 'Undo' },
+ "class": {
+ "small": smallScreen,
+ "marginleft": true,
+ },
+ },
+ [h('i', { 'class': { "material-icons": true } }, "undo")]
+ ),
+ h('button',
+ {
+ on: { click: () => { this.mycolor = this.vr.getOppCol(this.mycolor) } },
+ attrs: { "aria-label": 'Flip' },
+ "class": { "small": smallScreen },
+ },
+ [h('i', { 'class': { "material-icons": true } }, "cached")]
+ ),
+ ]);
+ }
elementArray.push(gameDiv);
- if (!!this.vr.reserve) //TODO: table, show counts for reserve pieces
- //
- // 3 |
+ if (!!this.vr.reserve)
{
- let reservePiecesArray = [];
+ const shiftIdx = (this.mycolor=="w" ? 0 : 1);
+ let myReservePiecesArray = [];
for (let i=0; i {
+ const fen = document.getElementById("input-fen").value;
+ document.getElementById("modal-fenedit").checked = false;
+ this.newGame("friend", fen);
+ }
+ },
+ domProps: { innerHTML: "Ok" },
+ }
+ ),
+ h('button',
+ {
+ on: { click:
+ () => {
+ document.getElementById("input-fen").value =
+ VariantRules.GenRandInitFen();
+ }
+ },
+ domProps: { innerHTML: "Random" },
+ }
+ ),
+ ]
+ )
+ ]
+ )
+ ];
+ elementArray = elementArray.concat(modalFenEdit);
const actions = h('div',
{
attrs: { "id": "actions" },
@@ -375,9 +559,24 @@ Vue.component('my-game', {
{
attrs: { id: "pgn-game" },
on: { click: this.download },
- domProps: {
- innerHTML: this.pgnTxt
- }
+ domProps: { innerHTML: this.pgnTxt }
+ }
+ )
+ ]
+ )
+ );
+ }
+ else if (this.mode != "idle")
+ {
+ // Show current FEN
+ elementArray.push(
+ h('div',
+ { attrs: { id: "fen-div" } },
+ [
+ h('p',
+ {
+ attrs: { id: "fen-string" },
+ domProps: { innerHTML: this.vr.getFen() }
}
)
]
@@ -394,14 +593,14 @@ Vue.component('my-game', {
"col-lg-6":true,
"col-lg-offset-3":true,
},
- // NOTE: click = mousedown + mouseup --> what about smartphone?!
+ // NOTE: click = mousedown + mouseup
on: {
mousedown: this.mousedown,
mousemove: this.mousemove,
mouseup: this.mouseup,
- touchdown: this.mousedown,
+ touchstart: this.mousedown,
touchmove: this.mousemove,
- touchup: this.mouseup,
+ touchend: this.mouseup,
},
},
elementArray
@@ -410,13 +609,11 @@ Vue.component('my-game', {
created: function() {
const url = socketUrl;
const continuation = (localStorage.getItem("variant") === variant);
- this.myid = continuation
- ? localStorage.getItem("myid")
- // random enough (TODO: function)
- : (Date.now().toString(36) + Math.random().toString(36).substr(2, 7)).toUpperCase();
+ this.myid = continuation ? localStorage.getItem("myid") : getRandString();
if (!continuation)
{
- // HACK: play a small silent sound to allow "new game" sound later if tab not focused
+ // HACK: play a small silent sound to allow "new game" sound later
+ // if tab not focused (TODO: does it really work ?!)
new Audio("/sounds/silent.mp3").play().then(() => {}).catch(err => {});
}
this.conn = new WebSocket(url + "/?sid=" + this.myid + "&page=" + variant);
@@ -434,7 +631,6 @@ Vue.component('my-game', {
else if (localStorage.getItem("newgame") === variant)
{
// New game request has been cancelled on disconnect
- this.seek = true;
this.newGame("human", undefined, undefined, undefined, undefined, "reconnect");
}
};
@@ -443,7 +639,8 @@ Vue.component('my-game', {
switch (data.code)
{
case "newgame": //opponent found
- this.newGame("human", data.fen, data.color, data.oppid); //oppid: opponent socket ID
+ // oppid: opponent socket ID
+ this.newGame("human", data.fen, data.color, data.oppid);
break;
case "newmove": //..he played!
this.play(data.move, "animate");
@@ -509,6 +706,18 @@ Vue.component('my-game', {
this.conn.onopen = socketOpenListener;
this.conn.onmessage = socketMessageListener;
this.conn.onclose = socketCloseListener;
+ // Listen to keyboard left/right to navigate in game
+ document.onkeydown = event => {
+ if (this.mode == "idle" && !!this.vr && this.vr.moves.length > 0
+ && [37,39].includes(event.keyCode))
+ {
+ event.preventDefault();
+ if (event.keyCode == 37) //Back
+ this.undo();
+ else //Forward (39)
+ this.play();
+ }
+ };
},
methods: {
download: function() {
@@ -517,7 +726,8 @@ Vue.component('my-game', {
// Prepare and trigger download link
let downloadAnchor = document.getElementById("download");
downloadAnchor.setAttribute("download", "game.pgn");
- downloadAnchor.href = "data:text/plain;charset=utf-8," + encodeURIComponent(content);
+ downloadAnchor.href = "data:text/plain;charset=utf-8," +
+ encodeURIComponent(content);
downloadAnchor.click();
},
endGame: function(score) {
@@ -530,6 +740,7 @@ Vue.component('my-game', {
if (this.mode == "human")
this.clearStorage();
this.mode = "idle";
+ this.cursor = this.vr.moves.length; //to navigate in finished game
this.oppid = "";
},
getEndgameMessage: function(score) {
@@ -548,21 +759,6 @@ Vue.component('my-game', {
}
return eogMessage;
},
- toggleExpertMode: function() {
- this.expert = !this.expert;
- document.cookie = "expert=" + (this.expert ? "1" : "0");
- },
- resign: function() {
- if (this.mode == "human" && this.oppConnected)
- {
- try {
- this.conn.send(JSON.stringify({code: "resign", oppid: this.oppid}));
- } catch (INVALID_STATE_ERR) {
- return; //socket is not ready (and not yet reconnected)
- }
- }
- this.endGame(this.mycolor=="w"?"0-1":"1-0");
- },
setStorage: function() {
localStorage.setItem("myid", this.myid);
localStorage.setItem("variant", variant);
@@ -585,26 +781,54 @@ Vue.component('my-game', {
delete localStorage["fen"];
delete localStorage["moves"];
},
- clickGameSeek: function() {
+ // HACK because mini-css tooltips are persistent after click...
+ getRidOfTooltip: function(elt) {
+ elt.style.visibility = "hidden";
+ setTimeout(() => { elt.style.visibility="visible"; }, 100);
+ },
+ clickGameSeek: function(e) {
+ this.getRidOfTooltip(e.currentTarget);
if (this.mode == "human")
return; //no newgame while playing
if (this.seek)
{
+ this.conn.send(JSON.stringify({code:"cancelnewgame"}));
delete localStorage["newgame"]; //cancel game seek
this.seek = false;
}
else
this.newGame("human");
},
- clickComputerGame: function() {
+ clickComputerGame: function(e) {
+ this.getRidOfTooltip(e.currentTarget);
if (this.mode == "human")
return; //no newgame while playing
this.newGame("computer");
},
+ clickFriendGame: function(e) {
+ this.getRidOfTooltip(e.currentTarget);
+ document.getElementById("modal-fenedit").checked = true;
+ },
+ toggleExpertMode: function(e) {
+ this.getRidOfTooltip(e.currentTarget);
+ this.expert = !this.expert;
+ setCookie("expert", this.expert ? "1" : "0");
+ },
+ resign: function(e) {
+ this.getRidOfTooltip(e.currentTarget);
+ if (this.mode == "human" && this.oppConnected)
+ {
+ try {
+ this.conn.send(JSON.stringify({code: "resign", oppid: this.oppid}));
+ } catch (INVALID_STATE_ERR) {
+ return; //socket is not ready (and not yet reconnected)
+ }
+ }
+ this.endGame(this.mycolor=="w"?"0-1":"1-0");
+ },
newGame: function(mode, fenInit, color, oppId, moves, continuation) {
const fen = fenInit || VariantRules.GenRandInitFen();
console.log(fen); //DEBUG
- this.score = "*";
if (mode=="human" && !oppId)
{
const storageVariant = localStorage.getItem("variant");
@@ -630,15 +854,12 @@ Vue.component('my-game', {
}
return;
}
- // random enough (TODO: function)
- this.gameId = (Date.now().toString(36) + Math.random().toString(36).substr(2, 7)).toUpperCase();
this.vr = new VariantRules(fen, moves || []);
+ this.score = "*";
this.pgnTxt = ""; //redundant with this.score = "*", but cleaner
this.mode = mode;
this.incheck = []; //in case of
- this.fenStart = continuation
- ? localStorage.getItem("fenStart")
- : fen.split(" ")[0]; //Only the position matters
+ this.fenStart = (continuation ? localStorage.getItem("fenStart") : fen);
if (mode=="human")
{
// Opponent found!
@@ -662,25 +883,16 @@ Vue.component('my-game', {
delete localStorage["newgame"];
this.setStorage(); //in case of interruptions
}
- else //against computer
+ else if (mode == "computer")
{
this.mycolor = Math.random() < 0.5 ? 'w' : 'b';
if (this.mycolor == 'b')
setTimeout(this.playComputerMove, 500);
}
+ //else: against a (IRL) friend: nothing more to do
},
playComputerMove: function() {
const timeStart = Date.now();
- const nbMoves = this.vr.moves.length; //using played moves to know if search finished
- const gameId = this.gameId; //to know if game was reset before timer end
- setTimeout(
- () => {
- if (gameId != this.gameId)
- return; //game stopped
- const L = this.vr.moves.length;
- if (nbMoves == L || !this.vr.moves[L-1].notation) //move search didn't finish
- this.vr.shouldReturn = true;
- }, 5000);
const compMove = this.vr.getComputerMove();
// (first move) HACK: avoid selecting elements before they appear on page:
const delay = Math.max(500-(Date.now()-timeStart), 0);
@@ -698,6 +910,19 @@ Vue.component('my-game', {
},
mousedown: function(e) {
e = e || window.event;
+ let ingame = false;
+ let elem = e.target;
+ while (!ingame && elem !== null)
+ {
+ if (elem.classList.contains("game"))
+ {
+ ingame = true;
+ break;
+ }
+ elem = elem.parentElement;
+ }
+ if (!ingame) //let default behavior (click on button...)
+ return;
e.preventDefault(); //disable native drag & drop
if (!this.selectedPiece && e.target.classList.contains("piece"))
{
@@ -714,10 +939,12 @@ Vue.component('my-game', {
this.selectedPiece.style.display = "inline-block";
this.selectedPiece.style.zIndex = 3000;
let startSquare = this.getSquareFromId(e.target.parentNode.id);
- this.possibleMoves = this.mode!="idle" && this.vr.canIplay(this.mycolor,startSquare)
- ? this.vr.getPossibleMovesFrom(startSquare)
- : [];
- e.target.parentNode.appendChild(this.selectedPiece);
+ const iCanPlay = this.mode!="idle"
+ && (this.mode=="friend" || this.vr.canIplay(this.mycolor,startSquare));
+ this.possibleMoves = iCanPlay ? this.vr.getPossibleMovesFrom(startSquare) : [];
+ // Next line add moving piece just after current image
+ // (required for Crazyhouse reserve)
+ e.target.parentNode.insertBefore(this.selectedPiece, e.target.nextSibling);
}
},
mousemove: function(e) {
@@ -727,8 +954,11 @@ Vue.component('my-game', {
// If there is an active element, move it around
if (!!this.selectedPiece)
{
- this.selectedPiece.style.left = (e.clientX-this.start.x) + "px";
- this.selectedPiece.style.top = (e.clientY-this.start.y) + "px";
+ const [offsetX,offsetY] = !!e.clientX
+ ? [e.clientX,e.clientY] //desktop browser
+ : [e.changedTouches[0].pageX, e.changedTouches[0].pageY]; //smartphone
+ this.selectedPiece.style.left = (offsetX-this.start.x) + "px";
+ this.selectedPiece.style.top = (offsetY-this.start.y) + "px";
}
},
mouseup: function(e) {
@@ -736,13 +966,20 @@ Vue.component('my-game', {
return;
e = e || window.event;
// Read drop target (or parentElement, parentNode... if type == "img")
- this.selectedPiece.style.zIndex = -3000; //HACK to find square from final coordinates
- let landing = document.elementFromPoint(e.clientX, e.clientY);
+ this.selectedPiece.style.zIndex = -3000; //HACK to find square from final coords
+ const [offsetX,offsetY] = !!e.clientX
+ ? [e.clientX,e.clientY]
+ : [e.changedTouches[0].pageX, e.changedTouches[0].pageY];
+ let landing = document.elementFromPoint(offsetX, offsetY);
this.selectedPiece.style.zIndex = 3000;
- while (landing.tagName == "IMG") //classList.contains(piece) fails because of mark/highlight
+ // Next condition: classList.contains(piece) fails because of marks
+ while (landing.tagName == "IMG")
landing = landing.parentNode;
- if (this.start.id == landing.id) //a click: selectedPiece and possibleMoves already filled
+ if (this.start.id == landing.id)
+ {
+ // A click: selectedPiece and possibleMoves are already filled
return;
+ }
// OK: process move attempt
let endSquare = this.getSquareFromId(landing.id);
let moves = this.findMatchingMoves(endSquare);
@@ -773,7 +1010,7 @@ Vue.component('my-game', {
let translation = {x:rectEnd.x-rectStart.x, y:rectEnd.y-rectStart.y};
let movingPiece =
document.querySelector("#" + this.getSquareId(move.start) + " > img.piece");
- // HACK for animation (with positive translate, image slides "under background"...)
+ // HACK for animation (with positive translate, image slides "under background")
// Possible improvement: just alter squares on the piece's way...
squares = document.getElementsByClassName("board");
for (let i=0; i {
@@ -793,24 +1031,57 @@ Vue.component('my-game', {
}, 200);
},
play: function(move, programmatic) {
+ if (!move)
+ {
+ // Navigate after game is over
+ if (this.cursor >= this.vr.moves.length)
+ return; //already at the end
+ move = this.vr.moves[this.cursor++];
+ }
if (!!programmatic) //computer or human opponent
{
this.animateMove(move);
return;
}
- this.incheck = this.vr.getCheckSquares(move); //is opponent in check?
// Not programmatic, or animation is over
if (this.mode == "human" && this.vr.turn == this.mycolor)
this.conn.send(JSON.stringify({code:"newmove", move:move, oppid:this.oppid}));
new Audio("/sounds/chessmove1.mp3").play().then(() => {}).catch(err => {});
- this.vr.play(move, "ingame");
+ if (this.mode != "idle")
+ {
+ this.incheck = this.vr.getCheckSquares(move); //is opponent in check?
+ this.vr.play(move, "ingame");
+ }
+ else
+ {
+ VariantRules.PlayOnBoard(this.vr.board, move);
+ this.$forceUpdate(); //TODO: ?!
+ }
if (this.mode == "human")
this.updateStorage(); //after our moves and opponent moves
- const eog = this.vr.checkGameOver();
- if (eog != "*")
- this.endGame(eog);
- else if (this.mode == "computer" && this.vr.turn != this.mycolor)
+ if (this.mode != "idle")
+ {
+ const eog = this.vr.checkGameOver();
+ if (eog != "*")
+ this.endGame(eog);
+ }
+ if (this.mode == "computer" && this.vr.turn != this.mycolor)
setTimeout(this.playComputerMove, 500);
},
+ undo: function() {
+ // Navigate after game is over
+ if (this.cursor == 0)
+ return; //already at the beginning
+ if (this.cursor == this.vr.moves.length)
+ this.incheck = []; //in case of...
+ const move = this.vr.moves[--this.cursor];
+ VariantRules.UndoOnBoard(this.vr.board, move);
+ this.$forceUpdate(); //TODO: ?!
+ },
+ undoInGame: function() {
+ const lm = this.vr.lastMove;
+ if (!!lm)
+ this.vr.undo(lm);
+ },
},
})