X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FCheckered.js;h=79ea63c44a3fc6bd24b71aebf4d2511031d41d12;hb=2c5d7b20742b802d9c47916915c1114bcfc9a9c3;hp=799c3e548f320e2bf957c62d3bce872f09ffa2b3;hpb=305ede7ec3753fc669b7c86af5b5c5b2fc78a164;p=vchess.git

diff --git a/client/src/variants/Checkered.js b/client/src/variants/Checkered.js
index 799c3e54..79ea63c4 100644
--- a/client/src/variants/Checkered.js
+++ b/client/src/variants/Checkered.js
@@ -303,7 +303,8 @@ export class CheckeredRules extends ChessRules {
   }
 
   isAttackedByBishop(sq, colors) {
-    return this.isAttackedBySlideNJump(sq, colors, V.BISHOP, V.steps[V.BISHOP]);
+    return this.isAttackedBySlideNJump(
+      sq, colors, V.BISHOP, V.steps[V.BISHOP]);
   }
 
   isAttackedByQueen(sq, colors) {
@@ -337,7 +338,7 @@ export class CheckeredRules extends ChessRules {
       "c"
     ]);
     let res = kingAttacked
-      ? [JSON.parse(JSON.stringify(this.kingPos[color]))] //need to duplicate!
+      ? [JSON.parse(JSON.stringify(this.kingPos[color]))]
       : [];
     this.turn = color;
     return res;
@@ -429,37 +430,25 @@ export class CheckeredRules extends ChessRules {
       return "0-0";
     }
 
-    // Translate final square
     const finalSquare = V.CoordsToSquare(move.end);
-
     const piece = this.getPiece(move.start.x, move.start.y);
+    let notation = "";
     if (piece == V.PAWN) {
       // Pawn move
-      let notation = "";
       if (move.vanish.length > 1) {
         // Capture
         const startColumn = V.CoordToColumn(move.start.y);
-        notation =
-          startColumn +
-          "x" +
-          finalSquare +
-          "=" +
-          move.appear[0].p.toUpperCase();
-      } //no capture
-      else {
-        notation = finalSquare;
-        if (move.appear.length > 0 && piece != move.appear[0].p)
-          //promotion
-          notation += "=" + move.appear[0].p.toUpperCase();
-      }
-      return notation;
+        notation = startColumn + "x" + finalSquare;
+      } else notation = finalSquare;
+    } else {
+      // Piece movement
+      notation =
+        piece.toUpperCase() +
+        (move.vanish.length > 1 ? "x" : "") +
+        finalSquare;
     }
-    // Piece movement
-    return (
-      piece.toUpperCase() +
-      (move.vanish.length > 1 ? "x" : "") +
-      finalSquare +
-      (move.vanish.length > 1 ? "=" + move.appear[0].p.toUpperCase() : "")
-    );
+    if (move.appear[0].p != move.vanish[0].p)
+      notation += "=" + move.appear[0].p.toUpperCase();
+    return notation;
   }
 };