X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FBall.js;fp=client%2Fsrc%2Fvariants%2FBall.js;h=734a921882fbb90787f12d25cdf87006de9de103;hb=bfa7d9931b50c1ed54ff3c6d4ef5bc423f26de94;hp=19b81eded4c30dfdd501603ec2cf2a3c70997781;hpb=5a187b07e221493931cf089bf85ef6db41d8b775;p=vchess.git

diff --git a/client/src/variants/Ball.js b/client/src/variants/Ball.js
index 19b81ede..734a9218 100644
--- a/client/src/variants/Ball.js
+++ b/client/src/variants/Ball.js
@@ -134,17 +134,26 @@ export class BallRules extends ChessRules {
         break;
       }
 
-      // Get random squares for every piece, totally freely
+      // Get random squares for every piece, with bishops and phoenixes
+      // on different colors:
       let positions = shuffle(ArrayFun.range(9));
-      const composition = ['b', 'b', 'r', 'r', 'n', 'n', 'h', 'h', 'q'];
-      const rem2 = positions[0] % 2;
+      const composition = ['b', 'b', 'h', 'h', 'n', 'n', 'r', 'r', 'q'];
+      let rem2 = positions[0] % 2;
       if (rem2 == positions[1] % 2) {
         // Fix bishops (on different colors)
-        for (let i=2; i<9; i++) {
+        for (let i=4; i<9; i++) {
           if (positions[i] % 2 != rem2)
             [positions[1], positions[i]] = [positions[i], positions[1]];
         }
       }
+      rem2 = positions[2] % 2;
+      if (rem2 == positions[3] % 2) {
+        // Fix phoenixes too:
+        for (let i=4; i<9; i++) {
+          if (positions[i] % 2 != rem2)
+            [positions[3], positions[i]] = [positions[i], positions[3]];
+        }
+      }
       for (let i = 0; i < 9; i++) pieces[c][positions[i]] = composition[i];
     }
     return (