char *array; // initial position\r
} VariantDesc;\r
\r
-typedef enum { V_CHESS, V_SHO, V_CHU, V_DAI, V_TENJIKU, V_DADA, V_MAKA, V_TAI, V_KYOKU, V_SHATRANJ, V_MAKRUK, V_LION, V_NUMBER } Variant;\r
+typedef enum { V_CHESS, V_SHO, V_CHU, V_DAI, V_DADA, V_MAKA, V_TAI, V_KYOKU, V_TENJIKU, V_SHATRANJ, V_MAKRUK, V_LION } Variant;\r
\r
VariantDesc variants[] = {\r
{ 16, 8, 8, 1, V_CHESS, "normal", chessArray }, // FIDE\r
{ 18, 9, 9, 3, V_SHO, "9x9+0_shogi", shoArray }, // Sho\r
+ { 18, 9, 9, 3, V_SHO, "sho", shoArray }, // Sho duplicat\r
{ 24, 12, 12, 4, V_CHU, "chu", chuArray }, // Chu\r
{ 30, 15, 15, 5, V_DAI, "dai", daiArray }, // Dai\r
{ 32, 16, 16, 5, V_TENJIKU, "tenjiku", tenArray }, // Tenjiku\r
{ 16, 8, 8, 3, V_MAKRUK, "makruk", thaiArray}, // Makruk\r
{ 16, 8, 8, 1, V_LION, "lion", lionArray}, // Mighty Lion\r
\r
-// { 0, 0, 0, 0, 0 }, // sentinel\r
+ { 0, 0, 0, 0, 0 }, // sentinel\r
{ 34, 17, 17, 0, V_DADA, "dada", chuArray }, // Dai Dai\r
{ 38, 19, 19, 0, V_MAKA, "maka", chuArray }, // Maka Dai Dai\r
{ 50, 25, 25, 0, V_TAI, "tai", chuArray }, // Tai\r
\r
if(p[u->piece].promoFlag & LAST_RANK) cnt50 = 0; // forward piece: move is irreversible\r
// TODO: put in some test for forward moves of non-backward pieces?\r
+// int n = board[promoSuppress-1];\r
+// if( n != EMPTY && (n&TYPE) == xstm && p[n].value == 8 ) NewNonCapt(promoSuppress-1, 16, 0);\r
\r
if(p[u->piece].value == FVAL) { // move with Fire Demon\r
int i, f=~fireFlags[u->piece-2];\r
if(PATH) printf("# autofail end (%d-%d)\n", firstMove, msp);\r
autoFail = 0; curMove = firstMove - 1; continue; // release stashed moves for search\r
}\r
-// if(currentVariant == V_CHESS && promoSuppress != ABSENT) { // e.p.\r
-// int n = board[promoSuppress-1];\r
-// if( n != EMPTY && (n&TYPE) == xstm && p[n].value == 8 ) \r
-// }\r
phase = 4; // out of victims: all captures generated\r
+ if(chessFlag && promoSuppress != ABSENT) { // e.p. rights. Create e.p. captures as Lion moves\r
+ int n = board[promoSuppress-1], old = msp; // a-side neighbor of pushed pawn\r
+ if( n != EMPTY && (n&TYPE) == stm && p[n].value == 80 ) NewCapture(promoSuppress-1, SPECIAL + 20 - 4*stm, 0);\r
+ n = board[promoSuppress+1]; // h-side neighbor of pushed pawn\r
+ if( n != EMPTY && (n&TYPE) == stm && p[n].value == 80 ) NewCapture(promoSuppress+1, SPECIAL + 52 - 4*stm, 0);\r
+ if(msp != old) goto extractMove; // one or more e.p. capture were generated\r
+ }\r
case 4: // dubious captures\r
#if 0\r
while( dubious < framePtr + 250 ) // add dubious captures back to move stack\r
for(j=0; j<8; j++) if(e + kStep[j] == t) break;\r
if(j >= 8) return INVALID; // this rejects Lion Dog 1+2 moves!\r
t2 = SPECIAL + 8*i + j;\r
+ } else if(chessFlag && board[f] != EMPTY && p[board[f]].value == 80 && board[t] == EMPTY) { // Pawn to empty, could be e.p.\r
+ if(t == f + BW + 1) t2 = SPECIAL + 16; else\r
+ if(t == f + BW - 1) t2 = SPECIAL + 48; else\r
+ if(t == f - BW + 1) t2 = SPECIAL + 20; else\r
+ if(t == f - BW - 1) t2 = SPECIAL + 52; // fake double-move\r
}\r
ret = f<<SQLEN | t2;\r
if(*moveText != '\n' && *moveText != '=') ret |= PROMOTE;\r
engineSide = NONE; // so stop playing\r
PrintResult(stm, score);\r
} else {\r
+ MOVE f, pMove = move;\r
+ if((move & SQUARE) >= SPECIAL && p[board[f = move>>SQLEN & SQUARE]].value == 80) { // e.p. capture\r
+ pMove = move & ~SQUARE | f + toList[(move & SQUARE) - SPECIAL]; // print as a single move\r
+ }\r
stm = MakeMove2(stm, move); // assumes MakeMove returns new side to move\r
gameMove[moveNr++] = move; // remember game\r
- printf("move %s\n", MoveToText(move, 1));\r
+ printf("move %s\n", MoveToText(pMove, 1));\r
listEnd = 0;\r
continue; // go check if we should ponder\r
}\r
continue;\r
}\r
if(!strcmp(command, "protover")){\r
+ for(i=0; variants[i].boardWidth; i++)\r
+ printf("%s%s", (i ? "," : "feature variants=\""), variants[i].name); printf("\"\n");\r
printf("feature ping=1 setboard=1 colors=0 usermove=1 memory=1 debug=1 sigint=0 sigterm=0\n");\r
- printf("feature variants=\"normal,shatranj,makruk,chu,dai,tenjiku,12x12+0_fairy,9x9+0_shogi,lion\"\n");\r
printf("feature myname=\"HaChu " VERSION "\" highlight=1\n");\r
printf("feature option=\"Full analysis PV -check 1\"\n"); // example of an engine-defined option\r
printf("feature option=\"Allow repeats -check 0\"\n");\r
continue;\r
}\r
if(!strcmp(command, "variant")) {\r
- for(i=0; i<8; i++) {\r
+ for(i=0; variants[i].boardWidth; i++) {\r
sscanf(inBuf+8, "%s", command);\r
if(!strcmp(variants[i].name, command)) {\r
Init(curVarNr = i); stm = Setup2(NULL); break;\r
}\r
}\r
+ if(currentVariant == V_SHO)\r
+ printf("setup (PNBRLSE..G.+++++++Kpnbrlse..g.+++++++k) 9x9+0_shogi lnsgkgsnl/1r2e2b1/ppppppppp/9/9/9/PPPPPPPPP/1B2E2R1/LNSGKGSNL w 0 1\n");\r
repStack[199] = hashKeyH, checkStack[199] = 0;\r
continue;\r
}\r
projects / hachu.git / blobdiff