X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FArena.js;h=b2b18ee6e981d8a1d8210ce5aba0a41b2e262dad;hp=620b980ae90cd87984ddc3842f42ab922ab6a3c4;hb=32f6285ee325a14286562a53baefc647201df2af;hpb=11482348f50058d235adb89bfc174a1da7c6abc4

diff --git a/client/src/variants/Arena.js b/client/src/variants/Arena.js
index 620b980a..b2b18ee6 100644
--- a/client/src/variants/Arena.js
+++ b/client/src/variants/Arena.js
@@ -1,10 +1,18 @@
 import { ChessRules } from "@/base_rules";
 
-export const VariantRules = class ArenaRules extends ChessRules {
+export class ArenaRules extends ChessRules {
   static get HasFlags() {
     return false;
   }
 
+  static get PawnSpecs() {
+    return Object.assign(
+      {},
+      ChessRules.PawnSpecs,
+      { captureBackward: true }
+    );
+  }
+
   static GenRandInitFen(randomness) {
     return ChessRules.GenRandInitFen(randomness).slice(0, -6) + "-";
   }
@@ -28,60 +36,6 @@ export const VariantRules = class ArenaRules extends ChessRules {
     return moves;
   }
 
-  getPotentialPawnMoves([x, y]) {
-    const color = this.turn;
-    let moves = [];
-    const [sizeX, sizeY] = [V.size.x, V.size.y];
-    const shiftX = color == "w" ? -1 : 1;
-    const startRank = color == "w" ? sizeX - 2 : 1;
-
-    if (this.board[x + shiftX][y] == V.EMPTY) {
-      // One square forward
-      moves.push(this.getBasicMove([x, y], [x + shiftX, y]));
-      // Next condition because pawns on 1st rank can generally jump
-      if (
-        x == startRank &&
-        this.board[x + 2 * shiftX][y] == V.EMPTY
-      ) {
-        // Two squares jump
-        moves.push(this.getBasicMove([x, y], [x + 2 * shiftX, y]));
-      }
-    }
-    // Captures: also possible backward
-    for (let shiftY of [-1, 1]) {
-      if (y + shiftY >= 0 && y + shiftY < sizeY) {
-        for (let direction of [-1,1]) {
-          if (
-            this.board[x + direction][y + shiftY] != V.EMPTY &&
-            this.canTake([x, y], [x + direction, y + shiftY])
-          ) {
-            moves.push(this.getBasicMove([x, y], [x + direction, y + shiftY]));
-          }
-        }
-      }
-    }
-
-    // En passant
-    const Lep = this.epSquares.length;
-    const epSquare = this.epSquares[Lep - 1]; //always at least one element
-    if (
-      !!epSquare &&
-      epSquare.x == x + shiftX &&
-      Math.abs(epSquare.y - y) == 1
-    ) {
-      let enpassantMove = this.getBasicMove([x, y], [epSquare.x, epSquare.y]);
-      enpassantMove.vanish.push({
-        x: x,
-        y: epSquare.y,
-        p: "p",
-        c: this.getColor(x, epSquare.y)
-      });
-      moves.push(enpassantMove);
-    }
-
-    return moves;
-  }
-
   getPotentialQueenMoves(sq) {
     return this.getSlideNJumpMoves(
       sq,