Fix Musketeer, Joker, Shinobi. Start draft of Cwda

[vchess.git] / client / src / variants / Musketeer.js

diff --git a/client/src/variants/Musketeer.js b/client/src/variants/Musketeer.js
index 7fa3930..14ba919 100644 (file)
--- a/client/src/variants/Musketeer.js
+++ b/client/src/variants/Musketeer.js
@@ -328,19 +328,19 @@ export class MusketeerRules extends ChessRules {
     outerLoop: for (let step of steps) {
       let i = x + step[0];
       let j = y + step[1];
-      let stepCounter = 1;
+      let stepCounter = 0;
       while (V.OnBoard(i, j) && this.board[i][j] == V.EMPTY) {
         moves.push(this.getBasicMove([x, y], [i, j]));
+        stepCounter++;
         if (
           !!nbSteps &&
           // Next condition to remain compatible with super method
-          (isNaN(parseInt(nbSteps, 10)) || nbSteps >= stepCounter)
+          (stepCounter >= nbSteps || isNaN(parseInt(nbSteps, 10)))
         ) {
           continue outerLoop;
         }
         i += step[0];
         j += step[1];
-        stepCounter++;
       }
       if (V.OnBoard(i, j) && this.canTake([x, y], [i, j]))
         moves.push(this.getBasicMove([x, y], [i, j]));