X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FBerolina.js;h=a7f7afa7e0605168c208ddcef351e9dd11270710;hb=59e74176f5e2e828ce0b81c2ead6f8cdb0654f69;hp=065922440342bf8ed31fd3ee732987395820191e;hpb=11482348f50058d235adb89bfc174a1da7c6abc4;p=vchess.git

diff --git a/client/src/variants/Berolina.js b/client/src/variants/Berolina.js
index 06592244..a7f7afa7 100644
--- a/client/src/variants/Berolina.js
+++ b/client/src/variants/Berolina.js
@@ -1,6 +1,6 @@
 import { ChessRules } from "@/base_rules";
 
-export const VariantRules = class BerolinaRules extends ChessRules {
+export class BerolinaRules extends ChessRules {
   // En-passant after 2-sq jump
   getEpSquare(moveOrSquare) {
     if (!moveOrSquare) return undefined;
@@ -62,7 +62,9 @@ export const VariantRules = class BerolinaRules extends ChessRules {
     const startRank = color == "w" ? sizeX - 2 : 1;
     const lastRank = color == "w" ? 0 : sizeX - 1;
     const finalPieces =
-      x + shiftX == lastRank ? [V.ROOK, V.KNIGHT, V.BISHOP, V.QUEEN] : [V.PAWN];
+      x + shiftX == lastRank
+        ? [V.ROOK, V.KNIGHT, V.BISHOP, V.QUEEN]
+        : [V.PAWN];
 
     // One square diagonally
     for (let shiftY of [-1, 1]) {
@@ -76,6 +78,7 @@ export const VariantRules = class BerolinaRules extends ChessRules {
           );
         }
         if (
+          V.PawnSpecs.twoSquares &&
           x == startRank &&
           y + 2 * shiftY >= 0 &&
           y + 2 * shiftY < sizeY &&
@@ -93,28 +96,32 @@ export const VariantRules = class BerolinaRules extends ChessRules {
       this.board[x + shiftX][y] != V.EMPTY &&
       this.canTake([x, y], [x + shiftX, y])
     ) {
-      for (let piece of finalPieces)
+      for (let piece of finalPieces) {
         moves.push(
           this.getBasicMove([x, y], [x + shiftX, y], { c: color, p: piece })
         );
+      }
     }
 
-    // En passant
-    const Lep = this.epSquares.length;
-    const epSquare = this.epSquares[Lep - 1]; //always at least one element
-    if (
-      !!epSquare &&
-      epSquare[0].x == x + shiftX &&
-      epSquare[0].y == y
-    ) {
-      let enpassantMove = this.getBasicMove([x, y], [x + shiftX, y]);
-      enpassantMove.vanish.push({
-        x: x,
-        y: epSquare[1],
-        p: "p",
-        c: this.getColor(x, epSquare[1])
-      });
-      moves.push(enpassantMove);
+    // Next condition so that other variants could inherit from this class
+    if (V.PawnSpecs.enPassant) {
+      // En passant
+      const Lep = this.epSquares.length;
+      const epSquare = this.epSquares[Lep - 1]; //always at least one element
+      if (
+        !!epSquare &&
+        epSquare[0].x == x + shiftX &&
+        epSquare[0].y == y
+      ) {
+        let enpassantMove = this.getBasicMove([x, y], [x + shiftX, y]);
+        enpassantMove.vanish.push({
+          x: x,
+          y: epSquare[1],
+          p: "p",
+          c: this.getColor(x, epSquare[1])
+        });
+        moves.push(enpassantMove);
+      }
     }
 
     return moves;
@@ -122,15 +129,15 @@ export const VariantRules = class BerolinaRules extends ChessRules {
 
   isAttackedByPawn([x, y], color) {
     let pawnShift = (color == "w" ? 1 : -1);
-    if (x + pawnShift >= 0 && x + pawnShift < V.size.x) {
-      if (
-        this.getPiece(x + pawnShift, y) == V.PAWN &&
-        this.getColor(x + pawnShift, y) == color
-      ) {
-        return true;
-      }
-    }
-    return false;
+    return (
+      x + pawnShift >= 0 && x + pawnShift < V.size.x &&
+      this.getPiece(x + pawnShift, y) == V.PAWN &&
+      this.getColor(x + pawnShift, y) == color
+    );
+  }
+
+  static get SEARCH_DEPTH() {
+    return 2;
   }
 
   getNotation(move) {
@@ -140,7 +147,7 @@ export const VariantRules = class BerolinaRules extends ChessRules {
       const finalSquare = V.CoordsToSquare(move.end);
       let notation = "";
       if (move.vanish.length == 2)
-        //capture
+        // Capture
         notation = "Px" + finalSquare;
       else {
         // No capture: indicate the initial square for potential ambiguity