X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FWormhole.js;h=f47fea3985a05b2ed7e4030e1fe479d503e75c95;hb=32f6285ee325a14286562a53baefc647201df2af;hp=b04efa94c288a6edd5b7151c8f3f0fa7f3510727;hpb=d1be804633f9632b35662c0b10743ca50e10030f;p=vchess.git

diff --git a/client/src/variants/Wormhole.js b/client/src/variants/Wormhole.js
index b04efa94..f47fea39 100644
--- a/client/src/variants/Wormhole.js
+++ b/client/src/variants/Wormhole.js
@@ -1,6 +1,6 @@
 import { ChessRules } from "@/base_rules";
 
-export const VariantRules = class WormholeRules extends ChessRules {
+export class WormholeRules extends ChessRules {
   static get HasFlags() {
     return false;
   }
@@ -154,16 +154,16 @@ export const VariantRules = class WormholeRules extends ChessRules {
       }
     }
     // Captures
-    const finalPieces = x + shiftX == lastRank
-      ? [V.ROOK, V.KNIGHT, V.BISHOP, V.QUEEN]
-      : [V.PAWN];
     for (let shiftY of [-1, 1]) {
       const sq = this.getSquareAfter([x,y], [shiftX,shiftY]);
       if (
-        sq &&
+        !!sq &&
         this.board[sq[0]][sq[1]] != V.EMPTY &&
         this.canTake([x, y], [sq[0], sq[1]])
       ) {
+        const finalPieces = sq[0] == lastRank
+          ? [V.ROOK, V.KNIGHT, V.BISHOP, V.QUEEN]
+          : [V.PAWN];
         for (let piece of finalPieces) {
           moves.push(
             this.getBasicMove([x, y], [sq[0], sq[1]], {
@@ -201,13 +201,13 @@ export const VariantRules = class WormholeRules extends ChessRules {
     return this.getJumpMoves(sq, V.steps[V.KING]);
   }
 
-  isAttackedByJump([x, y], colors, piece, steps) {
+  isAttackedByJump([x, y], color, piece, steps) {
     for (let step of steps) {
       const sq = this.getSquareAfter([x,y], step);
       if (
         sq &&
-        this.getPiece(sq[0], sq[1]) === piece &&
-        colors.includes(this.getColor(sq[0], sq[1]))
+        this.getPiece(sq[0], sq[1]) == piece &&
+        this.getColor(sq[0], sq[1]) == color
       ) {
         return true;
       }
@@ -215,55 +215,55 @@ export const VariantRules = class WormholeRules extends ChessRules {
     return false;
   }
 
-  isAttackedByPawn([x, y], colors) {
-    for (let c of colors) {
-      const pawnShift = c == "w" ? 1 : -1;
-      for (let i of [-1, 1]) {
-        const sq = this.getSquareAfter([x,y], [pawnShift,i]);
-        if (
-          sq &&
-          this.getPiece(sq[0], sq[1]) == V.PAWN &&
-          this.getColor(sq[0], sq[1]) == c
-        ) {
-          return true;
-        }
+  isAttackedByPawn([x, y], color) {
+    const pawnShift = (color == "w" ? 1 : -1);
+    for (let i of [-1, 1]) {
+      const sq = this.getSquareAfter([x,y], [pawnShift,i]);
+      if (
+        sq &&
+        this.getPiece(sq[0], sq[1]) == V.PAWN &&
+        this.getColor(sq[0], sq[1]) == color
+      ) {
+        return true;
       }
     }
     return false;
   }
 
-  isAttackedByRook(sq, colors) {
-    return this.isAttackedByJump(sq, colors, V.ROOK, V.steps[V.ROOK]);
+  isAttackedByRook(sq, color) {
+    return this.isAttackedByJump(sq, color, V.ROOK, V.steps[V.ROOK]);
   }
 
-  isAttackedByKnight(sq, colors) {
+  isAttackedByKnight(sq, color) {
     // NOTE: knight attack is not symmetric in this variant:
     // steps order need to be reversed.
     return this.isAttackedByJump(
       sq,
-      colors,
+      color,
       V.KNIGHT,
       V.steps[V.KNIGHT].map(s => s.reverse())
     );
   }
 
-  isAttackedByBishop(sq, colors) {
-    return this.isAttackedByJump(sq, colors, V.BISHOP, V.steps[V.BISHOP]);
+  isAttackedByBishop(sq, color) {
+    return this.isAttackedByJump(sq, color, V.BISHOP, V.steps[V.BISHOP]);
   }
 
-  isAttackedByQueen(sq, colors) {
+  isAttackedByQueen(sq, color) {
     return this.isAttackedByJump(
       sq,
-      colors,
+      color,
       V.QUEEN,
       V.steps[V.ROOK].concat(V.steps[V.BISHOP])
     );
   }
 
-  isAttackedByKing(sq, colors) {
-    return this.isAttackedByJump(sq, colors, V.KING, V.steps[V.KING]);
+  isAttackedByKing(sq, color) {
+    return this.isAttackedByJump(sq, color, V.KING, V.steps[V.KING]);
   }
 
+  // NOTE: altering move in getBasicMove doesn't work and wouldn't be logical.
+  // This is a side-effect on board generated by the move.
   static PlayOnBoard(board, move) {
     board[move.vanish[0].x][move.vanish[0].y] = V.HOLE;
     for (let psq of move.appear) board[psq.x][psq.y] = psq.c + psq.p;
@@ -276,6 +276,10 @@ export const VariantRules = class WormholeRules extends ChessRules {
     return this.turn == "w" ? "0-1" : "1-0";
   }
 
+  static get SEARCH_DEPTH() {
+    return 2;
+  }
+
   evalPosition() {
     let evaluation = 0;
     for (let i = 0; i < V.size.x; i++) {
@@ -293,7 +297,7 @@ export const VariantRules = class WormholeRules extends ChessRules {
     const piece = this.getPiece(move.start.x, move.start.y);
     // Indicate start square + dest square, because holes distort the board
     let notation =
-      piece.toUpperCase() +
+      (piece != V.PAWN ? piece.toUpperCase() : "") +
       V.CoordsToSquare(move.start) +
       (move.vanish.length > move.appear.length ? "x" : "") +
       V.CoordsToSquare(move.end);