X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FCheckered.js;h=882a32ac8a465ea49092dcc40f99898da47a5df7;hb=6f2f94374f1e73c375edf732d9425e575e81fff7;hp=afbf21e2d5264cbb44399cb56b5a853e5485491b;hpb=dac395887d96e2d642b209c6db6aaacc3ffacb34;p=vchess.git

diff --git a/client/src/variants/Checkered.js b/client/src/variants/Checkered.js
index afbf21e2..882a32ac 100644
--- a/client/src/variants/Checkered.js
+++ b/client/src/variants/Checkered.js
@@ -1,159 +1,154 @@
-import { ChessRules } from "@/base_rules";
+import { ChessRules, Move, PiPo } from "@/base_rules";
 
-export const VariantRules = class CheckeredRules extends ChessRules
-{
-  static getPpath(b)
-  {
-    return b[0]=='c' ? "Checkered/"+b : b;
-  }
-
-  static board2fen(b)
-  {
+export class CheckeredRules extends ChessRules {
+  static board2fen(b) {
     const checkered_codes = {
-      'p': 's',
-      'q': 't',
-      'r': 'u',
-      'b': 'c',
-      'n': 'o',
+      p: "s",
+      q: "t",
+      r: "u",
+      b: "c",
+      n: "o"
     };
-    if (b[0]=="c")
-      return checkered_codes[b[1]];
+    if (b[0] == "c") return checkered_codes[b[1]];
     return ChessRules.board2fen(b);
   }
 
-  static fen2board(f)
-  {
+  static fen2board(f) {
     // Tolerate upper-case versions of checkered pieces (why not?)
     const checkered_pieces = {
-      's': 'p',
-      'S': 'p',
-      't': 'q',
-      'T': 'q',
-      'u': 'r',
-      'U': 'r',
-      'c': 'b',
-      'C': 'b',
-      'o': 'n',
-      'O': 'n',
+      s: "p",
+      S: "p",
+      t: "q",
+      T: "q",
+      u: "r",
+      U: "r",
+      c: "b",
+      C: "b",
+      o: "n",
+      O: "n"
     };
     if (Object.keys(checkered_pieces).includes(f))
-      return 'c'+checkered_pieces[f];
+      return "c" + checkered_pieces[f];
     return ChessRules.fen2board(f);
   }
 
-  static get PIECES()
-  {
-    return ChessRules.PIECES.concat(['s','t','u','c','o']);
+  static get PIECES() {
+    return ChessRules.PIECES.concat(["s", "t", "u", "c", "o"]);
+  }
+
+  getPpath(b) {
+    return (b[0] == "c" ? "Checkered/" : "") + b;
   }
 
-  setOtherVariables(fen)
-  {
+  setOtherVariables(fen) {
     super.setOtherVariables(fen);
     // Local stack of non-capturing checkered moves:
     this.cmoves = [];
-    const cmove = fen.split(" ")[5];
-    if (cmove == "-")
-      this.cmoves.push(null);
-    else
-    {
+    const cmove = V.ParseFen(fen).cmove;
+    if (cmove == "-") this.cmoves.push(null);
+    else {
       this.cmoves.push({
-        start: ChessRules.SquareToCoords(cmove.substr(0,2)),
-        end: ChessRules.SquareToCoords(cmove.substr(2)),
+        start: ChessRules.SquareToCoords(cmove.substr(0, 2)),
+        end: ChessRules.SquareToCoords(cmove.substr(2))
       });
     }
   }
 
-  static IsGoodFen(fen)
-  {
-    if (!ChessRules.IsGoodFen(fen))
-      return false;
+  static IsGoodFen(fen) {
+    if (!ChessRules.IsGoodFen(fen)) return false;
     const fenParts = fen.split(" ");
-    if (fenParts.length != 6)
-      return false;
+    if (fenParts.length != 6) return false;
     if (fenParts[5] != "-" && !fenParts[5].match(/^([a-h][1-8]){2}$/))
       return false;
     return true;
   }
 
-  static IsGoodFlags(flags)
-  {
+  static IsGoodFlags(flags) {
     // 4 for castle + 16 for pawns
-    return !!flags.match(/^[01]{20,20}$/);
+    return !!flags.match(/^[a-z]{4,4}[01]{16,16}$/);
   }
 
-  setFlags(fenflags)
-  {
+  setFlags(fenflags) {
     super.setFlags(fenflags); //castleFlags
-    this.pawnFlags =
-    {
-      "w": [...Array(8).fill(true)], //pawns can move 2 squares?
-      "b": [...Array(8).fill(true)],
+    this.pawnFlags = {
+      w: [...Array(8).fill(true)], //pawns can move 2 squares?
+      b: [...Array(8).fill(true)]
     };
-    if (!fenflags)
-      return;
-    const flags = fenflags.substr(4); //skip first 4 digits, for castle
-    for (let c of ['w','b'])
-    {
-      for (let i=0; i<8; i++)
-        this.pawnFlags[c][i] = (flags.charAt((c=='w'?0:8)+i) == '1');
+    const flags = fenflags.substr(4); //skip first 4 letters, for castle
+    for (let c of ["w", "b"]) {
+      for (let i = 0; i < 8; i++)
+        this.pawnFlags[c][i] = flags.charAt((c == "w" ? 0 : 8) + i) == "1";
     }
   }
 
-  aggregateFlags()
-  {
+  aggregateFlags() {
     return [this.castleFlags, this.pawnFlags];
   }
 
-  disaggregateFlags(flags)
-  {
+  disaggregateFlags(flags) {
     this.castleFlags = flags[0];
     this.pawnFlags = flags[1];
   }
 
-  getCmove(move)
-  {
-    if (move.appear[0].c == 'c' && move.vanish.length == 1)
-      return {start: move.start, end: move.end};
+  getEpSquare(moveOrSquare) {
+    if (typeof moveOrSquare !== "object" || moveOrSquare.appear[0].c != 'c')
+      return super.getEpSquare(moveOrSquare);
+    // Checkered move: no en-passant
+    return undefined;
+  }
+
+  getCmove(move) {
+    if (move.appear[0].c == "c" && move.vanish.length == 1)
+      return { start: move.start, end: move.end };
     return null;
   }
 
-  canTake([x1,y1], [x2,y2])
-  {
-    const color1 = this.getColor(x1,y1);
-    const color2 = this.getColor(x2,y2);
+  canTake([x1, y1], [x2, y2]) {
+    const color1 = this.getColor(x1, y1);
+    const color2 = this.getColor(x2, y2);
     // Checkered aren't captured
-    return color1 != color2 && color2 != 'c' && (color1 != 'c' || color2 != this.turn);
+    return (
+      color1 != color2 &&
+      color2 != "c" &&
+      (color1 != "c" || color2 != this.turn)
+    );
   }
 
   // Post-processing: apply "checkerization" of standard moves
-  getPotentialMovesFrom([x,y])
-  {
-    let standardMoves = super.getPotentialMovesFrom([x,y]);
+  getPotentialMovesFrom([x, y]) {
+    let standardMoves = super.getPotentialMovesFrom([x, y]);
     const lastRank = this.turn == "w" ? 0 : 7;
-    if (this.getPiece(x,y) == V.KING)
-      return standardMoves; //king has to be treated differently (for castles)
+    // King is treated differently: it never turn checkered
+    if (this.getPiece(x, y) == V.KING) return standardMoves;
     let moves = [];
     standardMoves.forEach(m => {
-      if (m.vanish[0].p == V.PAWN)
-      {
-        if (Math.abs(m.end.x-m.start.x)==2 && !this.pawnFlags[this.turn][m.start.y])
+      if (m.vanish[0].p == V.PAWN) {
+        if (
+          Math.abs(m.end.x - m.start.x) == 2 &&
+          !this.pawnFlags[this.turn][m.start.y]
+        ) {
           return; //skip forbidden 2-squares jumps
-        if (this.board[m.end.x][m.end.y] == V.EMPTY && m.vanish.length==2
-          && this.getColor(m.start.x,m.start.y) == 'c')
-        {
+        }
+        if (
+          this.board[m.end.x][m.end.y] == V.EMPTY &&
+          m.vanish.length == 2 &&
+          this.getColor(m.start.x, m.start.y) == "c"
+        ) {
           return; //checkered pawns cannot take en-passant
         }
       }
       if (m.vanish.length == 1)
-        moves.push(m); //no capture
-      else
-      {
+        // No capture
+        moves.push(m);
+      else {
         // A capture occured (m.vanish.length == 2)
         m.appear[0].c = "c";
         moves.push(m);
-        if (m.appear[0].p != m.vanish[1].p //avoid promotions (already treated):
-          && (m.vanish[0].p != V.PAWN || m.end.x != lastRank))
-        {
+        if (
+          // Avoid promotions (already treated):
+          m.appear[0].p != m.vanish[1].p &&
+          (m.vanish[0].p != V.PAWN || m.end.x != lastRank)
+        ) {
           // Add transformation into captured piece
           let m2 = JSON.parse(JSON.stringify(m));
           m2.appear[0].p = m.vanish[1].p;
@@ -164,29 +159,41 @@ export const VariantRules = class CheckeredRules extends ChessRules
     return moves;
   }
 
-  canIplay(side, [x,y])
-  {
-    return (side == this.turn && [side,'c'].includes(this.getColor(x,y)));
+  getPotentialPawnMoves([x, y]) {
+    let moves = super.getPotentialPawnMoves([x, y]);
+    // Post-process: set right color for checkered moves
+    if (this.getColor(x, y) == 'c')
+      moves.forEach(m => {
+        m.appear[0].c = 'c'; //may be done twice if capture
+        m.vanish[0].c = 'c';
+      });
+    return moves;
+  }
+
+  canIplay(side, [x, y]) {
+    return side == this.turn && [side, "c"].includes(this.getColor(x, y));
   }
 
   // Does m2 un-do m1 ? (to disallow undoing checkered moves)
-  oppositeMoves(m1, m2)
-  {
-    return (!!m1 && m2.appear[0].c == 'c'
-      && m2.appear.length == 1 && m2.vanish.length == 1
-      && m1.start.x == m2.end.x && m1.end.x == m2.start.x
-      && m1.start.y == m2.end.y && m1.end.y == m2.start.y);
-  }
-
-  filterValid(moves)
-  {
-    if (moves.length == 0)
-      return [];
+  oppositeMoves(m1, m2) {
+    return (
+      m1 &&
+      m2.appear[0].c == "c" &&
+      m2.appear.length == 1 &&
+      m2.vanish.length == 1 &&
+      m1.start.x == m2.end.x &&
+      m1.end.x == m2.start.x &&
+      m1.start.y == m2.end.y &&
+      m1.end.y == m2.start.y
+    );
+  }
+
+  filterValid(moves) {
+    if (moves.length == 0) return [];
     const color = this.turn;
+    const L = this.cmoves.length; //at least 1: init from FEN
     return moves.filter(m => {
-      const L = this.cmoves.length; //at least 1: init from FEN
-      if (this.oppositeMoves(this.cmoves[L-1], m))
-        return false;
+      if (this.oppositeMoves(this.cmoves[L - 1], m)) return false;
       this.play(m);
       const res = !this.underCheck(color);
       this.undo(m);
@@ -194,19 +201,66 @@ export const VariantRules = class CheckeredRules extends ChessRules
     });
   }
 
-  isAttackedByPawn([x,y], colors)
-  {
-    for (let c of colors)
-    {
-      const color = (c=="c" ? this.turn : c);
-      let pawnShift = (color=="w" ? 1 : -1);
-      if (x+pawnShift>=0 && x+pawnShift<8)
-      {
-        for (let i of [-1,1])
-        {
-          if (y+i>=0 && y+i<8 && this.getPiece(x+pawnShift,y+i)==V.PAWN
-            && this.getColor(x+pawnShift,y+i)==c)
-          {
+  getAllValidMoves() {
+    const oppCol = V.GetOppCol(this.turn);
+    let potentialMoves = [];
+    for (let i = 0; i < V.size.x; i++) {
+      for (let j = 0; j < V.size.y; j++) {
+        // NOTE: just testing == color isn't enough because of checkred pieces
+        if (this.board[i][j] != V.EMPTY && this.getColor(i, j) != oppCol) {
+          Array.prototype.push.apply(
+            potentialMoves,
+            this.getPotentialMovesFrom([i, j])
+          );
+        }
+      }
+    }
+    return this.filterValid(potentialMoves);
+  }
+
+  atLeastOneMove() {
+    const oppCol = V.GetOppCol(this.turn);
+    for (let i = 0; i < V.size.x; i++) {
+      for (let j = 0; j < V.size.y; j++) {
+        // NOTE: just testing == color isn't enough because of checkered pieces
+        if (this.board[i][j] != V.EMPTY && this.getColor(i, j) != oppCol) {
+          const moves = this.getPotentialMovesFrom([i, j]);
+          if (moves.length > 0) {
+            for (let k = 0; k < moves.length; k++) {
+              if (this.filterValid([moves[k]]).length > 0) return true;
+            }
+          }
+        }
+      }
+    }
+    return false;
+  }
+
+  // colors: array, generally 'w' and 'c' or 'b' and 'c'
+  isAttacked(sq, colors) {
+    if (!Array.isArray(colors)) colors = [colors];
+    return (
+      this.isAttackedByPawn(sq, colors) ||
+      this.isAttackedByRook(sq, colors) ||
+      this.isAttackedByKnight(sq, colors) ||
+      this.isAttackedByBishop(sq, colors) ||
+      this.isAttackedByQueen(sq, colors) ||
+      this.isAttackedByKing(sq, colors)
+    );
+  }
+
+  isAttackedByPawn([x, y], colors) {
+    for (let c of colors) {
+      const color = (c == "c" ? this.turn : c);
+      let pawnShift = color == "w" ? 1 : -1;
+      if (x + pawnShift >= 0 && x + pawnShift < 8) {
+        for (let i of [-1, 1]) {
+          if (
+            y + i >= 0 &&
+            y + i < 8 &&
+            this.getPiece(x + pawnShift, y + i) == V.PAWN &&
+            this.getColor(x + pawnShift, y + i) == c
+          ) {
             return true;
           }
         }
@@ -215,17 +269,73 @@ export const VariantRules = class CheckeredRules extends ChessRules
     return false;
   }
 
-  underCheck(color)
-  {
-    return this.isAttacked(this.kingPos[color], [V.GetOppCol(color),'c']);
+  isAttackedBySlideNJump([x, y], colors, piece, steps, oneStep) {
+    for (let step of steps) {
+      let rx = x + step[0],
+          ry = y + step[1];
+      while (V.OnBoard(rx, ry) && this.board[rx][ry] == V.EMPTY && !oneStep) {
+        rx += step[0];
+        ry += step[1];
+      }
+      if (
+        V.OnBoard(rx, ry) &&
+        this.getPiece(rx, ry) === piece &&
+        colors.includes(this.getColor(rx, ry))
+      ) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  isAttackedByRook(sq, colors) {
+    return this.isAttackedBySlideNJump(sq, colors, V.ROOK, V.steps[V.ROOK]);
+  }
+
+  isAttackedByKnight(sq, colors) {
+    return this.isAttackedBySlideNJump(
+      sq,
+      colors,
+      V.KNIGHT,
+      V.steps[V.KNIGHT],
+      "oneStep"
+    );
+  }
+
+  isAttackedByBishop(sq, colors) {
+    return this.isAttackedBySlideNJump(sq, colors, V.BISHOP, V.steps[V.BISHOP]);
+  }
+
+  isAttackedByQueen(sq, colors) {
+    return this.isAttackedBySlideNJump(
+      sq,
+      colors,
+      V.QUEEN,
+      V.steps[V.ROOK].concat(V.steps[V.BISHOP])
+    );
   }
 
-  getCheckSquares(color)
-  {
+  isAttackedByKing(sq, colors) {
+    return this.isAttackedBySlideNJump(
+      sq,
+      colors,
+      V.KING,
+      V.steps[V.ROOK].concat(V.steps[V.BISHOP]),
+      "oneStep"
+    );
+  }
+
+  underCheck(color) {
+    return this.isAttacked(this.kingPos[color], [V.GetOppCol(color), "c"]);
+  }
+
+  getCheckSquares(color) {
     // Artifically change turn, for checkered pawns
     this.turn = V.GetOppCol(color);
-    const kingAttacked = this.isAttacked(
-      this.kingPos[color], [V.GetOppCol(color),'c']);
+    const kingAttacked = this.isAttacked(this.kingPos[color], [
+      V.GetOppCol(color),
+      "c"
+    ]);
     let res = kingAttacked
       ? [JSON.parse(JSON.stringify(this.kingPos[color]))] //need to duplicate!
       : [];
@@ -233,139 +343,123 @@ export const VariantRules = class CheckeredRules extends ChessRules
     return res;
   }
 
-  updateVariables(move)
-  {
-    super.updateVariables(move);
+  postPlay(move) {
+    super.postPlay(move);
     // Does this move turn off a 2-squares pawn flag?
-    const secondRank = [1,6];
-    if (secondRank.includes(move.start.x) && move.vanish[0].p == V.PAWN)
-      this.pawnFlags[move.start.x==6 ? "w" : "b"][move.start.y] = false;
+    if ([1, 6].includes(move.start.x) && move.vanish[0].p == V.PAWN)
+      this.pawnFlags[move.start.x == 6 ? "w" : "b"][move.start.y] = false;
+    this.cmoves.push(this.getCmove(move));
   }
 
-  getCurrentScore()
-  {
-    if (this.atLeastOneMove()) // game not over
-      return "*";
+  postUndo(move) {
+    super.postUndo(move);
+    this.cmoves.pop();
+  }
 
+  getCurrentScore() {
+    if (this.atLeastOneMove()) return "*";
     const color = this.turn;
     // Artifically change turn, for checkered pawns
     this.turn = V.GetOppCol(this.turn);
-    const res = this.isAttacked(this.kingPos[color], [V.GetOppCol(color),'c'])
-      ? (color == "w" ? "0-1" : "1-0")
+    const res = this.isAttacked(this.kingPos[color], [V.GetOppCol(color), "c"])
+      ? color == "w"
+        ? "0-1"
+        : "1-0"
       : "1/2";
     this.turn = V.GetOppCol(this.turn);
     return res;
   }
 
-  evalPosition()
-  {
+  evalPosition() {
     let evaluation = 0;
-    //Just count material for now, considering checkered neutral (...)
-    for (let i=0; i<V.size.x; i++)
-    {
-      for (let j=0; j<V.size.y; j++)
-      {
-        if (this.board[i][j] != V.EMPTY)
-        {
-          const sqColor = this.getColor(i,j);
-          const sign = sqColor == "w" ? 1 : (sqColor=="b" ? -1 : 0);
-          evaluation += sign * V.VALUES[this.getPiece(i,j)];
+    // Just count material for now, considering checkered neutral (...)
+    for (let i = 0; i < V.size.x; i++) {
+      for (let j = 0; j < V.size.y; j++) {
+        if (this.board[i][j] != V.EMPTY) {
+          const sqColor = this.getColor(i, j);
+          if (["w","b"].includes(sqColor)) {
+            const sign = sqColor == "w" ? 1 : -1;
+            evaluation += sign * V.VALUES[this.getPiece(i, j)];
+          }
         }
       }
     }
     return evaluation;
   }
 
-  static GenRandInitFen()
-  {
-    const randFen = ChessRules.GenRandInitFen();
+  static GenRandInitFen(randomness) {
     // Add 16 pawns flags + empty cmove:
-    return randFen.replace(" w 0 1111", " w 0 11111111111111111111 -");
+    return ChessRules.GenRandInitFen(randomness)
+      .slice(0, -2) + "1111111111111111 - -";
   }
 
-  static ParseFen(fen)
-  {
-    const fenParsed = ChessRules.ParseFen(fen);
-    return Object.assign({},
+  static ParseFen(fen) {
+    return Object.assign(
       ChessRules.ParseFen(fen),
-      {cmove: fen.split(" ")[5]});
+      { cmove: fen.split(" ")[5] }
+    );
   }
 
-  getFen()
-  {
+  getFen() {
     const L = this.cmoves.length;
-    const cmoveFen = (!this.cmoves[L-1]
+    const cmoveFen = !this.cmoves[L - 1]
       ? "-"
-      : ChessRules.CoordsToSquare(this.cmoves[L-1].start)
-        + ChessRules.CoordsToSquare(this.cmoves[L-1].end));
+      : ChessRules.CoordsToSquare(this.cmoves[L - 1].start) +
+        ChessRules.CoordsToSquare(this.cmoves[L - 1].end);
     return super.getFen() + " " + cmoveFen;
   }
 
-  getFlagsFen()
-  {
+  getFlagsFen() {
     let fen = super.getFlagsFen();
     // Add pawns flags
-    for (let c of ['w','b'])
-    {
-      for (let i=0; i<8; i++)
-        fen += this.pawnFlags[c][i] ? '1' : '0';
+    for (let c of ["w", "b"]) {
+      for (let i = 0; i < 8; i++) fen += this.pawnFlags[c][i] ? "1" : "0";
     }
     return fen;
   }
 
-  // TODO (design): this cmove update here or in (un)updateVariables ?
-  play(move)
-  {
-    this.cmoves.push( this.getCmove(move) );
-    super.play(move);
+  static get SEARCH_DEPTH() {
+    return 2;
   }
 
-  undo(move)
-  {
-    this.cmoves.pop();
-    super.undo(move);
-  }
-
-  getNotation(move)
-  {
-    if (move.appear.length == 2)
-    {
+  getNotation(move) {
+    if (move.appear.length == 2) {
       // Castle
-      if (move.end.y < move.start.y)
-        return "0-0-0";
-      else
-        return "0-0";
+      if (move.end.y < move.start.y) return "0-0-0";
+      return "0-0";
     }
 
     // Translate final square
     const finalSquare = V.CoordsToSquare(move.end);
 
     const piece = this.getPiece(move.start.x, move.start.y);
-    if (piece == V.PAWN)
-    {
+    if (piece == V.PAWN) {
       // Pawn move
       let notation = "";
-      if (move.vanish.length > 1)
-      {
+      if (move.vanish.length > 1) {
         // Capture
         const startColumn = V.CoordToColumn(move.start.y);
-        notation = startColumn + "x" + finalSquare +
-          "=" + move.appear[0].p.toUpperCase();
-      }
-      else //no capture
-      {
+        notation =
+          startColumn +
+          "x" +
+          finalSquare +
+          "=" +
+          move.appear[0].p.toUpperCase();
+      } //no capture
+      else {
         notation = finalSquare;
-        if (move.appear.length > 0 && piece != move.appear[0].p) //promotion
+        if (move.appear.length > 0 && piece != move.appear[0].p)
+          //promotion
           notation += "=" + move.appear[0].p.toUpperCase();
       }
       return notation;
     }
-
-    else
-    {
-      // Piece movement
-      return piece.toUpperCase() + (move.vanish.length > 1 ? "x" : "") + finalSquare
-        + (move.vanish.length > 1 ? "=" + move.appear[0].p.toUpperCase() : "");
-    }
+    // Piece movement
+    return (
+      piece.toUpperCase() +
+      (move.vanish.length > 1 ? "x" : "") +
+      finalSquare +
+      (move.vanish.length > 1 ? "=" + move.appear[0].p.toUpperCase() : "")
+    );
   }
-}
+};