X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FMagnetic.js;h=6682b2709682d419b6c474f1131e94374ef1cc53;hb=fb6ceeff17b53ab049e14d2bee7a61de92ca4762;hp=4d83fad156f4fa54bad68e22ed8ae45e3002ff18;hpb=5bbf449c738b243bdfdecb8b810cdc281d8e9de0;p=vchess.git

diff --git a/public/javascripts/variants/Magnetic.js b/public/javascripts/variants/Magnetic.js
index 4d83fad1..6682b270 100644
--- a/public/javascripts/variants/Magnetic.js
+++ b/public/javascripts/variants/Magnetic.js
@@ -1,8 +1,13 @@
 class MagneticRules extends ChessRules
 {
-	getEpSquare(move)
+	static get HasEnpassant() { return false; }
+
+	setOtherVariables(fen)
 	{
-		return undefined; //no en-passant
+		// No en-passant:
+		const parsedFen = V.ParseFen(fen);
+		this.setFlags(fenParsed.flags);
+		this.scanKingsRooks(fen);
 	}
 
 	getPotentialMovesFrom([x,y])
@@ -19,11 +24,71 @@ class MagneticRules extends ChessRules
 		return moves;
 	}
 
+	getPotentialPawnMoves([x,y])
+	{
+		const color = this.turn;
+		let moves = [];
+		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);
+		const lastRank = (color == "w" ? 0 : sizeX-1);
+
+		if (x+shift >= 0 && x+shift < sizeX && x+shift != lastRank)
+		{
+			// Normal moves
+			if (this.board[x+shift][y] == V.EMPTY)
+			{
+				moves.push(this.getBasicMove([x,y], [x+shift,y]));
+				// Next condition because variants with pawns on 1st rank allow them to jump
+				if ([startRank,firstRank].includes(x) && this.board[x+2*shift][y] == V.EMPTY)
+				{
+					// Two squares jump
+					moves.push(this.getBasicMove([x,y], [x+2*shift,y]));
+				}
+			}
+			// Captures
+			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.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 (x+shift == lastRank)
+		{
+			// Promotion
+			const pawnColor = this.getColor(x,y); //can be different for checkered
+			let promotionPieces = [V.ROOK,V.KNIGHT,V.BISHOP,V.QUEEN];
+			promotionPieces.forEach(p => {
+				// Normal move
+				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.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.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}));
+				}
+			});
+		}
+		return moves; //no en-passant
+	}
+
 	// Complete a move with magnetic actions
 	// TODO: job is done multiple times for (normal) promotions.
 	applyMagneticLaws(move)
 	{
-		const V = VariantRules;
 		if (move.appear[0].p == V.KING && move.appear.length==1)
 			return [move]; //kings are not charged
 		const aIdx = (move.appear[0].p != V.KING ? 0 : 1); //if castling, rook is charged
@@ -32,11 +97,10 @@ class MagneticRules extends ChessRules
 		const lastRank = (color=="w" ? 0 : 7);
 		const standardMove = JSON.parse(JSON.stringify(move));
 		this.play(standardMove);
-		const [sizeX,sizeY] = V.size;
 		for (let step of [[-1,0],[1,0],[0,-1],[0,1]])
 		{
 			let [i,j] = [x+step[0],y+step[1]];
-			while (i>=0 && i<sizeX && j>=0 && j<sizeY)
+			while (V.OnBoard(i,j))
 			{
 				if (this.board[i][j] != V.EMPTY)
 				{
@@ -71,7 +135,7 @@ class MagneticRules extends ChessRules
 						{
 							// Push it until we meet an obstacle or edge of the board
 							let [ii,jj] = [i+step[0],j+step[1]];
-							while (ii>=0 && ii<sizeX && jj>=0 && jj<sizeY)
+							while (V.OnBoard(ii,jj))
 							{
 								if (this.board[ii][jj] != V.EMPTY)
 									break;
@@ -137,10 +201,11 @@ class MagneticRules extends ChessRules
 		return moves;
 	}
 
-	// TODO: verify this assertion
 	atLeastOneMove()
 	{
-		return true; //always at least one possible move
+		if (this.kingPos[this.turn][0] < 0)
+			return false;
+		return true; //TODO: is it right?
 	}
 
 	underCheck(move)
@@ -155,8 +220,8 @@ class MagneticRules extends ChessRules
 		this.play(move);
 		// The only way to be "under check" is to have lost the king (thus game over)
 		let res = this.kingPos[c][0] < 0
-			? [ JSON.parse(JSON.stringify(saveKingPos)) ]
-			: [ ];
+			? [JSON.parse(JSON.stringify(saveKingPos))]
+			: [];
 		this.undo(move);
 		return res;
 	}
@@ -165,16 +230,16 @@ class MagneticRules extends ChessRules
 	{
 		super.updateVariables(move);
 		const c = this.getColor(move.start.x,move.start.y);
-		if (c != this.getColor(move.end.x,move.end.y)
-			&& this.board[move.end.x][move.end.y] != VariantRules.EMPTY
-			&& this.getPiece(move.end.x,move.end.y) == VariantRules.KING)
+		if (this.board[move.end.x][move.end.y] != V.EMPTY
+			&& c != this.getColor(move.end.x,move.end.y)
+			&& this.getPiece(move.end.x,move.end.y) == V.KING)
 		{
 			// We took opponent king !
 			const oppCol = this.getOppCol(c);
 			this.kingPos[oppCol] = [-1,-1];
 			this.castleFlags[oppCol] = [false,false];
 		}
-		// Did we move our (init) rooks or opponents' ones ?
+		// Did we magnetically move our (init) rooks or opponents' ones ?
 		const firstRank = (c == "w" ? 7 : 0);
 		const oppFirstRank = 7 - firstRank;
 		const oppCol = this.getOppCol(c);
@@ -205,26 +270,16 @@ class MagneticRules extends ChessRules
 		}
 	}
 
-	checkGameOver()
-	{
-		if (this.checkRepetition())
-			return "1/2";
-
-		const color = this.turn;
-		// TODO: do we need "atLeastOneMove()"?
-		if (this.atLeastOneMove() && this.kingPos[color][0] >= 0)
-			return "*";
-
-		return this.checkGameEnd();
-	}
-
 	checkGameEnd()
 	{
 		// No valid move: our king disappeared
 		return this.turn == "w" ? "0-1" : "1-0";
 	}
 
-	static get THRESHOLD_MATE() {
+	static get THRESHOLD_MATE()
+	{
 		return 500; //checkmates evals may be slightly below 1000
 	}
 }
+
+const VariantRules = MagneticRules;