projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Step toward a one-page application
[vchess.git]
/
public
/
javascripts
/
variants
/
Checkered.js
diff --git
a/public/javascripts/variants/Checkered.js
b/public/javascripts/variants/Checkered.js
index
585d20f
..
9de46ff
100644
(file)
--- a/
public/javascripts/variants/Checkered.js
+++ b/
public/javascripts/variants/Checkered.js
@@
-4,6
+4,7
@@
class CheckeredRules extends ChessRules
{
return b[0]=='c' ? "Checkered/"+b : b;
}
{
return b[0]=='c' ? "Checkered/"+b : b;
}
+
static board2fen(b)
{
const checkered_codes = {
static board2fen(b)
{
const checkered_codes = {
@@
-17,6
+18,7
@@
class CheckeredRules extends ChessRules
return checkered_codes[b[1]];
return ChessRules.board2fen(b);
}
return checkered_codes[b[1]];
return ChessRules.board2fen(b);
}
+
static fen2board(f)
{
// Tolerate upper-case versions of checkered pieces (why not?)
static fen2board(f)
{
// Tolerate upper-case versions of checkered pieces (why not?)
@@
-37,7
+39,8
@@
class CheckeredRules extends ChessRules
return ChessRules.fen2board(f);
}
return ChessRules.fen2board(f);
}
- static get PIECES() {
+ static get PIECES()
+ {
return ChessRules.PIECES.concat(['s','t','u','c','o']);
}
return ChessRules.PIECES.concat(['s','t','u','c','o']);
}
@@
-47,15
+50,17
@@
class CheckeredRules extends ChessRules
return !!flags.match(/^[01]{20,20}$/);
}
return !!flags.match(/^[01]{20,20}$/);
}
- setFlags(fen)
+ setFlags(fen
flags
)
{
{
- super.setFlags(fen); //castleFlags
+ super.setFlags(fen
flags
); //castleFlags
this.pawnFlags =
{
this.pawnFlags =
{
- "w":
new Array(8
), //pawns can move 2 squares?
- "b":
new Array(8
)
+ "w":
_.map(_.range(8), i => true
), //pawns can move 2 squares?
+ "b":
_.map(_.range(8), i => true
)
};
};
- const flags = fen.split(" ")[1].substr(4); //skip first 4 digits, for castle
+ if (!fenflags)
+ return;
+ const flags = fenflags.substr(4); //skip first 4 digits, for castle
for (let c of ['w','b'])
{
for (let i=0; i<8; i++)
for (let c of ['w','b'])
{
for (let i=0; i<8; i++)
@@
-63,13
+68,12
@@
class CheckeredRules extends ChessRules
}
}
}
}
- // Aggregates flags into one object
-
get flags()
{
+ aggregateFlags()
+ {
return [this.castleFlags, this.pawnFlags];
}
return [this.castleFlags, this.pawnFlags];
}
- // Reverse operation
- parseFlags(flags)
+ disaggregateFlags(flags)
{
this.castleFlags = flags[0];
this.pawnFlags = flags[1];
{
this.castleFlags = flags[0];
this.pawnFlags = flags[1];
@@
-147,7
+151,10
@@
class CheckeredRules extends ChessRules
const L = this.moves.length;
if (L > 0 && this.oppositeMoves(this.moves[L-1], m))
return false;
const L = this.moves.length;
if (L > 0 && this.oppositeMoves(this.moves[L-1], m))
return false;
- return !this.underCheck(m);
+ this.play(m);
+ const res = !this.underCheck(color);
+ this.undo(m);
+ return res;
});
}
});
}
@@
-172,27
+179,21
@@
class CheckeredRules extends ChessRules
return false;
}
return false;
}
- underCheck(
move
)
+ underCheck(
color
)
{
{
- const color = this.turn;
- this.play(move);
- let res = this.isAttacked(this.kingPos[color], [this.getOppCol(color),'c']);
- this.undo(move);
- return res;
+ return this.isAttacked(this.kingPos[color], [V.GetOppCol(color),'c']);
}
}
- getCheckSquares(
move
)
+ getCheckSquares(
color
)
{
{
- this.play(move);
- const color = this.turn;
- this.moves.push(move); //artifically change turn, for checkered pawns (TODO)
+ // Artifically change turn, for checkered pawns
+ this.turn = V.GetOppCol(color);
const kingAttacked = this.isAttacked(
const kingAttacked = this.isAttacked(
- this.kingPos[color], [
this.g
etOppCol(color),'c']);
+ this.kingPos[color], [
V.G
etOppCol(color),'c']);
let res = kingAttacked
let res = kingAttacked
- ? [ JSON.parse(JSON.stringify(this.kingPos[color])) ] //need to duplicate!
- : [ ];
- this.moves.pop();
- this.undo(move);
+ ? [JSON.parse(JSON.stringify(this.kingPos[color]))] //need to duplicate!
+ : [];
+ this.turn = color;
return res;
}
return res;
}
@@
-209,11
+210,11
@@
class CheckeredRules extends ChessRules
{
const color = this.turn;
// Artifically change turn, for checkered pawns
{
const color = this.turn;
// Artifically change turn, for checkered pawns
- this.turn =
this.g
etOppCol(this.turn);
- const res = this.isAttacked(this.kingPos[color], [
this.g
etOppCol(color),'c'])
+ this.turn =
V.G
etOppCol(this.turn);
+ const res = this.isAttacked(this.kingPos[color], [
V.G
etOppCol(color),'c'])
? (color == "w" ? "0-1" : "1-0")
: "1/2";
? (color == "w" ? "0-1" : "1-0")
: "1/2";
- this.turn =
this.g
etOppCol(this.turn);
+ this.turn =
V.G
etOppCol(this.turn);
return res;
}
return res;
}
@@
-238,7
+239,9
@@
class CheckeredRules extends ChessRules
static GenRandInitFen()
{
static GenRandInitFen()
{
- return ChessRules.GenRandInitFen() + "1111111111111111"; //add 16 pawns flags
+ const randFen = ChessRules.GenRandInitFen();
+ // Add 16 pawns flags:
+ return randFen.replace(" w 1111", " w 11111111111111111111");
}
getFlagsFen()
}
getFlagsFen()
@@
-265,10
+268,9
@@
class CheckeredRules extends ChessRules
}
// Translate final square
}
// Translate final square
- let finalSquare =
- String.fromCharCode(97 + move.end.y) + (V.size.x-move.end.x);
+ const finalSquare = V.CoordsToSquare(move.end);
-
le
t piece = this.getPiece(move.start.x, move.start.y);
+
cons
t piece = this.getPiece(move.start.x, move.start.y);
if (piece == V.PAWN)
{
// Pawn move
if (piece == V.PAWN)
{
// Pawn move
@@
-276,7
+278,7
@@
class CheckeredRules extends ChessRules
if (move.vanish.length > 1)
{
// Capture
if (move.vanish.length > 1)
{
// Capture
-
let startColumn = String.fromCharCode(97 +
move.start.y);
+
const startColumn = V.CoordToColumn(
move.start.y);
notation = startColumn + "x" + finalSquare +
"=" + move.appear[0].p.toUpperCase();
}
notation = startColumn + "x" + finalSquare +
"=" + move.appear[0].p.toUpperCase();
}