Flip knights for variants with knightriders (waiting for a better image)

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

diff --git a/client/src/variants/Royalrace.js b/client/src/variants/Royalrace.js
index 9318c12..5232cc9 100644 (file)
--- a/client/src/variants/Royalrace.js
+++ b/client/src/variants/Royalrace.js
@@ -2,7 +2,7 @@ import { ChessRules } from "@/base_rules";
 import { ArrayFun } from "@/utils/array";
 import { randInt, shuffle } from "@/utils/alea";
 
-export const VariantRules = class RoyalraceRules extends ChessRules {
+export class RoyalraceRules extends ChessRules {
   static get HasFlags() {
     return false;
   }
@@ -19,9 +19,13 @@ export const VariantRules = class RoyalraceRules extends ChessRules {
     return { x: 11, y: 11 };
   }
 
+  getPpath(b) {
+    return (b[1] == V.KNIGHT ? "Enpassant/" : "") + b;
+  }
+
   static GenRandInitFen(randomness) {
     if (randomness == 0)
-      return "11/11/11/11/11/11/11/11/11/QRBNP1pnbrq/KRBNP1pnbrk w 0";
+      return "92/92/92/92/92/92/92/92/92/qrbnp1PNBRQ/krbnp1PNBRK w 0";
 
     let pieces = { w: new Array(10), b: new Array(10) };
     // Shuffle pieces on first and second rank
@@ -92,14 +96,14 @@ export const VariantRules = class RoyalraceRules extends ChessRules {
     const whiteFen = pieces["w"].join("").toUpperCase();
     const blackFen = pieces["b"].join("");
     return (
-      "11/11/11/11/11/11/11/11/11/" +
-      whiteFen.substr(5).split("").reverse().join("") +
+      "92/92/92/92/92/92/92/92/92/" +
+      blackFen.substr(5).split("").reverse().join("") +
       "1" +
-      blackFen.substr(5).split("").join("") +
+      whiteFen.substr(5).split("").join("") +
       "/" +
-      whiteFen.substr(0,5) +
+      blackFen.substr(0,5) +
       "1" +
-      blackFen.substr(0,5).split("").reverse().join("") +
+      whiteFen.substr(0,5).split("").reverse().join("") +
       " w 0"
     );
   }
@@ -133,15 +137,6 @@ export const VariantRules = class RoyalraceRules extends ChessRules {
     return this.getSlideNJumpMoves(sq, V.steps[V.KNIGHT]);
   }
 
-  // What are the king moves from square x,y ?
-  getPotentialKingMoves(sq) {
-    return this.getSlideNJumpMoves(
-      sq,
-      V.steps[V.ROOK].concat(V.steps[V.BISHOP]),
-      "oneStep"
-    );
-  }
-
   filterValid(moves) {
     if (moves.length == 0) return [];
     const color = this.turn;
@@ -155,16 +150,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;
           }
@@ -174,10 +169,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]
     );
@@ -189,8 +184,7 @@ 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";
-    if (this.atLeastOneMove())
-      return "*";
+    if (this.atLeastOneMove()) return "*";
     // Stalemate (will probably never happen)
     return "1/2";
   }