A few fixes, and write rules for Grand + Wildebeest

[vchess.git] / public / javascripts / variants / Grand.js

diff --git a/public/javascripts/variants/Grand.js b/public/javascripts/variants/Grand.js
index f4e325d..1409bcc 100644 (file)
--- a/public/javascripts/variants/Grand.js
+++ b/public/javascripts/variants/Grand.js
@@ -63,8 +63,8 @@ class GrandRules extends ChessRules
                const V = VariantRules;
                const [sizeX,sizeY] = VariantRules.size;
                const shift = (color == "w" ? -1 : 1);
-               const startRanks = (color == "w" ? [sizeY-2,sizeY-3] : [1,2]);
-               const lastRanks = (color == "w" ? [0,1,2] : [sizeY-1,sizeY-2,sizeY-3]);
+               const startRanks = (color == "w" ? [sizeX-2,sizeX-3] : [1,2]);
+               const lastRanks = (color == "w" ? [0,1,2] : [sizeX-1,sizeX-2,sizeX-3]);
 
                if (x+shift >= 0 && x+shift < sizeX && x+shift != lastRanks[0])
                {
@@ -76,7 +76,7 @@ class GrandRules extends ChessRules
                                {
                                        // Two squares jump
                                        moves.push(this.getBasicMove([x,y], [x+2*shift,y]));
-                                       if (x == startRanks[0] && this.board[x+2*shift][y] == V.EMPTY)
+                                       if (x == startRanks[0] && this.board[x+3*shift][y] == V.EMPTY)
                                        {
                                                // 3-squares jump
                                                moves.push(this.getBasicMove([x,y], [x+3*shift,y]));
@@ -93,7 +93,7 @@ class GrandRules extends ChessRules
                if (lastRanks.includes(x+shift))
                {
                        // Promotion
-                       let promotionPieces = [V.ROOK,V.KNIGHT,V.BISHOP,V.QUEEN];
+                       let promotionPieces = [V.ROOK,V.KNIGHT,V.BISHOP,V.QUEEN,V.MARSHALL,V.CARDINAL];
                        promotionPieces.forEach(p => {
                                if (!this.captures[color][p] || this.captures[color][p]==0)
                                        return;
@@ -134,6 +134,8 @@ class GrandRules extends ChessRules
                return moves;
        }
 
+       // TODO: different castle?
+
        getPotentialMarshallMoves(sq)
        {
                const V = VariantRules;
@@ -189,7 +191,6 @@ class GrandRules extends ChessRules
                if (move.vanish.length==2 && move.appear.length==1
                        && move.vanish[1].p != VariantRules.PAWN)
                {
-                       // Capture: update this.captures
                        this.captures[move.vanish[1].c][move.vanish[1].p] =
                                Math.max(0, this.captures[move.vanish[1].c][move.vanish[1].p]-1);
                }