X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FZen.js;h=64587d204b9cdf3412789aaa6476a0d75aa4ca2a;hb=0b7d99ecbb5dedc02cd96c457b5fc2962db9b297;hp=b7f229c3c19ee083a1db1b952c0153dc179817b8;hpb=46302e643947a66a5593a8eb1140d314effcea95;p=vchess.git

diff --git a/public/javascripts/variants/Zen.js b/public/javascripts/variants/Zen.js
index b7f229c3..64587d20 100644
--- a/public/javascripts/variants/Zen.js
+++ b/public/javascripts/variants/Zen.js
@@ -6,20 +6,18 @@ class ZenRules extends ChessRules
 		return undefined;
 	}
 
-	// TODO: some duplicated code in 2 next functions
+	// TODO(?): some duplicated code in 2 next functions
 	getSlideNJumpMoves([x,y], steps, oneStep)
 	{
 		const color = this.getColor(x,y);
-		var moves = [];
-		let [sizeX,sizeY] = VariantRules.size;
+		let moves = [];
 		outerLoop:
-		for (var loop=0; loop<steps.length; loop++)
+		for (let loop=0; loop<steps.length; loop++)
 		{
-			var step = steps[loop];
-			var i = x + step[0];
-			var j = y + step[1];
-			while (i>=0 && i<sizeX && j>=0 && j<sizeY
-				&& this.board[i][j] == VariantRules.EMPTY)
+			const step = steps[loop];
+			let i = x + step[0];
+			let j = y + step[1];
+			while (V.OnBoard(i,j) && this.board[i][j] == V.EMPTY)
 			{
 				moves.push(this.getBasicMove([x,y], [i,j]));
 				if (!!oneStep)
@@ -38,30 +36,27 @@ class ZenRules extends ChessRules
 	{
 		const color = this.getColor(x,y);
 		var moves = [];
-		var V = VariantRules;
-		var steps = asA != V.PAWN
-			? V.steps[asA]
+		const steps = asA != V.PAWN
+			? (asA==V.QUEEN ? V.steps[V.ROOK].concat(V.steps[V.BISHOP]) : V.steps[asA])
 			: color=='w' ? [[-1,-1],[-1,1]] : [[1,-1],[1,1]];
-		var oneStep = (asA==V.KNIGHT || asA==V.PAWN); //we don't capture king
-		let [sizeX,sizeY] = V.size;
-		let lastRank = (color == 'w' ? 0 : sizeY-1);
-		let promotionPieces = [V.ROOK,V.KNIGHT,V.BISHOP,V.QUEEN];
+		const oneStep = (asA==V.KNIGHT || asA==V.PAWN); //we don't capture king
+		const lastRank = (color == 'w' ? 0 : V.size.x-1);
+		const promotionPieces = [V.ROOK,V.KNIGHT,V.BISHOP,V.QUEEN];
 		outerLoop:
-		for (var loop=0; loop<steps.length; loop++)
+		for (let loop=0; loop<steps.length; loop++)
 		{
-			var step = steps[loop];
-			var i = x + step[0];
-			var j = y + step[1];
-			while (i>=0 && i<sizeX && j>=0 && j<sizeY
-				&& this.board[i][j] == V.EMPTY)
+			const step = steps[loop];
+			let i = x + step[0];
+			let j = y + step[1];
+			while (V.OnBoard(i,j) && this.board[i][j] == V.EMPTY)
 			{
 				if (oneStep)
 					continue outerLoop;
 				i += step[0];
 				j += step[1];
 			}
-			if (i>=0 && i<sizeX && j>=0 && j<sizeY &&
-				this.getColor(i,j) == this.getOppCol(color) && this.getPiece(i,j) == asA)
+			if (V.OnBoard(i,j) && this.getColor(i,j) == this.getOppCol(color)
+				&& this.getPiece(i,j) == asA)
 			{
 				// eat!
 				if (this.getPiece(x,y) == V.PAWN && i == lastRank)
@@ -84,22 +79,13 @@ class ZenRules extends ChessRules
 	// Find possible captures from a square: look in every direction!
 	findCaptures(sq)
 	{
-		var moves = [];
-
-		// PAWN
-		Array.prototype.push.apply(moves, this.findCaptures_aux(sq, VariantRules.PAWN));
-
-		// ROOK
-		Array.prototype.push.apply(moves, this.findCaptures_aux(sq, VariantRules.ROOK));
+		let moves = [];
 
-		// KNIGHT
-		Array.prototype.push.apply(moves, this.findCaptures_aux(sq, VariantRules.KNIGHT));
-
-		// BISHOP
-		Array.prototype.push.apply(moves, this.findCaptures_aux(sq, VariantRules.BISHOP));
-
-		// QUEEN
-		Array.prototype.push.apply(moves, this.findCaptures_aux(sq, VariantRules.QUEEN));
+		Array.prototype.push.apply(moves, this.findCaptures_aux(sq, V.PAWN));
+		Array.prototype.push.apply(moves, this.findCaptures_aux(sq, V.ROOK));
+		Array.prototype.push.apply(moves, this.findCaptures_aux(sq, V.KNIGHT));
+		Array.prototype.push.apply(moves, this.findCaptures_aux(sq, V.BISHOP));
+		Array.prototype.push.apply(moves, this.findCaptures_aux(sq, V.QUEEN));
 
 		return moves;
 	}
@@ -107,13 +93,12 @@ class ZenRules extends ChessRules
 	getPotentialPawnMoves([x,y])
 	{
 		const color = this.getColor(x,y);
-		var moves = [];
-		var V = VariantRules;
-		let [sizeX,sizeY] = VariantRules.size;
-		let shift = (color == 'w' ? -1 : 1);
-		let startRank = (color == 'w' ? sizeY-2 : 1);
-		let firstRank = (color == 'w' ? sizeY-1 : 0);
-		let lastRank = (color == "w" ? 0 : sizeY-1);
+		let moves = [];
+		const [sizeX,sizeY] = [V.size.x,V.size.y];
+		const shift = (color == 'w' ? -1 : 1);
+		const startRank = (color == 'w' ? sizeY-2 : 1);
+		const firstRank = (color == 'w' ? sizeY-1 : 0);
+		const lastRank = (color == "w" ? 0 : sizeY-1);
 
 		if (x+shift >= 0 && x+shift < sizeX && x+shift != lastRank)
 		{
@@ -150,28 +135,29 @@ class ZenRules extends ChessRules
 
 	getPotentialRookMoves(sq)
 	{
-		let noCaptures = this.getSlideNJumpMoves(sq, VariantRules.steps[VariantRules.ROOK]);
+		let noCaptures = this.getSlideNJumpMoves(sq, V.steps[V.ROOK]);
 		let captures = this.findCaptures(sq);
 		return noCaptures.concat(captures);
 	}
 
 	getPotentialKnightMoves(sq)
 	{
-		let noCaptures = this.getSlideNJumpMoves(sq, VariantRules.steps[VariantRules.KNIGHT], "oneStep");
+		let noCaptures = this.getSlideNJumpMoves(sq, V.steps[V.KNIGHT], "oneStep");
 		let captures = this.findCaptures(sq);
 		return noCaptures.concat(captures);
 	}
 
 	getPotentialBishopMoves(sq)
 	{
-		let noCaptures = this.getSlideNJumpMoves(sq, VariantRules.steps[VariantRules.BISHOP]);
+		let noCaptures = this.getSlideNJumpMoves(sq, V.steps[V.BISHOP]);
 		let captures = this.findCaptures(sq);
 		return noCaptures.concat(captures);
 	}
 
 	getPotentialQueenMoves(sq)
 	{
-		let noCaptures = this.getSlideNJumpMoves(sq, VariantRules.steps[VariantRules.QUEEN]);
+		let noCaptures = this.getSlideNJumpMoves(
+			sq, V.steps[V.ROOK].concat(V.steps[V.BISHOP]));
 		let captures = this.findCaptures(sq);
 		return noCaptures.concat(captures);
 	}
@@ -179,7 +165,8 @@ class ZenRules extends ChessRules
 	getPotentialKingMoves(sq)
 	{
 		// Initialize with normal moves
-		let noCaptures = this.getSlideNJumpMoves(sq, VariantRules.steps[VariantRules.QUEEN], "oneStep");
+		let noCaptures = this.getSlideNJumpMoves(sq,
+			V.steps[V.ROOK].concat(V.steps[V.BISHOP]), "oneStep");
 		let captures = this.findCaptures(sq);
 		return noCaptures.concat(captures).concat(this.getCastleMoves(sq));
 	}
@@ -197,16 +184,16 @@ class ZenRules extends ChessRules
 		}
 
 		// Translate initial square (because pieces may fly unusually in this variant!)
-		let initialSquare =
-			String.fromCharCode(97 + move.start.y) + (VariantRules.size[0]-move.start.x);
+		const initialSquare =
+			String.fromCharCode(97 + move.start.y) + (V.size.x-move.start.x);
 
 		// Translate final square
-		let 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);
 
 		let notation = "";
-		let piece = this.getPiece(move.start.x, move.start.y);
-		if (piece == VariantRules.PAWN)
+		const piece = this.getPiece(move.start.x, move.start.y);
+		if (piece == V.PAWN)
 		{
 			// pawn move (TODO: enPassant indication)
 			if (move.vanish.length > 1)