X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=moves.c;h=9700dbf884449b4800275d54afeec930b5527e05;hb=b52aafe5fc484a170251d4bb5bad039ffbbda4df;hp=d59542a201ba87f5206679c981cb0ad67b561c72;hpb=1fbfb851ce740e380fa9a16eb07fe1465af479fa;p=xboard.git diff --git a/moves.c b/moves.c index d59542a..9700dbf 100644 --- a/moves.c +++ b/moves.c @@ -5,7 +5,7 @@ * Massachusetts. * * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006, - * 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. + * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. * * Enhancements Copyright 2005 Alessandro Scotti * @@ -54,6 +54,8 @@ #include "config.h" #include +#include +#include #if HAVE_STRING_H # include #else /* not HAVE_STRING_H */ @@ -71,6 +73,7 @@ int PosFlags(int index); extern signed char initialRights[BOARD_FILES]; /* [HGM] all rights enabled, set in InitPosition */ int quickFlag; +char *pieceDesc[EmptySquare]; int WhitePiece (ChessSquare piece) @@ -98,7 +101,7 @@ SameColor (ChessSquare piece1, ChessSquare piece2) (int) piece2 < (int) EmptySquare); } #else -#define SameColor(piece1, piece2) (piece1 < EmptySquare && piece2 < EmptySquare && (piece1 < BlackPawn) == (piece2 < BlackPawn)) +#define SameColor(piece1, piece2) (piece1 < EmptySquare && piece2 < EmptySquare && (piece1 < BlackPawn) == (piece2 < BlackPawn) || piece1 == DarkSquare || piece2 == DarkSquare) #endif char pieceToChar[] = { @@ -165,6 +168,322 @@ CompareBoards (Board board1, Board board2) return TRUE; } +// [HGM] gen: configurable move generation from Betza notation sent by engine. + +// alphabet "abcdefghijklmnopqrstuvwxyz" +char symmetry[] = "FBNW.FFW.NKN.NW.QR....W..N"; +char xStep[] = "2110.130.102.10.00....0..2"; +char yStep[] = "2132.133.313.20.11....1..3"; +char dirType[] = "01000104000200000260050000"; +// alphabet "a b c d e f g h i j k l m n o p q r s t u v w x y z " +int dirs1[] = { 0,0x3C,0,0,0,0xC3,0,0, 0,0,0,0xF0,0,0,0,0,0,0x0F,0 ,0,0,0 ,0,0,0,0 }; +int dirs2[] = { 0,0x18,0,0,0,0x81,0,0xFF,0,0,0,0x60,0,0,0,0,0,0x06,0x66,0,0,0x99,0,0,0,0 }; + +int rot[][4] = { // rotation matrices for each direction + { 1, 0, 0, 1 }, + { 0, 1, 1, 0 }, + { 0, 1,-1, 0 }, + { 1, 0, 0,-1 }, + {-1, 0, 0,-1 }, + { 0,-1,-1, 0 }, + { 0,-1, 1, 0 }, + {-1, 0, 0, 1 } +}; + +void +MovesFromString (Board board, int flags, int f, int r, char *desc, MoveCallback cb, VOIDSTAR cl) +{ + char *p = desc; + int mine, his, dir, bit, occup, i; + if(flags & F_WHITE_ON_MOVE) his = 2, mine = 1; else his = 1, mine = 2; + while(*p) { // more moves to go + int expo = 1, dx, dy, x, y, mode, dirSet, retry=0, initial=0, jump=1; + if(*p == 'i') initial = 1, desc = ++p; + while(islower(*p)) p++; // skip prefixes + if(!isupper(*p)) return; // syntax error: no atom + dirSet = 0; // build direction set based on atom symmetry + switch(symmetry[*p-'A']) { + case 'B': expo = 0; // bishop, slide + case 'F': // diagonal atom (degenerate 4-fold) + while(islower(*desc) && (i = dirType[*desc-'a']) != '0') { + int b = dirs1[*desc-'a']; // use wide version + if( islower(desc[1]) && + ((i | dirType[desc[1]-'a']) & 3) == 3) { // combinable (perpendicular dim) + b = dirs1[*desc-'a'] & dirs1[desc[1]-'a']; // intersect wide & perp wide + desc += 2; + } else desc++; + dirSet |= b; + } + dirSet &= 0x99; if(!dirSet) dirSet = 0x99; + break; + case 'R': expo = 0; // rook, slide + case 'W': // orthogonal atom (non-deg 4-fold) + while(islower(*desc) && (dirType[*desc-'a'] & ~4) != '0') dirSet |= dirs2[*desc++-'a']; + dirSet &= 0x55; if(!dirSet) dirSet = 0x55; + break; + case 'N': // oblique atom (degenerate 8-fold) + while(islower(*desc) && (i = dirType[*desc-'a']) != '0') { + int b = dirs2[*desc-'a']; // when alone, use narrow version + if(desc[1] == 'h') b = dirs1[*desc-'a'], desc += 2; // dirs1 is wide version + else if(islower(desc[1]) && i < '4' + && ((i | dirType[desc[1]-'a']) & 3) == 3) { // combinable (perpendicular dim) + b = dirs1[*desc-'a'] & dirs2[desc[1]-'a']; // intersect wide & perp narrow + desc += 2; + } else desc++; + dirSet |= b; + } + if(!dirSet) dirSet = 0xFF; + break; + case 'Q': expo = 0; // queen, slide + case 'K': // non-deg (pseudo) 8-fold + dirSet=0x55; // start with orthogonal moves + retry = 1; // and schedule the diagonal moves for later + break; // should not have direction indicators + default: return; // syntax error: invalid atom + } + if(mine == 2) dirSet = dirSet >> 4 | dirSet << 4 & 255; // invert black moves + mode = 0; // build mode mask + if(*desc == 'm') mode |= 4, desc++; + if(*desc == 'c') mode |= his, desc++; + if(*desc == 'd') mode |= mine, desc++; + if(*desc == 'e') mode |= 8, desc++; + if(*desc == 'n') jump = 0, desc++; + while(*desc == 'j') jump++, desc++; + if(!mode) mode = his + 4;// no mode spec, use default = mc + dx = xStep[*p-'A'] - '0'; // step vector of atom + dy = yStep[*p-'A'] - '0'; + if(isdigit(*++p)) expo = atoi(p++); // read exponent + if(expo > 9) p++; // allow double-digit + desc = p; // this is start of next move + if(initial && board[r][f] != initialPosition[r][f]) continue; + do { + for(dir=0, bit=1; dir<8; dir++, bit += bit) { // loop over directions + int i = expo, vx, vy; + if(!(bit & dirSet)) continue; // does not move in this direction + vx = dx*rot[dir][0] + dy*rot[dir][1]; // rotate step vector + vy = dx*rot[dir][2] + dy*rot[dir][3]; + x = f; y = r; // start square + do { + x += vx; y += vy; // step to next square + if(y < 0 || y >= BOARD_HEIGHT || x < BOARD_LEFT || x >= BOARD_RGHT) break; + if(!jump && board[y - vy + vy/2][x - vx + vx/2] != EmptySquare) break; // blocked + if(jump > 1 && board[y - vy + vy/2][x - vx + vx/2] == EmptySquare) break; // no hop + if(board[y][x] < BlackPawn) occup = 1; else + if(board[y][x] < EmptySquare) occup = 2; else + occup = 4; + if(mode & 8 && y == board[EP_RANK] && occup == 4 && board[EP_FILE] == x) { // to e.p. square + cb(board, flags, mine == 1 ? WhiteCapturesEnPassant : BlackCapturesEnPassant, r, f, y, x, cl); + } + if(occup & mode) cb(board, flags, NormalMove, r, f, y, x, cl); // allowed, generate + if(occup != 4) break; // not valid transit square + } while(--i); + } + dx = dy = 1; dirSet = 0x99; // prepare for diagonal moves of K,Q + } while(retry--); // and start doing them + } +} // next atom + +// [HGM] move generation now based on hierarchy of subroutines for rays and combinations of rays + +void +SlideForward (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + int i, rt, ft = ff; + for (i = 1;; i++) { + rt = rf + i; + if (rt >= BOARD_HEIGHT) break; + if (SameColor(board[rf][ff], board[rt][ft])) break; + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); + if (board[rt][ft] != EmptySquare) break; + } +} + +void +SlideBackward (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + int i, rt, ft = ff; + for (i = 1;; i++) { + rt = rf - i; + if (rt < 0) break; + if (SameColor(board[rf][ff], board[rt][ft])) break; + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); + if (board[rt][ft] != EmptySquare) break; + } +} + +void +SlideVertical (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + SlideForward(board, flags, rf, ff, callback, closure); + SlideBackward(board, flags, rf, ff, callback, closure); +} + +void +SlideSideways (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + int i, s, rt = rf, ft; + for(s = -1; s <= 1; s+= 2) { + for (i = 1;; i++) { + ft = ff + i*s; + if (ft < BOARD_LEFT || ft >= BOARD_RGHT) break; + if (SameColor(board[rf][ff], board[rt][ft])) break; + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); + if (board[rt][ft] != EmptySquare) break; + } + } +} + +void +SlideDiagForward (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + int i, s, rt, ft; + for(s = -1; s <= 1; s+= 2) { + for (i = 1;; i++) { + rt = rf + i; + ft = ff + i * s; + if (rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) break; + if (SameColor(board[rf][ff], board[rt][ft])) break; + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); + if (board[rt][ft] != EmptySquare) break; + } + } +} + +void +SlideDiagBackward (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + int i, s, rt, ft; + for(s = -1; s <= 1; s+= 2) { + for (i = 1;; i++) { + rt = rf - i; + ft = ff + i * s; + if (rt < 0 || ft < BOARD_LEFT || ft >= BOARD_RGHT) break; + if (SameColor(board[rf][ff], board[rt][ft])) break; + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); + if (board[rt][ft] != EmptySquare) break; + } + } +} + +void +Rook (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + SlideVertical(board, flags, rf, ff, callback, closure); + SlideSideways(board, flags, rf, ff, callback, closure); +} + +void +Bishop (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + SlideDiagForward(board, flags, rf, ff, callback, closure); + SlideDiagBackward(board, flags, rf, ff, callback, closure); +} + +void +Sting (Board board, int flags, int rf, int ff, int dy, int dx, MoveCallback callback, VOIDSTAR closure) +{ // Lion-like move of Horned Falcon and Souring Eagle + int ft = ff + dx, rt = rf + dy; + if (rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) return; + if (!SameColor(board[rf][ff], board[rt][ft])) + callback(board, flags, board[rt][ft] != EmptySquare ? FirstLeg : NormalMove, rf, ff, rt, ft, closure); + ft += dx; rt += dy; + if (rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) return; + if (!SameColor(board[rf][ff], board[rt][ft])) + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); +} + +void +StepForward (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + int ft = ff, rt = rf + 1; + if (rt >= BOARD_HEIGHT) return; + if (SameColor(board[rf][ff], board[rt][ft])) return; + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); +} + +void +StepBackward (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + int ft = ff, rt = rf - 1; + if (rt < 0) return; + if (SameColor(board[rf][ff], board[rt][ft])) return; + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); +} + +void +StepSideways (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + int ft, rt = rf; + ft = ff + 1; + if (!(rt >= BOARD_HEIGHT || ft >= BOARD_RGHT) && !SameColor(board[rf][ff], board[rt][ft])) + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); + ft = ff - 1; + if (!(rt >= BOARD_HEIGHT || ft < BOARD_LEFT) && !SameColor(board[rf][ff], board[rt][ft])) + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); +} + +void +StepDiagForward (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + int ft, rt = rf + 1; + if (rt >= BOARD_HEIGHT) return; + ft = ff + 1; + if (!(rt >= BOARD_HEIGHT || ft >= BOARD_RGHT) && !SameColor(board[rf][ff], board[rt][ft])) + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); + ft = ff - 1; + if (!(rt >= BOARD_HEIGHT || ft < BOARD_LEFT) && !SameColor(board[rf][ff], board[rt][ft])) + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); +} + +void +StepDiagBackward (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + int ft, rt = rf - 1; + if(rt < 0) return; + ft = ff + 1; + if (!(rt < 0 || ft >= BOARD_RGHT) && !SameColor(board[rf][ff], board[rt][ft])) + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); + ft = ff - 1; + if (!(rt < 0 || ft < BOARD_LEFT) && !SameColor(board[rf][ff], board[rt][ft])) + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); +} + +void +StepVertical (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + StepForward(board, flags, rf, ff, callback, closure); + StepBackward(board, flags, rf, ff, callback, closure); +} + +void +Ferz (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + StepDiagForward(board, flags, rf, ff, callback, closure); + StepDiagBackward(board, flags, rf, ff, callback, closure); +} + +void +Wazir (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + StepVertical(board, flags, rf, ff, callback, closure); + StepSideways(board, flags, rf, ff, callback, closure); +} + +void +Knight (Board board, int flags, int rf, int ff, MoveCallback callback, VOIDSTAR closure) +{ + int i, j, s, rt, ft; + for (i = -1; i <= 1; i += 2) + for (j = -1; j <= 1; j += 2) + for (s = 1; s <= 2; s++) { + rt = rf + i*s; + ft = ff + j*(3-s); + if (!(rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) + && ( gameInfo.variant != VariantXiangqi || board[rf+i*(s-1)][ff+j*(2-s)] == EmptySquare) + && !SameColor(board[rf][ff], board[rt][ft])) + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); + } +} /* Call callback once for each pseudo-legal move in the given position, except castling moves. A move is pseudo-legal if it is @@ -181,21 +500,20 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure, int rf, ff; int i, j, d, s, fs, rs, rt, ft, m; int epfile = (signed char)board[EP_STATUS]; // [HGM] gamestate: extract ep status from board - int promoRank = gameInfo.variant == VariantMakruk || gameInfo.variant == VariantGrand ? 3 : 1; + int promoRank = gameInfo.variant == VariantMakruk || gameInfo.variant == VariantGrand || gameInfo.variant == VariantChuChess ? 3 : 1; for (rf = 0; rf < BOARD_HEIGHT; rf++) for (ff = BOARD_LEFT; ff < BOARD_RGHT; ff++) { ChessSquare piece; - int rookRange; if(board[rf][ff] == EmptySquare) continue; if ((flags & F_WHITE_ON_MOVE) != (board[rf][ff] < BlackPawn)) continue; // [HGM] speed: wrong color - rookRange = 1000; m = 0; piece = board[rf][ff]; if(PieceToChar(piece) == '~') piece = (ChessSquare) ( DEMOTED piece ); if(filter != EmptySquare && piece != filter) continue; - if(gameInfo.variant == VariantShogi) + if(pieceDesc[piece]) { MovesFromString(board, flags, ff, rf, pieceDesc[piece], callback, closure); continue; } // [HGM] gen + if(IS_SHOGI(gameInfo.variant)) piece = (ChessSquare) ( SHOGI piece ); switch ((int)piece) { @@ -309,7 +627,6 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure, case BlackUnicorn: case WhiteKnight: case BlackKnight: - mounted: for (i = -1; i <= 1; i += 2) for (j = -1; j <= 1; j += 2) for (s = 1; s <= 2; s++) { @@ -366,47 +683,77 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure, /* Gold General (and all its promoted versions) . First do the */ /* diagonal forward steps, then proceed as normal Wazir */ - case SHOGI WhiteWazir: case SHOGI (PROMOTED WhitePawn): + if(gameInfo.variant == VariantShogi) goto WhiteGold; + case SHOGI (PROMOTED BlackPawn): + if(gameInfo.variant == VariantShogi) goto BlackGold; + SlideVertical(board, flags, rf, ff, callback, closure); + break; + case SHOGI (PROMOTED WhiteKnight): - case SHOGI (PROMOTED WhiteQueen): - case SHOGI (PROMOTED WhiteFerz): - for (s = -1; s <= 1; s += 2) { - if (rf < BOARD_HEIGHT-1 && ff + s >= BOARD_LEFT && ff + s < BOARD_RGHT && - !SameColor(board[rf][ff], board[rf + 1][ff + s])) { - callback(board, flags, NormalMove, - rf, ff, rf + 1, ff + s, closure); - } - } - goto finishGold; + if(gameInfo.variant == VariantShogi) goto WhiteGold; + case SHOGI BlackDrunk: + case SHOGI BlackAlfil: + Ferz(board, flags, rf, ff, callback, closure); + StepSideways(board, flags, rf, ff, callback, closure); + StepBackward(board, flags, rf, ff, callback, closure); + break; - case SHOGI BlackWazir: - case SHOGI (PROMOTED BlackPawn): case SHOGI (PROMOTED BlackKnight): + if(gameInfo.variant == VariantShogi) goto BlackGold; + case SHOGI WhiteDrunk: + case SHOGI WhiteAlfil: + Ferz(board, flags, rf, ff, callback, closure); + StepSideways(board, flags, rf, ff, callback, closure); + StepForward(board, flags, rf, ff, callback, closure); + break; + + + case SHOGI WhiteStag: + case SHOGI BlackStag: + if(gameInfo.variant == VariantShogi) goto BlackGold; + SlideVertical(board, flags, rf, ff, callback, closure); + Ferz(board, flags, rf, ff, callback, closure); + StepSideways(board, flags, rf, ff, callback, closure); + break; + + case SHOGI (PROMOTED WhiteQueen): + case SHOGI WhiteTokin: + case SHOGI WhiteWazir: + WhiteGold: + StepDiagForward(board, flags, rf, ff, callback, closure); + Wazir(board, flags, rf, ff, callback, closure); + break; + case SHOGI (PROMOTED BlackQueen): - case SHOGI (PROMOTED BlackFerz): - for (s = -1; s <= 1; s += 2) { - if (rf > 0 && ff + s >= BOARD_LEFT && ff + s < BOARD_RGHT && - !SameColor(board[rf][ff], board[rf - 1][ff + s])) { - callback(board, flags, NormalMove, - rf, ff, rf - 1, ff + s, closure); - } - } + case SHOGI BlackTokin: + case SHOGI BlackWazir: + BlackGold: + StepDiagBackward(board, flags, rf, ff, callback, closure); + Wazir(board, flags, rf, ff, callback, closure); + break; case WhiteWazir: case BlackWazir: - finishGold: - for (d = 0; d <= 1; d++) - for (s = -1; s <= 1; s += 2) { - rt = rf + s * d; - ft = ff + s * (1 - d); - if (!(rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) - && !SameColor(board[rf][ff], board[rt][ft]) && - (gameInfo.variant != VariantXiangqi || InPalace(rt, ft) ) ) - callback(board, flags, NormalMove, - rf, ff, rt, ft, closure); - } - break; + Wazir(board, flags, rf, ff, callback, closure); + break; + + case SHOGI WhiteMarshall: + case SHOGI BlackMarshall: + Ferz(board, flags, rf, ff, callback, closure); + for (d = 0; d <= 1; d++) + for (s = -2; s <= 2; s += 4) { + rt = rf + s * d; + ft = ff + s * (1 - d); + if (rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) continue; + if (!SameColor(board[rf][ff], board[rt][ft]) ) + callback(board, flags, NormalMove, rf, ff, rt, ft, closure); + } + break; + + case SHOGI WhiteAngel: + case SHOGI BlackAngel: + Wazir(board, flags, rf, ff, callback, closure); case WhiteAlfil: case BlackAlfil: @@ -422,8 +769,8 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure, && !SameColor(board[rf][ff], board[rt][ft])) callback(board, flags, NormalMove, rf, ff, rt, ft, closure); - if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier - || gameInfo.variant == VariantXiangqi) continue; // classical Alfil + if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier || + gameInfo.variant == VariantChu || gameInfo.variant == VariantXiangqi) continue; // classical Alfil rt = rf + rs; // in unknown variant we assume Modern Elephant, which can also do one step ft = ff + fs; if (!(rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) @@ -442,6 +789,7 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure, /* Make Dragon-Horse also do Dababba moves outside Shogi, for better disambiguation in variant Fairy */ case WhiteCardinal: case BlackCardinal: + if(gameInfo.variant == VariantChuChess) goto DragonHorse; for (d = 0; d <= 1; d++) // Dababba moves that Rook cannot do for (s = -2; s <= 2; s += 4) { rt = rf + s * d; @@ -454,36 +802,31 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure, /* Shogi Dragon Horse has to continue with Wazir after Bishop */ case SHOGI WhiteCardinal: case SHOGI BlackCardinal: - m++; + case SHOGI WhitePCardinal: + case SHOGI BlackPCardinal: + DragonHorse: + Bishop(board, flags, rf, ff, callback, closure); + Wazir(board, flags, rf, ff, callback, closure); + break; /* Capablanca Archbishop continues as Knight */ case WhiteAngel: case BlackAngel: - m++; + Knight(board, flags, rf, ff, callback, closure); /* Shogi Bishops are ordinary Bishops */ case SHOGI WhiteBishop: case SHOGI BlackBishop: + case SHOGI WhitePBishop: + case SHOGI BlackPBishop: case WhiteBishop: case BlackBishop: - for (rs = -1; rs <= 1; rs += 2) - for (fs = -1; fs <= 1; fs += 2) - for (i = 1;; i++) { - rt = rf + (i * rs); - ft = ff + (i * fs); - if (rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) break; - if (SameColor(board[rf][ff], board[rt][ft])) break; - callback(board, flags, NormalMove, - rf, ff, rt, ft, closure); - if (board[rt][ft] != EmptySquare) break; - } - if(m==1) goto mounted; - if(m==2) goto finishGold; - /* Bishop falls through */ - break; + Bishop(board, flags, rf, ff, callback, closure); + break; /* Shogi Lance is unlike anything, and asymmetric at that */ case SHOGI WhiteQueen: + if(gameInfo.variant == VariantChu) goto doQueen; for(i = 1;; i++) { rt = rf + i; ft = ff; @@ -496,6 +839,7 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure, break; case SHOGI BlackQueen: + if(gameInfo.variant == VariantChu) goto doQueen; for(i = 1;; i++) { rt = rf - i; ft = ff; @@ -510,126 +854,102 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure, /* Make Dragon-King Dababba & Rook-like outside Shogi, for better disambiguation in variant Fairy */ case WhiteDragon: case BlackDragon: + if(gameInfo.variant == VariantChuChess) goto DragonKing; for (d = 0; d <= 1; d++) // Dababba moves that Rook cannot do for (s = -2; s <= 2; s += 4) { rt = rf + s * d; ft = ff + s * (1 - d); - if (rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT || board[rf+rt>>1][ff+ft>>1] == EmptySquare) continue; + if (rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) continue; + if (board[rf+rt>>1][ff+ft>>1] == EmptySquare && gameInfo.variant != VariantSpartan) continue; if (SameColor(board[rf][ff], board[rt][ft])) continue; callback(board, flags, NormalMove, rf, ff, rt, ft, closure); } - if(gameInfo.variant == VariantSpartan) rookRange = 2; // in Spartan Chess restrict range to modern Dababba - goto doRook; + if(gameInfo.variant == VariantSpartan) // in Spartan Chess restrict range to modern Dababba + Wazir(board, flags, rf, ff, callback, closure); + else + Rook(board, flags, rf, ff, callback, closure); + break; /* Shogi Dragon King has to continue as Ferz after Rook moves */ case SHOGI WhiteDragon: case SHOGI BlackDragon: + case SHOGI WhitePDragon: + case SHOGI BlackPDragon: + DragonKing: + Rook(board, flags, rf, ff, callback, closure); + Ferz(board, flags, rf, ff, callback, closure); + break; m++; /* Capablanca Chancellor sets flag to continue as Knight */ case WhiteMarshall: case BlackMarshall: - m++; - m += (gameInfo.variant == VariantSpartan); // in Spartan Chess Chancellor is used for Dragon King. + Rook(board, flags, rf, ff, callback, closure); + if(gameInfo.variant == VariantSpartan) // in Spartan Chess Chancellor is used for Dragon King. + Ferz(board, flags, rf, ff, callback, closure); + else + Knight(board, flags, rf, ff, callback, closure); + break; /* Shogi Rooks are ordinary Rooks */ case SHOGI WhiteRook: case SHOGI BlackRook: + case SHOGI WhitePRook: + case SHOGI BlackPRook: case WhiteRook: case BlackRook: - doRook: - for (d = 0; d <= 1; d++) - for (s = -1; s <= 1; s += 2) - for (i = 1;; i++) { - rt = rf + (i * s) * d; - ft = ff + (i * s) * (1 - d); - if (rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) break; - if (SameColor(board[rf][ff], board[rt][ft])) break; - callback(board, flags, NormalMove, - rf, ff, rt, ft, closure); - if (board[rt][ft] != EmptySquare || i == rookRange) break; - } - if(m==1) goto mounted; - if(m==2) goto finishSilver; - break; + Rook(board, flags, rf, ff, callback, closure); + break; case WhiteQueen: case BlackQueen: - for (rs = -1; rs <= 1; rs++) - for (fs = -1; fs <= 1; fs++) { - if (rs == 0 && fs == 0) continue; - for (i = 1;; i++) { - rt = rf + (i * rs); - ft = ff + (i * fs); - if (rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) break; - if (SameColor(board[rf][ff], board[rt][ft])) break; - callback(board, flags, NormalMove, - rf, ff, rt, ft, closure); - if (board[rt][ft] != EmptySquare) break; - } - } - break; + case SHOGI WhiteMother: + case SHOGI BlackMother: + doQueen: + Rook(board, flags, rf, ff, callback, closure); + Bishop(board, flags, rf, ff, callback, closure); + break; + + case SHOGI WhitePawn: + StepForward(board, flags, rf, ff, callback, closure); + break; + + case SHOGI BlackPawn: + StepBackward(board, flags, rf, ff, callback, closure); + break; - /* Shogi Pawn and Silver General: first the Pawn move, */ - /* then the General continues like a Ferz */ case WhiteMan: - if(gameInfo.variant != VariantMakruk) goto commoner; - case SHOGI WhitePawn: + if(gameInfo.variant != VariantMakruk && gameInfo.variant != VariantASEAN) goto commoner; case SHOGI WhiteFerz: - if (rf < BOARD_HEIGHT-1 && - !SameColor(board[rf][ff], board[rf + 1][ff]) ) - callback(board, flags, NormalMove, - rf, ff, rf + 1, ff, closure); - if(piece != SHOGI WhitePawn) goto finishSilver; - break; + Ferz(board, flags, rf, ff, callback, closure); + StepForward(board, flags, rf, ff, callback, closure); + break; case BlackMan: - if(gameInfo.variant != VariantMakruk) goto commoner; - case SHOGI BlackPawn: + if(gameInfo.variant != VariantMakruk && gameInfo.variant != VariantASEAN) goto commoner; case SHOGI BlackFerz: - if (rf > 0 && - !SameColor(board[rf][ff], board[rf - 1][ff]) ) - callback(board, flags, NormalMove, - rf, ff, rf - 1, ff, closure); - if(piece == SHOGI BlackPawn) break; + StepBackward(board, flags, rf, ff, callback, closure); case WhiteFerz: case BlackFerz: - finishSilver: /* [HGM] support Shatranj pieces */ - for (rs = -1; rs <= 1; rs += 2) - for (fs = -1; fs <= 1; fs += 2) { - rt = rf + rs; - ft = ff + fs; - if (rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) continue; - if (!SameColor(board[rf][ff], board[rt][ft]) && - (gameInfo.variant != VariantXiangqi || InPalace(rt, ft) ) ) - callback(board, flags, NormalMove, - rf, ff, rt, ft, closure); - } - break; + Ferz(board, flags, rf, ff, callback, closure); + break; case WhiteSilver: case BlackSilver: - m++; // [HGM] superchess: use for Centaur + Knight(board, flags, rf, ff, callback, closure); // [HGM] superchess: use for Centaur + commoner: + case SHOGI WhiteMonarch: + case SHOGI BlackMonarch: case SHOGI WhiteKing: case SHOGI BlackKing: case WhiteKing: case BlackKing: -// walking: - for (i = -1; i <= 1; i++) - for (j = -1; j <= 1; j++) { - if (i == 0 && j == 0) continue; - rt = rf + i; - ft = ff + j; - if (rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) continue; - if (SameColor(board[rf][ff], board[rt][ft])) continue; - callback(board, flags, NormalMove, - rf, ff, rt, ft, closure); - } - if(m==1) goto mounted; - break; + Ferz(board, flags, rf, ff, callback, closure); + Wazir(board, flags, rf, ff, callback, closure); + break; case WhiteNightrider: case BlackNightrider: @@ -649,20 +969,10 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure, break; Amazon: - /* First do Bishop,then continue like Chancellor */ - for (rs = -1; rs <= 1; rs += 2) - for (fs = -1; fs <= 1; fs += 2) - for (i = 1;; i++) { - rt = rf + (i * rs); - ft = ff + (i * fs); - if (rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) break; - if (SameColor(board[rf][ff], board[rt][ft])) break; - callback(board, flags, NormalMove, - rf, ff, rt, ft, closure); - if (board[rt][ft] != EmptySquare) break; - } - m++; - goto doRook; + Bishop(board, flags, rf, ff, callback, closure); + Rook(board, flags, rf, ff, callback, closure); + Knight(board, flags, rf, ff, callback, closure); + break; // Use Lance as Berolina / Spartan Pawn. case WhiteLance: @@ -697,6 +1007,127 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure, } break; + case SHOGI WhiteNothing: + case SHOGI BlackNothing: + case SHOGI WhiteLion: + case SHOGI BlackLion: + case WhiteLion: + case BlackLion: + for(rt = rf - 2; rt <= rf + 2; rt++) for(ft = ff - 2; ft <= ff + 2; ft++) { + if (rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) continue; + if (!(ff == ft && rf == rt) && SameColor(board[rf][ff], board[rt][ft])) continue; + callback(board, flags, (rt-rf)*(rt-rf) + (ff-ft)*(ff-ft) < 3 && board[rt][ft] != EmptySquare ? FirstLeg : NormalMove, + rf, ff, rt, ft, closure); + } + break; + + case SHOGI WhiteFalcon: + case SHOGI BlackFalcon: + case SHOGI WhitePDagger: + case SHOGI BlackPDagger: + SlideSideways(board, flags, rf, ff, callback, closure); + StepVertical(board, flags, rf, ff, callback, closure); + break; + + case SHOGI WhiteCobra: + case SHOGI BlackCobra: + StepVertical(board, flags, rf, ff, callback, closure); + break; + + case SHOGI (PROMOTED WhiteFerz): + if(gameInfo.variant == VariantShogi) goto WhiteGold; + case SHOGI (PROMOTED BlackFerz): + if(gameInfo.variant == VariantShogi) goto BlackGold; + case SHOGI WhitePSword: + case SHOGI BlackPSword: + SlideVertical(board, flags, rf, ff, callback, closure); + StepSideways(board, flags, rf, ff, callback, closure); + break; + + case SHOGI WhiteUnicorn: + case SHOGI BlackUnicorn: + Ferz(board, flags, rf, ff, callback, closure); + StepVertical(board, flags, rf, ff, callback, closure); + break; + + case SHOGI WhiteMan: + StepDiagForward(board, flags, rf, ff, callback, closure); + StepVertical(board, flags, rf, ff, callback, closure); + break; + + case SHOGI BlackMan: + StepDiagBackward(board, flags, rf, ff, callback, closure); + StepVertical(board, flags, rf, ff, callback, closure); + break; + + case SHOGI WhiteHCrown: + case SHOGI BlackHCrown: + Bishop(board, flags, rf, ff, callback, closure); + SlideSideways(board, flags, rf, ff, callback, closure); + break; + + case SHOGI WhiteCrown: + case SHOGI BlackCrown: + Bishop(board, flags, rf, ff, callback, closure); + SlideVertical(board, flags, rf, ff, callback, closure); + break; + + case SHOGI WhiteHorned: + Sting(board, flags, rf, ff, 1, 0, callback, closure); + callback(board, flags, NormalMove, rf, ff, rf, ff, closure); + if(killX >= 0) break; + Bishop(board, flags, rf, ff, callback, closure); + SlideSideways(board, flags, rf, ff, callback, closure); + SlideBackward(board, flags, rf, ff, callback, closure); + break; + + case SHOGI BlackHorned: + Sting(board, flags, rf, ff, -1, 0, callback, closure); + callback(board, flags, NormalMove, rf, ff, rf, ff, closure); + if(killX >= 0) break; + Bishop(board, flags, rf, ff, callback, closure); + SlideSideways(board, flags, rf, ff, callback, closure); + SlideForward(board, flags, rf, ff, callback, closure); + break; + + case SHOGI WhiteEagle: + Sting(board, flags, rf, ff, 1, 1, callback, closure); + Sting(board, flags, rf, ff, 1, -1, callback, closure); + callback(board, flags, NormalMove, rf, ff, rf, ff, closure); + if(killX >= 0) break; + Rook(board, flags, rf, ff, callback, closure); + SlideDiagBackward(board, flags, rf, ff, callback, closure); + break; + + case SHOGI BlackEagle: + Sting(board, flags, rf, ff, -1, 1, callback, closure); + Sting(board, flags, rf, ff, -1, -1, callback, closure); + callback(board, flags, NormalMove, rf, ff, rf, ff, closure); + if(killX >= 0) break; + Rook(board, flags, rf, ff, callback, closure); + SlideDiagForward(board, flags, rf, ff, callback, closure); + break; + + case SHOGI WhiteDolphin: + case SHOGI BlackHorse: + SlideDiagBackward(board, flags, rf, ff, callback, closure); + SlideVertical(board, flags, rf, ff, callback, closure); + break; + + case SHOGI BlackDolphin: + case SHOGI WhiteHorse: + SlideDiagForward(board, flags, rf, ff, callback, closure); + SlideVertical(board, flags, rf, ff, callback, closure); + break; + + case SHOGI WhiteLance: + SlideForward(board, flags, rf, ff, callback, closure); + break; + + case SHOGI BlackLance: + SlideBackward(board, flags, rf, ff, callback, closure); + break; + case WhiteFalcon: // [HGM] wild: for wildcards, self-capture symbolizes move to anywhere case BlackFalcon: case WhiteCobra: @@ -728,6 +1159,8 @@ GenLegalCallback (Board board, int flags, ChessMove kind, int rf, int ff, int rt if(rFilter >= 0 && rFilter != rt || fFilter >= 0 && fFilter != ft) return; // [HGM] speed: ignore moves with wrong to-square + if (board[EP_STATUS] == EP_IRON_LION && (board[rt][ft] == WhiteLion || board[rt][ft] == BlackLion)) return; //[HGM] lion + if (!(flags & F_IGNORE_CHECK) ) { int check, promo = (gameInfo.variant == VariantSpartan && kind == BlackPromotion); if(promo) { @@ -902,8 +1335,10 @@ GenLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure, Ches if(k != ft && board[0][k] != EmptySquare) ft = NoRights; for(k=left; k BOARD_LEFT+2) for(k=left+1; k<=right && ft != NoRights; k++) /* then if not checked */ if(!ignoreCheck && CheckTest(board, flags, 0, ff, 0, k, FALSE)) ft = NoRights; - if(ft != NoRights && board[0][ft] == WhiteRook) - callback(board, flags, WhiteASideCastleFR, 0, swap ? ft : ff, 0, swap ? ff : ft, closure); + if(ft != NoRights && board[0][ft] == WhiteRook) { + if(flags & F_FRC_TYPE_CASTLING) callback(board, flags, WhiteASideCastleFR, 0, ff, 0, ft, closure); + if(swap) callback(board, flags, WhiteASideCastleFR, 0, ft, 0, ff, closure); + } } } else { ff = castlingRights[5]; /* King file if we have any rights */ @@ -928,8 +1366,10 @@ GenLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure, Ches if(k != ft && board[BOARD_HEIGHT-1][k] != EmptySquare) ft = NoRights; for(k=left; k BOARD_LEFT+2) for(k=left+1; k<=right && ft != NoRights; k++) /* then if not checked */ if(!ignoreCheck && CheckTest(board, flags, BOARD_HEIGHT-1, ff, BOARD_HEIGHT-1, k, FALSE)) ft = NoRights; - if(ft != NoRights && board[BOARD_HEIGHT-1][ft] == BlackRook) - callback(board, flags, BlackASideCastleFR, BOARD_HEIGHT-1, swap ? ft : ff, BOARD_HEIGHT-1, swap ? ff : ft, closure); + if(ft != NoRights && board[BOARD_HEIGHT-1][ft] == BlackRook) { + if(flags & F_FRC_TYPE_CASTLING) callback(board, flags, BlackASideCastleFR, BOARD_HEIGHT-1, ff, BOARD_HEIGHT-1, ft, closure); + if(swap) callback(board, flags, BlackASideCastleFR, BOARD_HEIGHT-1, ft, BOARD_HEIGHT-1, ff, closure); + } } } @@ -972,6 +1415,9 @@ CheckTestCallback (Board board, int flags, ChessMove kind, int rf, int ff, int r cl->check++; xqCheckers[rf][ff] = xqCheckers[EP_STATUS] & 1; // remember who is checking (if status == 1) } + if( board[EP_STATUS] == EP_ROYAL_LION && (board[rt][ft] == WhiteLion || board[rt][ft] == BlackLion) + && (gameInfo.variant != VariantLion || board[rf][ff] != WhiteKing && board[rf][ff] != BlackKing) ) + cl->check++; // [HGM] lion: forbidden counterstrike against Lion equated to putting yourself in check } @@ -987,25 +1433,43 @@ CheckTest (Board board, int flags, int rf, int ff, int rt, int ft, int enPassant { CheckTestClosure cl; ChessSquare king = flags & F_WHITE_ON_MOVE ? WhiteKing : BlackKing; - ChessSquare captured = EmptySquare; + ChessSquare captured = EmptySquare, ep=0, trampled=0; /* Suppress warnings on uninitialized variables */ if(gameInfo.variant == VariantXiangqi) king = flags & F_WHITE_ON_MOVE ? WhiteWazir : BlackWazir; if(gameInfo.variant == VariantKnightmate) king = flags & F_WHITE_ON_MOVE ? WhiteUnicorn : BlackUnicorn; + if(gameInfo.variant == VariantChu) { // strictly speaking this is not needed, as Chu officially has no check + int r, f, k = king, royals=0, prince = flags & F_WHITE_ON_MOVE ? WhiteMonarch : BlackMonarch; + for(r=0; r 1) return FALSE; // no check if we have two royals (ignores double captureby Lion!) + king = board[r][f]; // remember hich one we had + } + } + } if (rt >= 0) { if (enPassant) { captured = board[rf][ft]; board[rf][ft] = EmptySquare; } else { - captured = board[rt][ft]; + captured = board[rt][ft]; + if(killX >= 0) { trampled = board[killY][killX]; board[killY][killX] = EmptySquare; } } if(rf == DROP_RANK) board[rt][ft] = ff; else { // [HGM] drop board[rt][ft] = board[rf][ff]; board[rf][ff] = EmptySquare; } + ep = board[EP_STATUS]; + if( captured == WhiteLion || captured == BlackLion ) { // [HGM] lion: Chu Lion-capture rules + ChessSquare victim = killX < 0 ? EmptySquare : trampled; + if( (board[rt][ft] == WhiteLion || board[rt][ft] == BlackLion) && // capturer is Lion + (ff - ft > 1 || ft - ff > 1 || rf - rt > 1 || rt - rf > 1) && // captures from a distance + (victim == EmptySquare || victim == WhitePawn || victim == BlackPawn) ) // no or worthless 'bridge' + board[EP_STATUS] = EP_ROYAL_LION; // on distant Lion x Lion victim must not be pseudo-legally protected + } } /* For compatibility with ICS wild 9, we scan the board in the @@ -1040,13 +1504,25 @@ CheckTest (Board board, int flags, int rf, int ff, int rt, int ft, int enPassant board[rf][ft] = captured; board[rt][ft] = EmptySquare; } else { + if(killX >= 0) board[killY][killX] = trampled; board[rt][ft] = captured; } + board[EP_STATUS] = ep; } return cl.fking < BOARD_RGHT ? cl.check : 1000; // [HGM] atomic: return 1000 if we have no king } +int +HasLion (Board board, int flags) +{ + int lion = F_WHITE_ON_MOVE & flags ? WhiteLion : BlackLion; + int r, f; + for(r=0; r BOARD_HEIGHT-3 || piece == BlackKnight && rt < 2 ) return IllegalMove; // e.g. where dropped piece has no moves if(piece == WhitePawn || piece == BlackPawn) { - int r; + int r, max = 1 + (BOARD_HEIGHT == 7); // two Pawns per file in Tori! for(r=1; r WhiteMan : piece > BlackMan) return ImpossibleMove; // already promoted + // should test if in zone, really + if(gameInfo.variant == VariantChuChess && (piece == WhiteKnight || piece == BlackKnight) && HasLion(board, flags)) + return IllegalMove; + if(PieceToChar(PROMOTED piece) == '+') return flags & F_WHITE_ON_MOVE ? WhitePromotion : BlackPromotion; + } else if(promoChar == '=') cl.kind = IllegalMove; else // [HGM] shogi: no deferred promotion outside Shogi if (cl.kind == WhitePromotion || cl.kind == BlackPromotion) { ChessSquare piece = CharToPiece(flags & F_WHITE_ON_MOVE ? ToUpper(promoChar) : ToLower(promoChar)); if(piece == EmptySquare) cl.kind = ImpossibleMove; // non-existing piece - if(gameInfo.variant == VariantSpartan && cl.kind == BlackPromotion ) { + if(gameInfo.variant == VariantChuChess && promoChar == 'l' && HasLion(board, flags)) { + cl.kind = IllegalMove; // no two Lions + } else if(gameInfo.variant == VariantSpartan && cl.kind == BlackPromotion ) { if(promoChar != PieceToChar(BlackKing)) { if(CheckTest(board, flags, rf, ff, rt, ft, FALSE)) cl.kind = IllegalMove; // [HGM] spartan: only promotion to King was possible if(piece == BlackLance) cl.kind = ImpossibleMove; - } else { // promotion to King allowed only if we do not haave two yet + } else { // promotion to King allowed only if we do not have two yet int r, f, kings = 0; for(r=0; rrf != 0) closure->kind = IllegalMove; // must be on back rank if(!(board[VIRGIN][closure->ff] & VIRGIN_W)) closure->kind = IllegalMove; // non-virgin if(board[PieceToNumber(CharToPiece(ToUpper(c)))][BOARD_WIDTH-2] == 0) closure->kind = ImpossibleMove;// must be in stock + if(closure->kind == WhiteHSideCastleFR && (closure->ff == BOARD_RGHT-2 || closure->ff == BOARD_RGHT-3)) closure->kind = ImpossibleMove; + if(closure->kind == WhiteASideCastleFR && (closure->ff == BOARD_LEFT+2 || closure->ff == BOARD_LEFT+3)) closure->kind = ImpossibleMove; } else { if(closure->rf != BOARD_HEIGHT-1) closure->kind = IllegalMove; if(!(board[VIRGIN][closure->ff] & VIRGIN_B)) closure->kind = IllegalMove; // non-virgin if(board[BOARD_HEIGHT-1-PieceToNumber(CharToPiece(ToLower(c)))][1] == 0) closure->kind = ImpossibleMove; + if(closure->kind == BlackHSideCastleFR && (closure->ff == BOARD_RGHT-2 || closure->ff == BOARD_RGHT-3)) closure->kind = ImpossibleMove; + if(closure->kind == BlackASideCastleFR && (closure->ff == BOARD_LEFT+2 || closure->ff == BOARD_LEFT+3)) closure->kind = ImpossibleMove; } } else + if(gameInfo.variant == VariantChu) { + if(c == '+') closure->kind = (flags & F_WHITE_ON_MOVE ? WhitePromotion : BlackPromotion); // for now, accept any + } else if(gameInfo.variant == VariantShogi) { /* [HGM] Shogi promotions. On input, '=' means defer, '+' promote. Afterwards, c is set to '+' for promotions, NULL other */ if(closure->rfIn != DROP_RANK && closure->kind == NormalMove) { @@ -1400,7 +1904,8 @@ Disambiguate (Board board, int flags, DisambiguateClosure *closure) } else if (closure->kind == WhitePromotion || closure->kind == BlackPromotion) { if(c == NULLCHAR) { // missing promoChar on mandatory promotion; use default for variant - if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier || gameInfo.variant == VariantMakruk) + if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier || + gameInfo.variant == VariantMakruk || gameInfo.variant == VariantASEAN) c = PieceToChar(BlackFerz); else if(gameInfo.variant == VariantGreat) c = PieceToChar(BlackMan); @@ -1409,6 +1914,12 @@ Disambiguate (Board board, int flags, DisambiguateClosure *closure) else c = PieceToChar(BlackQueen); } else if(c == '=') closure->kind = IllegalMove; // no deferral outside Shogi + else if(c == 'l' && gameInfo.variant == VariantChuChess && HasLion(board, flags)) closure->kind = IllegalMove; + } else if (c == '+') { // '+' outside shogi, check if pieceToCharTable enabled it + ChessSquare p = closure->piece; + if(p > WhiteMan && p < BlackPawn || p > BlackMan || PieceToChar(PROMOTED p) != '+') + closure->kind = ImpossibleMove; // used on non-promotable piece + else if(gameInfo.variant == VariantChuChess && HasLion(board, flags)) closure->kind = IllegalMove; } else if (c != NULLCHAR) closure->kind = IllegalMove; closure->promoChar = ToLower(c); // this can be NULLCHAR! Note we keep original promoChar even if illegal. @@ -1477,7 +1988,7 @@ CoordsToAlgebraic (Board board, int flags, int rf, int ff, int rt, int ft, int p { ChessSquare piece; ChessMove kind; - char *outp = out, c; + char *outp = out, c, capture; CoordsToAlgebraicClosure cl; if (rf == DROP_RANK) { @@ -1510,14 +2021,15 @@ CoordsToAlgebraic (Board board, int flags, int rf, int ff, int rt, int ft, int p } /* Pawn move */ *outp++ = ff + AAA; - if (ff == ft && board[rt][ft] == EmptySquare) { /* [HGM] Xiangqi has straight noncapts! */ + capture = board[rt][ft] != EmptySquare || kind == WhiteCapturesEnPassant || kind == BlackCapturesEnPassant; + if (ff == ft && !capture) { /* [HGM] Xiangqi has straight noncapts! */ /* Non-capture; use style "e5" */ if(rt+ONE <= '9') *outp++ = rt + ONE; else { *outp++ = (rt+ONE-'0')/10 + '0';*outp++ = (rt+ONE-'0')%10 + '0'; } } else { /* Capture; use style "exd5" */ - if(gameInfo.variant != VariantXiangqi || board[rt][ft] != EmptySquare ) + if(capture) *outp++ = 'x'; /* [HGM] Xiangqi has sideway noncaptures across river! */ *outp++ = ft + AAA; if(rt+ONE <= '9') @@ -1527,7 +2039,7 @@ CoordsToAlgebraic (Board board, int flags, int rf, int ff, int rt, int ft, int p /* Use promotion suffix style "=Q" */ *outp = NULLCHAR; if (promoChar != NULLCHAR) { - if(gameInfo.variant == VariantShogi) { + if(IS_SHOGI(gameInfo.variant)) { /* [HGM] ... but not in Shogi! */ *outp++ = promoChar == '=' ? '=' : '+'; } else { @@ -1604,7 +2116,7 @@ CoordsToAlgebraic (Board board, int flags, int rf, int ff, int rt, int ft, int p */ if( c == '~' || c == '+') { /* [HGM] print nonexistent piece as its demoted version */ - piece = (ChessSquare) (DEMOTED piece); + piece = (ChessSquare) (DEMOTED piece - 11*(gameInfo.variant == VariantChu)); } if(c=='+') *outp++ = c; *outp++ = ToUpper(PieceToChar(piece)); @@ -1625,11 +2137,12 @@ CoordsToAlgebraic (Board board, int flags, int rf, int ff, int rt, int ft, int p if(rt+ONE <= '9') *outp++ = rt + ONE; else { *outp++ = (rt+ONE-'0')/10 + '0';*outp++ = (rt+ONE-'0')%10 + '0'; } - if (gameInfo.variant == VariantShogi) { + if (IS_SHOGI(gameInfo.variant)) { /* [HGM] in Shogi non-pawns can promote */ *outp++ = promoChar; // Don't bother to correct move type, return value is never used! } - else if (gameInfo.variant != VariantSuper && promoChar && + else if (gameInfo.variant == VariantChuChess && promoChar || + gameInfo.variant != VariantSuper && promoChar && (piece == WhiteLance || piece == BlackLance) ) { // Lance sometimes represents Pawn *outp++ = '='; *outp++ = ToUpper(promoChar);