X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FAlice.js;h=220fbd407cd3b2801e27cb478a1b10aa6c7d90f4;hp=3d79580fd7977c92effb4046e39c9ddd1e531726;hb=9234226104764b91df9d677fb360ad538b98510c;hpb=9de73b71a1db5464f89a202e6cdfdc7b6b6b0753

diff --git a/public/javascripts/variants/Alice.js b/public/javascripts/variants/Alice.js
index 3d79580f..220fbd40 100644
--- a/public/javascripts/variants/Alice.js
+++ b/public/javascripts/variants/Alice.js
@@ -1,3 +1,4 @@
+// NOTE: alternative implementation, probably cleaner = use only 1 board
 class AliceRules extends ChessRules
 {
 	static get ALICE_PIECES()
@@ -60,61 +61,62 @@ class AliceRules extends ChessRules
 		}
 	}
 
-	getBoardOfPiece([x,y])
+	// Return the (standard) color+piece notation at a square for a board
+	getSquareOccupation(i, j, mirrorSide)
 	{
+		const piece = this.getPiece(i,j);
 		const V = VariantRules;
-		// Build board where the piece is
-		const mirrorSide = (Object.keys(V.ALICE_CODES).includes(this.getPiece(x,y)) ? 1 : 2);
+		if (mirrorSide==1 && Object.keys(V.ALICE_CODES).includes(piece))
+			return this.board[i][j];
+		else if (mirrorSide==2 && Object.keys(V.ALICE_PIECES).includes(piece))
+			return this.getColor(i,j) + V.ALICE_PIECES[piece];
+		return "";
+	}
+
+	// Build board of the given (mirror)side
+	getSideBoard(mirrorSide)
+	{
 		// Build corresponding board from complete board
-		const [sizeX,sizeY] = V.size;
+		const [sizeX,sizeY] = VariantRules.size;
 		let sideBoard = doubleArray(sizeX, sizeY, "");
 		for (let i=0; i<sizeX; i++)
 		{
 			for (let j=0; j<sizeY; j++)
-			{
-				const piece = this.getPiece(i,j);
-				if (mirrorSide==1 && Object.keys(V.ALICE_CODES).includes(piece))
-					sideBoard[i][j] = this.board[i][j];
-				else if (mirrorSide==2 && Object.keys(V.ALICE_PIECES).includes(piece))
-					sideBoard[i][j] = this.getColor(i,j) + V.ALICE_PIECES[piece];
-			}
+				sideBoard[i][j] = this.getSquareOccupation(i, j, mirrorSide);
 		}
 		return sideBoard;
 	}
 
-	// TODO: move board building one level up (findAllMoves()) to avoid re-building at every piece...
 	// NOTE: castle & enPassant https://www.chessvariants.com/other.dir/alice.html
