projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various fixes, additions...
[vchess.git]
/
public
/
javascripts
/
variants
/
Alice.js
diff --git
a/public/javascripts/variants/Alice.js
b/public/javascripts/variants/Alice.js
index
220fbd4
..
2788e21
100644
(file)
--- a/
public/javascripts/variants/Alice.js
+++ b/
public/javascripts/variants/Alice.js
@@
-29,20
+29,24
@@
class AliceRules extends ChessRules
return (Object.keys(this.ALICE_PIECES).includes(b[1]) ? "Alice/" : "") + b;
}
return (Object.keys(this.ALICE_PIECES).includes(b[1]) ? "Alice/" : "") + b;
}
-
initVariables(fen
)
+
static get PIECES(
)
{
{
- super.initVariables(fen);
- const fenParts = fen.split(" ");
- const position = fenParts[0].split("/");
+ return ChessRules.PIECES.concat(Object.keys(V.ALICE_PIECES));
+ }
+
+ setOtherVariables(fen)
+ {
+ super.setOtherVariables(fen);
+ const rows = V.ParseFen(fen).position.split("/");
if (this.kingPos["w"][0] < 0 || this.kingPos["b"][0] < 0)
{
if (this.kingPos["w"][0] < 0 || this.kingPos["b"][0] < 0)
{
- // INIT_COL_XXX won't be
used, so no need to set them for Alice kings
- for (let i=0; i<
position
.length; i++)
+ // INIT_COL_XXX won't be
required if Alice kings are found (means 'king moved')
+ for (let i=0; i<
rows
.length; i++)
{
let k = 0; //column index on board
{
let k = 0; //column index on board
- for (let j=0; j<
position
[i].length; j++)
+ for (let j=0; j<
rows
[i].length; j++)
{
{
- switch (
position
[i].charAt(j))
+ switch (
rows
[i].charAt(j))
{
case 'l':
this.kingPos['b'] = [i,k];
{
case 'l':
this.kingPos['b'] = [i,k];
@@
-51,7
+55,7
@@
class AliceRules extends ChessRules
this.kingPos['w'] = [i,k];
break;
default:
this.kingPos['w'] = [i,k];
break;
default:
-
let num = parseInt(position
[i].charAt(j));
+
const num = parseInt(rows
[i].charAt(j));
if (!isNaN(num))
k += (num-1);
}
if (!isNaN(num))
k += (num-1);
}
@@
-65,7
+69,6
@@
class AliceRules extends ChessRules
getSquareOccupation(i, j, mirrorSide)
{
const piece = this.getPiece(i,j);
getSquareOccupation(i, j, mirrorSide)
{
const piece = this.getPiece(i,j);
- const V = VariantRules;
if (mirrorSide==1 && Object.keys(V.ALICE_CODES).includes(piece))
return this.board[i][j];
else if (mirrorSide==2 && Object.keys(V.ALICE_PIECES).includes(piece))
if (mirrorSide==1 && Object.keys(V.ALICE_CODES).includes(piece))
return this.board[i][j];
else if (mirrorSide==2 && Object.keys(V.ALICE_PIECES).includes(piece))
@@
-77,11
+80,10
@@
class AliceRules extends ChessRules
getSideBoard(mirrorSide)
{
// Build corresponding board from complete board
getSideBoard(mirrorSide)
{
// Build corresponding board from complete board
- const [sizeX,sizeY] = VariantRules.size;
- let sideBoard = doubleArray(sizeX, sizeY, "");
- for (let i=0; i<sizeX; i++)
+ let sideBoard = doubleArray(V.size.x, V.size.y, "");
+ for (let i=0; i<V.size.x; i++)
{
{
- for (let j=0; j<
sizeY
; j++)
+ for (let j=0; j<
V.size.y
; j++)
sideBoard[i][j] = this.getSquareOccupation(i, j, mirrorSide);
}
return sideBoard;
sideBoard[i][j] = this.getSquareOccupation(i, j, mirrorSide);
}
return sideBoard;
@@
-90,8
+92,8
@@
class AliceRules extends ChessRules
// NOTE: castle & enPassant https://www.chessvariants.com/other.dir/alice.html
getPotentialMovesFrom([x,y], sideBoard)
{
// NOTE: castle & enPassant https://www.chessvariants.com/other.dir/alice.html
getPotentialMovesFrom([x,y], sideBoard)
{
- const pieces = Object.keys(V
ariantRules
.ALICE_CODES);
- const codes = Object.keys(V
ariantRules
.ALICE_PIECES);
+ const pieces = Object.keys(V.ALICE_CODES);
+ const codes = Object.keys(V.ALICE_PIECES);
const mirrorSide = (pieces.includes(this.getPiece(x,y)) ? 1 : 2);
// Search valid moves on sideBoard
const mirrorSide = (pieces.includes(this.getPiece(x,y)) ? 1 : 2);
// Search valid moves on sideBoard
@@
-107,11
+109,11
@@
class AliceRules extends ChessRules
// appear[i] must be an empty square on the other board
for (let psq of m.appear)
{
// appear[i] must be an empty square on the other board
for (let psq of m.appear)
{
- if (this.getSquareOccupation(psq.x,psq.y,3-mirrorSide) != V
ariantRules
.EMPTY)
+ if (this.getSquareOccupation(psq.x,psq.y,3-mirrorSide) != V.EMPTY)
return false;
}
}
return false;
}
}
- else if (this.board[m.end.x][m.end.y] != V
ariantRules
.EMPTY)
+ else if (this.board[m.end.x][m.end.y] != V.EMPTY)
{
// Attempt to capture
const piece = this.getPiece(m.end.x,m.end.y);
{
// Attempt to capture
const piece = this.getPiece(m.end.x,m.end.y);
@@
-125,18
+127,18
@@
class AliceRules extends ChessRules
if (mirrorSide==1)
{
m.appear.forEach(psq => { //forEach: castling taken into account
if (mirrorSide==1)
{
m.appear.forEach(psq => { //forEach: castling taken into account
- psq.p = V
ariantRules
.ALICE_CODES[psq.p]; //goto board2
+ psq.p = V.ALICE_CODES[psq.p]; //goto board2
});
}
else //move on board2: mark vanishing pieces as Alice
{
m.vanish.forEach(psq => {
});
}
else //move on board2: mark vanishing pieces as Alice
{
m.vanish.forEach(psq => {
- psq.p = V
ariantRules
.ALICE_CODES[psq.p];
+ psq.p = V.ALICE_CODES[psq.p];
});
}
// Fix en-passant captures
});
}
// Fix en-passant captures
- if (m.vanish[0].p == V
ariantRules.PAWN
- &&
m.vanish.length == 2 && this.board[m.end.x][m.end.y] == VariantRules
.EMPTY)
+ if (m.vanish[0].p == V
.PAWN && m.vanish.length == 2
+ &&
this.board[m.end.x][m.end.y] == V
.EMPTY)
{
m.vanish[1].c = this.getOppCol(this.getColor(x,y));
// In the special case of en-passant, if
{
m.vanish[1].c = this.getOppCol(this.getColor(x,y));
// In the special case of en-passant, if
@@
-144,9
+146,9
@@
class AliceRules extends ChessRules
// - board2 takes board1 : vanish[1] --> normal
let van = m.vanish[1];
if (mirrorSide==1 && codes.includes(this.getPiece(van.x,van.y)))
// - board2 takes board1 : vanish[1] --> normal
let van = m.vanish[1];
if (mirrorSide==1 && codes.includes(this.getPiece(van.x,van.y)))
- van.p = V
ariantRules
.ALICE_CODES[van.p];
+ van.p = V.ALICE_CODES[van.p];
else if (mirrorSide==2 && pieces.includes(this.getPiece(van.x,van.y)))
else if (mirrorSide==2 && pieces.includes(this.getPiece(van.x,van.y)))
- van.p = V
ariantRules
.ALICE_PIECES[van.p];
+ van.p = V.ALICE_PIECES[van.p];
}
return true;
});
}
return true;
});
@@
-158,7
+160,13
@@
class AliceRules extends ChessRules
if (moves.length == 0)
return [];
let sideBoard = [this.getSideBoard(1), this.getSideBoard(2)];
if (moves.length == 0)
return [];
let sideBoard = [this.getSideBoard(1), this.getSideBoard(2)];
- return moves.filter(m => { return !this.underCheck(m, sideBoard); });
+ const color = this.turn;
+ return moves.filter(m => {
+ this.playSide(m, sideBoard); //no need to track flags
+ const res = !this.underCheck(color, sideBoard);
+ this.undoSide(m, sideBoard);
+ return res;
+ });
}
getAllValidMoves()
}
getAllValidMoves()
@@
-166,16
+174,15
@@
class AliceRules extends ChessRules
const color = this.turn;
const oppCol = this.getOppCol(color);
var potentialMoves = [];
const color = this.turn;
const oppCol = this.getOppCol(color);
var potentialMoves = [];
- let [sizeX,sizeY] = VariantRules.size;
let sideBoard = [this.getSideBoard(1), this.getSideBoard(2)];
let sideBoard = [this.getSideBoard(1), this.getSideBoard(2)];
- for (var i=0; i<
sizeX
; i++)
+ for (var i=0; i<
V.size.x
; i++)
{
{
- for (var j=0; j<
sizeY
; j++)
+ for (var j=0; j<
V.size.y
; j++)
{
{
- if (this.board[i][j] != V
ariantRules
.EMPTY && this.getColor(i,j) == color)
+ if (this.board[i][j] != V.EMPTY && this.getColor(i,j) == color)
{
const mirrorSide =
{
const mirrorSide =
- Object.keys(V
ariantRules
.ALICE_CODES).includes(this.getPiece(i,j))
+ Object.keys(V.ALICE_CODES).includes(this.getPiece(i,j))
? 1
: 2;
Array.prototype.push.apply(potentialMoves,
? 1
: 2;
Array.prototype.push.apply(potentialMoves,
@@
-189,16
+196,16
@@
class AliceRules extends ChessRules
// Play on sideboards [TODO: only one sideBoard required]
playSide(move, sideBoard)
{
// Play on sideboards [TODO: only one sideBoard required]
playSide(move, sideBoard)
{
- const pieces = Object.keys(V
ariantRules
.ALICE_CODES);
+ const pieces = Object.keys(V.ALICE_CODES);
move.vanish.forEach(psq => {
const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
move.vanish.forEach(psq => {
const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
- sideBoard[mirrorSide-1][psq.x][psq.y] = V
ariantRules
.EMPTY;
+ sideBoard[mirrorSide-1][psq.x][psq.y] = V.EMPTY;
});
move.appear.forEach(psq => {
const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
});
move.appear.forEach(psq => {
const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
- const piece = (mirrorSide == 1 ? psq.p : V
ariantRules
.ALICE_PIECES[psq.p]);
+ const piece = (mirrorSide == 1 ? psq.p : V.ALICE_PIECES[psq.p]);
sideBoard[mirrorSide-1][psq.x][psq.y] = psq.c + piece;
sideBoard[mirrorSide-1][psq.x][psq.y] = psq.c + piece;
- if (piece == V
ariantRules
.KING)
+ if (piece == V.KING)
this.kingPos[psq.c] = [psq.x,psq.y];
});
}
this.kingPos[psq.c] = [psq.x,psq.y];
});
}
@@
-206,39
+213,34
@@
class AliceRules extends ChessRules
// Undo on sideboards
undoSide(move, sideBoard)
{
// Undo on sideboards
undoSide(move, sideBoard)
{
- const pieces = Object.keys(V
ariantRules
.ALICE_CODES);
+ const pieces = Object.keys(V.ALICE_CODES);
move.appear.forEach(psq => {
const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
move.appear.forEach(psq => {
const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
- sideBoard[mirrorSide-1][psq.x][psq.y] = V
ariantRules
.EMPTY;
+ sideBoard[mirrorSide-1][psq.x][psq.y] = V.EMPTY;
});
move.vanish.forEach(psq => {
const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
});
move.vanish.forEach(psq => {
const mirrorSide = (pieces.includes(psq.p) ? 1 : 2);
- const piece = (mirrorSide == 1 ? psq.p : V
ariantRules
.ALICE_PIECES[psq.p]);
+ const piece = (mirrorSide == 1 ? psq.p : V.ALICE_PIECES[psq.p]);
sideBoard[mirrorSide-1][psq.x][psq.y] = psq.c + piece;
sideBoard[mirrorSide-1][psq.x][psq.y] = psq.c + piece;
- if (piece == V
ariantRules
.KING)
+ if (piece == V.KING)
this.kingPos[psq.c] = [psq.x,psq.y];
});
}
this.kingPos[psq.c] = [psq.x,psq.y];
});
}
- underCheck(
move
, sideBoard) //sideBoard arg always provided
+ underCheck(
color
, sideBoard) //sideBoard arg always provided
{
{
- const color = this.turn;
- this.playSide(move, sideBoard); //no need to track flags
const kp = this.kingPos[color];
const kp = this.kingPos[color];
- const mirrorSide =
sideBoard[0][kp[0]][kp[1]] != VariantRules.EMPTY ? 1 : 2
;
+ const mirrorSide =
(sideBoard[0][kp[0]][kp[1]] != V.EMPTY ? 1 : 2)
;
let saveBoard = this.board;
this.board = sideBoard[mirrorSide-1];
let res = this.isAttacked(kp, [this.getOppCol(color)]);
this.board = saveBoard;
let saveBoard = this.board;
this.board = sideBoard[mirrorSide-1];
let res = this.isAttacked(kp, [this.getOppCol(color)]);
this.board = saveBoard;
- this.undoSide(move, sideBoard);
return res;
}
return res;
}
- getCheckSquares(
move
)
+ getCheckSquares(
color
)
{
{
- this.play(move);
- const color = this.turn; //opponent
- const pieces = Object.keys(VariantRules.ALICE_CODES);
+ const pieces = Object.keys(V.ALICE_CODES);
const kp = this.kingPos[color];
const mirrorSide = (pieces.includes(this.getPiece(kp[0],kp[1])) ? 1 : 2);
let sideBoard = this.getSideBoard(mirrorSide);
const kp = this.kingPos[color];
const mirrorSide = (pieces.includes(this.getPiece(kp[0],kp[1])) ? 1 : 2);
let sideBoard = this.getSideBoard(mirrorSide);
@@
-248,15
+250,14
@@
class AliceRules extends ChessRules
? [ JSON.parse(JSON.stringify(this.kingPos[color])) ]
: [ ];
this.board = saveBoard;
? [ JSON.parse(JSON.stringify(this.kingPos[color])) ]
: [ ];
this.board = saveBoard;
- this.undo(move);
return res;
}
updateVariables(move)
{
super.updateVariables(move); //standard king
return res;
}
updateVariables(move)
{
super.updateVariables(move); //standard king
- const piece =
this.getPiece(move.start.x,move.start.y)
;
- const c =
this.getColor(move.start.x,move.start.y)
;
+ const piece =
move.vanish[0].p
;
+ const c =
move.vanish[0].c
;
// "l" = Alice king
if (piece == "l")
{
// "l" = Alice king
if (piece == "l")
{
@@
-269,14
+270,14
@@
class AliceRules extends ChessRules
unupdateVariables(move)
{
super.unupdateVariables(move);
unupdateVariables(move)
{
super.unupdateVariables(move);
- const c =
this.getColor(move.start.x,move.start.y)
;
- if (
this.getPiece(move.start.x,move.start.y)
== "l")
+ const c =
move.vanish[0].c
;
+ if (
move.vanish[0].p
== "l")
this.kingPos[c] = [move.start.x, move.start.y];
}
checkGameEnd()
{
this.kingPos[c] = [move.start.x, move.start.y];
}
checkGameEnd()
{
- const pieces = Object.keys(V
ariantRules
.ALICE_CODES);
+ const pieces = Object.keys(V.ALICE_CODES);
const color = this.turn;
const kp = this.kingPos[color];
const mirrorSide = (pieces.includes(this.getPiece(kp[0],kp[1])) ? 1 : 2);
const color = this.turn;
const kp = this.kingPos[color];
const mirrorSide = (pieces.includes(this.getPiece(kp[0],kp[1])) ? 1 : 2);
@@
-292,7
+293,8
@@
class AliceRules extends ChessRules
return res;
}
return res;
}
- static get VALUES() {
+ static get VALUES()
+ {
return Object.assign(
ChessRules.VALUES,
{
return Object.assign(
ChessRules.VALUES,
{
@@
-308,7
+310,7
@@
class AliceRules extends ChessRules
getNotation(move)
{
getNotation(move)
{
- if (move.appear.length == 2 && move.appear[0].p == V
ariantRules
.KING)
+ if (move.appear.length == 2 && move.appear[0].p == V.KING)
{
if (move.end.y < move.start.y)
return "0-0-0";
{
if (move.end.y < move.start.y)
return "0-0-0";
@@
-316,14
+318,13
@@
class AliceRules extends ChessRules
return "0-0";
}
return "0-0";
}
- const finalSquare =
- String.fromCharCode(97 + move.end.y) + (VariantRules.size[0]-move.end.x);
+ const finalSquare = V.CoordsToSquare(move.end);
const piece = this.getPiece(move.start.x, move.start.y);
const captureMark = (move.vanish.length > move.appear.length ? "x" : "");
let pawnMark = "";
if (["p","s"].includes(piece) && captureMark.length == 1)
const piece = this.getPiece(move.start.x, move.start.y);
const captureMark = (move.vanish.length > move.appear.length ? "x" : "");
let pawnMark = "";
if (["p","s"].includes(piece) && captureMark.length == 1)
- pawnMark =
String.fromCharCode(97 +
move.start.y); //start column
+ pawnMark =
V.CoordToColumn(
move.start.y); //start column
// Piece or pawn movement
let notation = piece.toUpperCase() + pawnMark + captureMark + finalSquare;
// Piece or pawn movement
let notation = piece.toUpperCase() + pawnMark + captureMark + finalSquare;
@@
-335,3
+336,5
@@
class AliceRules extends ChessRules
return notation;
}
}
return notation;
}
}
+
+const VariantRules = AliceRules;