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

diff --git a/public/javascripts/variants/Magnetic.js b/public/javascripts/variants/Magnetic.js
index 2e90e6c0..8adb1bab 100644
--- a/public/javascripts/variants/Magnetic.js
+++ b/public/javascripts/variants/Magnetic.js
@@ -1,9 +1,6 @@
 class MagneticRules extends ChessRules
 {
-	getEpSquare(move)
-	{
-		return undefined; //no en-passant
-	}
+	static get HasEnpassant() { return false; }
 
 	getPotentialMovesFrom([x,y])
 	{
@@ -142,41 +139,31 @@ class MagneticRules extends ChessRules
 		return true; //TODO: is it right?
 	}
 
-	underCheck(move)
+	underCheck(color)
 	{
 		return false; //there is no check
 	}
 
 	getCheckSquares(move)
 	{
-		const c = this.getOppCol(this.turn); //opponent
-		const saveKingPos = this.kingPos[c]; //king might be taken
-		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)) ]
-			: [ ];
-		this.undo(move);
-		return res;
+		return [];
 	}
 
 	updateVariables(move)
 	{
 		super.updateVariables(move);
-		const c = this.getColor(move.start.x,move.start.y);
-		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)
+		const c = move.vanish[0].c;
+		if (move.vanish.length >= 2 && move.vanish[1].p == V.KING)
 		{
 			// We took opponent king !
-			const oppCol = this.getOppCol(c);
+			const oppCol = V.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);
+		const oppCol = V.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;
@@ -188,8 +175,8 @@ class MagneticRules extends ChessRules
 	unupdateVariables(move)
 	{
 		super.unupdateVariables(move);
-		const c = this.getColor(move.start.x,move.start.y);
-		const oppCol = this.getOppCol(c);
+		const c = move.vanish[0].c;
+		const oppCol = V.GetOppCol(c);
 		if (this.kingPos[oppCol][0] < 0)
 		{
 			// Last move took opponent's king
@@ -210,7 +197,10 @@ class MagneticRules extends ChessRules
 		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;