Several small improvements + integrate options + first working draft of Cwda

[vchess.git] / client / src / variants / Suction.js

diff --git a/client/src/variants/Suction.js b/client/src/variants/Suction.js
index 9ac5b44..77aef39 100644 (file)
--- a/client/src/variants/Suction.js
+++ b/client/src/variants/Suction.js
@@ -1,14 +1,22 @@
 import { ChessRules, PiPo, Move } from "@/base_rules";
+import { SuicideRules } from "@/variants/Suicide";
+
+export class SuctionRules extends ChessRules {
+
+  static get PawnSpecs() {
+    return Object.assign(
+      {},
+      ChessRules.PawnSpecs,
+      // No promotions:
+      { promotions: [V.PAWN] }
+    );
+  }
 
-export const VariantRules = class SuctionRules extends ChessRules {
   static get HasFlags() {
     return false;
   }
 
   setOtherVariables(fen) {
-
-console.log(fen);
-
     super.setOtherVariables(fen);
     // Local stack of "captures"
     this.cmoves = [];
@@ -23,16 +31,17 @@ console.log(fen);
   }
 
   static ParseFen(fen) {
-    return Object.assign({}, ChessRules.ParseFen(fen), {
-      cmove: fen.split(" ")[4]
-    });
+    return Object.assign(
+      ChessRules.ParseFen(fen),
+      { cmove: fen.split(" ")[4] }
+    );
   }
 
   static IsGoodFen(fen) {
     if (!ChessRules.IsGoodFen(fen)) return false;
     const fenParts = fen.split(" ");
-    if (fenParts.length != 6) return false;
-    if (fenParts[5] != "-" && !fenParts[5].match(/^([a-h][1-8]){2}$/))
+    if (fenParts.length != 5) return false;
+    if (fenParts[4] != "-" && !fenParts[4].match(/^([a-h][1-8]){2}$/))
       return false;
     return true;
   }
@@ -88,50 +97,8 @@ console.log(fen);
     return mv;
   }
 
-  getPotentialPawnMoves([x, y]) {
-    const color = this.turn;
+  getEnpassantCaptures([x, y], shiftX) {
     let moves = [];
-    const [sizeX, sizeY] = [V.size.x, V.size.y];
-    const shiftX = color == "w" ? -1 : 1;
-    const startRank = color == "w" ? sizeX - 2 : 1;
-    const firstRank = color == "w" ? sizeX - 1 : 0;
-
-    if (x + shiftX >= 0 && x + shiftX < sizeX) {
-      // One square forward
-      if (this.board[x + shiftX][y] == V.EMPTY) {
-        moves.push(
-          this.getBasicMove([x, y], [x + shiftX, y], {
-            c: color,
-            p: "p"
-          })
-        );
-        if (
-          [startRank,firstRank].includes(x) &&
-          this.board[x + 2 * shiftX][y] == V.EMPTY
-        ) {
-          // Two squares jump
-          moves.push(this.getBasicMove([x, y], [x + 2 * shiftX, y]));
-        }
-      }
-      // Swaps
-      for (let shiftY of [-1, 1]) {
-        if (
-          y + shiftY >= 0 &&
-          y + shiftY < sizeY &&
-          this.board[x + shiftX][y + shiftY] != V.EMPTY &&
-          this.canTake([x, y], [x + shiftX, y + shiftY])
-        ) {
-          moves.push(
-            this.getBasicMove([x, y], [x + shiftX, y + shiftY], {
-              c: color,
-              p: "p"
-            })
-          );
-        }
-      }
-    }
-
-    // En passant
     const Lep = this.epSquares.length;
     const epSquare = this.epSquares[Lep - 1]; //always at least one element
     if (
@@ -140,7 +107,7 @@ console.log(fen);
       Math.abs(epSquare.y - y) == 1
     ) {
       let enpassantMove = this.getBasicMove([x, y], [epSquare.x, epSquare.y]);
-      const oppCol = V.GetOppCol(color);
+      const oppCol = V.GetOppCol(this.turn);
       enpassantMove.vanish.push({
         x: x,
         y: epSquare.y,
@@ -155,7 +122,6 @@ console.log(fen);
       });
       moves.push(enpassantMove);
     }
-
     return moves;
   }
 
@@ -166,7 +132,7 @@ console.log(fen);
   // Does m2 un-do m1 ? (to disallow undoing captures)
   oppositeMoves(m1, m2) {
     return (
-      m1 &&
+      !!m1 &&
       m2.vanish.length == 2 &&
       m1.start.x == m2.start.x &&
       m1.end.x == m2.end.x &&
@@ -177,43 +143,47 @@ console.log(fen);
 
   filterValid(moves) {
     if (moves.length == 0) return [];
-    const color = this.turn;
     return moves.filter(m => {
       const L = this.cmoves.length; //at least 1: init from FEN
       return !this.oppositeMoves(this.cmoves[L - 1], m);
     });
   }
 
-  static GenRandInitFen(randomness) {
+  static GenRandInitFen(options) {
     // Add empty cmove:
-    return ChessRules.GenRandInitFen(randomness).slice(0, -6) + "- -";
+    return SuicideRules.GenRandInitFen(options) + " -";
   }
 
-  getFen() {
+  getCmoveFen() {
     const L = this.cmoves.length;
-    const cmoveFen = !this.cmoves[L - 1]
-      ? "-"
-      : ChessRules.CoordsToSquare(this.cmoves[L - 1].start) +
-        ChessRules.CoordsToSquare(this.cmoves[L - 1].end);
-    return super.getFen() + " " + cmoveFen;
+    return (
+      !this.cmoves[L - 1]
+        ? "-"
+        : ChessRules.CoordsToSquare(this.cmoves[L - 1].start) +
+          ChessRules.CoordsToSquare(this.cmoves[L - 1].end)
+    );
+  }
+
+  getFen() {
+    return super.getFen() + " " + this.getCmoveFen();
+  }
+
+  getFenForRepeat() {
+    return super.getFenForRepeat() + "_" + this.getCmoveFen();
   }
 
   postPlay(move) {
     super.postPlay(move);
-    if (move.vanish.length == 2) {
-      // Was opponent king swapped?
-      if (move.vanish[1].p == V.KING)
-        this.kingPos[this.turn] = [move.appear[1].x, move.appear[1].y];
-    }
+    // Was opponent king swapped?
+    if (move.vanish.length == 2 && move.vanish[1].p == V.KING)
+      this.kingPos[this.turn] = [move.appear[1].x, move.appear[1].y];
     this.cmoves.push(this.getCmove(move));
   }
 
   postUndo(move) {
     super.postUndo(move);
-    if (move.appear.length == 2) {
-      if (move.appear[1].p == V.KING)
-        this.kingPos[move.vanish[1].c] = [move.vanish[1].x, move.vanish[1].y];
-    }
+    if (move.appear.length == 2 && move.appear[1].p == V.KING)
+      this.kingPos[move.vanish[1].c] = [move.vanish[1].x, move.vanish[1].y];
     this.cmoves.pop();
   }
 
@@ -228,10 +198,8 @@ console.log(fen);
   getCurrentScore() {
     const color = this.turn;
     const kp = this.kingPos[color];
-    if (color == "w" && kp[0] == 0)
-      return "0-1";
-    if (color == "b" && kp[0] == V.size.x - 1)
-      return "1-0";
+    if (color == "w" && kp[0] == 0) return "0-1";
+    if (color == "b" && kp[0] == V.size.x - 1) return "1-0";
     // King is not on the opposite edge: game not over
     return "*";
   }
@@ -264,4 +232,5 @@ console.log(fen);
       finalSquare
     );
   }
+
 };