X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FGrasshopper.js;h=c47ac2b13cf2f2b0726b5aa94e3e5ce4e81cfe6d;hb=1d67d9611c52fbe667cea39f68098f4e52464223;hp=ec52d9b3f635c1a619fd0bd87109e865344a56dd;hpb=68e19a449db7a12e0a168e99cd750d985c983ba1;p=vchess.git

diff --git a/client/src/variants/Grasshopper.js b/client/src/variants/Grasshopper.js
index ec52d9b3..c47ac2b1 100644
--- a/client/src/variants/Grasshopper.js
+++ b/client/src/variants/Grasshopper.js
@@ -2,11 +2,19 @@ import { ChessRules } from "@/base_rules";
 import { ArrayFun } from "@/utils/array";
 import { randInt } from "@/utils/alea";
 
-export const VariantRules = class GrasshopperRules extends ChessRules {
+export class GrasshopperRules extends ChessRules {
   static get HasEnpassant() {
     return false;
   }
 
+  static get PawnSpecs() {
+    return Object.assign(
+      {},
+      ChessRules.PawnSpecs,
+      { promotions: ChessRules.PawnSpecs.promotions.concat([V.GRASSHOPPER]) }
+    );
+  }
+
   static get GRASSHOPPER() {
     return "g";
   }
@@ -28,51 +36,6 @@ export const VariantRules = class GrasshopperRules extends ChessRules {
     }
   }
 
-  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 lastRank = color == "w" ? 0 : sizeX - 1;
-
-    const finalPieces =
-      x + shiftX == lastRank
-        ? [V.ROOK, V.KNIGHT, V.BISHOP, V.QUEEN, V.GRASSHOPPER]
-        : [V.PAWN];
-    if (this.board[x + shiftX][y] == V.EMPTY) {
-      // One square forward
-      for (let piece of finalPieces) {
-        moves.push(
-          this.getBasicMove([x, y], [x + shiftX, y], {
-            c: color,
-            p: piece
-          })
-        );
-      }
-      // No 2-squares jump
-    }
-    // Captures
-    for (let shiftY of [-1, 1]) {
-      if (
-        y + shiftY >= 0 &&
-        y + shiftY < sizeY &&
-        this.board[x + shiftX][y + shiftY] != V.EMPTY &&
-        this.canTake([x, y], [x + shiftX, y + shiftY])
-      ) {
-        for (let piece of finalPieces) {
-          moves.push(
-            this.getBasicMove([x, y], [x + shiftX, y + shiftY], {
-              c: color,
-              p: piece
-            })
-          );
-        }
-      }
-    }
-
-    return moves;
-  }
-
   getPotentialGrasshopperMoves([x, y]) {
     let moves = [];
     // Look in every direction until an obstacle (to jump) is met