projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Titan Chess
[vchess.git]
/
client
/
src
/
variants
/
Baroque.js
diff --git
a/client/src/variants/Baroque.js
b/client/src/variants/Baroque.js
index
016f7b7
..
063b182
100644
(file)
--- a/
client/src/variants/Baroque.js
+++ b/
client/src/variants/Baroque.js
@@
-3,6
+3,7
@@
import { ArrayFun } from "@/utils/array";
import { shuffle } from "@/utils/alea";
export class BaroqueRules extends ChessRules {
import { shuffle } from "@/utils/alea";
export class BaroqueRules extends ChessRules {
+
static get HasFlags() {
return false;
}
static get HasFlags() {
return false;
}
@@
-38,7
+39,7
@@
export class BaroqueRules extends ChessRules {
this.kingPos["w"] = [i, k];
break;
default: {
this.kingPos["w"] = [i, k];
break;
default: {
- const num = parseInt(position[i].charAt(j));
+ const num = parseInt(position[i].charAt(j)
, 10
);
if (!isNaN(num)) k += num - 1;
}
}
if (!isNaN(num)) k += num - 1;
}
}
@@
-293,12
+294,7
@@
export class BaroqueRules extends ChessRules {
mergedMoves[key].vanish.push(m.vanish[i]);
}
});
mergedMoves[key].vanish.push(m.vanish[i]);
}
});
- // Finally return an array
- moves = [];
- Object.keys(mergedMoves).forEach(k => {
- moves.push(mergedMoves[k]);
- });
- return moves;
+ return Object.values(mergedMoves);
}
addQueenCaptures(moves, byChameleon) {
}
addQueenCaptures(moves, byChameleon) {
@@
-430,8
+426,9
@@
export class BaroqueRules extends ChessRules {
if (
(sameRow && move.end.y == y) ||
(sameColumn && move.end.x == x)
if (
(sameRow && move.end.y == y) ||
(sameColumn && move.end.x == x)
- )
+ )
{
return true;
return true;
+ }
}
}
}
}
}
}
@@
-459,8
+456,9
@@
export class BaroqueRules extends ChessRules {
if (
this.getPiece(i, j) == V.KNIGHT &&
!this.isImmobilized([i, j])
if (
this.getPiece(i, j) == V.KNIGHT &&
!this.isImmobilized([i, j])
- )
+ )
{
return true;
return true;
+ }
continue outerLoop;
}
// [else] Our color,
continue outerLoop;
}
// [else] Our color,
@@
-486,9
+484,10
@@
export class BaroqueRules extends ChessRules {
V.OnBoard(i, j) &&
this.board[i][j] != V.EMPTY &&
this.getColor(i, j) == color &&
V.OnBoard(i, j) &&
this.board[i][j] != V.EMPTY &&
this.getColor(i, j) == color &&
- this.getPiece(i, j) == V.BISHOP
+ this.getPiece(i, j) == V.BISHOP &&
+ !this.isImmobilized([i, j])
) {
) {
- return true;
//bishops are never immobilized
+ return true;
}
}
return false;
}
}
return false;
@@
-532,26
+531,10
@@
export class BaroqueRules extends ChessRules {
return false;
}
return false;
}
- static get VALUES() {
- return {
- p: 1,
- r: 2,
- n: 5,
- b: 3,
- q: 3,
- m: 5,
- k: 1000
- };
- }
-
- static get SEARCH_DEPTH() {
- return 2;
- }
-
static GenRandInitFen(randomness) {
if (randomness == 0)
// Deterministic:
static GenRandInitFen(randomness) {
if (randomness == 0)
// Deterministic:
- return "rnb
qkbnrm/pppppppp/8/8/8/8/PPPPPPPP/MNBKQ
BNR w 0";
+ return "rnb
kqbnm/pppppppp/8/8/8/8/PPPPPPPP/MNBQK
BNR w 0";
let pieces = { w: new Array(8), b: new Array(8) };
// Shuffle pieces on first and last rank
let pieces = { w: new Array(8), b: new Array(8) };
// Shuffle pieces on first and last rank
@@
-574,6
+557,22
@@
export class BaroqueRules extends ChessRules {
);
}
);
}
+ static get VALUES() {
+ return {
+ p: 1,
+ r: 2,
+ n: 5,
+ b: 3,
+ q: 3,
+ m: 5,
+ k: 1000
+ };
+ }
+
+ static get SEARCH_DEPTH() {
+ return 2;
+ }
+
getNotation(move) {
const initialSquare = V.CoordsToSquare(move.start);
const finalSquare = V.CoordsToSquare(move.end);
getNotation(move) {
const initialSquare = V.CoordsToSquare(move.start);
const finalSquare = V.CoordsToSquare(move.end);
@@
-588,4
+587,5
@@
export class BaroqueRules extends ChessRules {
if (move.vanish.length > 1 && move.appear[0].p != V.KING) notation += "X";
return notation;
}
if (move.vanish.length > 1 && move.appear[0].p != V.KING) notation += "X";
return notation;
}
+
};
};