X-Git-Url: https://git.auder.net/doc/index.css?a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FMarseille.js;h=618e8330a1d277efbd6051d986874c67ce6c9728;hb=69f3d8014e594ef949792d04d97b8286e9c2c268;hp=02daa22b8d416ba7ca131e14dbf6ec7700b98c97;hpb=78bab51e57306ae9085d83828bbb73b62dd83fd8;p=vchess.git
diff --git a/public/javascripts/variants/Marseille.js b/public/javascripts/variants/Marseille.js
index 02daa22b..618e8330 100644
--- a/public/javascripts/variants/Marseille.js
+++ b/public/javascripts/variants/Marseille.js
@@ -73,40 +73,37 @@ class MarseilleRules extends ChessRules
const startRank = (color == "w" ? sizeX-2 : 1);
const lastRank = (color == "w" ? 0 : sizeX-1);
const pawnColor = this.getColor(x,y); //can be different for checkered
+ const finalPieces = x + shiftX == lastRank
+ ? [V.ROOK,V.KNIGHT,V.BISHOP,V.QUEEN]
+ : [V.PAWN];
- if (x+shiftX >= 0 && x+shiftX < sizeX) //TODO: always true
+ // One square forward
+ if (this.board[x+shiftX][y] == V.EMPTY)
{
- const finalPieces = x + shiftX == lastRank
- ? [V.ROOK,V.KNIGHT,V.BISHOP,V.QUEEN]
- : [V.PAWN]
- // One square forward
- if (this.board[x+shiftX][y] == V.EMPTY)
+ for (let piece of finalPieces)
{
- for (let piece of finalPieces)
- {
- moves.push(this.getBasicMove([x,y], [x+shiftX,y],
- {c:pawnColor,p:piece}));
- }
- // Next condition because pawns on 1st rank can generally jump
- if ([startRank,firstRank].includes(x)
- && this.board[x+2*shiftX][y] == V.EMPTY)
- {
- // Two squares jump
- moves.push(this.getBasicMove([x,y], [x+2*shiftX,y]));
- }
+ moves.push(this.getBasicMove([x,y], [x+shiftX,y],
+ {c:pawnColor,p:piece}));
}
- // Captures
- for (let shiftY of [-1,1])
+ // Next condition because pawns on 1st rank can generally jump
+ if ([startRank,firstRank].includes(x)
+ && this.board[x+2*shiftX][y] == V.EMPTY)
{
- if (y + shiftY >= 0 && y + shiftY < sizeY
- && this.board[x+shiftX][y+shiftY] != V.EMPTY
- && this.canTake([x,y], [x+shiftX,y+shiftY]))
+ // Two squares jump
+ moves.push(this.getBasicMove([x,y], [x+2*shiftX,y]));
+ }
+ }
+ // Captures
+ for (let shiftY of [-1,1])
+ {
+ if (y + shiftY >= 0 && y + shiftY < sizeY
+ && this.board[x+shiftX][y+shiftY] != V.EMPTY
+ && this.canTake([x,y], [x+shiftX,y+shiftY]))
+ {
+ for (let piece of finalPieces)
{
- for (let piece of finalPieces)
- {
- moves.push(this.getBasicMove([x,y], [x+shiftX,y+shiftY],
- {c:pawnColor,p:piece}));
- }
+ moves.push(this.getBasicMove([x,y], [x+shiftX,y+shiftY],
+ {c:pawnColor,p:piece}));
}
}
}
@@ -127,6 +124,7 @@ class MarseilleRules extends ChessRules
{
if (this.subTurn == 1 || (epSqs.length == 2 &&
// Was this en-passant capture already played at subturn 1 ?
+ // (Or maybe the opponent filled the en-passant square with a piece)
this.board[epSqs[0].x][epSqs[0].y] != V.EMPTY))
{
if (sq.x == x+shiftX && Math.abs(sq.y - y) == 1)
@@ -148,10 +146,12 @@ class MarseilleRules extends ChessRules
play(move, ingame)
{
-// console.log("play " + this.getNotation(move));
-// console.log(this.turn + " "+ this.subTurn);
if (!!ingame)
+ {
move.notation = [this.getNotation(move), this.getLongNotation(move)];
+ // In this special case, we also need the "move color":
+ move.color = this.turn;
+ }
move.flags = JSON.stringify(this.aggregateFlags());
let lastEpsq = this.epSquares[this.epSquares.length-1];
const epSq = this.getEpSquare(move);
@@ -185,7 +185,6 @@ class MarseilleRules extends ChessRules
this.updateVariables(move);
if (!!ingame)
move.hash = hex_md5(this.getFen());
- //console.log(move.checkOnSubturn1 + " " +this.turn + " "+ this.subTurn);
}
undo(move)
@@ -220,8 +219,6 @@ class MarseilleRules extends ChessRules
}
this.moves.pop();
this.unupdateVariables(move);
-// console.log("UNDO " + this.getNotation(move));
-// console.log(this.turn + " "+ this.subTurn);
}
// NOTE: GenRandInitFen() is OK,
@@ -315,6 +312,54 @@ class MarseilleRules extends ChessRules
return selected[0];
return selected;
}
+
+ getPGN(mycolor, score, fenStart, mode)
+ {
+ let pgn = "";
+ pgn += '[Site "vchess.club"]
';
+ const opponent = mode=="human" ? "Anonymous" : "Computer";
+ pgn += '[Variant "' + variant + '"]
';
+ pgn += '[Date "' + getDate(new Date()) + '"]
';
+ pgn += '[White "' + (mycolor=='w'?'Myself':opponent) + '"]
';
+ pgn += '[Black "' + (mycolor=='b'?'Myself':opponent) + '"]
';
+ pgn += '[FenStart "' + fenStart + '"]
';
+ pgn += '[Fen "' + this.getFen() + '"]
';
+ pgn += '[Result "' + score + '"]
';
+
+ let counter = 1;
+ let i = 0;
+ while (i < this.moves.length)
+ {
+ pgn += (counter++) + ".";
+ for (let color of ["w","b"])
+ {
+ let move = "";
+ while (i < this.moves.length && this.moves[i].color == color)
+ move += this.moves[i++].notation[0] + ",";
+ move = move.slice(0,-1); //remove last comma
+ pgn += move + (i < this.moves.length-1 ? " " : "");
+ }
+ }
+ pgn += "
";
+
+ // "Complete moves" PGN (helping in ambiguous cases)
+ counter = 1;
+ i = 0;
+ while (i < this.moves.length)
+ {
+ pgn += (counter++) + ".";
+ for (let color of ["w","b"])
+ {
+ let move = "";
+ while (i < this.moves.length && this.moves[i].color == color)
+ move += this.moves[i++].notation[1] + ",";
+ move = move.slice(0,-1); //remove last comma
+ pgn += move + (i < this.moves.length-1 ? " " : "");
+ }
+ }
+
+ return pgn;
+ }
}
const VariantRules = MarseilleRules;