-	// --> Should be OK as is.
-	getPotentialMovesFrom([x,y])
+	getPotentialMovesFrom([x,y], sideBoard)
 	{
-		let sideBoard = this.getBoardOfPiece([x,y]);
+		const pieces = Object.keys(VariantRules.ALICE_CODES);
+		const codes = Object.keys(VariantRules.ALICE_PIECES);
+		const mirrorSide = (pieces.includes(this.getPiece(x,y)) ? 1 : 2);
 
 		// Search valid moves on sideBoard
 		let saveBoard = this.board;
-		this.board = sideBoard;
+		this.board = sideBoard || this.getSideBoard(mirrorSide);
 		let moves = super.getPotentialMovesFrom([x,y]);
 		this.board = saveBoard;
 
 		// Finally filter impossible moves
-		const mirrorSide = (Object.keys(VariantRules.ALICE_CODES).includes(this.getPiece(x,y)) ? 1 : 2);
-		return moves.filter(m => {
+		let res = moves.filter(m => {
 			if (m.appear.length == 2) //castle
 			{
-				// If appear[i] not in vanish array, then must be empty square on other board
-				m.appear.forEach(psq => {
-					if (this.board[psq.x][psq.y] != VariantRules.EMPTY &&
-						![m.vanish[0].y,m.vanish[1].y].includes(psq.y))
-					{
+				// appear[i] must be an empty square on the other board
+				for (let psq of m.appear)
+				{
+					if (this.getSquareOccupation(psq.x,psq.y,3-mirrorSide) != VariantRules.EMPTY)
 						return false;
-					}
-				});
+				}
 			}
 			else if (this.board[m.end.x][m.end.y] != VariantRules.EMPTY)
 			{
 				// Attempt to capture
 				const piece = this.getPiece(m.end.x,m.end.y);
-				if ((mirrorSide==1 && Object.keys(VariantRules.ALICE_PIECES).includes(piece))
-					|| (mirrorSide==2 && Object.keys(VariantRules.ALICE_CODES).includes(piece)))
+				if ((mirrorSide==1 && codes.includes(piece))
+					|| (mirrorSide==2 && pieces.includes(piece)))
 				{
 					return false;
 				}
@@ -133,22 +135,102 @@ class AliceRules extends ChessRules
 				});
 			}
 			// Fix en-passant captures
-			if (m.vanish.length == 2 && this.board[m.end.x][m.end.y] == VariantRules.EMPTY)
+			if (m.vanish[0].p == VariantRules.PAWN
+				&& m.vanish.length == 2 && this.board[m.end.x][m.end.y] == VariantRules.EMPTY)
+			{
 				m.vanish[1].c = this.getOppCol(this.getColor(x,y));
+				// In the special case of en-passant, if
+				//  - board1 takes board2 : vanish[1] --> Alice
+				//  - board2 takes board1 : vanish[1] --> normal
+				let van = m.vanish[1];
+				if (mirrorSide==1 && codes.includes(this.getPiece(van.x,van.y)))
+					van.p = VariantRules.ALICE_CODES[van.p];
+				else if (mirrorSide==2 && pieces.includes(this.getPiece(van.x,van.y)))
+					van.p = VariantRules.ALICE_PIECES[van.p];
+			}
 			return true;
 		});
+		return res;
+	}
+
+	filterValid(moves)
+	{
+		if (moves.length == 0)
+			return [];
+		let sideBoard = [this.getSideBoard(1), this.getSideBoard(2)];
+		return moves.filter(m => { return !this.underCheck(m, sideBoard); });
 	}
 
-	underCheck(move)
+	getAllValidMoves()
 	{
 		const color = this.turn;
-		this.play(move);
-		let sideBoard = this.getBoardOfPiece(this.kingPos[color]);
+		const oppCol = this.getOppCol(color);
+		var potentialMoves = [];
+		let [sizeX,sizeY] = VariantRules.size;
+		let sideBoard = [this.getSideBoard(1), this.getSideBoard(2)];
+		for (var i=0; i<sizeX; i++)
+		{
+			for (var j=0; j<sizeY; j++)
+			{
+				if (this.board[i][j] != VariantRules.EMPTY && this.getColor(i,j) == color)
+				{
+					const mirrorSide =
+						Object.keys(VariantRules.ALICE_CODES).includes(this.getPiece(i,j))
+							? 1
+							: 2;
+					Array.prototype.push.apply(potentialMoves,
+						this.getPotentialMovesFrom([i,j], sideBoard[mirrorSide-1]));
+				}
+			}
+		}
+		return this.filterValid(potentialMoves, sideBoard);
+	}
+
+	// Play on sideboards [TODO: only one sideBoard required]
+	playSide(move, sideBoard)
+	{
+		const pieces = Object.keys(VariantRules.ALICE_CODES);
+		move.vanish.forEach(psq => {
+			const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
+			sideBoard[mirrorSide-1][psq.x][psq.y] = VariantRules.EMPTY;
+		});
+		move.appear.forEach(psq => {
+			const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
+			const piece = (mirrorSide == 1 ? psq.p : VariantRules.ALICE_PIECES[psq.p]);
+			sideBoard[mirrorSide-1][psq.x][psq.y] = psq.c + piece;
+			if (piece == VariantRules.KING)
+				this.kingPos[psq.c] = [psq.x,psq.y];
+		});
+	}
+
+	// Undo on sideboards
+	undoSide(move, sideBoard)
+	{
+		const pieces = Object.keys(VariantRules.ALICE_CODES);
+		move.appear.forEach(psq => {
+			const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
+			sideBoard[mirrorSide-1][psq.x][psq.y] = VariantRules.EMPTY;
+		});
+		move.vanish.forEach(psq => {
+			const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
+			const piece = (mirrorSide == 1 ? psq.p : VariantRules.ALICE_PIECES[psq.p]);
+			sideBoard[mirrorSide-1][psq.x][psq.y] = psq.c + piece;
+			if (piece == VariantRules.KING)
+				this.kingPos[psq.c] = [psq.x,psq.y];
+		});
+	}
+
+	underCheck(move, sideBoard) //sideBoard arg always provided
+	{
+		const color = this.turn;
+		this.playSide(move, sideBoard); //no need to track flags
+		const kp = this.kingPos[color];
+		const mirrorSide = sideBoard[0][kp[0]][kp[1]] != VariantRules.EMPTY ? 1 : 2;
 		let saveBoard = this.board;
-		this.board = sideBoard;
-		let res = this.isAttacked(this.kingPos[color], this.getOppCol(color));
+		this.board = sideBoard[mirrorSide-1];
+		let res = this.isAttacked(kp, [this.getOppCol(color)]);
 		this.board = saveBoard;
-		this.undo(move);
+		this.undoSide(move, sideBoard);
 		return res;
 	}
 
