X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FAlice.js;h=2788e2101701cc60621bf6e973a96cf45eaa5de1;hb=26c1e3bd4d3e9fb7c86e25c0f423bea57b977111;hp=00103a7bcf93fd7a1dbed0c9b8314097128eb8a5;hpb=2d7194bd9c976f444e43e5dc0a725823b6472eb9;p=vchess.git

diff --git a/public/javascripts/variants/Alice.js b/public/javascripts/variants/Alice.js
index 00103a7b..2788e210 100644
--- a/public/javascripts/variants/Alice.js
+++ b/public/javascripts/variants/Alice.js
@@ -160,7 +160,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()
@@ -221,24 +227,19 @@ class AliceRules extends ChessRules
 		});
 	}
 
-	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]] != 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(V.ALICE_CODES);
 		const kp = this.kingPos[color];
 		const mirrorSide = (pieces.includes(this.getPiece(kp[0],kp[1])) ? 1 : 2);
@@ -249,15 +250,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")
 		{
@@ -270,8 +270,8 @@ 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];
 	}
 
@@ -324,7 +324,7 @@ class AliceRules extends ChessRules
 		const captureMark = (move.vanish.length > move.appear.length ? "x" : "");
 		let pawnMark = "";
 		if (["p","s"].includes(piece) && captureMark.length == 1)
-			pawnMark = V.GetColumn(move.start.y); //start column
+			pawnMark = V.CoordToColumn(move.start.y); //start column
 
 		// Piece or pawn movement
 		let notation = piece.toUpperCase() + pawnMark + captureMark + finalSquare;
@@ -336,3 +336,5 @@ class AliceRules extends ChessRules
 		return notation;
 	}
 }
+
+const VariantRules = AliceRules;