X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FAlice.js;h=57c7b25cf47b43d10b2eddfe2582267920f66f95;hp=5aa9ee8182ccc3d3f3cbda7e726ab2b11ca34ade;hb=b6487fb9c41705187cf97215fc9e8f86a59057c7;hpb=cf1303697774a12ef9bb154014a38797716944cf

diff --git a/public/javascripts/variants/Alice.js b/public/javascripts/variants/Alice.js
index 5aa9ee81..57c7b25c 100644
--- a/public/javascripts/variants/Alice.js
+++ b/public/javascripts/variants/Alice.js
@@ -29,20 +29,24 @@ class AliceRules extends ChessRules
 		return (Object.keys(this.ALICE_PIECES).includes(b[1]) ? "Alice/" : "") + b;
 	}
 
-	initVariables(fen)
+	static get PIECES()
 	{
-		super.initVariables(fen);
-		const fenParts = fen.split(" ");
-		const position = fenParts[0].split("/");
+		return ChessRules.PIECES.concat(Object.keys(V.ALICE_PIECES));
+	}
+
+	setOtherVariables(fen)
+	{
+		super.setOtherVariables(fen);
+		const rows = V.ParseFen(fen).position.split("/");
 		if (this.kingPos["w"][0] < 0 || this.kingPos["b"][0] < 0)
 		{
-			// INIT_COL_XXX won't be used, so no need to set them for Alice kings
-			for (let i=0; i<position.length; i++)
+			// INIT_COL_XXX won't be required if Alice kings are found (means 'king moved')
+			for (let i=0; i<rows.length; i++)
 			{
 				let k = 0; //column index on board
-				for (let j=0; j<position[i].length; j++)
+				for (let j=0; j<rows[i].length; j++)
 				{
-					switch (position[i].charAt(j))
+					switch (rows[i].charAt(j))
 					{
 						case 'l':
 							this.kingPos['b'] = [i,k];
@@ -51,7 +55,7 @@ class AliceRules extends ChessRules
 							this.kingPos['w'] = [i,k];
 							break;
 						default:
-							let num = parseInt(position[i].charAt(j));
+							const num = parseInt(rows[i].charAt(j));
 							if (!isNaN(num))
 								k += (num-1);
 					}
@@ -61,23 +65,26 @@ class AliceRules extends ChessRules
 		}
 	}
 
+	// Return the (standard) color+piece notation at a square for a board
+	getSquareOccupation(i, j, mirrorSide)
+	{
+		const piece = this.getPiece(i,j);
+		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)
 	{
-		const V = VariantRules;
 		// Build corresponding board from complete board
-		const [sizeX,sizeY] = V.size;
-		let sideBoard = doubleArray(sizeX, sizeY, "");
-		for (let i=0; i<sizeX; i++)
+		let sideBoard = doubleArray(V.size.x, V.size.y, "");
+		for (let i=0; i<V.size.x; 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];
-			}
+			for (let j=0; j<V.size.y; j++)
+				sideBoard[i][j] = this.getSquareOccupation(i, j, mirrorSide);
 		}
 		return sideBoard;
 	}
@@ -85,30 +92,42 @@ class AliceRules extends ChessRules
 	// NOTE: castle & enPassant https://www.chessvariants.com/other.dir/alice.html
 	getPotentialMovesFrom([x,y], sideBoard)
 	{
-		const pieces = Object.keys(VariantRules.ALICE_CODES);
-		const codes = Object.keys(VariantRules.ALICE_PIECES);
+		const pieces = Object.keys(V.ALICE_CODES);
+		const codes = Object.keys(V.ALICE_PIECES);
 		const mirrorSide = (pieces.includes(this.getPiece(x,y)) ? 1 : 2);
+		const color = this.getColor(x,y);
 
 		// Search valid moves on sideBoard
 		let saveBoard = this.board;
 		this.board = sideBoard || this.getSideBoard(mirrorSide);
-		let moves = super.getPotentialMovesFrom([x,y]);
+		let moves = super.getPotentialMovesFrom([x,y])
+			.filter(m => {
+				// Filter out king moves which result in under-check position on
+				// current board (before mirror traversing)
+				let aprioriValid = true;
+				if (m.appear[0].p == V.KING)
+				{
+					this.play(m);
+					if (this.underCheck(color))
+						aprioriValid = false;
+					this.undo(m);
+				}
+				return aprioriValid;
+			});
 		this.board = saveBoard;
 
 		// Finally filter impossible moves
 		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) != V.EMPTY)
 						return false;
