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
ece59cd
..
2788e21
100644
(file)
--- a/
public/javascripts/variants/Alice.js
+++ b/
public/javascripts/variants/Alice.js
@@
-29,24
+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;
}
- static get PIECES() {
+ static get PIECES()
+ {
return ChessRules.PIECES.concat(Object.keys(V.ALICE_PIECES));
}
return ChessRules.PIECES.concat(Object.keys(V.ALICE_PIECES));
}
-
init
Variables(fen)
+
setOther
Variables(fen)
{
{
- super.initVariables(fen);
- const fenParts = fen.split(" ");
- const position = fenParts[0].split("/");
+ 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];
@@
-55,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);
}
@@
-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,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")
{
@@
-270,8
+270,8
@@
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];
}
this.kingPos[c] = [move.start.x, move.start.y];
}
@@
-293,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,
{
@@
-317,13
+318,13
@@
class AliceRules extends ChessRules
return "0-0";
}
return "0-0";
}
- const finalSquare =
String.fromCharCode(97 + move.end.y) + (V.size.x-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;