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

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

diff --git a/client/src/variants/Hiddenqueen.js b/client/src/variants/Hiddenqueen.js
index aa536a6..1ce85be 100644 (file)
--- a/client/src/variants/Hiddenqueen.js
+++ b/client/src/variants/Hiddenqueen.js
@@ -3,6 +3,7 @@ import { ArrayFun } from "@/utils/array";
 import { randInt } from "@/utils/alea";
 
 export class HiddenqueenRules extends ChessRules {
+
   // Analyse in Hiddenqueen mode makes no sense
   static get CanAnalyze() {
     return false;
@@ -52,9 +53,11 @@ export class HiddenqueenRules extends ChessRules {
     const move = moveOrSquare;
     const s = move.start,
           e = move.end;
+    const color = move.vanish[0].c;
     if (
       s.y == e.y &&
       Math.abs(s.x - e.x) == 2 &&
+      ((color == 'w' && s.x == 6) || (color == 'b' && s.x == 1)) &&
       [V.PAWN, V.HIDDEN_QUEEN].includes(move.vanish[0].p)
     ) {
       return {
@@ -149,8 +152,8 @@ export class HiddenqueenRules extends ChessRules {
     return this.filterValid(this.getPotentialMovesFrom(sq));
   }
 
-  static GenRandInitFen(randomness) {
-    let fen = ChessRules.GenRandInitFen(randomness);
+  static GenRandInitFen(options) {
+    let fen = ChessRules.GenRandInitFen(options);
     // Place hidden queens at random (always):
     let hiddenQueenPos = randInt(8);
     let pawnRank = "PPPPPPPP".split("");
@@ -178,12 +181,21 @@ export class HiddenqueenRules extends ChessRules {
       this.kingPos[oppCol] = [move.vanish[1].x, move.vanish[1].y];
   }
 
+  underCheck(color) {
+    if (this.kingPos[color][0] < 0) return false;
+    return super.underCheck(color);
+  }
+
   getCurrentScore() {
     const color = this.turn;
     if (this.kingPos[color][0] < 0)
       // King disappeared
-      return color == "w" ? "0-1" : "1-0";
-    return super.getCurrentScore();
+      return (color == "w" ? "0-1" : "1-0");
+    const oldSide = this.side;
+    this.side = color;
+    const res = super.getCurrentScore();
+    this.side = oldSide;
+    return res;
   }
 
   // Search is biased, so not really needed to explore deeply
@@ -205,7 +217,7 @@ export class HiddenqueenRules extends ChessRules {
 
   getNotation(move) {
     // Not using getPiece() method because it would transform HQ into pawn:
-    if (this.board[move.start.x][move.start.y][1] != V.HIDDEN_QUEEN)
+    if (this.board[move.start.x][move.start.y].charAt(1) != V.HIDDEN_QUEEN)
       return super.getNotation(move);
     const finalSquare = V.CoordsToSquare(move.end);
     if (move.appear[0].p == V.QUEEN) {
@@ -223,4 +235,5 @@ export class HiddenqueenRules extends ChessRules {
     else notation = finalSquare;
     return notation;
   }
+
 };