Add Knightrelay1. Some fixes. Move odd 'isAttackedBy_multiple_colors' to Checkered...

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

diff --git a/client/src/variants/Royalrace.js b/client/src/variants/Royalrace.js
index 1ae531d..346ca5f 100644 (file)
--- a/client/src/variants/Royalrace.js
+++ b/client/src/variants/Royalrace.js
@@ -19,10 +19,21 @@ export const VariantRules = class RoyalraceRules extends ChessRules {
     return { x: 11, y: 11 };
   }
 
-  static GenRandInitFen() {
+  static GenRandInitFen(randomness) {
+    if (randomness == 0)
+      return "11/11/11/11/11/11/11/11/11/qrbnp1PNBRQ/krbnp1PNBRK w 0";
+
     let pieces = { w: new Array(10), b: new Array(10) };
     // Shuffle pieces on first and second rank
     for (let c of ["w", "b"]) {
+      if (c == 'b' && randomness == 1) {
+        pieces['b'] = JSON.parse(JSON.stringify(pieces['w'])).reverse();
+        pieces['b'] =
+          pieces['b'].splice(5,10).reverse().concat(
+          pieces['b'].splice(0,5).reverse());
+        break;
+      }
+
       // Reserve 4 and 5 which are pawns positions
       let positions = ArrayFun.range(10).filter(i => i != 4 && i != 5);
 
@@ -82,11 +93,13 @@ export const VariantRules = class RoyalraceRules extends ChessRules {
     const blackFen = pieces["b"].join("");
     return (
       "11/11/11/11/11/11/11/11/11/" +
-      whiteFen.substr(5).split("").reverse().join("") +
-      "1" +
       blackFen.substr(5).split("").reverse().join("") +
+      "1" +
+      whiteFen.substr(5).split("").join("") +
       "/" +
-      whiteFen.substr(0,5) + "1" + blackFen.substr(0,5) +
+      blackFen.substr(0,5) +
+      "1" +
+      whiteFen.substr(0,5).split("").reverse().join("") +
       " w 0"
     );
   }
@@ -99,15 +112,16 @@ export const VariantRules = class RoyalraceRules extends ChessRules {
         return m.vanish.length == 1;
       });
 
-    // Captures
-    const shiftX = -1;
-    for (let shiftY of [-1, 1]) {
-      if (
-        V.OnBoard(x + shiftX, y + shiftY) &&
-        this.board[x + shiftX][y + shiftY] != V.EMPTY &&
-        this.canTake([x, y], [x + shiftX, y + shiftY])
-      ) {
-        moves.push(this.getBasicMove([x, y], [x + shiftX, y + shiftY]));
+    // Captures (in both directions)
+    for (let shiftX of [-1, 1]) {
+      for (let shiftY of [-1, 1]) {
+        if (
+          V.OnBoard(x + shiftX, y + shiftY) &&
+          this.board[x + shiftX][y + shiftY] != V.EMPTY &&
+          this.canTake([x, y], [x + shiftX, y + shiftY])
+        ) {
+          moves.push(this.getBasicMove([x, y], [x + shiftX, y + shiftY]));
+        }
       }
     }
 
@@ -141,16 +155,16 @@ export const VariantRules = class RoyalraceRules extends ChessRules {
     });
   }
 
-  isAttackedByPawn([x, y], colors) {
-    const pawnShift = 1;
-    if (x + pawnShift < V.size.x) {
-      for (let c of colors) {
+  isAttackedByPawn([x, y], color) {
+    // Pawns can capture forward and backward:
+    for (let pawnShift of [-1, 1]) {
+      if (0 < x + pawnShift && x + pawnShift < V.size.x) {
         for (let i of [-1, 1]) {
           if (
             y + i >= 0 &&
             y + i < V.size.y &&
             this.getPiece(x + pawnShift, y + i) == V.PAWN &&
-            this.getColor(x + pawnShift, y + i) == c
+            this.getColor(x + pawnShift, y + i) == color
           ) {
             return true;
           }
@@ -160,10 +174,10 @@ export const VariantRules = class RoyalraceRules extends ChessRules {
     return false;
   }
 
-  isAttackedByKnight(sq, colors) {
+  isAttackedByKnight(sq, color) {
     return this.isAttackedBySlideNJump(
       sq,
-      colors,
+      color,
       V.KNIGHT,
       V.steps[V.KNIGHT]
     );
@@ -175,7 +189,9 @@ export const VariantRules = class RoyalraceRules extends ChessRules {
     if (this.kingPos[color][0] == 0)
       // The opposing edge is reached!
       return color == "w" ? "1-0" : "0-1";
-    return "*";
+    if (this.atLeastOneMove()) return "*";
+    // Stalemate (will probably never happen)
+    return "1/2";
   }
 
   static get SEARCH_DEPTH() {