projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug in sentry attacked detections when pushing lancers
[vchess.git]
/
client
/
src
/
variants
/
Grand.js
diff --git
a/client/src/variants/Grand.js
b/client/src/variants/Grand.js
index
4ea521e
..
f4a96ce
100644
(file)
--- a/
client/src/variants/Grand.js
+++ b/
client/src/variants/Grand.js
@@
-4,7
+4,7
@@
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);
static IsGoodFen(fen) {
if (!ChessRules.IsGoodFen(fen)) return false;
const fenParsed = V.ParseFen(fen);
@@
-40,13
+40,7
@@
export const VariantRules = class GrandRules extends ChessRules {
}
getFenForRepeat() {
}
getFenForRepeat() {
- return (
- this.getBaseFen() + "_" +
- this.getTurnFen() + "_" +
- this.getFlagsFen() + "_" +
- this.getEnpassantFen() + "_" +
- this.getCapturedFen()
- );
+ return super.getFenForRepeat() + "_" + this.getCapturedFen();
}
getCapturedFen() {
}
getCapturedFen() {
@@
-93,12
+87,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]);
@@
-229,7
+226,7
@@
export const VariantRules = class GrandRules extends ChessRules {
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;
@@
-261,20
+258,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"
@@
-282,12
+279,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"
@@
-295,8
+292,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]++;
@@
-307,8
+304,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)
@@
-328,8
+325,9
@@
export const VariantRules = class GrandRules extends ChessRules {
static GenRandInitFen(randomness) {
if (randomness == 0) {
static GenRandInitFen(randomness) {
if (randomness == 0) {
- return "rnbqkmcbnr/pppppppppp/10/10/10/10/10/10/PPPPPPPPPP/RNBQKMCBNR " +
- "w 0 1111 - 00000000000000";
+ // No castling in the official initial setup
+ return "r8r/1nbqkmcbn1/pppppppppp/10/10/10/10/PPPPPPPPPP/1NBQKMCBN1/R8R " +
+ "w 0 zzzz - 00000000000000";
}
let pieces = { w: new Array(10), b: new Array(10) };
}
let pieces = { w: new Array(10), b: new Array(10) };