X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FGrand.js;h=8d06f710b54d18cee26adf813e2d7b765baf4120;hp=b598f2d29e2666a67645c09d1d2595186f3a95c5;hb=b6487fb9c41705187cf97215fc9e8f86a59057c7;hpb=2d7194bd9c976f444e43e5dc0a725823b6472eb9 diff --git a/public/javascripts/variants/Grand.js b/public/javascripts/variants/Grand.js index b598f2d2..8d06f710 100644 --- a/public/javascripts/variants/Grand.js +++ b/public/javascripts/variants/Grand.js @@ -13,15 +13,35 @@ class GrandRules extends ChessRules return false; const fenParsed = V.ParseFen(fen); // 5) Check captures - if (!fenParsed.captured || !fenParsed.captured.match(/^[0-9]{10,10}$/)) + if (!fenParsed.captured || !fenParsed.captured.match(/^[0-9]{14,14}$/)) return false; return true; } - static GenRandInitFen() + static IsGoodEnpassant(enpassant) { - const fen = ChessRules.GenRandInitFen(); - return fen.replace(" w 1111", " w 1111 0000000000"); + if (enpassant != "-") + { + const squares = enpassant.split(","); + if (squares.length > 2) + return false; + for (let sq of squares) + { + const ep = V.SquareToCoords(sq); + if (isNaN(ep.x) || !V.OnBoard(ep)) + return false; + } + } + return true; + } + + static ParseFen(fen) + { + const fenParts = fen.split(" "); + return Object.assign( + ChessRules.ParseFen(fen), + { captured: fenParts[5] } + ); } getFen() @@ -31,11 +51,15 @@ class GrandRules extends ChessRules getCapturedFen() { - let counts = _.map(_.range(10), 0); - for (let i=0; i= 0 && x+shift < sizeX && x+shift != lastRanks[0]) + // Always x+shiftX >= 0 && x+shiftX < sizeX, because no pawns on last rank + let finalPieces = undefined; + if (lastRanks.includes(x + shiftX)) + { + finalPieces = promotionPieces.filter(p => this.captured[color][p] > 0); + if (x + shiftX != lastRanks[0]) + finalPieces.push(V.PAWN); + } + else + finalPieces = [V.PAWN]; + if (this.board[x+shiftX][y] == V.EMPTY) { - // Normal moves - if (this.board[x+shift][y] == V.EMPTY) + // One square forward + for (let piece of finalPieces) + moves.push(this.getBasicMove([x,y], [x+shiftX,y], {c:color,p:piece})); + if (startRanks.includes(x)) { - moves.push(this.getBasicMove([x,y], [x+shift,y])); - if (startRanks.includes(x) && this.board[x+2*shift][y] == V.EMPTY) + if (this.board[x+2*shiftX][y] == V.EMPTY) { // Two squares jump - moves.push(this.getBasicMove([x,y], [x+2*shift,y])); - if (x == startRanks[0] && this.board[x+3*shift][y] == V.EMPTY) + moves.push(this.getBasicMove([x,y], [x+2*shiftX,y])); + if (x==startRanks[0] && this.board[x+3*shiftX][y] == V.EMPTY) { - // 3-squares jump - moves.push(this.getBasicMove([x,y], [x+3*shift,y])); + // Three squares jump + moves.push(this.getBasicMove([x,y], [x+3*shiftX,y])); } } } - // Captures - if (y>0 && this.canTake([x,y], [x+shift,y-1]) - && this.board[x+shift][y-1] != V.EMPTY) - { - moves.push(this.getBasicMove([x,y], [x+shift,y-1])); - } - if (y { - if (this.captured[color][p]==0) - return; - // Normal move - if (this.board[x+shift][y] == V.EMPTY) - moves.push(this.getBasicMove([x,y], [x+shift,y], {c:color,p:p})); - // Captures - if (y>0 && this.canTake([x,y], [x+shift,y-1]) - && this.board[x+shift][y-1] != V.EMPTY) - { - moves.push(this.getBasicMove([x,y], [x+shift,y-1], {c:color,p:p})); - } - if (y= 0 && y + shiftY < sizeY + && this.board[x+shiftX][y+shiftY] != V.EMPTY + && this.canTake([x,y], [x+shiftX,y+shiftY])) + { + for (let piece of finalPieces) { - moves.push(this.getBasicMove([x,y], [x+shift,y+1], {c:color,p:p})); + moves.push(this.getBasicMove([x,y], [x+shiftX,y+shiftY], + {c:color,p:piece})); } - }); + } } // En passant const Lep = this.epSquares.length; - const epSquare = Lep>0 ? this.epSquares[Lep-1] : undefined; + const epSquare = this.epSquares[Lep-1]; if (!!epSquare) { for (let epsq of epSquare) { // TODO: some redundant checks - if (epsq.x == x+shift && Math.abs(epsq.y - y) == 1) + if (epsq.x == x+shiftX && Math.abs(epsq.y - y) == 1) { - let epStep = epsq.y - y; - var enpassantMove = this.getBasicMove([x,y], [x+shift,y+epStep]); + var enpassantMove = this.getBasicMove([x,y], [epsq.x,epsq.y]); + // WARNING: the captured pawn may be diagonally behind us, + // if it's a 3-squares jump and we take on 1st passing square + const px = (this.board[x][epsq.y] != V.EMPTY ? x : x - shiftX); enpassantMove.vanish.push({ - x: x, - y: y+epStep, + x: px, + y: epsq.y, p: 'p', - c: this.getColor(x,y+epStep) + c: this.getColor(px,epsq.y) }); moves.push(enpassantMove); } @@ -269,18 +291,25 @@ class GrandRules extends ChessRules updateVariables(move) { super.updateVariables(move); - if (move.vanish.length==2 && move.appear.length==1 && move.vanish[1].p != V.PAWN) + if (move.vanish.length == 2 && move.appear.length == 1) { // Capture: update this.captured this.captured[move.vanish[1].c][move.vanish[1].p]++; } + if (move.vanish[0].p != move.appear[0].p) + { + // Promotion: update this.captured + this.captured[move.vanish[0].c][move.appear[0].p]--; + } } unupdateVariables(move) { super.unupdateVariables(move); - if (move.vanish.length==2 && move.appear.length==1 && move.vanish[1].p != V.PAWN) + if (move.vanish.length == 2 && move.appear.length == 1) this.captured[move.vanish[1].c][move.vanish[1].p]--; + if (move.vanish[0].p != move.appear[0].p) + this.captured[move.vanish[0].c][move.appear[0].p]++; } static get VALUES() @@ -355,6 +384,8 @@ class GrandRules extends ChessRules return pieces["b"].join("") + "/pppppppppp/10/10/10/10/10/10/PPPPPPPPPP/" + pieces["w"].join("").toUpperCase() + - " w 1111 -"; + " w 1111 - 00000000000000"; } } + +const VariantRules = GrandRules;