X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fbase_rules.js;h=5763af7e1d0f86e40789ff7c9467ce66a3bd1334;hb=7931e479adf93c87771ded1892a0873af72ae46d;hp=71695c49336fac471d71db083aeca76843a69b1f;hpb=97fc8bf769610b26d5edca92905f30af2e4b9633;p=vchess.git

diff --git a/public/javascripts/base_rules.js b/public/javascripts/base_rules.js
index 71695c49..5763af7e 100644
--- a/public/javascripts/base_rules.js
+++ b/public/javascripts/base_rules.js
@@ -1,3 +1,6 @@
+// (Orthodox) Chess rules are defined in ChessRules class.
+// Variants generally inherit from it, and modify some parts.
+
 class PiPo //Piece+Position
 {
 	// o: {piece[p], color[c], posX[x], posY[y]}
@@ -10,6 +13,7 @@ class PiPo //Piece+Position
 	}
 }
 
+// TODO: for animation, moves should contains "moving" and "fading" maybe...
 class Move
 {
 	// o: {appear, vanish, [start,] [end,]}
@@ -50,17 +54,20 @@ class ChessRules
 	constructor(fen, moves)
 	{
 		this.moves = moves;
-		// Use fen string to initialize variables, flags and board
-		this.board = VariantRules.GetBoard(fen);
-		this.setFlags(fen);
+		// Use fen string to initialize variables, flags, turn and board
+		const fenParts = fen.split(" ");
+		this.board = V.GetBoard(fenParts[0]);
+		this.setFlags(fenParts[1]); //NOTE: fenParts[1] might be undefined
+		this.setTurn(fenParts[2]); //Same note
 		this.initVariables(fen);
 	}
 
+	// Some additional variables from FEN (variant dependant)
 	initVariables(fen)
 	{
 		this.INIT_COL_KING = {'w':-1, 'b':-1};
 		this.INIT_COL_ROOK = {'w':[-1,-1], 'b':[-1,-1]};
-		this.kingPos = {'w':[-1,-1], 'b':[-1,-1]}; //respective squares of white and black king
+		this.kingPos = {'w':[-1,-1], 'b':[-1,-1]}; //squares of white and black king
 		const fenParts = fen.split(" ");
 		const position = fenParts[0].split("/");
 		for (let i=0; i<position.length; i++)
@@ -91,66 +98,120 @@ class ChessRules
 							this.INIT_COL_ROOK['w'][1] = k;
 						break;
 					default:
-						let num = parseInt(position[i].charAt(j));
+						const num = parseInt(position[i].charAt(j));
 						if (!isNaN(num))
 							k += (num-1);
 				}
 				k++;
 			}
 		}
-		const epSq = this.moves.length > 0 ? this.getEpSquare(this.lastMove) : undefined;
+		const epSq = (this.moves.length > 0 ? this.getEpSquare(this.lastMove) : undefined);
 		this.epSquares = [ epSq ];
 	}
 
+	// Check if FEN describe a position
+	static IsGoodFen(fen)
+	{
+		const fenParts = fen.split(" ");
+		if (fenParts.length== 0 || fenParts.length > 3)
+			return false;
+		// 1) Check position
+		const position = fenParts[0];
+		const rows = position.split("/");
+		if (rows.length != V.size.x)
+			return false;
+		for (let row of rows)
+		{
+			let sumElts = 0;
+			for (let i=0; i<row.length; i++)
+			{
+				if (V.PIECES.includes(row[i].toLowerCase()))
+					sumElts++;
+				else
+				{
+					const num = parseInt(row[i]);
+					if (isNaN(num))
+						return false;
+					sumElts += num;
+				}
+			}
+			if (sumElts != V.size.y)
+				return false;
+		}
+		// 2) Check flags (if present)
+		if (fenParts.length >= 2)
+		{
+			if (!V.IsGoodFlags(fenParts[1]))
+				return false;
+		}
+		// 3) Check turn (if present)
+		if (fenParts.length == 3)
+		{
+			if (!["w","b"].includes(fenParts[2]))
+				return false;
+		}
+		return true;
+	}
+
+	// For FEN checking
+	static IsGoodFlags(flags)
+	{
+		return !!flags.match(/^[01]{4,4}$/);
+	}
+
 	// Turn diagram fen into double array ["wb","wp","bk",...]
 	static GetBoard(fen)
 	{
-		let rows = fen.split(" ")[0].split("/");
-		const [sizeX,sizeY] = VariantRules.size;
-		let board = doubleArray(sizeX, sizeY, "");
+		const rows = fen.split(" ")[0].split("/");
+		let board = doubleArray(V.size.x, V.size.y, "");
 		for (let i=0; i<rows.length; i++)
 		{
 			let j = 0;
 			for (let indexInRow = 0; indexInRow < rows[i].length; indexInRow++)
 			{
-				let character = rows[i][indexInRow];
-				let num = parseInt(character);
+				const character = rows[i][indexInRow];
+				const num = parseInt(character);
 				if (!isNaN(num))
 					j += num; //just shift j
 				else //something at position i,j
-					board[i][j++] = VariantRules.fen2board(character);
+					board[i][j++] = V.fen2board(character);
 			}
 		}
 		return board;
 	}
 
 	// Extract (relevant) flags from fen
