Several small improvements + integrate options + first working draft of Cwda

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

diff --git a/client/src/variants/Diamond.js b/client/src/variants/Diamond.js
index 2a3869e..658b7ad 100644 (file)
--- a/client/src/variants/Diamond.js
+++ b/client/src/variants/Diamond.js
@@ -3,6 +3,7 @@ import { ArrayFun } from "@/utils/array";
 import { shuffle } from "@/utils/alea";
 
 export class DiamondRules extends ChessRules {
+
   static get HasFlags() {
     return false;
   }
@@ -11,12 +12,12 @@ export class DiamondRules extends ChessRules {
     return false;
   }
 
-  static GenRandInitFen(randomness) {
-    if (randomness == 0)
+  static GenRandInitFen(options) {
+    if (options.randomness == 0)
       return "krbp4/rqnp4/nbpp4/pppp4/4PPPP/4PPBN/4PNQR/4PBRK w 0";
     let pieces = { w: new Array(8), b: new Array(8) };
     for (let c of ["w", "b"]) {
-      if (c == 'b' && randomness == 1) {
+      if (c == 'b' && options.randomness == 1) {
         pieces['b'] = pieces['w'];
         break;
       }
@@ -27,8 +28,10 @@ export class DiamondRules extends ChessRules {
       if (rem2 == positions[1] % 2) {
         // Fix bishops (on different colors)
         for (let i=2; i<8; i++) {
-          if (positions[i] % 2 != rem2)
+          if (positions[i] % 2 != rem2) {
             [positions[1], positions[i]] = [positions[i], positions[1]];
+            break;
+          }
         }
       }
       for (let i = 0; i < 8; i++) pieces[c][positions[i]] = composition[i];
@@ -136,4 +139,5 @@ export class DiamondRules extends ChessRules {
     }
     return super.getNotation(move); //all other pieces are orthodox
   }
+
 };