X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FCrazyhouse.js;h=2307eaffe9fbb02107f20dfb4ed260da5917f9cd;hb=6f2f94374f1e73c375edf732d9425e575e81fff7;hp=d677823d6c48d60d929fdb96c6aa1667072e24e3;hpb=c292ebb2a014646005b01e27253c162f1d639387;p=vchess.git

diff --git a/client/src/variants/Crazyhouse.js b/client/src/variants/Crazyhouse.js
index d677823d..2307eaff 100644
--- a/client/src/variants/Crazyhouse.js
+++ b/client/src/variants/Crazyhouse.js
@@ -1,7 +1,7 @@
 import { ChessRules, PiPo, Move } from "@/base_rules";
 import { ArrayFun } from "@/utils/array";
 
-export const VariantRules = class CrazyhouseRules extends ChessRules {
+export class CrazyhouseRules extends ChessRules {
   static IsGoodFen(fen) {
     if (!ChessRules.IsGoodFen(fen)) return false;
     const fenParsed = V.ParseFen(fen);
@@ -22,10 +22,20 @@ export const VariantRules = class CrazyhouseRules extends ChessRules {
 
   static ParseFen(fen) {
     const fenParts = fen.split(" ");
-    return Object.assign(ChessRules.ParseFen(fen), {
-      reserve: fenParts[5],
-      promoted: fenParts[6]
-    });
+    return Object.assign(
+      ChessRules.ParseFen(fen),
+      {
+        reserve: fenParts[5],
+        promoted: fenParts[6]
+      }
+    );
+  }
+
+  getEpSquare(moveOrSquare) {
+    if (typeof moveOrSquare !== "object" || moveOrSquare.vanish.length > 0)
+      return super.getEpSquare(moveOrSquare);
+    // Landing move: no en-passant
+    return undefined;
   }
 
   static GenRandInitFen(randomness) {
@@ -34,16 +44,15 @@ export const VariantRules = class CrazyhouseRules extends ChessRules {
 
   getFen() {
     return (
-      super.getFen() + " " + this.getReserveFen() + " " + this.getPromotedFen()
+      super.getFen() + " " +
+      this.getReserveFen() + " " +
+      this.getPromotedFen()
     );
   }
 
   getFenForRepeat() {
     return (
-      this.getBaseFen() + "_" +
-      this.getTurnFen() + "_" +
-      this.getFlagsFen() + "_" +
-      this.getEnpassantFen() + "_" +
+      super.getFenForRepeat() + "_" +
       this.getReserveFen() + "_" +
       this.getPromotedFen()
     );
@@ -118,6 +127,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() {
@@ -186,8 +203,8 @@ export const VariantRules = class CrazyhouseRules extends ChessRules {
     return true;
   }
 
-  updateVariables(move) {
-    super.updateVariables(move);
+  postPlay(move) {
+    super.postPlay(move);
     if (move.vanish.length == 2 && move.appear.length == 2) return; //skip castle
     const color = move.appear[0].c;
     if (move.vanish.length == 0) {
@@ -204,8 +221,8 @@ export const VariantRules = class CrazyhouseRules extends ChessRules {
     else if (move.vanish.length == 2) this.reserve[color][move.vanish[1].p]++;
   }
 
-  unupdateVariables(move) {
-    super.unupdateVariables(move);
+  postUndo(move) {
+    super.postUndo(move);
     if (move.vanish.length == 2 && move.appear.length == 2) return;
     const color = this.turn;
     if (move.vanish.length == 0) {
@@ -219,7 +236,6 @@ export const VariantRules = class CrazyhouseRules extends ChessRules {
   }
 
   static get SEARCH_DEPTH() {
-    // High branching factor
     return 2;
   }