X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FBerolina.js;h=dc9e25740f622be88c720a4ec53c4a6cc1eff395;hb=f6dbe8e31a3260487664f1e0b50710b3f3efaf5f;hp=c556f51758c6a8122f1c4818cd363a352097049c;hpb=388e4c401f05b1f6a4c54e33c9da9114969a53c0;p=vchess.git

diff --git a/public/javascripts/variants/Berolina.js b/public/javascripts/variants/Berolina.js
index c556f517..dc9e2574 100644
--- a/public/javascripts/variants/Berolina.js
+++ b/public/javascripts/variants/Berolina.js
@@ -18,15 +18,14 @@ class BerolinaRules extends ChessRules
 		if (this.getPiece(sx,sy) == V.PAWN && Math.abs(sx - ex) == 2)
 		{
 			return {
-				x: ex,
+				x: (ex + sx)/2,
 				y: (move.end.y + sy)/2
 			};
 		}
 		return undefined; //default
 	}
 
-	// Special pawn rules: promotions to captured friendly pieces,
-	// optional on ranks 8-9 and mandatory on rank 10.
+	// Special pawns movements
 	getPotentialPawnMoves([x,y])
 	{
 		const color = this.turn;
@@ -48,14 +47,12 @@ class BerolinaRules extends ChessRules
 				if (this.board[x+shiftX][y+shiftY] == V.EMPTY)
 				{
 					for (let piece of finalPieces)
-					{
-						moves.push(this.getBasicMove([x,y], [x+shiftX,y+shiftY],
-							{c:pawnColor,p:piece}));
-					}
-					if (x == startRank && this.board[x+2*shiftX][y] == V.EMPTY)
+						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+2*shiftX,y+2*shiftY]));
 					}
 				}
 			}
@@ -64,10 +61,7 @@ class BerolinaRules extends ChessRules
 				&& this.canTake([x,y], [x+shiftX,y]))
 			{
 				for (let piece of finalPieces)
-				{
-					moves.push(this.getBasicMove([x,y], [x+shiftX,y+shiftY],
-						{c:pawnColor,p:piece}));
-				}
+					moves.push(this.getBasicMove([x,y], [x+shiftX,y], {c:color,p:piece}));
 			}
 		}
 
@@ -76,18 +70,32 @@ class BerolinaRules extends ChessRules
 		const epSquare = this.epSquares[Lep-1]; //always at least one element
 		if (!!epSquare && epSquare.x == x+shiftX && epSquare.y == y)
 		{
-			let enpassantMove = this.getBasicMove([x,y], [x+shift,y]);
+			let enpassantMove = this.getBasicMove([x,y], [x+shiftX,y]);
 			enpassantMove.vanish.push({
 				x: epSquare.x,
-				y: y,
+				y: epSquare.y,
 				p: 'p',
-				c: this.getColor(epSquare.x,y)
+				c: this.getColor(epSquare.x,epSquare.y)
 			});
 			moves.push(enpassantMove);
 		}
 
 		return moves;
 	}
+
+	isAttackedByPawn([x,y], colors)
+	{
+		for (let c of colors)
+		{
+			let pawnShift = (c=="w" ? 1 : -1);
+			if (x+pawnShift>=0 && x+pawnShift<V.size.x)
+			{
+				if (this.getPiece(x+pawnShift,y)==V.PAWN && this.getColor(x+pawnShift,y)==c)
+					return true;
+			}
+		}
+		return false;
+	}
 }
 
 const VariantRules = BerolinaRules;