X-Git-Url: https://git.auder.net/js/img/current/gitweb.js?a=blobdiff_plain;f=variants%2FBalaklava%2Fclass.js;h=2922b02c5fb7397e869f46abe08aab2cd21bec79;hb=0437a28b7e71bf8eb72fdab83b04ba98996393ec;hp=dd3cf625fe6df11f198792446c4cc6d4b9d574fd;hpb=33b427488bb6ee5c505c3a024bccedbef763f80e;p=xogo.git diff --git a/variants/Balaklava/class.js b/variants/Balaklava/class.js index dd3cf62..2922b02 100644 --- a/variants/Balaklava/class.js +++ b/variants/Balaklava/class.js @@ -27,14 +27,14 @@ export default class BalaklavaRules extends ChessRules { } ] }; - ['r', 'b', 'm', 'q'].forEach(p => res[p].moves = knightSpec.moves); + ['p', 'r', 'b', 'm', 'q'].forEach(p => res[p].moves = knightSpec.moves); return res; } genRandInitBaseFen() { const baseFen = super.genRandInitBaseFen(); return { - fen: baseFen.replace(/n/g, 'm').replace(/N/g, 'M'), + fen: baseFen.fen.replace(/n/g, 'm').replace(/N/g, 'M'), o: baseFen.o }; } @@ -44,12 +44,16 @@ export default class BalaklavaRules extends ChessRules { return []; const color = moves[0].vanish[0].c; const lastRank = (color == 'w' ? 0 : this.size.x - 1); + const forward = (color == 'w' ? -1 : 1); const noKnightPromotions = moves.filter(m => { return ( - m.end.x != lastRank || + (m.end.x - m.start.x) * forward > 0 && ( - Math.abs(m.start.x - m.end.x) <= 1 && - Math.abs(m.start.y - m.end.y) <= 1 + m.end.x != lastRank || + ( + Math.abs(m.start.x - m.end.x) <= 1 && + Math.abs(m.start.y - m.end.y) <= 1 + ) ) ); });