-					}
-				});
+				}
 			}
-			else if (this.board[m.end.x][m.end.y] != VariantRules.EMPTY)
+			else if (this.board[m.end.x][m.end.y] != V.EMPTY)
 			{
 				// Attempt to capture
 				const piece = this.getPiece(m.end.x,m.end.y);
@@ -122,18 +141,18 @@ class AliceRules extends ChessRules
 			if (mirrorSide==1)
 			{
 				m.appear.forEach(psq => { //forEach: castling taken into account
-					psq.p = VariantRules.ALICE_CODES[psq.p]; //goto board2
+					psq.p = V.ALICE_CODES[psq.p]; //goto board2
 				});
 			}
 			else //move on board2: mark vanishing pieces as Alice
 			{
 				m.vanish.forEach(psq => {
-					psq.p = VariantRules.ALICE_CODES[psq.p];
+					psq.p = V.ALICE_CODES[psq.p];
 				});
 			}
 			// Fix en-passant captures
-			if (m.vanish[0].p == VariantRules.PAWN
-				&& m.vanish.length == 2 && this.board[m.end.x][m.end.y] == VariantRules.EMPTY)
+			if (m.vanish[0].p == V.PAWN && m.vanish.length == 2
+				&& this.board[m.end.x][m.end.y] == V.EMPTY)
 			{
 				m.vanish[1].c = this.getOppCol(this.getColor(x,y));
 				// In the special case of en-passant, if
@@ -141,9 +160,9 @@ class AliceRules extends ChessRules
 				//  - 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];
+					van.p = V.ALICE_CODES[van.p];
 				else if (mirrorSide==2 && pieces.includes(this.getPiece(van.x,van.y)))
-					van.p = VariantRules.ALICE_PIECES[van.p];
+					van.p = V.ALICE_PIECES[van.p];
 			}
 			return true;
 		});
@@ -155,7 +174,13 @@ class AliceRules extends ChessRules
 		if (moves.length == 0)
 			return [];
 		let sideBoard = [this.getSideBoard(1), this.getSideBoard(2)];
-		return moves.filter(m => { return !this.underCheck(m, sideBoard); });
+		const color = this.turn;
+		return moves.filter(m => {
+			this.playSide(m, sideBoard); //no need to track flags
+			const res = !this.underCheck(color, sideBoard);
+			this.undoSide(m, sideBoard);
+			return res;
+		});
 	}
 
 	getAllValidMoves()
