X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FSuction.js;h=4ddffbe45b1ca75b4f5d1bdc4e1229c1504024c7;hb=7ddfec38b0804bf0bd0c5b5c6972d355902e9fb0;hp=ac3aeb02a537dd57c3251b28861d2ded7c4498a7;hpb=bb688df52df0713aba7b2c1c068614544f5ae96d;p=vchess.git

diff --git a/client/src/variants/Suction.js b/client/src/variants/Suction.js
index ac3aeb02..4ddffbe4 100644
--- a/client/src/variants/Suction.js
+++ b/client/src/variants/Suction.js
@@ -20,16 +20,17 @@ export class SuctionRules extends ChessRules {
   }
 
   static ParseFen(fen) {
-    return Object.assign({}, ChessRules.ParseFen(fen), {
-      cmove: fen.split(" ")[4]
-    });
+    return Object.assign(
+      ChessRules.ParseFen(fen),
+      { cmove: fen.split(" ")[4] }
+    );
   }
 
   static IsGoodFen(fen) {
     if (!ChessRules.IsGoodFen(fen)) return false;
     const fenParts = fen.split(" ");
-    if (fenParts.length != 6) return false;
-    if (fenParts[5] != "-" && !fenParts[5].match(/^([a-h][1-8]){2}$/))
+    if (fenParts.length != 5) return false;
+    if (fenParts[4] != "-" && !fenParts[4].match(/^([a-h][1-8]){2}$/))
       return false;
     return true;
   }
@@ -95,7 +96,7 @@ export class SuctionRules extends ChessRules {
       Math.abs(epSquare.y - y) == 1
     ) {
       let enpassantMove = this.getBasicMove([x, y], [epSquare.x, epSquare.y]);
-      const oppCol = V.GetOppCol(color);
+      const oppCol = V.GetOppCol(this.turn);
       enpassantMove.vanish.push({
         x: x,
         y: epSquare.y,
@@ -120,7 +121,7 @@ export class SuctionRules extends ChessRules {
   // Does m2 un-do m1 ? (to disallow undoing captures)
   oppositeMoves(m1, m2) {
     return (
-      m1 &&
+      !!m1 &&
       m2.vanish.length == 2 &&
       m1.start.x == m2.start.x &&
       m1.end.x == m2.end.x &&
@@ -143,13 +144,22 @@ export class SuctionRules extends ChessRules {
     return ChessRules.GenRandInitFen(randomness).slice(0, -6) + "- -";
   }
 
-  getFen() {
+  getCmoveFen() {
     const L = this.cmoves.length;
-    const cmoveFen = !this.cmoves[L - 1]
-      ? "-"
-      : ChessRules.CoordsToSquare(this.cmoves[L - 1].start) +
-        ChessRules.CoordsToSquare(this.cmoves[L - 1].end);
-    return super.getFen() + " " + cmoveFen;
+    return (
+      !this.cmoves[L - 1]
+        ? "-"
+        : ChessRules.CoordsToSquare(this.cmoves[L - 1].start) +
+          ChessRules.CoordsToSquare(this.cmoves[L - 1].end)
+    );
+  }
+
+  getFen() {
+    return super.getFen() + " " + this.getCmoveFen();
+  }
+
+  getFenForRepeat() {
+    return super.getFenForRepeat() + "_" + this.getCmoveFen();
   }
 
   postPlay(move) {