X-Git-Url: https://git.auder.net/img/rock_paper_scissors_lizard_spock.gif?a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fgame.js;h=2897b1cd00f6abd5d0c61d8e488075f71be54dab;hb=1221ac47836806efb287b0323b92957d9129c653;hp=5ad33d079ef77cfdabe28690131ddf6dc9b2ad03;hpb=5bfb09560aa346d132e829a7c63558407bcc8091;p=vchess.git
diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js
index 5ad33d07..2897b1cd 100644
--- a/public/javascripts/components/game.js
+++ b/public/javascripts/components/game.js
@@ -1,4 +1,3 @@
-// TODO: use indexedDB instead of localStorage? (more flexible: allow several games)
Vue.component('my-game', {
data: function() {
return {
@@ -18,10 +17,11 @@ Vue.component('my-game', {
incheck: [],
pgnTxt: "",
expert: document.cookie.length>0 ? document.cookie.substr(-1)=="1" : false,
+ gameId: "", //used to limit computer moves' time
};
},
render(h) {
- let [sizeX,sizeY] = VariantRules.size;
+ const [sizeX,sizeY] = VariantRules.size;
// Precompute hints squares to facilitate rendering
let hintSquares = doubleArray(sizeX, sizeY, false);
this.possibleMoves.forEach(m => { hintSquares[m.end.x][m.end.y] = true; });
@@ -128,7 +128,10 @@ Vue.component('my-game', {
this.choices.map( m => { //a "choice" is a move
return h('div',
{
- 'class': { 'board': true },
+ 'class': {
+ 'board': true,
+ ['board'+sizeY]: true,
+ },
style: {
'width': (100/this.choices.length) + "%",
'padding-bottom': (100/this.choices.length) + "%",
@@ -136,8 +139,9 @@ Vue.component('my-game', {
},
[h('img',
{
- attrs: { "src": '/images/pieces/' + VariantRules.getPpath(m.appear[0].c+m.appear[0].p) + '.svg' },
- 'class': { 'choice-piece': true, 'board': true },
+ attrs: { "src": '/images/pieces/' +
+ VariantRules.getPpath(m.appear[0].c+m.appear[0].p) + '.svg' },
+ 'class': { 'choice-piece': true },
on: { "click": e => { this.play(m); this.choices=[]; } },
})
]
@@ -170,10 +174,12 @@ Vue.component('my-game', {
{
'class': {
'piece': true,
- 'ghost': !!this.selectedPiece && this.selectedPiece.parentNode.id == "sq-"+ci+"-"+cj,
+ 'ghost': !!this.selectedPiece
+ && this.selectedPiece.parentNode.id == "sq-"+ci+"-"+cj,
},
attrs: {
- src: "/images/pieces/" + VariantRules.getPpath(this.vr.board[ci][cj]) + ".svg",
+ src: "/images/pieces/" +
+ VariantRules.getPpath(this.vr.board[ci][cj]) + ".svg",
},
}
)
@@ -202,6 +208,7 @@ Vue.component('my-game', {
{
'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,
@@ -233,23 +240,39 @@ Vue.component('my-game', {
);
}
elementArray.push(gameDiv);
- // if (!!vr.reserve)
- // {
- // let reserve = h('div',
- // {'class':{'game':true}}, [
- // h('div',
- // { 'class': { 'row': true }},
- // [
- // h('div',
- // {'class':{'board':true}},
- // [h('img',{'class':{"piece":true},attrs:{"src":"/images/pieces/wb.svg"}})]
- // )
- // ]
- // )
- // ],
- // );
- // elementArray.push(reserve);
- // }
+ if (!!this.vr.reserve) //TODO: table, show counts for reserve pieces
+ //
+ // 3 |
+ {
+ let reservePiecesArray = [];
+ for (let i=0; i {}).catch(err => {});
+ }
this.conn = new WebSocket(url + "/?sid=" + this.myid + "&page=" + variant);
const socketOpenListener = () => {
if (continuation)
@@ -574,7 +602,7 @@ Vue.component('my-game', {
this.newGame("computer");
},
newGame: function(mode, fenInit, color, oppId, moves, continuation) {
- const fen = "rbnqknbr/pppppppp/8/8/8/8/PPPPPPPP/BQRKNNRB 1111";//fenInit || VariantRules.GenRandInitFen();
+ const fen = fenInit || VariantRules.GenRandInitFen();
console.log(fen); //DEBUG
this.score = "*";
if (mode=="human" && !oppId)
@@ -602,6 +630,8 @@ 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.pgnTxt = ""; //redundant with this.score = "*", but cleaner
this.mode = mode;
@@ -634,15 +664,27 @@ Vue.component('my-game', {
}
else //against computer
{
- this.mycolor = "w";//Math.random() < 0.5 ? 'w' : 'b';
+ this.mycolor = Math.random() < 0.5 ? 'w' : 'b';
if (this.mycolor == 'b')
setTimeout(this.playComputerMove, 500);
}
},
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();
- // HACK: avoid selecting elements before they appear on page:
- setTimeout(() => this.play(compMove, "animate"), 500);
+ // (first move) HACK: avoid selecting elements before they appear on page:
+ const delay = Math.max(500-(Date.now()-timeStart), 0);
+ setTimeout(() => this.play(compMove, "animate"), delay);
},
// Get the identifier of a HTML table cell from its numeric coordinates o.x,o.y.
getSquareId: function(o) {
@@ -672,10 +714,9 @@ 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 = true //this.mode!="idle" && this.vr.canIplay(this.mycolor,startSquare)
+ this.possibleMoves = this.mode!="idle" && this.vr.canIplay(this.mycolor,startSquare)
? this.vr.getPossibleMovesFrom(startSquare)
: [];
- console.log(this.possibleMoves);
e.target.parentNode.appendChild(this.selectedPiece);
}
},
@@ -730,8 +771,9 @@ Vue.component('my-game', {
let rectStart = startSquare.getBoundingClientRect();
let rectEnd = endSquare.getBoundingClientRect();
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 (otherwise with positive translate, image slides "under background"...)
+ let movingPiece =
+ document.querySelector("#" + this.getSquareId(move.start) + " > img.piece");
+ // 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