projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Omega castling and pieces randomization, fix a bug when undoing partial multi...
[vchess.git]
/
client
/
src
/
variants
/
Grand.js
diff --git
a/client/src/variants/Grand.js
b/client/src/variants/Grand.js
index
c910dd8
..
aeb7b6f
100644
(file)
--- a/
client/src/variants/Grand.js
+++ b/
client/src/variants/Grand.js
@@
-4,31
+4,27
@@
import { randInt } from "@/utils/alea";
// NOTE: initial setup differs from the original; see
// https://www.chessvariants.com/large.dir/freeling.html
// NOTE: initial setup differs from the original; see
// https://www.chessvariants.com/large.dir/freeling.html
-export c
onst VariantRules = c
lass GrandRules extends ChessRules {
+export class GrandRules extends ChessRules {
static IsGoodFen(fen) {
if (!ChessRules.IsGoodFen(fen)) return false;
const fenParsed = V.ParseFen(fen);
// 5) Check captures
static IsGoodFen(fen) {
if (!ChessRules.IsGoodFen(fen)) return false;
const fenParsed = V.ParseFen(fen);
// 5) Check captures
- if (!fenParsed.captured || !fenParsed.captured.match(/^[0-9]{1
4,14
}$/))
+ if (!fenParsed.captured || !fenParsed.captured.match(/^[0-9]{1
2,12
}$/))
return false;
return true;
}
static IsGoodEnpassant(enpassant) {
return false;
return true;
}
static IsGoodEnpassant(enpassant) {
- if (enpassant != "-") {
- const squares = enpassant.split(",");
- if (squares.length > 2) return false;
- for (let sq of squares) {
- const ep = V.SquareToCoords(sq);
- if (isNaN(ep.x) || !V.OnBoard(ep)) return false;
- }
- }
+ if (enpassant != "-") return !!enpassant.match(/^([a-j][0-9]{1,2},?)+$/);
return true;
}
static ParseFen(fen) {
const fenParts = fen.split(" ");
return true;
}
static ParseFen(fen) {
const fenParts = fen.split(" ");
- return Object.assign(ChessRules.ParseFen(fen), { captured: fenParts[5] });
+ return Object.assign(
+ ChessRules.ParseFen(fen),
+ { captured: fenParts[5] }
+ );
}
getPpath(b) {
}
getPpath(b) {
@@
-39,6
+35,10
@@
export const VariantRules = class GrandRules extends ChessRules {
return super.getFen() + " " + this.getCapturedFen();
}
return super.getFen() + " " + this.getCapturedFen();
}
+ getFenForRepeat() {
+ return super.getFenForRepeat() + "_" + this.getCapturedFen();
+ }
+
getCapturedFen() {
let counts = [...Array(14).fill(0)];
let i = 0;
getCapturedFen() {
let counts = [...Array(14).fill(0)];
let i = 0;
@@
-83,12
+83,15
@@
export const VariantRules = class GrandRules extends ChessRules {
return { x: 10, y: 10 };
}
return { x: 10, y: 10 };
}
+ // Rook + knight:
static get MARSHALL() {
return "m";
static get MARSHALL() {
return "m";
- } //rook+knight
+ }
+
+ // Bishop + knight
static get CARDINAL() {
return "c";
static get CARDINAL() {
return "c";
- }
//bishop+knight
+ }
static get PIECES() {
return ChessRules.PIECES.concat([V.MARSHALL, V.CARDINAL]);
static get PIECES() {
return ChessRules.PIECES.concat([V.MARSHALL, V.CARDINAL]);
@@
-129,7
+132,7
@@
export const VariantRules = class GrandRules extends ChessRules {
}
];
if (sx + 2 * step != ex) {
}
];
if (sx + 2 * step != ex) {
- //
3-squares move
+ //
3-squares jump
res.push({
x: sx + 2 * step,
y: sy
res.push({
x: sx + 2 * step,
y: sy
@@
-215,11
+218,11
@@
export const VariantRules = class GrandRules extends ChessRules {
// En passant
const Lep = this.epSquares.length;
const epSquare = this.epSquares[Lep - 1];
// En passant
const Lep = this.epSquares.length;
const epSquare = this.epSquares[Lep - 1];
- if (epSquare) {
+ if (
!!
epSquare) {
for (let epsq of epSquare) {
// TODO: some redundant checks
if (epsq.x == x + shiftX && Math.abs(epsq.y - y) == 1) {
for (let epsq of epSquare) {
// TODO: some redundant checks
if (epsq.x == x + shiftX && Math.abs(epsq.y - y) == 1) {
-
var
enpassantMove = this.getBasicMove([x, y], [epsq.x, epsq.y]);
+
let
enpassantMove = this.getBasicMove([x, y], [epsq.x, epsq.y]);
// WARNING: the captured pawn may be diagonally behind us,
// if it's a 3-squares jump and we take on 1st passing square
const px = this.board[x][epsq.y] != V.EMPTY ? x : x - shiftX;
// WARNING: the captured pawn may be diagonally behind us,
// if it's a 3-squares jump and we take on 1st passing square
const px = this.board[x][epsq.y] != V.EMPTY ? x : x - shiftX;
@@
-251,20
+254,20
@@
export const VariantRules = class GrandRules extends ChessRules {
);
}
);
}
- isAttacked(sq, color
s
) {
+ isAttacked(sq, color) {
return (
return (
- super.isAttacked(sq, color
s
) ||
- this.isAttackedByMarshall(sq, color
s
) ||
- this.isAttackedByCardinal(sq, color
s
)
+ super.isAttacked(sq, color) ||
+ this.isAttackedByMarshall(sq, color) ||
+ this.isAttackedByCardinal(sq, color)
);
}
);
}
- isAttackedByMarshall(sq, color
s
) {
+ isAttackedByMarshall(sq, color) {
return (
return (
- this.isAttackedBySlideNJump(sq, color
s
, V.MARSHALL, V.steps[V.ROOK]) ||
+ this.isAttackedBySlideNJump(sq, color, V.MARSHALL, V.steps[V.ROOK]) ||
this.isAttackedBySlideNJump(
sq,
this.isAttackedBySlideNJump(
sq,
- color
s
,
+ color,
V.MARSHALL,
V.steps[V.KNIGHT],
"oneStep"
V.MARSHALL,
V.steps[V.KNIGHT],
"oneStep"
@@
-272,12
+275,12
@@
export const VariantRules = class GrandRules extends ChessRules {
);
}
);
}
- isAttackedByCardinal(sq, color
s
) {
+ isAttackedByCardinal(sq, color) {
return (
return (
- this.isAttackedBySlideNJump(sq, color
s
, V.CARDINAL, V.steps[V.BISHOP]) ||
+ this.isAttackedBySlideNJump(sq, color, V.CARDINAL, V.steps[V.BISHOP]) ||
this.isAttackedBySlideNJump(
sq,
this.isAttackedBySlideNJump(
sq,
- color
s
,
+ color,
V.CARDINAL,
V.steps[V.KNIGHT],
"oneStep"
V.CARDINAL,
V.steps[V.KNIGHT],
"oneStep"
@@
-285,8
+288,8
@@
export const VariantRules = class GrandRules extends ChessRules {
);
}
);
}
-
updateVariables
(move) {
- super.
updateVariables
(move);
+
postPlay
(move) {
+ super.
postPlay
(move);
if (move.vanish.length == 2 && move.appear.length == 1) {
// Capture: update this.captured
this.captured[move.vanish[1].c][move.vanish[1].p]++;
if (move.vanish.length == 2 && move.appear.length == 1) {
// Capture: update this.captured
this.captured[move.vanish[1].c][move.vanish[1].p]++;
@@
-297,8
+300,8
@@
export const VariantRules = class GrandRules extends ChessRules {
}
}
}
}
-
unupdateVariables
(move) {
- super.
unupdateVariables
(move);
+
postUndo
(move) {
+ super.
postUndo
(move);
if (move.vanish.length == 2 && move.appear.length == 1)
this.captured[move.vanish[1].c][move.vanish[1].p]--;
if (move.vanish[0].p != move.appear[0].p)
if (move.vanish.length == 2 && move.appear.length == 1)
this.captured[move.vanish[1].c][move.vanish[1].p]--;
if (move.vanish[0].p != move.appear[0].p)
@@
-317,17
+320,21
@@
export const VariantRules = class GrandRules extends ChessRules {
}
static GenRandInitFen(randomness) {
}
static GenRandInitFen(randomness) {
- if (!randomness) randomness = 2;
if (randomness == 0) {
if (randomness == 0) {
- return "rnbqkmcbnr/pppppppppp/10/10/10/10/10/10/PPPPPPPPPP/RNBQKMCBNR " +
- "w 0 1111 - 00000000000000";
+ return (
+ "r8r/1nbqkmcbn1/pppppppppp/91/91/91/91/PPPPPPPPPP/1NBQKMCBN1/R8R " +
+ // No castling in the official initial setup
+ "w 0 zzzz - 00000000000000"
+ );
}
let pieces = { w: new Array(10), b: new Array(10) };
}
let pieces = { w: new Array(10), b: new Array(10) };
+ let flags = "";
// Shuffle pieces on first and last rank
for (let c of ["w", "b"]) {
if (c == 'b' && randomness == 1) {
pieces['b'] = pieces['w'];
// Shuffle pieces on first and last rank
for (let c of ["w", "b"]) {
if (c == 'b' && randomness == 1) {
pieces['b'] = pieces['w'];
+ flags += flags;
break;
}
break;
}
@@
-366,7
+373,8
@@
export const VariantRules = class GrandRules extends ChessRules {
let cardinalPos = positions[randIndex];
positions.splice(randIndex, 1);
let cardinalPos = positions[randIndex];
positions.splice(randIndex, 1);
- // Rooks and king positions are now fixed, because of the ordering rook-king-rook
+ // Rooks and king positions are now fixed,
+ // because of the ordering rook-king-rook
let rook1Pos = positions[0];
let kingPos = positions[1];
let rook2Pos = positions[2];
let rook1Pos = positions[0];
let kingPos = positions[1];
let rook2Pos = positions[2];
@@
-382,12
+390,13
@@
export const VariantRules = class GrandRules extends ChessRules {
pieces[c][bishop2Pos] = "b";
pieces[c][knight2Pos] = "n";
pieces[c][rook2Pos] = "r";
pieces[c][bishop2Pos] = "b";
pieces[c][knight2Pos] = "n";
pieces[c][rook2Pos] = "r";
+ flags += V.CoordToColumn(rook1Pos) + V.CoordToColumn(rook2Pos);
}
return (
pieces["b"].join("") +
}
return (
pieces["b"].join("") +
- "/pppppppppp/
10/10/10/10/10/10
/PPPPPPPPPP/" +
+ "/pppppppppp/
91/91/91/91/91/91
/PPPPPPPPPP/" +
pieces["w"].join("").toUpperCase() +
pieces["w"].join("").toUpperCase() +
- " w 0
1111
- 00000000000000"
+ " w 0
" + flags + "
- 00000000000000"
);
}
};
);
}
};