X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FBall.js;h=8f6493a3629761e9a28089d282685c24338c7b84;hb=54879803f060e8243291735d02181f350c4dfe78;hp=04ad1feb697d2324be2ad6e2fc8d9a7eaf82c495;hpb=7e8a7ea1cb66adb4a987badfb0a3c2f99a21bd0a;p=vchess.git

diff --git a/client/src/variants/Ball.js b/client/src/variants/Ball.js
index 04ad1feb..8f6493a3 100644
--- a/client/src/variants/Ball.js
+++ b/client/src/variants/Ball.js
@@ -36,7 +36,7 @@ export class BallRules extends ChessRules {
   }
 
   static get BALL() {
-    // Ball is already taken:
+    // 'b' is already taken:
     return "aa";
   }
 
@@ -95,17 +95,18 @@ export class BallRules extends ChessRules {
     const rows = position.split("/");
     if (rows.length != V.size.x) return false;
     let pieces = { "w": 0, "b": 0 };
-    const withBall = Object.keys(V.HAS_BALL_DECODE).concat([V.BALL]);
+    const withBall = Object.keys(V.HAS_BALL_DECODE).concat(['a']);
     let ballCount = 0;
     for (let row of rows) {
       let sumElts = 0;
       for (let i = 0; i < row.length; i++) {
         const lowerRi = row[i].toLowerCase();
         if (V.PIECES.includes(lowerRi)) {
-          if (lowerRi != V.BALL) pieces[row[i] == lowerRi ? "b" : "w"]++;
+          if (lowerRi != 'a') pieces[row[i] == lowerRi ? "b" : "w"]++;
           if (withBall.includes(lowerRi)) ballCount++;
           sumElts++;
-        } else {
+        }
+        else {
           const num = parseInt(row[i], 10);
           if (isNaN(num)) return false;
           sumElts += num;
@@ -136,7 +137,7 @@ export class BallRules extends ChessRules {
     const withPrefix =
       Object.keys(V.HAS_BALL_DECODE)
       .concat([V.PHOENIX])
-      .concat(['a']);
+      .concat(['a', 'w']); //TODO: 'w' for backward compatibility - to remove
     if (withPrefix.includes(b[1])) prefix = "Ball/";
     return prefix + b;
   }
@@ -204,8 +205,10 @@ export class BallRules extends ChessRules {
       if (rem2 == positions[1] % 2) {
         // Fix bishops (on different colors)
         for (let i=4; i<9; i++) {
-          if (positions[i] % 2 != rem2)
+          if (positions[i] % 2 != rem2) {
             [positions[1], positions[i]] = [positions[i], positions[1]];
+            break;
+          }
         }
       }
       rem2 = positions[2] % 2;
@@ -337,7 +340,8 @@ export class BallRules extends ChessRules {
             })
           );
         }
-      } else if (mv.vanish[1].c == mv.vanish[0].c) {
+      }
+      else if (mv.vanish[1].c == mv.vanish[0].c) {
         // Pass the ball: the passing unit does not disappear
         mv.appear.push(JSON.parse(JSON.stringify(mv.vanish[0])));
         mv.appear[0].p = V.HAS_BALL_CODE[mv.vanish[1].p];