@@ -156,10 +238,13 @@ class AliceRules extends ChessRules
 	{
 		this.play(move);
 		const color = this.turn; //opponent
-		let sideBoard = this.getBoardOfPiece(this.kingPos[color]);
+		const pieces = Object.keys(VariantRules.ALICE_CODES);
+		const kp = this.kingPos[color];
+		const mirrorSide = (pieces.includes(this.getPiece(kp[0],kp[1])) ? 1 : 2);
+		let sideBoard = this.getSideBoard(mirrorSide);
 		let saveBoard = this.board;
 		this.board = sideBoard;
-		let res = this.isAttacked(this.kingPos[color], this.getOppCol(color))
+		let res = this.isAttacked(this.kingPos[color], [this.getOppCol(color)])
 			? [ JSON.parse(JSON.stringify(this.kingPos[color])) ]
 			: [ ];
 		this.board = saveBoard;
@@ -189,6 +274,38 @@ class AliceRules extends ChessRules
 			this.kingPos[c] = [move.start.x, move.start.y];
 	}
 
+	checkGameEnd()
+	{
+		const pieces = Object.keys(VariantRules.ALICE_CODES);
+		const color = this.turn;
+		const kp = this.kingPos[color];
+		const mirrorSide = (pieces.includes(this.getPiece(kp[0],kp[1])) ? 1 : 2);
+		let sideBoard = this.getSideBoard(mirrorSide);
+		let saveBoard = this.board;
+		this.board = sideBoard;
+		let res = "*";
+		if (!this.isAttacked(this.kingPos[color], [this.getOppCol(color)]))
+			res = "1/2";
+		else
+			res = (color == "w" ? "0-1" : "1-0");
+		this.board = saveBoard;
+		return res;
+	}
+
+	static get VALUES() {
+		return Object.assign(
+			ChessRules.VALUES,
+			{
+				's': 1,
+				'u': 5,
+				'o': 3,
+				'c': 3,
+				't': 9,
+				'l': 1000,
+			}
+		);
+	}
+
 	getNotation(move)
 	{
 		if (move.appear.length == 2 && move.appear[0].p == VariantRules.KING)
@@ -203,9 +320,13 @@ class AliceRules extends ChessRules
 			String.fromCharCode(97 + move.end.y) + (VariantRules.size[0]-move.end.x);
 		const piece = this.getPiece(move.start.x, move.start.y);
 
+		const captureMark = (move.vanish.length > move.appear.length ? "x" : "");
+		let pawnMark = "";
+		if (["p","s"].includes(piece) && captureMark.length == 1)
+			pawnMark = String.fromCharCode(97 + move.start.y); //start column
+
 		// Piece or pawn movement
-		let notation = piece.toUpperCase() +
-			(move.vanish.length > move.appear.length ? "x" : "") + finalSquare;
+		let notation = piece.toUpperCase() + pawnMark + captureMark + finalSquare;
 		if (['s','p'].includes(piece) && !['s','p'].includes(move.appear[0].p))
 		{
 			// Promotion
@@ -213,36 +334,4 @@ class AliceRules extends ChessRules
 		}
 		return notation;
 	}
-
-	checkGameEnd()
-	{
-		const color = this.turn;
-		let sideBoard = this.getBoardOfPiece(this.kingPos[color]);
-		let saveBoard = this.board;
-		this.board = sideBoard;
-		let res = "*";
-		if (!this.isAttacked(this.kingPos[color], this.getOppCol(color)))
-			res = "1/2";
-		else
-			res = (color == "w" ? "0-1" : "1-0");
-		this.board = saveBoard;
-		return res;
-	}
-
-	static get VALUES() {
-		return {
-			'p': 1,
-			's': 1,
-			'r': 5,
-			'u': 5,
-			'n': 3,
-			'o': 3,
-			'b': 3,
-			'c': 3,
-			'q': 9,
-			't': 9,
-			'k': 1000,
-			'l': 1000
-		};
-	}
 }