@@ -163,16 +188,17 @@ class AliceRules extends ChessRules
 		const color = this.turn;
 		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 i=0; i<V.size.x; i++)
 		{
-			for (var j=0; j<sizeY; j++)
+			for (var j=0; j<V.size.y; j++)
 			{
-				if (this.board[i][j] != VariantRules.EMPTY && this.getColor(i,j) == color)
+				if (this.board[i][j] != V.EMPTY && this.getColor(i,j) == color)
 				{
 					const mirrorSide =
-						(Object.keys(VariantRules.ALICE_CODES).includes(this.getPiece(i,j)) ? 1 : 2);
+						Object.keys(V.ALICE_CODES).includes(this.getPiece(i,j))
+							? 1
+							: 2;
 					Array.prototype.push.apply(potentialMoves,
 						this.getPotentialMovesFrom([i,j], sideBoard[mirrorSide-1]));
 				}
@@ -184,16 +210,16 @@ class AliceRules extends ChessRules
 	// Play on sideboards [TODO: only one sideBoard required]
 	playSide(move, sideBoard)
 	{
-		const pieces = Object.keys(VariantRules.ALICE_CODES);
+		const pieces = Object.keys(V.ALICE_CODES);
 		move.vanish.forEach(psq => {
 			const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
-			sideBoard[mirrorSide-1][psq.x][psq.y] = VariantRules.EMPTY;
+			sideBoard[mirrorSide-1][psq.x][psq.y] = V.EMPTY;
 		});
 		move.appear.forEach(psq => {
 			const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
-			const piece = (mirrorSide == 1 ? psq.p : VariantRules.ALICE_PIECES[psq.p]);
+			const piece = (mirrorSide == 1 ? psq.p : V.ALICE_PIECES[psq.p]);
 			sideBoard[mirrorSide-1][psq.x][psq.y] = psq.c + piece;
-			if (piece == VariantRules.KING)
+			if (piece == V.KING)
 				this.kingPos[psq.c] = [psq.x,psq.y];
 		});
 	}
@@ -201,39 +227,34 @@ class AliceRules extends ChessRules
 	// Undo on sideboards
 	undoSide(move, sideBoard)
 	{
-		const pieces = Object.keys(VariantRules.ALICE_CODES);
+		const pieces = Object.keys(V.ALICE_CODES);
 		move.appear.forEach(psq => {
 			const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
-			sideBoard[mirrorSide-1][psq.x][psq.y] = VariantRules.EMPTY;
+			sideBoard[mirrorSide-1][psq.x][psq.y] = V.EMPTY;
 		});
 		move.vanish.forEach(psq => {
 			const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
-			const piece = (mirrorSide == 1 ? psq.p : VariantRules.ALICE_PIECES[psq.p]);
+			const piece = (mirrorSide == 1 ? psq.p : V.ALICE_PIECES[psq.p]);
 			sideBoard[mirrorSide-1][psq.x][psq.y] = psq.c + piece;
-			if (piece == VariantRules.KING)
+			if (piece == V.KING)
 				this.kingPos[psq.c] = [psq.x,psq.y];
 		});
 	}
 
-	underCheck(move, sideBoard) //sideBoard arg always provided
+	underCheck(color, 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;
+		const mirrorSide = (sideBoard[0][kp[0]][kp[1]] != V.EMPTY ? 1 : 2);
 		let saveBoard = this.board;
 		this.board = sideBoard[mirrorSide-1];
 		let res = this.isAttacked(kp, [this.getOppCol(color)]);
 		this.board = saveBoard;
-		this.undoSide(move, sideBoard);
 		return res;
 	}
 
-	getCheckSquares(move)
+	getCheckSquares(color)
 	{
-		this.play(move);
-		const color = this.turn; //opponent
-		const pieces = Object.keys(VariantRules.ALICE_CODES);
+		const pieces = Object.keys(V.ALICE_CODES);
 		const kp = this.kingPos[color];
 		const mirrorSide = (pieces.includes(this.getPiece(kp[0],kp[1])) ? 1 : 2);
 		let sideBoard = this.getSideBoard(mirrorSide);
@@ -243,15 +264,14 @@ class AliceRules extends ChessRules
 			? [ JSON.parse(JSON.stringify(this.kingPos[color])) ]
 			: [ ];
 		this.board = saveBoard;
-		this.undo(move);
 		return res;
 	}
 
 	updateVariables(move)
 	{
 		super.updateVariables(move); //standard king
-		const piece = this.getPiece(move.start.x,move.start.y);
-		const c = this.getColor(move.start.x,move.start.y);
+		const piece = move.vanish[0].p;
+		const c = move.vanish[0].c;
 		// "l" = Alice king
 		if (piece == "l")
 		{
@@ -264,14 +284,14 @@ class AliceRules extends ChessRules
 	unupdateVariables(move)
 	{
 		super.unupdateVariables(move);
-		const c = this.getColor(move.start.x,move.start.y);
-		if (this.getPiece(move.start.x,move.start.y) == "l")
+		const c = move.vanish[0].c;
+		if (move.vanish[0].p == "l")
 			this.kingPos[c] = [move.start.x, move.start.y];
 	}
 
 	checkGameEnd()
 	{
-		const pieces = Object.keys(VariantRules.ALICE_CODES);
+		const pieces = Object.keys(V.ALICE_CODES);
 		const color = this.turn;
 		const kp = this.kingPos[color];
 		const mirrorSide = (pieces.includes(this.getPiece(kp[0],kp[1])) ? 1 : 2);
@@ -287,26 +307,24 @@ class AliceRules extends ChessRules
 		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
-		};
+	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)
+		if (move.appear.length == 2 && move.appear[0].p == V.KING)
 		{
 			if (move.end.y < move.start.y)
 				return "0-0-0";
@@ -314,14 +332,13 @@ class AliceRules extends ChessRules
 				return "0-0";
 		}
 
-		const finalSquare =
-			String.fromCharCode(97 + move.end.y) + (VariantRules.size[0]-move.end.x);
+		const finalSquare = V.CoordsToSquare(move.end);
 		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
+			pawnMark = V.CoordToColumn(move.start.y); //start column
 
 		// Piece or pawn movement
 		let notation = piece.toUpperCase() + pawnMark + captureMark + finalSquare;
@@ -333,3 +350,5 @@ class AliceRules extends ChessRules
 		return notation;
 	}
 }
+
+const VariantRules = AliceRules;