-	setFlags(fen)
+	setFlags(fenflags)
 	{
 		// white a-castle, h-castle, black a-castle, h-castle
-		this.castleFlags = {'w': new Array(2), 'b': new Array(2)};
-		let flags = fen.split(" ")[1]; //flags right after position
+		this.castleFlags = {'w': [true,true], 'b': [true,true]};
+		if (!fenflags)
+			return;
 		for (let i=0; i<4; i++)
-			this.castleFlags[i < 2 ? 'w' : 'b'][i%2] = (flags.charAt(i) == '1');
+			this.castleFlags[i < 2 ? 'w' : 'b'][i%2] = (fenflags.charAt(i) == '1');
+	}
+
+	// Initialize turn (white or black)
+	setTurn(turnflag)
+	{
+		this.turn = turnflag || "w";
 	}
 
 	///////////////////
 	// GETTERS, SETTERS
 
-	static get size() { return [8,8]; }
+	static get size() { return {x:8, y:8}; }
+
 	// Two next functions return 'undefined' if called on empty square
 	getColor(i,j) { return this.board[i][j].charAt(0); }
 	getPiece(i,j) { return this.board[i][j].charAt(1); }
 
 	// Color
-	getOppCol(color) { return color=="w" ? "b" : "w"; }
+	getOppCol(color) { return (color=="w" ? "b" : "w"); }
 
 	get lastMove() {
 		const L = this.moves.length;
-		return L>0 ? this.moves[L-1] : null;
-	}
-	get turn() {
-		return this.moves.length%2==0 ? 'w' : 'b';
+		return (L>0 ? this.moves[L-1] : null);
 	}
 
 	// Pieces codes
@@ -161,6 +222,11 @@ class ChessRules
 	static get QUEEN() { return 'q'; }
 	static get KING() { return 'k'; }
 
+	// For FEN checking:
+	static get PIECES() {
+		return [V.PAWN,V.ROOK,V.KNIGHT,V.BISHOP,V.QUEEN,V.KING];
+	}
+
 	// Empty square
 	static get EMPTY() { return ''; }
 
