X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FRococo.js;h=6af29c0555dde5d3188d8f12caebc7e46eedebfe;hb=27ebf6afe4671ce23758724d308b2f9cf2b5b815;hp=66d9615a33136a5fabf6b4c08b5df7bc986fbabe;hpb=7e8a7ea1cb66adb4a987badfb0a3c2f99a21bd0a;p=vchess.git

diff --git a/client/src/variants/Rococo.js b/client/src/variants/Rococo.js
index 66d9615a..6af29c05 100644
--- a/client/src/variants/Rococo.js
+++ b/client/src/variants/Rococo.js
@@ -142,7 +142,8 @@ export class RococoRules extends ChessRules {
     // Pre-check: is thing on this square immobilized?
     const imSq = this.isImmobilized([x, y]);
     const piece = this.getPiece(x, y);
-    if (!!imSq && piece != V.KING) {
+    if (!!imSq) {
+      if (piece == V.KING) return [];
       // Only option is suicide, if I'm not a king:
       return [
         new Move({
@@ -290,13 +291,12 @@ export class RococoRules extends ChessRules {
     return super.getPotentialQueenMoves(sq).concat(this.getRookCaptures(sq));
   }
 
-  getKnightCaptures(startSquare, byChameleon) {
+  getKnightCaptures([x, y], byChameleon) {
     // Look in every direction for captures
     const steps = V.steps[V.ROOK].concat(V.steps[V.BISHOP]);
     const color = this.turn;
     const oppCol = V.GetOppCol(color);
     let moves = [];
-    const [x, y] = [startSquare[0], startSquare[1]];
     const piece = this.getPiece(x, y); //might be a chameleon!
     outerLoop: for (let step of steps) {
       let [i, j] = [x + step[0], y + step[1]];
@@ -336,7 +336,8 @@ export class RococoRules extends ChessRules {
             //TODO: redundant test
             continue outerLoop;
           }
-        } else {
+        }
+        else {
           moves.push(
             new Move({
               appear: [new PiPo({ x: cur[0], y: cur[1], c: color, p: piece })],
@@ -715,11 +716,14 @@ export class RococoRules extends ChessRules {
     if (move.appear[0].p == V.PAWN) {
       // Pawn: generally ambiguous short notation, so we use full description
       notation = "P" + initialSquare + finalSquare;
-    } else if (move.appear[0].p == V.KING)
+    }
+    else if (move.appear[0].p == V.KING)
       notation = "K" + (move.vanish.length > 1 ? "x" : "") + finalSquare;
-    else notation = move.appear[0].p.toUpperCase() + finalSquare;
-    // Add a capture mark (not describing what is captured...):
-    if (move.vanish.length > 1 && move.appear[0].p != V.KING) notation += "X";
+    else {
+      notation = move.appear[0].p.toUpperCase() + finalSquare;
+      // Add a capture mark (not describing what is captured...):
+      if (move.vanish.length > 1) notation += "X";
+    }
     return notation;
   }