X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FMagnetic.js;h=2e90e6c02b1965a78f0b225960650ea7cf48f1f0;hb=0b7d99ecbb5dedc02cd96c457b5fc2962db9b297;hp=d1436c0f3ea4cb66623970d982423d004959bfa1;hpb=f6cc7faf4301dc4a7ae5bb07f16403f280beddc3;p=vchess.git

diff --git a/public/javascripts/variants/Magnetic.js b/public/javascripts/variants/Magnetic.js
index d1436c0f..2e90e6c0 100644
--- a/public/javascripts/variants/Magnetic.js
+++ b/public/javascripts/variants/Magnetic.js
@@ -23,7 +23,6 @@ class MagneticRules extends ChessRules
 	// 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 +31,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 +69,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;
@@ -112,7 +110,8 @@ class MagneticRules extends ChessRules
 		// Scan move for pawn (max 1) on 8th rank
 		for (let i=1; i<move.appear.length; i++)
 		{
-			if (move.appear[i].p==V.PAWN && move.appear[i].c==color && move.appear[i].x==lastRank)
+			if (move.appear[i].p==V.PAWN && move.appear[i].c==color
+				&& move.appear[i].x==lastRank)
 			{
 				move.appear[i].p = V.ROOK;
 				moves.push(move);
@@ -136,10 +135,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)
@@ -164,15 +164,25 @@ 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 magnetically move our (init) rooks or opponents' ones ?
+		const firstRank = (c == "w" ? 7 : 0);
+		const oppFirstRank = 7 - firstRank;
+		const oppCol = this.getOppCol(c);
+		move.vanish.forEach(psq => {
+			if (psq.x == firstRank && this.INIT_COL_ROOK[c].includes(psq.y))
+				this.castleFlags[c][psq.y==this.INIT_COL_ROOK[c][0] ? 0 : 1] = false;
+			else if (psq.x == oppFirstRank && this.INIT_COL_ROOK[oppCol].includes(psq.y))
+				this.castleFlags[oppCol][psq.y==this.INIT_COL_ROOK[oppCol][0] ? 0 : 1] = false;
+		});
 	}
 
 	unupdateVariables(move)
@@ -194,22 +204,13 @@ 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() {
+		return 500; //checkmates evals may be slightly below 1000
+	}
 }