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

diff --git a/client/src/variants/Crazyhouse.js b/client/src/variants/Crazyhouse.js
index d677823d..ee485448 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,13 @@ 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]
+      }
+    );
   }
 
   static GenRandInitFen(randomness) {
@@ -34,16 +37,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()
     );
@@ -77,22 +79,23 @@ export const VariantRules = class CrazyhouseRules extends ChessRules {
 
   setOtherVariables(fen) {
     super.setOtherVariables(fen);
-    const fenParsed = V.ParseFen(fen);
     // Also init reserves (used by the interface to show landable pieces)
+    const reserve =
+      V.ParseFen(fen).reserve.split("").map(x => parseInt(x, 10));
     this.reserve = {
       w: {
-        [V.PAWN]: parseInt(fenParsed.reserve[0]),
-        [V.ROOK]: parseInt(fenParsed.reserve[1]),
-        [V.KNIGHT]: parseInt(fenParsed.reserve[2]),
-        [V.BISHOP]: parseInt(fenParsed.reserve[3]),
-        [V.QUEEN]: parseInt(fenParsed.reserve[4])
+        [V.PAWN]: reserve[0],
+        [V.ROOK]: reserve[1],
+        [V.KNIGHT]: reserve[2],
+        [V.BISHOP]: reserve[3],
+        [V.QUEEN]: reserve[4]
       },
       b: {
-        [V.PAWN]: parseInt(fenParsed.reserve[5]),
-        [V.ROOK]: parseInt(fenParsed.reserve[6]),
-        [V.KNIGHT]: parseInt(fenParsed.reserve[7]),
-        [V.BISHOP]: parseInt(fenParsed.reserve[8]),
-        [V.QUEEN]: parseInt(fenParsed.reserve[9])
+        [V.PAWN]: reserve[5],
+        [V.ROOK]: reserve[6],
+        [V.KNIGHT]: reserve[7],
+        [V.BISHOP]: reserve[8],
+        [V.QUEEN]: reserve[9]
       }
     };
     this.promoted = ArrayFun.init(V.size.x, V.size.y, false);
@@ -118,6 +121,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() {
@@ -163,12 +174,13 @@ export const VariantRules = class CrazyhouseRules extends ChessRules {
   }
 
   getAllValidMoves() {
-    let moves = super.getAllValidMoves();
+    let moves = super.getAllPotentialMoves();
     const color = this.turn;
-    for (let i = 0; i < V.RESERVE_PIECES.length; i++)
+    for (let i = 0; i < V.RESERVE_PIECES.length; i++) {
       moves = moves.concat(
         this.getReserveMoves([V.size.x + (color == "w" ? 0 : 1), i])
       );
+    }
     return this.filterValid(moves);
   }
 
@@ -186,9 +198,10 @@ export const VariantRules = class CrazyhouseRules extends ChessRules {
     return true;
   }
 
-  updateVariables(move) {
-    super.updateVariables(move);
-    if (move.vanish.length == 2 && move.appear.length == 2) return; //skip castle
+  postPlay(move) {
+    super.postPlay(move);
+    // Skip castle:
+    if (move.vanish.length == 2 && move.appear.length == 2) return;
     const color = move.appear[0].c;
     if (move.vanish.length == 0) {
       this.reserve[color][move.appear[0].p]--;
@@ -204,8 +217,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 +232,6 @@ export const VariantRules = class CrazyhouseRules extends ChessRules {
   }
 
   static get SEARCH_DEPTH() {
-    // High branching factor
     return 2;
   }