X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=variants%2FAmbiguous%2Fclass.js;h=6a83374388749412854d0205a99696d09b9a6164;hb=ceeac4e82346ffba2d87d763df3cffcddaec912a;hp=6d9ac7ef1cc25a3ca2915a7ebed7fa9c07ad04ad;hpb=33b427488bb6ee5c505c3a024bccedbef763f80e;p=xogo.git

diff --git a/variants/Ambiguous/class.js b/variants/Ambiguous/class.js
index 6d9ac7e..6a83374 100644
--- a/variants/Ambiguous/class.js
+++ b/variants/Ambiguous/class.js
@@ -1,5 +1,5 @@
 import ChessRules from "/base_rules.js";
-import GiveawayRules from "/variants/Giveaway/class.js";
+import {FenUtil} from "/utils/setupPieces.js";
 
 export default class AmbiguousRules extends ChessRules {
 
@@ -23,9 +23,18 @@ export default class AmbiguousRules extends ChessRules {
   }
 
   genRandInitBaseFen() {
-    const options = Object.assign({mode: "suicide"}, this.options);
-    const gr = new GiveawayRules({options: options, genFenOnly: true});
-    return gr.genRandInitBaseFen();
+    const s = FenUtil.setupPieces(
+      ['r', 'n', 'b', 'q', 'k', 'b', 'n', 'r'],
+      {
+        randomness: this.options["randomness"],
+        diffCol: ['b']
+      }
+    );
+    return {
+      fen: s.b.join("") + "/pppppppp/8/8/8/8/PPPPPPPP/" +
+           s.w.join("").toUpperCase(),
+      o: {}
+    };
   }
 
   canStepOver(x, y) {
@@ -124,12 +133,12 @@ export default class AmbiguousRules extends ChessRules {
 
   pieces(color, x, y) {
     const targets = {
-      's': {"class": "target-pawn", moves: []},
-      'u': {"class": "target-rook", moves: []},
-      'o': {"class": "target-knight", moves: []},
-      'c': {"class": "target-bishop", moves: []},
-      't': {"class": "target-queen", moves: []},
-      'l': {"class": "target-king", moves: []}
+      's': {"class": "target-pawn"},
+      'u': {"class": "target-rook"},
+      'o': {"class": "target-knight"},
+      'c': {"class": "target-bishop"},
+      't': {"class": "target-queen"},
+      'l': {"class": "target-king"}
     };
     return Object.assign({ 'g': {"class": "target"} },
       targets, super.pieces(color, x, y));