Draft code reorganisation (+ fix Alice rules + stateless VariantRules object)

[vchess.git] / public / javascripts / variants / Magnetic.js

diff --git a/public/javascripts/variants/Magnetic.js b/public/javascripts/variants/Magnetic.js
index 2e90e6c..7b0d096 100644 (file)
--- 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,31 +139,21 @@ 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);
@@ -188,7 +175,7 @@ class MagneticRules extends ChessRules
        unupdateVariables(move)
        {
                super.unupdateVariables(move);
-               const c = this.getColor(move.start.x,move.start.y);
+               const c = move.vanish[0].c;
                const oppCol = this.getOppCol(c);
                if (this.kingPos[oppCol][0] < 0)
                {
@@ -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;