X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FCrazyhouse.js;h=03d7e418bb1b05404d0bb2eb10bb947990ddedbb;hb=b83a675a3066c67cc7843ae27ad8aeffd15b0976;hp=24018d14f6246903948a58db45b2c56ac7f67127;hpb=241bf8f2a9a2c48d793aeb0b1d20207f6371de70;p=vchess.git

diff --git a/client/src/variants/Crazyhouse.js b/client/src/variants/Crazyhouse.js
index 24018d14..03d7e418 100644
--- a/client/src/variants/Crazyhouse.js
+++ b/client/src/variants/Crazyhouse.js
@@ -28,8 +28,15 @@ export const VariantRules = class CrazyhouseRules extends ChessRules {
     });
   }
 
-  static GenRandInitFen() {
-    return ChessRules.GenRandInitFen() + " 0000000000 -";
+  getEpSquare(moveOrSquare) {
+    if (typeof moveOrSquare !== "object" || moveOrSquare.vanish.length > 0)
+      return super.getEpSquare(moveOrSquare);
+    // Landing move: no en-passant
+    return undefined;
+  }
+
+  static GenRandInitFen(randomness) {
+    return ChessRules.GenRandInitFen(randomness) + " 0000000000 -";
   }
 
   getFen() {
@@ -38,6 +45,17 @@ export const VariantRules = class CrazyhouseRules extends ChessRules {
     );
   }
 
+  getFenForRepeat() {
+    return (
+      this.getBaseFen() + "_" +
+      this.getTurnFen() + "_" +
+      this.getFlagsFen() + "_" +
+      this.getEnpassantFen() + "_" +
+      this.getReserveFen() + "_" +
+      this.getPromotedFen()
+    );
+  }
+
   getReserveFen() {
     let counts = new Array(10);
     for (
@@ -55,11 +73,11 @@ export const VariantRules = class CrazyhouseRules extends ChessRules {
     let res = "";
     for (let i = 0; i < V.size.x; i++) {
       for (let j = 0; j < V.size.y; j++) {
-        if (this.promoted[i][j]) res += V.CoordsToSquare({ x: i, y: j });
+        if (this.promoted[i][j]) res += V.CoordsToSquare({ x: i, y: j }) + ",";
       }
     }
+    // Remove last comma:
     if (res.length > 0) res = res.slice(0, -1);
-    //remove last comma
     else res = "-";
     return res;
   }
@@ -87,8 +105,8 @@ export const VariantRules = class CrazyhouseRules extends ChessRules {
     this.promoted = ArrayFun.init(V.size.x, V.size.y, false);
     if (fenParsed.promoted != "-") {
       for (let square of fenParsed.promoted.split(",")) {
-        const [x, y] = V.SquareToCoords(square);
-        this.promoted[x][y] = true;
+        const coords = V.SquareToCoords(square);
+        this.promoted[coords.x][coords.y] = true;
       }
     }
   }
@@ -107,6 +125,14 @@ export const VariantRules = class CrazyhouseRules extends ChessRules {
   getReservePpath(index, color) {
     return color + V.RESERVE_PIECES[index];
   }
+//  // Version if some day I have pieces with numbers printed on it:
+//  getReservePpath(index, color) {
+//    return (
+//      "Crazyhouse/" +
+//      color + V.RESERVE_PIECES[index] +
+//      "_" + this.vr.reserve[playingColor][V.RESERVE_PIECES[i]]
+//    );
+//  }
 
   // Ordering on reserve pieces
   static get RESERVE_PIECES() {
@@ -208,7 +234,6 @@ export const VariantRules = class CrazyhouseRules extends ChessRules {
   }
 
   static get SEARCH_DEPTH() {
-    // High branching factor
     return 2;
   }