X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FSuction.js;h=2bf3ecf762afe449b23e94d7e42c2339d504aeab;hb=cee75a57d2f4f89c89d64cefbab55d839a238ed9;hp=c3277e9c34ee78b1a7c676f7b9b83caa10bb7625;hpb=2ac5c764619a89498b7cc5099b30e9609cc22b9e;p=vchess.git

diff --git a/client/src/variants/Suction.js b/client/src/variants/Suction.js
index c3277e9c..2bf3ecf7 100644
--- a/client/src/variants/Suction.js
+++ b/client/src/variants/Suction.js
@@ -1,6 +1,8 @@
 import { ChessRules, PiPo, Move } from "@/base_rules";
+import { SuicideRules } from "@/variants/Suicide";
 
 export class SuctionRules extends ChessRules {
+
   static get PawnSpecs() {
     return Object.assign(
       {},
@@ -141,7 +143,6 @@ export class SuctionRules extends ChessRules {
 
   filterValid(moves) {
     if (moves.length == 0) return [];
-    const color = this.turn;
     return moves.filter(m => {
       const L = this.cmoves.length; //at least 1: init from FEN
       return !this.oppositeMoves(this.cmoves[L - 1], m);
@@ -150,7 +151,7 @@ export class SuctionRules extends ChessRules {
 
   static GenRandInitFen(randomness) {
     // Add empty cmove:
-    return ChessRules.GenRandInitFen(randomness).slice(0, -6) + "- -";
+    return SuicideRules.GenRandInitFen(randomness) + " -";
   }
 
   getCmoveFen() {
@@ -173,20 +174,16 @@ export class SuctionRules extends ChessRules {
 
   postPlay(move) {
     super.postPlay(move);
-    if (move.vanish.length == 2) {
-      // Was opponent king swapped?
-      if (move.vanish[1].p == V.KING)
-        this.kingPos[this.turn] = [move.appear[1].x, move.appear[1].y];
-    }
+    // Was opponent king swapped?
+    if (move.vanish.length == 2 && move.vanish[1].p == V.KING)
+      this.kingPos[this.turn] = [move.appear[1].x, move.appear[1].y];
     this.cmoves.push(this.getCmove(move));
   }
 
   postUndo(move) {
     super.postUndo(move);
-    if (move.appear.length == 2) {
-      if (move.appear[1].p == V.KING)
-        this.kingPos[move.vanish[1].c] = [move.vanish[1].x, move.vanish[1].y];
-    }
+    if (move.appear.length == 2 && move.appear[1].p == V.KING)
+      this.kingPos[move.vanish[1].c] = [move.vanish[1].x, move.vanish[1].y];
     this.cmoves.pop();
   }
 
@@ -235,4 +232,5 @@ export class SuctionRules extends ChessRules {
       finalSquare
     );
   }
+
 };