X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FBerolina.js;h=31630ab52bbfca0799c40b21b6060364201ab041;hp=8ea3c9ccffe941e7a49fbfbb653653e4f9ff7021;hb=69f3d8014e594ef949792d04d97b8286e9c2c268;hpb=1b61a94dbd13f6a37a89e62216615d2496c760a2

diff --git a/public/javascripts/variants/Berolina.js b/public/javascripts/variants/Berolina.js
index 8ea3c9cc..31630ab5 100644
--- a/public/javascripts/variants/Berolina.js
+++ b/public/javascripts/variants/Berolina.js
@@ -44,37 +44,34 @@ class BerolinaRules extends ChessRules
 		const firstRank = (color == 'w' ? sizeX-1 : 0);
 		const startRank = (color == "w" ? sizeX-2 : 1);
 		const lastRank = (color == "w" ? 0 : sizeX-1);
+		const finalPieces = x + shiftX == lastRank
+			? [V.ROOK,V.KNIGHT,V.BISHOP,V.QUEEN]
+			: [V.PAWN];
 
-		if (x+shiftX >= 0 && x+shiftX < sizeX) //TODO: always true
+		// One square diagonally
+		for (let shiftY of [-1,1])
 		{
-			const finalPieces = x + shiftX == lastRank
-				? [V.ROOK,V.KNIGHT,V.BISHOP,V.QUEEN]
-				: [V.PAWN]
-			// One square diagonally
-			for (let shiftY of [-1,1])
+			if (this.board[x+shiftX][y+shiftY] == V.EMPTY)
 			{
-				if (this.board[x+shiftX][y+shiftY] == V.EMPTY)
+				for (let piece of finalPieces)
 				{
-					for (let piece of finalPieces)
-					{
-						moves.push(this.getBasicMove([x,y], [x+shiftX,y+shiftY],
-							{c:color,p:piece}));
-					}
-					if (x == startRank && y+2*shiftY>=0 && y+2*shiftY<sizeY
-						&& this.board[x+2*shiftX][y+2*shiftY] == V.EMPTY)
-					{
-						// Two squares jump
-						moves.push(this.getBasicMove([x,y], [x+2*shiftX,y+2*shiftY]));
-					}
+					moves.push(this.getBasicMove([x,y], [x+shiftX,y+shiftY],
+						{c:color,p:piece}));
+				}
+				if (x == startRank && y+2*shiftY>=0 && y+2*shiftY<sizeY
+					&& this.board[x+2*shiftX][y+2*shiftY] == V.EMPTY)
+				{
+					// Two squares jump
+					moves.push(this.getBasicMove([x,y], [x+2*shiftX,y+2*shiftY]));
 				}
 			}
-			// Capture
-			if (this.board[x+shiftX][y] != V.EMPTY
-				&& this.canTake([x,y], [x+shiftX,y]))
-			{
-				for (let piece of finalPieces)
-					moves.push(this.getBasicMove([x,y], [x+shiftX,y], {c:color,p:piece}));
-			}
+		}
+		// Capture
+		if (this.board[x+shiftX][y] != V.EMPTY
+			&& this.canTake([x,y], [x+shiftX,y]))
+		{
+			for (let piece of finalPieces)
+				moves.push(this.getBasicMove([x,y], [x+shiftX,y], {c:color,p:piece}));
 		}
 
 		// En passant