Draft Ball variant + some fixes, enhancements and code cleaning

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

diff --git a/client/src/variants/Antiking1.js b/client/src/variants/Antiking1.js
index 42450d1..ac28c31 100644 (file)
--- a/client/src/variants/Antiking1.js
+++ b/client/src/variants/Antiking1.js
@@ -1,10 +1,15 @@
 import { ChessRules } from "@/base_rules";
+import { BerolinaRules } from "@/variants/Berolina";
 import { ArrayFun } from "@/utils/array";
 import { randInt } from "@/utils/alea";
 
-export const VariantRules = class Antiking1Rules extends ChessRules {
-  static get HasEnpassant() {
-    return false;
+export class Antiking1Rules extends BerolinaRules {
+  static get PawnSpecs() {
+    return Object.assign(
+      {},
+      ChessRules.PawnSpecs,
+      { twoSquares: false }
+    );
   }
 
   static get HasCastle() {
@@ -23,6 +28,19 @@ export const VariantRules = class Antiking1Rules extends ChessRules {
     return b[1] == "a" ? "Antiking/" + b : b;
   }
 
+  static IsGoodPosition(position) {
+    if (!ChessRules.IsGoodPosition(position)) return false;
+    const rows = position.split("/");
+    // Check that exactly one antiking of each color is there:
+    let antikings = { 'a': 0, 'A': 0 };
+    for (let row of rows) {
+      for (let i = 0; i < row.length; i++)
+        if (['A','a'].includes(row[i])) antikings[row[i]]++;
+    }
+    if (Object.values(antikings).some(v => v != 1)) return false;
+    return true;
+  }
+
   setOtherVariables(fen) {
     super.setOtherVariables(fen);
     this.antikingPos = { w: [-1, -1], b: [-1, -1] };
@@ -110,43 +128,6 @@ export const VariantRules = class Antiking1Rules extends ChessRules {
     return moves;
   }
 
-  getPotentialPawnMoves([x, y]) {
-    const color = this.turn;
-    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 lastRank = color == "w" ? 0 : sizeX - 1;
-    const finalPieces =
-      x + shiftX == lastRank ? [V.ROOK, V.KNIGHT, V.BISHOP, V.QUEEN] : [V.PAWN];
-
-    // One square diagonally
-    for (let shiftY of [-1, 1]) {
-      if (this.board[x + shiftX][y + shiftY] == V.EMPTY) {
-        for (let piece of finalPieces) {
-          moves.push(
-            this.getBasicMove([x, y], [x + shiftX, y + shiftY], {
-              c: color,
-              p: piece
-            })
-          );
-        }
-      }
-    }
-    // Capture
-    if (
-      this.board[x + shiftX][y] != V.EMPTY &&
-      this.canTake([x, y], [x + shiftX, y])
-    ) {
-      for (let piece of finalPieces)
-        moves.push(
-          this.getBasicMove([x, y], [x + shiftX, y], { c: color, p: piece })
-        );
-    }
-
-    return moves;
-  }
-
   getPotentialAntikingMoves(sq) {
     // The antiking moves like a king (only captured colors differ)
     return this.getSlideNJumpMoves(
@@ -163,19 +144,6 @@ export const VariantRules = class Antiking1Rules 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;
-  }
-
   isAttackedByKing([x, y], color) {
     // Antiking is not attacked by king:
     if (this.getPiece(x, y) == V.ANTIKING) return false;
@@ -237,21 +205,6 @@ export const VariantRules = class Antiking1Rules extends ChessRules {
       this.antikingPos[c] = [move.start.x, move.start.y];
   }
 
-  getCurrentScore() {
-    if (this.atLeastOneMove())
-      return "*";
-
-    const color = this.turn;
-    const oppCol = V.GetOppCol(color);
-    if (
-      !this.isAttacked(this.kingPos[color], oppCol) &&
-      this.isAttacked(this.antikingPos[color], oppCol)
-    ) {
-      return "1/2";
-    }
-    return color == "w" ? "0-1" : "1-0";
-  }
-
   static get VALUES() {
     return Object.assign(
       { a: 1000 },