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
1cbfccf
..
2788e21
100644
(file)
--- a/
public/javascripts/variants/Alice.js
+++ b/
public/javascripts/variants/Alice.js
@@
-160,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()
@@
-221,24
+227,19
@@
class AliceRules extends ChessRules
});
}
});
}
- 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 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;
const kp = this.kingPos[color];
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;
- this.undoSide(move, sideBoard);
return res;
}
return res;
}
- getCheckSquares(
move
)
+ getCheckSquares(
color
)
{
{
- this.play(move);
- const color = this.turn; //opponent
const pieces = Object.keys(V.ALICE_CODES);
const kp = this.kingPos[color];
const mirrorSide = (pieces.includes(this.getPiece(kp[0],kp[1])) ? 1 : 2);
const pieces = Object.keys(V.ALICE_CODES);
const kp = this.kingPos[color];
const mirrorSide = (pieces.includes(this.getPiece(kp[0],kp[1])) ? 1 : 2);
@@
-249,7
+250,6
@@
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;
}
return res;
}
@@
-324,7
+324,7
@@
class AliceRules extends ChessRules
const captureMark = (move.vanish.length > move.appear.length ? "x" : "");
let pawnMark = "";
if (["p","s"].includes(piece) && captureMark.length == 1)
const captureMark = (move.vanish.length > move.appear.length ? "x" : "");
let pawnMark = "";
if (["p","s"].includes(piece) && captureMark.length == 1)
- pawnMark = V.
Get
Column(move.start.y); //start column
+ pawnMark = V.
CoordTo
Column(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;