X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FShogi.js;h=bbd3af5b43387d69921a65afc145d1c86afd80fa;hb=ad2494bd14f9a2fd068d713df0f8ac1fb3c3743f;hp=7e827bc2ebbd9fac256768cd193553dd0ddd0743;hpb=0b9a6ff95fb80a9f40077e6554c420626a1e0454;p=vchess.git

diff --git a/client/src/variants/Shogi.js b/client/src/variants/Shogi.js
index 7e827bc2..bbd3af5b 100644
--- a/client/src/variants/Shogi.js
+++ b/client/src/variants/Shogi.js
@@ -1,5 +1,6 @@
 import { ChessRules, PiPo, Move } from "@/base_rules";
 import { ArrayFun } from "@/utils/array";
+import { shuffle } from "@/utils/alea";
 
 export class ShogiRules extends ChessRules {
   static get HasFlags() {
@@ -94,11 +95,28 @@ export class ShogiRules extends ChessRules {
     );
   }
 
-  static GenRandInitFen() {
-    // No randomization for now:
+  static GenRandInitFen(randomness) {
+    if (randomness == 0) {
+      return (
+        "lnsgkgsnl/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL " +
+        "w 0 00000000000000"
+      );
+    }
+    let pieces = { w: new Array(9), b: new Array(9) };
+    for (let c of ["w", "b"]) {
+      if (c == 'b' && randomness == 1) {
+        pieces['b'] = pieces['w'];
+        break;
+      }
+      let positions = shuffle(ArrayFun.range(9));
+      const composition = ['l', 'l', 'n', 'n', 's', 's', 'g', 'g', 'k'];
+      for (let i = 0; i < 9; i++) pieces[c][positions[i]] = composition[i];
+    }
     return (
-      "lnsgkgsnl/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL " +
-      "w 0 00000000000000"
+      pieces["b"].join("") +
+      "/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/" +
+      pieces["w"].join("").toUpperCase() +
+      " w 0 00000000000000"
     );
   }
 
@@ -114,7 +132,7 @@ export class ShogiRules extends ChessRules {
     let counts = new Array(14);
     for (let i = 0; i < V.RESERVE_PIECES.length; i++) {
       counts[i] = this.reserve["w"][V.RESERVE_PIECES[i]];
-      counts[6 + i] = this.reserve["b"][V.RESERVE_PIECES[i]];
+      counts[7 + i] = this.reserve["b"][V.RESERVE_PIECES[i]];
     }
     return counts.join("");
   }
@@ -268,7 +286,7 @@ export class ShogiRules extends ChessRules {
 
   // Modified to take promotions into account
   getSlideNJumpMoves([x, y], steps, options) {
-    const options = options || {};
+    options = options || {};
     const color = this.turn;
     const oneStep = options.oneStep;
     const forcePromoteOnLastRank = options.force;
@@ -466,7 +484,7 @@ export class ShogiRules extends ChessRules {
     return (
       this.isAttackedBySlideNJump(sq, color, V.P_ROOK, V.steps[V.ROOK]) ||
       this.isAttackedBySlideNJump(
-        sq, color, V.DRAGON, V.steps[V.BISHOP], "oneStep")
+        sq, color, V.P_ROOK, V.steps[V.BISHOP], "oneStep")
     );
   }
 
@@ -474,7 +492,7 @@ export class ShogiRules extends ChessRules {
     return (
       this.isAttackedBySlideNJump(sq, color, V.P_BISHOP, V.steps[V.BISHOP]) ||
       this.isAttackedBySlideNJump(
-        sq, color, V.DRAGON, V.steps[V.ROOK], "oneStep")
+        sq, color, V.P_BISHOP, V.steps[V.ROOK], "oneStep")
     );
   }