@@ -188,7 +254,7 @@ class ChessRules
 	getEpSquare(move)
 	{
 		const [sx,sy,ex] = [move.start.x,move.start.y,move.end.x];
-		if (this.getPiece(sx,sy) == VariantRules.PAWN && Math.abs(sx - ex) == 2)
+		if (this.getPiece(sx,sy) == V.PAWN && Math.abs(sx - ex) == 2)
 		{
 			return {
 				x: (sx + ex)/2,
@@ -201,7 +267,7 @@ class ChessRules
 	// Can thing on square1 take thing on square2
 	canTake([x1,y1], [x2,y2])
 	{
-		return this.getColor(x1,y1) != this.getColor(x2,y2);
+		return this.getColor(x1,y1) !== this.getColor(x2,y2);
 	}
 
 	///////////////////
@@ -212,17 +278,17 @@ class ChessRules
 	{
 		switch (this.getPiece(x,y))
 		{
-			case VariantRules.PAWN:
+			case V.PAWN:
 				return this.getPotentialPawnMoves([x,y]);
-			case VariantRules.ROOK:
+			case V.ROOK:
 				return this.getPotentialRookMoves([x,y]);
-			case VariantRules.KNIGHT:
+			case V.KNIGHT:
 				return this.getPotentialKnightMoves([x,y]);
-			case VariantRules.BISHOP:
+			case V.BISHOP:
 				return this.getPotentialBishopMoves([x,y]);
-			case VariantRules.QUEEN:
+			case V.QUEEN:
 				return this.getPotentialQueenMoves([x,y]);
-			case VariantRules.KING:
+			case V.KING:
 				return this.getPotentialKingMoves([x,y]);
 		}
 	}
@@ -250,7 +316,7 @@ class ChessRules
 		});
 
 		// The opponent piece disappears if we take it
-		if (this.board[ex][ey] != VariantRules.EMPTY)
+		if (this.board[ex][ey] != V.EMPTY)
 		{
 			mv.vanish.push(
 				new PiPo({
@@ -264,19 +330,23 @@ class ChessRules
 		return mv;
 	}
 
+	// Is (x,y) on the chessboard?
+	static OnBoard(x,y)
+	{
+		return (x>=0 && x<V.size.x && y>=0 && y<V.size.y);
+	}
+
 	// Generic method to find possible moves of non-pawn pieces ("sliding or jumping")
 	getSlideNJumpMoves([x,y], steps, oneStep)
 	{
 		const color = this.getColor(x,y);
 		let moves = [];
-		const [sizeX,sizeY] = VariantRules.size;
 		outerLoop:
 		for (let step of steps)
 		{
 			let i = x + step[0];
 			let j = y + step[1];
-			while (i>=0 && i<sizeX && j>=0 && j<sizeY
-				&& this.board[i][j] == VariantRules.EMPTY)
+			while (V.OnBoard(i,j) && this.board[i][j] == V.EMPTY)
 			{
 				moves.push(this.getBasicMove([x,y], [i,j]));
 				if (oneStep !== undefined)
@@ -284,7 +354,7 @@ class ChessRules
 				i += step[0];
 				j += step[1];
 			}
-			if (i>=0 && i<sizeX && j>=0 && j<sizeY && this.canTake([x,y], [i,j]))
+			if (V.OnBoard(i,j) && this.canTake([x,y], [i,j]))
 				moves.push(this.getBasicMove([x,y], [i,j]));
 		}
 		return moves;
@@ -295,8 +365,7 @@ class ChessRules
 	{
 		const color = this.turn;
 		let moves = [];
-		const V = VariantRules;
-		const [sizeX,sizeY] = V.size;
+		const [sizeX,sizeY] = [V.size.x,V.size.y];
 		const shift = (color == "w" ? -1 : 1);
 		const firstRank = (color == 'w' ? sizeX-1 : 0);
 		const startRank = (color == "w" ? sizeX-2 : 1);
@@ -316,13 +385,13 @@ class ChessRules
 				}
 			}
 			// Captures
-			if (y>0 && this.canTake([x,y], [x+shift,y-1])
-				&& this.board[x+shift][y-1] != V.EMPTY)
+			if (y>0 && this.board[x+shift][y-1] != V.EMPTY
+				&& this.canTake([x,y], [x+shift,y-1]))
 			{
 				moves.push(this.getBasicMove([x,y], [x+shift,y-1]));
 			}
-			if (y<sizeY-1 && this.canTake([x,y], [x+shift,y+1])
-				&& this.board[x+shift][y+1] != V.EMPTY)
+			if (y<sizeY-1 && this.board[x+shift][y+1] != V.EMPTY
+				&& this.canTake([x,y], [x+shift,y+1]))
 			{
 				moves.push(this.getBasicMove([x,y], [x+shift,y+1]));
 			}
@@ -338,13 +407,13 @@ class ChessRules
 				if (this.board[x+shift][y] == V.EMPTY)
 					moves.push(this.getBasicMove([x,y], [x+shift,y], {c:pawnColor,p:p}));
 				// Captures
-				if (y>0 && this.canTake([x,y], [x+shift,y-1])
-					&& this.board[x+shift][y-1] != V.EMPTY)
+				if (y>0 && this.board[x+shift][y-1] != V.EMPTY
+					&& this.canTake([x,y], [x+shift,y-1]))
 				{
 					moves.push(this.getBasicMove([x,y], [x+shift,y-1], {c:pawnColor,p:p}));
 				}
-				if (y<sizeY-1 && this.canTake([x,y], [x+shift,y+1])
-					&& this.board[x+shift][y+1] != V.EMPTY)
+				if (y<sizeY-1 && this.board[x+shift][y+1] != V.EMPTY
+					&& this.canTake([x,y], [x+shift,y+1]))
 				{
 					moves.push(this.getBasicMove([x,y], [x+shift,y+1], {c:pawnColor,p:p}));
 				}
@@ -353,11 +422,11 @@ class ChessRules
 
 		// En passant
 		const Lep = this.epSquares.length;
-		const epSquare = Lep>0 ? this.epSquares[Lep-1] : undefined;
+		const epSquare = (Lep>0 ? this.epSquares[Lep-1] : undefined);
 		if (!!epSquare && epSquare.x == x+shift && Math.abs(epSquare.y - y) == 1)
 		{
-			let epStep = epSquare.y - y;
-			var enpassantMove = this.getBasicMove([x,y], [x+shift,y+epStep]);
+			const epStep = epSquare.y - y;
+			let enpassantMove = this.getBasicMove([x,y], [x+shift,y+epStep]);
 			enpassantMove.vanish.push({
 				x: x,
 				y: y+epStep,
@@ -373,32 +442,30 @@ class ChessRules
 	// What are the rook moves from square x,y ?
 	getPotentialRookMoves(sq)
 	{
-		return this.getSlideNJumpMoves(sq, VariantRules.steps[VariantRules.ROOK]);
+		return this.getSlideNJumpMoves(sq, V.steps[V.ROOK]);
 	}
 
 	// What are the knight moves from square x,y ?
 	getPotentialKnightMoves(sq)
 	{
-		return this.getSlideNJumpMoves(sq, VariantRules.steps[VariantRules.KNIGHT], "oneStep");
+		return this.getSlideNJumpMoves(sq, V.steps[V.KNIGHT], "oneStep");
 	}
 
 	// What are the bishop moves from square x,y ?
 	getPotentialBishopMoves(sq)
 	{
-		return this.getSlideNJumpMoves(sq, VariantRules.steps[VariantRules.BISHOP]);
+		return this.getSlideNJumpMoves(sq, V.steps[V.BISHOP]);
 	}
 
 	// What are the queen moves from square x,y ?
 	getPotentialQueenMoves(sq)
 	{
-		const V = VariantRules;
 		return this.getSlideNJumpMoves(sq, V.steps[V.ROOK].concat(V.steps[V.BISHOP]));
 	}
 
 	// What are the king moves from square x,y ?
 	getPotentialKingMoves(sq)
 	{
-		const V = VariantRules;
 		// Initialize with normal moves
 		let moves = this.getSlideNJumpMoves(sq,
 			V.steps[V.ROOK].concat(V.steps[V.BISHOP]), "oneStep");
@@ -408,17 +475,14 @@ class ChessRules
 	getCastleMoves([x,y])
 	{
 		const c = this.getColor(x,y);
-		const [sizeX,sizeY] = VariantRules.size;
-		if (x != (c=="w" ? sizeX-1 : 0) || y != this.INIT_COL_KING[c])
+		if (x != (c=="w" ? V.size.x-1 : 0) || y != this.INIT_COL_KING[c])
 			return []; //x isn't first rank, or king has moved (shortcut)
 
-		const V = VariantRules;
-
 		// Castling ?
 		const oppCol = this.getOppCol(c);
 		let moves = [];
 		let i = 0;
-		const finalSquares = [ [2,3], [sizeY-2,sizeY-3] ]; //king, then rook
+		const finalSquares = [ [2,3], [V.size.y-2,V.size.y-3] ]; //king, then rook
 		castlingCheck:
 		for (let castleSide=0; castleSide < 2; castleSide++) //large, then small
 		{
@@ -480,8 +544,7 @@ class ChessRules
 
 	canIplay(side, [x,y])
 	{
-		return ((side=='w' && this.moves.length%2==0) || (side=='b' && this.moves.length%2==1))
-			&& this.getColor(x,y) == side;
+		return (this.turn == side && this.getColor(x,y) == side);
 	}
 
 	getPossibleMovesFrom(sq)
@@ -490,7 +553,7 @@ class ChessRules
 		return this.filterValid( this.getPotentialMovesFrom(sq) );
 	}
 
-	// TODO: once a promotion is filtered, the others results are same: useless computations
+	// TODO: promotions (into R,B,N,Q) should be filtered only once
 	filterValid(moves)
 	{
 		if (moves.length == 0)
@@ -504,13 +567,12 @@ class ChessRules
 		const color = this.turn;
 		const oppCol = this.getOppCol(color);
 		let potentialMoves = [];
-		const [sizeX,sizeY] = VariantRules.size;
-		for (let i=0; i<sizeX; i++)
+		for (let i=0; i<V.size.x; i++)
 		{
-			for (let j=0; j<sizeY; j++)
+			for (let j=0; j<V.size.y; j++)
 			{
-				// Next condition ... != oppCol is a little HACK to work with checkered variant
-				if (this.board[i][j] != VariantRules.EMPTY && this.getColor(i,j) != oppCol)
+				// Next condition "!= oppCol" = harmless hack to work with checkered variant
+				if (this.board[i][j] != V.EMPTY && this.getColor(i,j) != oppCol)
 					Array.prototype.push.apply(potentialMoves, this.getPotentialMovesFrom([i,j]));
 			}
 		}
@@ -524,12 +586,11 @@ class ChessRules
 	{
 		const color = this.turn;
 		const oppCol = this.getOppCol(color);
-		const [sizeX,sizeY] = VariantRules.size;
-		for (let i=0; i<sizeX; i++)
+		for (let i=0; i<V.size.x; i++)
 		{
-			for (let j=0; j<sizeY; j++)
+			for (let j=0; j<V.size.y; j++)
 			{
-				if (this.board[i][j] != VariantRules.EMPTY && this.getColor(i,j) != oppCol)
+				if (this.board[i][j] != V.EMPTY && this.getColor(i,j) != oppCol)
 				{
 					const moves = this.getPotentialMovesFrom([i,j]);
 					if (moves.length > 0)
@@ -560,15 +621,14 @@ class ChessRules
 	// Is square x,y attacked by 'colors' pawns ?
 	isAttackedByPawn([x,y], colors)
 	{
-		const [sizeX,sizeY] = VariantRules.size;
 		for (let c of colors)
 		{
 			let pawnShift = (c=="w" ? 1 : -1);
-			if (x+pawnShift>=0 && x+pawnShift<sizeX)
+			if (x+pawnShift>=0 && x+pawnShift<V.size.x)
 			{
 				for (let i of [-1,1])
 				{
-					if (y+i>=0 && y+i<sizeY && this.getPiece(x+pawnShift,y+i)==VariantRules.PAWN
+					if (y+i>=0 && y+i<V.size.y && this.getPiece(x+pawnShift,y+i)==V.PAWN
 						&& this.getColor(x+pawnShift,y+i)==c)
 					{
 						return true;
@@ -582,28 +642,25 @@ class ChessRules
 	// Is square x,y attacked by 'colors' rooks ?
 	isAttackedByRook(sq, colors)
 	{
-		return this.isAttackedBySlideNJump(sq, colors,
-			VariantRules.ROOK, VariantRules.steps[VariantRules.ROOK]);
+		return this.isAttackedBySlideNJump(sq, colors, V.ROOK, V.steps[V.ROOK]);
 	}
 
 	// Is square x,y attacked by 'colors' knights ?
 	isAttackedByKnight(sq, colors)
 	{
 		return this.isAttackedBySlideNJump(sq, colors,
-			VariantRules.KNIGHT, VariantRules.steps[VariantRules.KNIGHT], "oneStep");
+			V.KNIGHT, V.steps[V.KNIGHT], "oneStep");
 	}
 
 	// Is square x,y attacked by 'colors' bishops ?
 	isAttackedByBishop(sq, colors)
 	{
-		return this.isAttackedBySlideNJump(sq, colors,
-			VariantRules.BISHOP, VariantRules.steps[VariantRules.BISHOP]);
+		return this.isAttackedBySlideNJump(sq, colors, V.BISHOP, V.steps[V.BISHOP]);
 	}
 
 	// Is square x,y attacked by 'colors' queens ?
 	isAttackedByQueen(sq, colors)
 	{
-		const V = VariantRules;
 		return this.isAttackedBySlideNJump(sq, colors, V.QUEEN,
 			V.steps[V.ROOK].concat(V.steps[V.BISHOP]));
 	}
@@ -611,7 +668,6 @@ class ChessRules
 	// Is square x,y attacked by 'colors' king(s) ?
 	isAttackedByKing(sq, colors)
 	{
-		const V = VariantRules;
 		return this.isAttackedBySlideNJump(sq, colors, V.KING,
 			V.steps[V.ROOK].concat(V.steps[V.BISHOP]), "oneStep");
 	}
@@ -620,19 +676,16 @@ class ChessRules
 	// is x,y attacked by a piece of color in array 'colors' ?
 	isAttackedBySlideNJump([x,y], colors, piece, steps, oneStep)
 	{
-		const [sizeX,sizeY] = VariantRules.size;
 		for (let step of steps)
 		{
 			let rx = x+step[0], ry = y+step[1];
-			while (rx>=0 && rx<sizeX && ry>=0 && ry<sizeY
-				&& this.board[rx][ry] == VariantRules.EMPTY && !oneStep)
+			while (V.OnBoard(rx,ry) && this.board[rx][ry] == V.EMPTY && !oneStep)
 			{
 				rx += step[0];
 				ry += step[1];
 			}
-			if (rx>=0 && rx<sizeX && ry>=0 && ry<sizeY
-				&& this.board[rx][ry] != VariantRules.EMPTY
-				&& this.getPiece(rx,ry) == piece && colors.includes(this.getColor(rx,ry)))
+			if (V.OnBoard(rx,ry) && this.getPiece(rx,ry) === piece
+				&& colors.includes(this.getColor(rx,ry)))
 			{
 				return true;
 			}
@@ -666,7 +719,7 @@ class ChessRules
 	static PlayOnBoard(board, move)
 	{
 		for (let psq of move.vanish)
-			board[psq.x][psq.y] = VariantRules.EMPTY;
+			board[psq.x][psq.y] = V.EMPTY;
 		for (let psq of move.appear)
 			board[psq.x][psq.y] = psq.c + psq.p;
 	}
@@ -674,7 +727,7 @@ class ChessRules
 	static UndoOnBoard(board, move)
 	{
 		for (let psq of move.appear)
-			board[psq.x][psq.y] = VariantRules.EMPTY;
+			board[psq.x][psq.y] = V.EMPTY;
 		for (let psq of move.vanish)
 			board[psq.x][psq.y] = psq.c + psq.p;
 	}
@@ -683,12 +736,11 @@ class ChessRules
 	updateVariables(move)
 	{
 		const piece = this.getPiece(move.start.x,move.start.y);
-		const c = this.getColor(move.start.x,move.start.y);
-		const [sizeX,sizeY] = VariantRules.size;
-		const firstRank = (c == "w" ? sizeX-1 : 0);
+		const c = this.turn;
+		const firstRank = (c == "w" ? V.size.x-1 : 0);
 
 		// Update king position + flags
-		if (piece == VariantRules.KING && move.appear.length > 0)
+		if (piece == V.KING && move.appear.length > 0)
 		{
 			this.kingPos[c][0] = move.appear[0].x;
 			this.kingPos[c][1] = move.appear[0].y;
@@ -696,7 +748,7 @@ class ChessRules
 			return;
 		}
 		const oppCol = this.getOppCol(c);
-		const oppFirstRank = (sizeX-1) - firstRank;
+		const oppFirstRank = (V.size.x-1) - firstRank;
 		if (move.start.x == firstRank //our rook moves?
 			&& this.INIT_COL_ROOK[c].includes(move.start.y))
 		{
@@ -717,12 +769,22 @@ class ChessRules
 	{
 		// (Potentially) Reset king position
 		const c = this.getColor(move.start.x,move.start.y);
-		if (this.getPiece(move.start.x,move.start.y) == VariantRules.KING)
+		if (this.getPiece(move.start.x,move.start.y) == V.KING)
 			this.kingPos[c] = [move.start.x, move.start.y];
 	}
 
+	// Hash of position+flags+turn after a move is played (to detect repetitions)
+	getHashState()
+	{
+		return hex_md5(this.getFen());
+	}
+
 	play(move, ingame)
 	{
+		// DEBUG:
+//		if (!this.states) this.states = [];
+//		if (!ingame) this.states.push(JSON.stringify(this.board));
+
 		if (!!ingame)
 			move.notation = [this.getNotation(move), this.getLongNotation(move)];
 
@@ -730,36 +792,47 @@ class ChessRules
 		this.updateVariables(move);
 		this.moves.push(move);
 		this.epSquares.push( this.getEpSquare(move) );
-		VariantRules.PlayOnBoard(this.board, move);
+		V.PlayOnBoard(this.board, move);
+
+		if (!!ingame)
+			move.hash = this.getHashState();
 	}
 
 	undo(move)
 	{
-		VariantRules.UndoOnBoard(this.board, move);
+		V.UndoOnBoard(this.board, move);
 		this.epSquares.pop();
 		this.moves.pop();
 		this.unupdateVariables(move);
 		this.parseFlags(JSON.parse(move.flags));
+
+		// DEBUG:
+//		if (JSON.stringify(this.board) != this.states[this.states.length-1])
+//			debugger;
+//		this.states.pop();
 	}
 
 	//////////////
 	// END OF GAME
 
-	// Basic check for 3 repetitions (in the last moves only)
+	// Check for 3 repetitions (position + flags + turn)
 	checkRepetition()
 	{
-		if (this.moves.length >= 8)
+		if (!this.hashStates)
+			this.hashStates = {};
+		const startIndex =
+			Object.values(this.hashStates).reduce((a,b) => { return a+b; }, 0)
+		// Update this.hashStates with last move (or all moves if continuation)
+		// NOTE: redundant storage, but faster and moderate size
+		for (let i=startIndex; i<this.moves.length; i++)
 		{
-			const L = this.moves.length;
-			if (_.isEqual(this.moves[L-1], this.moves[L-5]) &&
-				_.isEqual(this.moves[L-2], this.moves[L-6]) &&
-				_.isEqual(this.moves[L-3], this.moves[L-7]) &&
-				_.isEqual(this.moves[L-4], this.moves[L-8]))
-			{
-				return true;
-			}
+			const move = this.moves[i];
+			if (!this.hashStates[move.hash])
+				this.hashStates[move.hash] = 1;
+			else
+				this.hashStates[move.hash]++;
 		}
-		return false;
+		return Object.values(this.hashStates).some(elt => { return (elt >= 3); });
 	}
 
 	// Is game over ? And if yes, what is the score ?
@@ -807,7 +880,7 @@ class ChessRules
 
 	static get THRESHOLD_MATE() {
 		// At this value or above, the game is over
-		return VariantRules.INFINITY;
+		return V.INFINITY;
 	}
 
 	static get SEARCH_DEPTH() {
@@ -818,16 +891,24 @@ class ChessRules
 	// NOTE: works also for extinction chess because depth is 3...
 	getComputerMove()
 	{
-		this.shouldReturn = false;
-		const maxeval = VariantRules.INFINITY;
+		const maxeval = V.INFINITY;
 		const color = this.turn;
-		let moves1 = this.getAllValidMoves();
+		// Some variants may show a bigger moves list to the human (Switching),
+		// thus the argument "computer" below (which is generally ignored)
+		let moves1 = this.getAllValidMoves("computer");
 
 		// Can I mate in 1 ? (for Magnetic & Extinction)
 		for (let i of _.shuffle(_.range(moves1.length)))
 		{
 			this.play(moves1[i]);
-			const finish = (Math.abs(this.evalPosition()) >= VariantRules.THRESHOLD_MATE);
+			let finish = (Math.abs(this.evalPosition()) >= V.THRESHOLD_MATE);
+			if (!finish && !this.atLeastOneMove())
+			{
+				// Try mate (for other variants)
+				const score = this.checkGameEnd();
+				if (score != "1/2")
+					finish = true;
+			}
 			this.undo(moves1[i]);
 			if (finish)
 				return moves1[i];
@@ -843,7 +924,7 @@ class ChessRules
 			{
 				eval2 = (color=="w" ? 1 : -1) * maxeval; //initialized with checkmate value
 				// Second half-move:
-				let moves2 = this.getAllValidMoves();
+				let moves2 = this.getAllValidMoves("computer");
 				for (let j=0; j<moves2.length; j++)
 				{
 					this.play(moves2[j]);
@@ -866,8 +947,11 @@ class ChessRules
 				const score = this.checkGameEnd();
 				eval2 = (score=="1/2" ? 0 : (score=="1-0" ? 1 : -1) * maxeval);
 			}
-			if ((color=="w" && eval2 > moves1[i].eval) || (color=="b" && eval2 < moves1[i].eval))
+			if ((color=="w" && eval2 > moves1[i].eval)
+				|| (color=="b" && eval2 < moves1[i].eval))
+			{
 				moves1[i].eval = eval2;
+			}
 			this.undo(moves1[i]);
 		}
 		moves1.sort( (a,b) => { return (color=="w" ? 1 : -1) * (b.eval - a.eval); });
@@ -878,18 +962,20 @@ class ChessRules
 			candidates.push(j);
 		let currentBest = moves1[_.sample(candidates, 1)];
 
+		// From here, depth >= 3: may take a while, so we control time
+		const timeStart = Date.now();
+
 		// Skip depth 3+ if we found a checkmate (or if we are checkmated in 1...)
-		if (VariantRules.SEARCH_DEPTH >= 3
-			&& Math.abs(moves1[0].eval) < VariantRules.THRESHOLD_MATE)
+		if (V.SEARCH_DEPTH >= 3 && Math.abs(moves1[0].eval) < V.THRESHOLD_MATE)
 		{
 			for (let i=0; i<moves1.length; i++)
 			{
-				if (this.shouldReturn)
-					return currentBest; //depth-2, minimum
+				if (Date.now()-timeStart >= 5000) //more than 5 seconds
+					return currentBest; //depth 2 at least
 				this.play(moves1[i]);
 				// 0.1 * oldEval : heuristic to avoid some bad moves (not all...)
 				moves1[i].eval = 0.1*moves1[i].eval +
-					this.alphabeta(VariantRules.SEARCH_DEPTH-1, -maxeval, maxeval);
+					this.alphabeta(V.SEARCH_DEPTH-1, -maxeval, maxeval);
 				this.undo(moves1[i]);
 			}
 			moves1.sort( (a,b) => { return (color=="w" ? 1 : -1) * (b.eval - a.eval); });
@@ -906,7 +992,7 @@ class ChessRules
 
 	alphabeta(depth, alpha, beta)
   {
-		const maxeval = VariantRules.INFINITY;
+		const maxeval = V.INFINITY;
 		const color = this.turn;
 		if (!this.atLeastOneMove())
 		{
@@ -921,7 +1007,7 @@ class ChessRules
 		}
 		if (depth == 0)
       return this.evalPosition();
-		const moves = this.getAllValidMoves();
+		const moves = this.getAllValidMoves("computer");
     let v = color=="w" ? -maxeval : maxeval;
 		if (color == "w")
 		{
@@ -952,17 +1038,16 @@ class ChessRules
 
 	evalPosition()
 	{
-		const [sizeX,sizeY] = VariantRules.size;
 		let evaluation = 0;
 		// Just count material for now
-		for (let i=0; i<sizeX; i++)
+		for (let i=0; i<V.size.x; i++)
 		{
-			for (let j=0; j<sizeY; j++)
+			for (let j=0; j<V.size.y; j++)
 			{
-				if (this.board[i][j] != VariantRules.EMPTY)
+				if (this.board[i][j] != V.EMPTY)
 				{
 					const sign = this.getColor(i,j) == "w" ? 1 : -1;
-					evaluation += sign * VariantRules.VALUES[this.getPiece(i,j)];
+					evaluation += sign * V.VALUES[this.getPiece(i,j)];
 				}
 			}
 		}
@@ -975,9 +1060,9 @@ class ChessRules
 	// Setup the initial random (assymetric) position
 	static GenRandInitFen()
 	{
-		let pieces = [new Array(8), new Array(8)];
+		let pieces = { "w": new Array(8), "b": new Array(8) };
 		// Shuffle pieces on first and last rank
-		for (let c = 0; c <= 1; c++)
+		for (let c of ["w","b"])
 		{
 			let positions = _.range(8);
 
@@ -1019,30 +1104,28 @@ class ChessRules
 			pieces[c][knight2Pos] = 'n';
 			pieces[c][rook2Pos] = 'r';
 		}
-		let fen = pieces[0].join("") +
+		return pieces["b"].join("") +
 			"/pppppppp/8/8/8/8/PPPPPPPP/" +
-			pieces[1].join("").toUpperCase() +
+			pieces["w"].join("").toUpperCase() +
 			" 1111"; //add flags
-		return fen;
 	}
 
 	// Return current fen according to pieces+colors state
 	getFen()
 	{
-		return this.getBaseFen() + " " + this.getFlagsFen();
+		return this.getBaseFen() + " " + this.getFlagsFen() + " " + this.turn;
 	}
 
 	// Position part of the FEN string
 	getBaseFen()
 	{
 		let fen = "";
-		let [sizeX,sizeY] = VariantRules.size;
-		for (let i=0; i<sizeX; i++)
+		for (let i=0; i<V.size.x; i++)
 		{
 			let emptyCount = 0;
-			for (let j=0; j<sizeY; j++)
+			for (let j=0; j<V.size.y; j++)
 			{
-				if (this.board[i][j] == VariantRules.EMPTY)
+				if (this.board[i][j] == V.EMPTY)
 					emptyCount++;
 				else
 				{
@@ -1052,7 +1135,7 @@ class ChessRules
 						fen += emptyCount;
 						emptyCount = 0;
 					}
-					fen += VariantRules.board2fen(this.board[i][j]);
+					fen += V.board2fen(this.board[i][j]);
 				}
 			}
 			if (emptyCount > 0)
@@ -1060,7 +1143,7 @@ class ChessRules
 				// "Flush remainder"
 				fen += emptyCount;
 			}
-			if (i < sizeX - 1)
+			if (i < V.size.x - 1)
 				fen += "/"; //separate rows
 		}
 		return fen;
@@ -1074,7 +1157,7 @@ class ChessRules
 		for (let i of ['w','b'])
 		{
 			for (let j=0; j<2; j++)
-				fen += this.castleFlags[i][j] ? '1' : '0';
+				fen += (this.castleFlags[i][j] ? '1' : '0');
 		}
 		return fen;
 	}
@@ -1082,21 +1165,14 @@ class ChessRules
 	// Context: just before move is played, turn hasn't changed
 	getNotation(move)
 	{
-		if (move.appear.length == 2 && move.appear[0].p == VariantRules.KING)
-		{
-			// Castle
-			if (move.end.y < move.start.y)
-				return "0-0-0";
-			else
-				return "0-0";
-		}
+		if (move.appear.length == 2 && move.appear[0].p == V.KING) //castle
+			return (move.end.y < move.start.y ? "0-0-0" : "0-0");
 
 		// Translate final square
-		const finalSquare =
-			String.fromCharCode(97 + move.end.y) + (VariantRules.size[0]-move.end.x);
+		const finalSquare = String.fromCharCode(97 + move.end.y) + (V.size.x-move.end.x);
 
 		const piece = this.getPiece(move.start.x, move.start.y);
-		if (piece == VariantRules.PAWN)
+		if (piece == V.PAWN)
 		{
 			// Pawn move
 			let notation = "";
@@ -1125,21 +1201,22 @@ class ChessRules
 	getLongNotation(move)
 	{
 		const startSquare =
-			String.fromCharCode(97 + move.start.y) + (VariantRules.size[0]-move.start.x);
-		const finalSquare =
-			String.fromCharCode(97 + move.end.y) + (VariantRules.size[0]-move.end.x);
+			String.fromCharCode(97 + move.start.y) + (V.size.x-move.start.x);
+		const finalSquare = String.fromCharCode(97 + move.end.y) + (V.size.x-move.end.x);
 		return startSquare + finalSquare; //not encoding move. But short+long is enough
 	}
 
 	// The score is already computed when calling this function
 	getPGN(mycolor, score, fenStart, mode)
 	{
+		const zeroPad = x => { return (x<10 ? "0" : "") + x; };
 		let pgn = "";
 		pgn += '[Site "vchess.club"]<br>';
 		const d = new Date();
 		const opponent = mode=="human" ? "Anonymous" : "Computer";
 		pgn += '[Variant "' + variant + '"]<br>';
-		pgn += '[Date "' + d.getFullYear() + '-' + (d.getMonth()+1) + '-' + d.getDate() + '"]<br>';
+		pgn += '[Date "' + d.getFullYear() + '-' + (d.getMonth()+1) +
+			'-' + zeroPad(d.getDate()) + '"]<br>';
 		pgn += '[White "' + (mycolor=='w'?'Myself':opponent) + '"]<br>';
 		pgn += '[Black "' + (mycolor=='b'?'Myself':opponent) + '"]<br>';
 		pgn += '[FenStart "' + fenStart + '"]<br>';