X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=variants%2FBalaklava%2Fclass.js;h=1ee2dd72b8987dc006640cd05c869e09909e8aae;hb=24a6312db06bd3632ff702389c3712f77d01046d;hp=2922b02c5fb7397e869f46abe08aab2cd21bec79;hpb=0437a28b7e71bf8eb72fdab83b04ba98996393ec;p=xogo.git

diff --git a/variants/Balaklava/class.js b/variants/Balaklava/class.js
index 2922b02..1ee2dd7 100644
--- a/variants/Balaklava/class.js
+++ b/variants/Balaklava/class.js
@@ -1,4 +1,5 @@
 import ChessRules from "/base_rules.js";
+import {FenUtil} from "/utils/setupPieces.js";
 
 export default class BalaklavaRules extends ChessRules {
 
@@ -12,7 +13,7 @@ export default class BalaklavaRules extends ChessRules {
 
   pieces(color, x, y) {
     let res = super.pieces(color, x, y);
-    const knightSpec = res['n'];
+    const knightSpecMoves = res['n'].both;
     delete res['n'];
     res['m'] = {
       "class": "mammoth",
@@ -27,15 +28,26 @@ export default class BalaklavaRules extends ChessRules {
         }
       ]
     };
-    ['p', 'r', 'b', 'm', 'q'].forEach(p => res[p].moves = knightSpec.moves);
+    ['p', 'r', 'b', 'm', 'q'].forEach(p => {
+      if (!res[p].moves)
+        res[p].moves = [];
+      Array.prototype.push.apply(res[p].moves, knightSpecMoves);
+    });
     return res;
   }
 
   genRandInitBaseFen() {
-    const baseFen = super.genRandInitBaseFen();
+    const s = FenUtil.setupPieces(
+      ['r', 'm', 'b', 'q', 'k', 'b', 'm', 'r'],
+      {
+        randomness: this.options["randomness"],
+        diffCol: ['b']
+      }
+    );
     return {
-      fen: baseFen.fen.replace(/n/g, 'm').replace(/N/g, 'M'),
-      o: baseFen.o
+      fen: s.b.join("") + "/pppppppp/8/8/8/8/PPPPPPPP/" +
+           s.w.join("").toUpperCase(),
+      o: {flags: s.flags}
     };
   }