static int legal_pawn_move( struct game_state_t *gs, int ff, int fr, int tf, int tr )
{
if (ff == tf) {\r
- if (gs->board[tf][tr] != NOPIECE && !gs->palace) return 0; // [HGM] XQ pawns can capture straight ahead\r
+ if (gs->board[tf][tr] != NOPIECE && !gs->palace && gs->promoType != 3) return 0; // [HGM] XQ and Shogi pawns can capture straight ahead\r
if (gs->onMove == WHITE) {\r
if (tr - fr == 1) return 1;\r
if ((fr <= gs->pawnDblStep) && (tr - fr == 2) && gs->board[ff][fr+1]==NOPIECE) return 1;
}\r
return 0;\r
}\r
- if (ff != tf) { /* Capture ? */
+ if (ff != tf && gs->promoType != 3) { /* Capture ? ([HGM] but not in Shogi) */
if ((ff - tf != 1) && (tf - ff != 1)) return 0;
if (gs->onMove == WHITE) {
if(gs->palace) return (fr >= gs->ranks/2 && fr == tr); // [HGM] XQ promoted pawns\r
dx = ff - tf;
dy = fr - tr;
- if (dy == gs->onMove == WHITE ? 2 : -2) {
+ if (dy == (gs->onMove == WHITE ? -2 : 2)) {
if (abs(dx) == 1)
return 1;
}
int *posf, int *posr, int *numpos)
{
if (gs->onMove == WHITE) {\r
- if (gs->board[onf][onr + 1] == NOPIECE || gs->palace) {\r
+ if (gs->board[onf][onr + 1] == NOPIECE || gs->palace || gs->promoType == 3) {\r
add_pos(onf, onr + 1, posf, posr, numpos);\r
if ((onr <= gs->pawnDblStep) && (gs->board[onf][onr + 2] == NOPIECE))\r
add_pos(onf, onr + 2, posf, posr, numpos);\r
}\r
if (onf > 0) {
if (gs->board[onf - 1][onr + 1] != NOPIECE &&\r
- iscolor(gs->board[onf - 1][onr + 1], BLACK))\r
+ iscolor(gs->board[onf - 1][onr + 1], BLACK) &&
+ !gs->palace && gs->promoType != 3) // no diagonal capture in XQ and Shogi\r
add_pos(onf - 1, onr + 1, posf, posr, numpos);
if(gs->palace && onr >= gs->ranks/2 && (gs->board[onf-1][onr] || iscolor(gs->board[onf-1][onr], BLACK)))
add_pos(onf - 1, onr, posf, posr, numpos); // XQ promoted pawn
}\r
if (onf < gs->files-1) {
if (gs->board[onf + 1][onr + 1] != NOPIECE &&\r
- iscolor(gs->board[onf + 1][onr + 1], BLACK))\r
+ iscolor(gs->board[onf + 1][onr + 1], BLACK) &&
+ !gs->palace && gs->promoType != 3) // no diagonal capture in XQ and Shogi\r
add_pos(onf + 1, onr + 1, posf, posr, numpos);
if(gs->palace && onr >= gs->ranks/2 && (gs->board[onf+1][onr] || iscolor(gs->board[onf+1][onr], BLACK)))
add_pos(onf + 1, onr, posf, posr, numpos); // XQ promoted pawn
if (gs->ep_possible[0][onf] == 1)\r
add_pos(onf + 1, onr + 1, posf, posr, numpos);
} else {\r
- if (gs->board[onf][onr - 1] == NOPIECE || gs->palace) {\r
+ if (gs->board[onf][onr - 1] == NOPIECE || gs->palace || gs->promoType == 3) {\r
add_pos(onf, onr - 1, posf, posr, numpos);\r
if ((onr >= gs->ranks - gs->pawnDblStep - 1) && (gs->board[onf][onr - 2] == NOPIECE))\r
add_pos(onf, onr - 2, posf, posr, numpos);\r
}\r
if (onf > 0) {
if (gs->board[onf - 1][onr - 1] != NOPIECE &&\r
- iscolor(gs->board[onf - 1][onr - 1], WHITE))\r
+ iscolor(gs->board[onf - 1][onr - 1], WHITE) &&\r
+ !gs->palace && gs->promoType != 3) // no diagonal capture in XQ and Shogi\r
add_pos(onf - 1, onr - 1, posf, posr, numpos);
if(gs->palace && onr < gs->ranks/2 && !iscolor(gs->board[onf-1][onr], BLACK))
add_pos(onf - 1, onr, posf, posr, numpos); // XQ promoted pawn
}\r
if (onf < gs->files-1) {
if (gs->board[onf + 1][onr - 1] != NOPIECE &&\r
- iscolor(gs->board[onf + 1][onr - 1], WHITE))\r
+ iscolor(gs->board[onf + 1][onr - 1], WHITE) &&\r
+ !gs->palace && gs->promoType != 3) // no diagonal capture in XQ and Shogi\r
add_pos(onf + 1, onr - 1, posf, posr, numpos);
if(gs->palace && onr < gs->ranks/2 && !iscolor(gs->board[onf+1][onr], BLACK))
add_pos(onf + 1, onr, posf, posr, numpos); // XQ promoted pawn
return 0;
if (gs->board[tFile][tRank] != NOPIECE)
return 0;
+ if (gs->promoType == 3) { // Shogi
+ int r;
+ switch(move_piece) {
+ case PAWN: // check for own Pawn in same file
+ for(r=0; r<gs->ranks; r++) if(gs->board[tFile][r] == (gs->onMove|PAWN)) return 0;
+ case LANCE: // Pawns and Lances not on last rank
+ if(gs->onMove == WHITE && tRank >= gs->ranks-1) return 0;
+ if(gs->onMove == BLACK && tRank < 1) return 0;
+ break;
+ case HONORABLEHORSE: // Knights at least two ranks from edge
+ if(gs->onMove == WHITE && tRank >= gs->ranks-2) return 0;
+ if(gs->onMove == BLACK && tRank < 2) return 0;
+ default: ;
+ }
+ } else
if (move_piece == PAWN && (tRank == 0 || tRank == gs->ranks-1))
return 0;
return 1;
// [HGM] castle: generalized castling, fr and tr give from and to file of Rook.
sprintf(mt->moveString, mt->toRank > mt->toFile ? "o-o-o" : "o-o");
} else {
+ if(gs->promoType == 3) { // Shogi-style promotions: not just Pawns, but many pieces can promote
+ int piece = gs->board[mt->fromFile][mt->fromRank];
+ mt->piecePromotionTo = NOPIECE;
+ if(colorval(piece) == WHITE && mt->fromRank < gs->ranks - gs->ranks/3
+ && mt->toRank < gs->ranks - gs->ranks/3 ||
+ colorval(piece) == BLACK && mt->fromRank >= gs->ranks/3
+ && mt->toRank >= gs->ranks/3 )
+ promote = NOPIECE; // suppress promotion outside zone
+ if(promote) { // promotion piece determined by original, no matter what was requested
+ switch(piecetype(piece)) {
+ case PAWN:
+ case LANCE:
+ case HONORABLEHORSE:
+ case SILVER:
+ promote = GOLD; break;
+ case BISHOP:
+ promote = DRAGONHORSE; break;
+ case ROOK:
+ promote = DRAGONKING; break;
+ default: promote = NOPIECE; // not a promotion
+ }
+ } else
+ switch(piecetype(piece)) { // force mandatory promotions
+ case HONORABLEHORSE:
+ if(mt->toRank == 1 || mt->toRank == gs->files-2) promote = GOLD;
+ case PAWN:
+ case LANCE:
+ if(mt->toRank == 0 || mt->toRank == gs->files-1) promote = GOLD;
+ default: break;
+ }
+ if(promote) mt->piecePromotionTo = promote | (colorval(gs->board[mt->fromFile][mt->fromRank]));\r
+ } else
if ((piecetype(gs->board[mt->fromFile][mt->fromRank]) == PAWN) &&
!gs->palace && // [HGM] XQ: no promotions in xiangqi\r
((mt->toRank == 0) || (mt->toRank == gs->ranks-1))) {
}\r
for (InitPieceLoop(gs->board, &f, &r, gs->onMove);\r
NextPieceLoop(gs->board, &f, &r, gs->onMove, gs->files, gs->ranks);) {\r
- if (legal_move(gs, f, r, kf, kr)) { /* In Check? */\r
+ if (legal_move(gs, f, r, kf, kr)) { /* In Check? */
return 1;\r
}\r
}\r
if(game_globals.garray[gs->gameNum].link < 0) {
// we have no partner, so we must have something to drop now
for(i=QUEEN; i>=PAWN; i--)
- if(gs->holding[gs->onMove==WHITE ? 0 : 1][i-1]) break;
- if(i > PAWN) return 1; // we have a non-Pawn to drop
- // We have a Pawn, but check if it legal to drop it
- if(i == PAWN && r != 0 && r != gs->ranks-1) return 1; // [HGM] todo: for Shogi there are extra conditions on Pawn drops!
+ if (legal_andcheck_move(gs, ALG_DROP, i, f, r)) return 1;\r
+ return 0;
}\r
return 1;\r
}\r
mt->fromFile = ALG_CASTLE;
}\r
\r
- if (mt->piecePromotionTo != NOPIECE) {\r
+ if (mt->piecePromotionTo != NOPIECE) {
promote = piecetype(mt->piecePromotionTo);\r
+printf("promotion piece = %d, type = %d",mt->piecePromotionTo, promote);\r
}\r
\r
return move_calculate(gs, mt, promote);\r