Debug movesCount for MarseilleChess, complete draft of Eightpieces variant

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

diff --git a/client/src/variants/Circular.js b/client/src/variants/Circular.js
index 4db5a52..a89712d 100644 (file)
--- a/client/src/variants/Circular.js
+++ b/client/src/variants/Circular.js
@@ -30,10 +30,18 @@ export const VariantRules = class CircularRules extends ChessRules {
     this.pawnFlags = flags;
   }
 
-  static GenRandInitFen() {
+  static GenRandInitFen(randomness) {
+    if (randomness == 0)
+      return "8/8/pppppppp/rnbqkbnr/8/8/PPPPPPPP/RNBQKBNR w 0 1111111111111111";
+
     let pieces = { w: new Array(8), b: new Array(8) };
     // Shuffle pieces on first and fifth rank
     for (let c of ["w", "b"]) {
+      if (c == 'b' && randomness == 1) {
+        pieces['b'] = pieces['w'];
+        break;
+      }
+
       let positions = ArrayFun.range(8);
 
       // Get random squares for bishops
@@ -157,8 +165,7 @@ export const VariantRules = class CircularRules extends ChessRules {
   filterValid(moves) {
     const filteredMoves = super.filterValid(moves);
     // If at least one full move made, everything is allowed:
-    if (this.movesCount >= 2)
-      return filteredMoves;
+    if (this.movesCount >= 2) return filteredMoves;
     // Else, forbid check:
     const oppCol = V.GetOppCol(this.turn);
     return filteredMoves.filter(m => {
@@ -170,9 +177,9 @@ export const VariantRules = class CircularRules extends ChessRules {
   }
 
   isAttackedByPawn([x, y], colors) {
+    const pawnShift = 1;
+    const attackerRow = V.ComputeX(x + pawnShift);
     for (let c of colors) {
-      let pawnShift = 1;
-      const attackerRow = V.ComputeX(x + pawnShift);
       for (let i of [-1, 1]) {
         if (
           y + i >= 0 &&
@@ -238,4 +245,8 @@ export const VariantRules = class CircularRules extends ChessRules {
       k: 1000
     };
   }
+
+  static get SEARCH_DEPTH() {
+    return 2;
+  }
 };