X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=hachu.c;h=2d6334939a29171647f15a272d83ef647abd579b;hb=12ca3b5e2047513cecc01b46a4bb84b2189a117a;hp=441656750e32524e948d1feea4b3abd9d98f321a;hpb=71d90af3d1e47be123cc9988245cbf5f0fdda27e;p=hachu.git diff --git a/hachu.c b/hachu.c index 4416567..2d63349 100644 --- a/hachu.c +++ b/hachu.c @@ -10,7 +10,7 @@ // promotions by pieces with Lion power stepping in & out the zone in same turn // promotion on capture -#define VERSION "0.19" +#define VERSION "0.21" //define PATH level==0 || path[0] == 0x590cb && (level==1 || path[1] == 0x4c0c9 && (level == 2 || path[2] == 0x8598ca && (level == 3 /*|| path[3] == 0x3e865 && (level == 4 || path[4] == 0x4b865 && (level == 5))*/))) #define PATH 0 @@ -89,6 +89,7 @@ #define PROMOTE (1<<2*SQLEN+1) /* promotion bit in move */ #define SPECIAL 1400 /* start of special moves */ #define BURN (SPECIAL + 96) /* start of burn encodings */ +#define CASTLE (SPECIAL + 100) /* castling encodings */ #define STEP(X,Y) (BW*(X)+ (Y)) #define SORTKEY(X) 0 @@ -127,6 +128,7 @@ char *MoveToText(Move move, int m); // from WB driver void pmap(int *m, int col); void pboard(int *b); void pbytes(unsigned char *b); +int myRandom(); typedef struct { int lock[5]; @@ -153,7 +155,7 @@ typedef struct { } PieceDesc; typedef struct { - int from, to, piece, victim, new, booty, epSquare, epVictim[8], ep2Square, revMoveCount; + int from, to, piece, victim, new, booty, epSquare, epVictim[9], ep2Square, revMoveCount; int savKeyL, savKeyH, gain, loss, filling, saveDelta; char fireMask; } UndoInfo; @@ -174,14 +176,16 @@ Move retMove, moveStack[20000], path[100], repStack[300], pv[1000], repeatMove[3 #define R 37 /* jump capture */ #define N -1 /* Knight */ #define J -2 /* jump */ -#define D -3 /* linear double move */ -#define T -4 /* linear triple move */ -#define L -5 /* true Lion move */ -#define F -6 /* Lion + 3-step */ -#define S -7 /* Lion + range */ -#define H -9 /* hook move */ -#define C -10 /* capture only */ -#define M -11 /* non-capture only */ +#define I -3 /* jump + step */ +#define D -4 /* linear double move */ +#define T -5 /* linear triple move */ +#define L -6 /* true Lion move */ +#define W -7 /* Werewolf move */ +#define F -8 /* Lion + 3-step */ +#define S -9 /* Lion + range */ +#define H -10 /* hook move */ +#define C -11 /* capture only */ +#define M -12 /* non-capture only */ #define LVAL 1000 /* piece value of Lion. Used in chu for recognizing it to implement Lion-trade rules */ #define FVAL 5000 /* piece value of Fire Demon. Used in code for recognizing moves with it and do burns */ @@ -247,6 +251,33 @@ PieceDesc daiPieces[] = { { NULL } // sentinel }; +PieceDesc waPieces[] = { + {"TE", "", 720, { X,X,1,X,X,X,1,X }, 4 }, // Tenacious Falcon + {"GS", "", 500, { X,0,X,0,X,0,X,0 }, 4 }, // Gliding Swallow (R) + {"DE", "", 430, { X,3,1,1,X,1,1,3 }, 3 }, // Cloud Eagle + {"K", "", 410, { 1,1,1,1,1,1,1,1 }, 2 }, // Crane King (K) + {"BT", "", 390, { I,I,0,I,I,I,0,I }, 4 }, // Treacherous Fox + {"FL", "TE", 380, { 1,X,0,X,0,X,0,X }, 4 }, // Flying Falcon + {"FS", "", 290, { X,1,1,0,X,0,1,1 }, 3 }, // Raiding Falcon + {"S", "GS", 260, { 1,0,X,0,1,0,X,0 }, 6 }, // Swallow's Wing (SM) + {"PO", "", 260, { 1,1,1,1,1,1,1,1 }, 2 }, // Plodding Ox (K) + {"R", "BT", 260, { X,1,0,1,1,1,0,1 }, 2 }, // Running Rabit + {"B", "", 240, { 1,1,1,1,0,1,1,1 }, 2 }, // Roaming Boar + {"HH", "", 220, { N,0,0,N,N,0,0,N }, 1 }, // Heavenly Horse + {"EW", "PO", 220, { 1,1,1,0,1,0,1,1 }, 2 }, // Violent Wolf (G) + {"VM", "B", 200, { 1,1,0,1,0,1,0,1 }, 2 }, // Violent Stag (S) + {"G", "S", 190, { 1,1,0,0,1,0,0,1 }, 2 }, // Flying Goose (C) + {"SM", "VM", 175, { 1,1,0,0,1,0,0,1 }, 2 }, // Climbing Monkey (C) + {"DH", "HH", 170, { X,0,0,0,2,0,0,0 }, 1 }, // Liberated Horse + {"DK", "EW", 150, { 0,1,1,0,1,0,1,1 }, 2 }, // Blind Dog + {"PH", "PO", 150, { X,0,0,0,0,0,0,0 }, 1 }, // Oxcart (L) + {"L", "FS", 130, { 0,1,1,0,0,0,1,1 }, 2 }, // Flying Cock + {"KN", "DE", 115, { 1,0,0,1,0,1,0,0 }, 2 }, // Swooping Owl + {"C", "FL", 105, { 1,0,0,1,0,1,0,0 }, 2 }, // Strutting Crow + {"P", "EW", 80, { 1,0,0,0,0,0,0,0 }, 2 }, // Sparrow Pawn (P) + { NULL } // sentinel +}; + PieceDesc ddPieces[] = { {"LO", "", 10, { 1,H,1,H,1,H,1,H } }, // Long-Nosed Goblin {"OK", "LO", 10, { 2,1,2,0,2,0,2,1 } }, // Old Kite @@ -429,6 +460,16 @@ PieceDesc makrukPieces[] = { { NULL } // sentinel }; +PieceDesc wolfPieces[] = { + {"EW","EW",1050,{ W,W,W,W,W,W,W,W }, 6, 5 }, // kludge to get extra Werewolves + {"R", "", 500, { X,0,X,0,X,0,X,0 }, 3 }, + {"B", "", 320, { 0,X,0,X,0,X,0,X }, 1 }, + {"N", "", 300, { N,N,N,N,N,N,N,N }, 1 }, + {"K", "", 280, { 1,1,1,1,1,1,1,1 }, 0, 4 }, + {"P", "R", 80, { M,C,0,0,0,0,0,C } }, + { NULL } // sentinel +}; + char chuArray[] = "L:FLCSGK:DEGSC:FLL/:RV.B.:BT:KN:PH:BT.B.:RV/:SM:VMR:DH:DK:LN:FK:DK:DHR:VM:SM/PPPPPPPPPPPP/...:GB....:GB..." "/............/............/" "...:gb....:gb.../pppppppppppp/:sm:vmr:dh:dk:fk:ln:dk:dhr:vm:sm/:rv.b.:bt:ph:kn:bt.b.:rv/l:flcsg:dekgsc:fll"; @@ -441,10 +482,14 @@ char tenArray[] = "LN:FLICSGK:DEGSCI:FLNL/:RV.:CS:CS.:BT:KN:LN:FK:PH:BT.:CS:CS.: "....d......d..../pppppppppppppppp/:sm:vmr:hf:se:bg:rg:vg:gg:rg:bg:se:hfr:vm:sm/" ":ss:vsb:dh:dk:wb:fi:fe:lh:fi:wb:dk:dhb:vs:ss/:rv.:cs:cs.:bt:ph:fk:ln:kn:bt.:cs:cs.:rv/ln:flicsg:dekgsci:flnl"; char shoArray[] = "LNSGKGSNL/.B..:DE..R./PPPPPPPPP/........./........./........./ppppppppp/.r..:de..b./lnsgkgsnl"; +char waArray[] = ":PH:DKCG:EWK:VML:KN:SM:DH/.:FL...S...:DE./PPP:BTPPPRPPP/...P...P..." + "/.........../.........../..........." + "/...p...p.../ppprppp:btppp/.:de...s...:fl./:dh:sm:knl:vmk:ewgc:dk:ph"; char chessArray[] = "RNB:FKKBNR/PPPPPPPP/......../......../......../......../pppppppp/rnb:fkkbnr"; char lionArray[] = "R:LNB:FKKBNR/PPPPPPPP/......../......../......../......../pppppppp/r:lnb:fkkbnr"; char shatArray[]= "RNBK:FKBNR/PPPPPPPP/......../......../......../......../pppppppp/rnbk:fkbnr"; char thaiArray[]= "RNSK:SMSNR/......../PPPPPPPP/......../......../pppppppp/......../rns:smksnr"; +char wolfArray[]= "RNB:EWKBNR/PPPPPPPP/......../......../......../......../pppppppp/rnb:ewkbnr"; typedef struct { int boardWidth, boardFiles, boardRanks, zoneDepth, varNr; // board sizes @@ -452,7 +497,7 @@ typedef struct { char *array; // initial position } VariantDesc; -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; +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, V_WA, V_WOLF } Variant; #define SAME (-1) @@ -466,6 +511,8 @@ VariantDesc variants[] = { { 16, 8, 8, 1, V_SHATRANJ,"shatranj",shatArray}, // Shatranj { 16, 8, 8, 3, V_MAKRUK, "makruk", thaiArray}, // Makruk { 16, 8, 8, 1, V_LION, "lion", lionArray}, // Mighty Lion + { 22, 11, 11, 3, V_WA, "washogi", waArray}, // Wa + { 16, 8, 8, 1, V_WOLF, "werewolf",wolfArray}, // Wa { 0, 0, 0, 0, 0 }, // sentinel { 34, 17, 17, 0, V_DADA, "dada", chuArray }, // Dai Dai @@ -498,7 +545,7 @@ Vector direction[] = { // clockwise! { 2,-1} }; -int epList[96], ep2List[96], toList[96], reverse[96]; // decoding tables for double and triple moves +int epList[104], ep2List[104], toList[104], reverse[104]; // decoding tables for double and triple moves int kingStep[10], knightStep[10]; // raw tables for step vectors (indexed as -1 .. 8) int neighbors[9]; // similar to kingStep, but starts with null-step char fireFlags[10]; // flags for Fire-Demon presence (last two are dummies, which stay 0, for compactify) @@ -588,6 +635,7 @@ typedef struct { char mobWeight; unsigned char promoGain; char bulk; + char ranking; } PieceInfo; // piece-list entry int last[2], royal[2], kylin[2]; @@ -620,7 +668,7 @@ int rawBoard[BSIZE + 11*BHMAX + 6]; int attackMaps[200*BSIZE], *attacks = attackMaps; char distance[2*BSIZE]; // distance table char promoBoard[BSIZE]; // flags to indicate promotion zones -char rawFire[BSIZE+2*BWMAX]; // flags to indicate squares controlled by Fire Demons +unsigned char rawFire[BSIZE+2*BWMAX]; // flags to indicate squares controlled by Fire Demons signed char PST[7*BSIZE]; #define board (rawBoard + 6*BHMAX + 3) @@ -658,6 +706,10 @@ LookUp (char *name, int var) return ListLookUp(name, makrukPieces); case V_LION: // Mighty Lion return ListLookUp(name, lionPieces); + case V_WA: // Wa + return ListLookUp(name, waPieces); + case V_WOLF: // Werewolf + return ListLookUp(name, wolfPieces); } return NULL; } @@ -707,7 +759,6 @@ Lance (signed char *r) int EasyProm (signed char *r) { - int i; if(r[0] == X) return 30 + PROMO*((unsigned int)(r[1] | r[2] | r[3] | r[5] | r[6] | r[7]) <= 1); if(r[1] == X || r[7] == X) return 30 + PROMO/2; return 0; @@ -762,7 +813,7 @@ StackMultis (int col) void Compactify (int stm) { // remove pieces that are permanently gone (captured or promoted) from one side's piece list - int i, j, k; + int i, k; for(i=stm+2; i<=last[stm]; i+=2) { // first pass: unpromoted pieces if((k = p[i].promo) >= 0 && p[i].pos == ABSENT) { // unpromoted piece no longer there p[k].promo = -2; // orphan promoted version @@ -800,6 +851,7 @@ AddPiece (int stm, PieceDesc *list) p[i].pieceKey = *key; p[i].promoFlag = 0; p[i].bulk = list->bulk; + p[i].ranking = list->ranking; p[i].mobWeight = v > 600 ? 0 : v >= 400 ? 1 : v >= 300 ? 2 : v > 150 ? 3 : v >= 100 ? 2 : 0; if(Lance(list->range)) p[i].mobWeight = 0, p[i].pst = list->range[4] ? PST_NEUTRAL : PST_LANCE; // keep back @@ -808,16 +860,16 @@ AddPiece (int stm, PieceDesc *list) } if(royal[stm] >= i) royal[stm] += 2; if(kylin[stm] >= i) kylin[stm] += 2; - if(p[i].value == (currentVariant == V_SHO ? 410 : 280) ) royal[stm] = i, p[i].pst = 0; + if(p[i].value == (currentVariant == V_SHO || currentVariant == V_WA ? 410 : 280) ) royal[stm] = i, p[i].pst = 0; p[i].qval = (currentVariant == V_TENJIKU ? list->ranking : 0); // jump-capture hierarchy return i; } void -SetUp(char *array, int var) +SetUp (char *array, int var) { - int i, j, n, m, nr, color; - char c, *q, name[3], prince = 0; + int i, j, n, m, color; + char c, name[3], prince = 0; PieceDesc *p1, *p2; last[WHITE] = 1; last[BLACK] = 0; royal[WHITE] = royal[BLACK] = 0; @@ -874,6 +926,7 @@ SetUp(char *array, int var) if(x != ABSENT) for(j=0; j<8; j++) fireBoard[x+kStep[j]] |= n; n <<= 1; } + for(i=2; i<6; i++) if(p[i].ranking == 5) p[i].promo = -1, p[i].promoFlag = 0; // take promotability away from Werewolves for(i=0; ivalue : 0; // get Pawn value @@ -955,10 +1008,15 @@ Init (int var) // Lion-Dog triple moves toList[64+i] = 3*kStep[i]; epList[64+i] = kStep[i]; toList[72+i] = 3*kStep[i]; epList[72+i] = 2*kStep[i]; - toList[80+i] = 3*kStep[i]; epList[80+i] = kStep[i]; ep2List[80+i] = 2*kStep[i]; + toList[80+i] = 3*kStep[i]; epList[80+i] = 2*kStep[i]; ep2List[80+i] = kStep[i]; toList[88+i] = kStep[i]; epList[88+i] = 2*kStep[i]; } + toList[100] = BH - 2; epList[100] = BH - 1; ep2List[100] = BH - 3; + toList[100+1] = 2; epList[100+1] = 0; ep2List[100+1] = 3; + toList[100+2] = bsize - BH - 2; epList[100+2] = bsize - BH - 1; ep2List[100+2] = bsize - BH - 3; + toList[100+3] = bsize - BW + 2; epList[100+3] = bsize - BW; ep2List[100+3] = bsize - BW + 3; + // fill distance table for(i=0; i<2*BSIZE; i++) { distance[i] = 0; @@ -1094,7 +1152,7 @@ char mapStep[] = { 7, 8, 1, -6, -7, -8, -1, 6 }; char rowMask[] = { 0100, 0140, 0160, 070, 034, 016, 07, 03, 01 }; char rows[9]; -int +void AreaStep (int from, int x, int flags, int n, int d) { int i; @@ -1108,7 +1166,7 @@ AreaStep (int from, int x, int flags, int n, int d) } } -int +void AreaMoves (int from, int piece, int range) { int i; @@ -1135,6 +1193,17 @@ MarkBurns (int x) for(r=b; r<=t-2; r++) rows[r] |= rows[r+1] | rows[r+2]; // smear vertically } +void +GenCastlings () +{ // castings for Lion Chess. Assumes board width = 8 and Kings on e-file, and K/R value = 280/300! + int f = BH>>1, t = CASTLE; + if(stm != WHITE) f += bsize - BW, t += 2; + if(p[board[f]].value = 280) { + if(p[board[f-4]].value == 300 && board[f-3] == EMPTY && board[f-2] == EMPTY && board[f-1] == EMPTY) moveStack[msp++] = f<= S) { // in any case, do a jump of 2 int occup = NewNonCapture(x, x + 2*v, pFlag); - if(r < J) { // Lion power, also single step - if(!NewNonCapture(x, x + v, pFlag)) nullMove = x; else occup = 1; + if(r < I) { // Lion power, also single step + if(!NewNonCapture(x, x + v, pFlag)) nullMove = (r == W ? ABSENT : x); else occup = 1; if(r <= L) { // true Lion, also Knight jump if(!occup & r < L) for(y=x+2*v; !NewNonCapture(x, y+=v, pFlag) && r == S; ); // BS and FF moves v = nStep[j]; - NewNonCapture(x, x + v, pFlag); - } - } + if(r != W) NewNonCapture(x, x + v, pFlag); + } else if(r == T) NewNonCapture(x, x+3*v, pFlag); // Lion Dog, also triple step + } else if(r == I) NewNonCapture(x, x + v, pFlag); // also do step } else if(r == M) { // FIDE Pawn; check double-move if(!NewNonCapture(x, x+v, pFlag) && chessFlag && promoBoard[x-v] & LAST_RANK) @@ -1182,7 +1251,7 @@ report (int x, int y, int i) int MapOneColor (int start, int last, int *map) { - int i, j, k, totMob = 0; + int i, j, totMob = 0; for(i=start+2; i<=last; i+=2) { int mob = 0; if(p[i].pos == ABSENT) continue; @@ -1200,6 +1269,7 @@ MapOneColor (int start, int last, int *map) if(r < J) { // Lion power, also single step if(board[x + v] != EMPTY && board[x + v] != EDGE) map[2*(x + v) + start] += one[j]; + if(r < I) { if(r == T) { // Lion Dog, also jump of 3 if(board[x + 3*v] != EMPTY && board[x + 3*v] != EDGE) map[2*(x + 3*v) + start] += one[j]; @@ -1207,8 +1277,8 @@ MapOneColor (int start, int last, int *map) if(r <= L) { // true Lion, also Knight jump if(r < L) { // Lion plus (limited) range int y = x, n = 0; - r = (r == S ? 36 : 3); - while(n++ <= r) { + int rg = (r == S ? 36 : 3); + while(n++ < rg) { if(board[y+=v] == EDGE) break; if(board[y] != EMPTY) { if(n > 2) map[2*y + start] += one[j]; // outside Lion range @@ -1217,9 +1287,10 @@ MapOneColor (int start, int last, int *map) } } v = nStep[j]; - if(board[x + v] != EMPTY && board[x + v] != EDGE) + if(board[x + v] != EMPTY && board[x + v] != EDGE && r != W) map[2*(x + v) + start] += one[8]; } + } } } else if(r == C) { // FIDE Pawn diagonal @@ -1264,6 +1335,7 @@ MapFromScratch (int *map) int i; for(i=0; i<2*bsize; i++) map[i] = 0; mobilityScore = MapOneColor(1, last[WHITE], map); + mobilityScore -= MapOneColor(0, last[BLACK], map); } @@ -1309,6 +1381,21 @@ MakeMove(Move m, UndoInfo *u) } else u->new = u->piece; if(u->to >= SPECIAL) { // two-step Lion move + if(u->to >= CASTLE) { // move Rook, faking it was an e.p. victim so that UnMake works automatically + u->epSquare = epList[u->to - SPECIAL]; + u->ep2Square = ep2List[u->to - SPECIAL]; + u->epVictim[0] = board[u->epSquare]; // kludgy: fake that King e.p. captured the Rook! + u->epVictim[1] = board[u->ep2Square]; // should be EMPTY (but you never know, so save as well). + board[u->ep2Square] = u->epVictim[0]; // but put Rook back + board[u->epSquare] = EMPTY; + p[u->epVictim[0]].pos = u->ep2Square; + p[u->epVictim[1]].pos = ABSENT; + u->to = toList[u->to - SPECIAL]; + hashKeyL ^= p[u->epVictim[0]].pieceKey * squareKey[u->epSquare]; + hashKeyH ^= p[u->epVictim[0]].pieceKey * squareKey[u->epSquare+BH]; + hashKeyL ^= p[u->epVictim[0]].pieceKey * squareKey[u->ep2Square]; + hashKeyH ^= p[u->epVictim[0]].pieceKey * squareKey[u->ep2Square+BH]; + } else { // take care of first e.p. victim u->epSquare = u->from + epList[u->to - SPECIAL]; // decode u->epVictim[0] = board[u->epSquare]; // remember for takeback @@ -1335,6 +1422,7 @@ MakeMove(Move m, UndoInfo *u) hashKeyH ^= p[u->epVictim[1]].pieceKey * squareKey[u->ep2Square+BH]; if(p[u->piece].value != LVAL && p[u->epVictim[0]].value == LVAL) deferred |= PROMOTE; // flag non-Lion x Lion cnt50 = 0; // double capture irreversible + } } if(u->fireMask & fireBoard[u->to]) { // we moved next to enemy Fire Demon (must be done after SPECIAL, to decode to-sqr) @@ -1364,10 +1452,18 @@ MakeMove(Move m, UndoInfo *u) u->epVictim[0] = EDGE; // kludge to flag to UnMake this is special move } - u->booty += PST[p[u->new].pst + u->to] - PST[p[u->piece].pst + u->from]; - u->victim = board[u->to]; p[u->victim].pos = ABSENT; + if(p[u->victim].ranking == 5 && p[u->piece].ranking < 4) { // contageous piece captured by non-royal + u->booty -= p[u->new].value; + u->new = u->piece & 1 | 2; // promote to it + if(p[u->new].pos != ABSENT) u->new += 2; + p[u->piece].pos = ABSENT; + u->booty += p[u->new].value; + } + + u->booty += PST[p[u->new].pst + u->to] - PST[p[u->piece].pst + u->from]; + filling += p[u->new].bulk - p[u->piece].bulk - p[u->victim].bulk; promoDelta += p[u->new].promoGain - p[u->piece].promoGain + p[u->victim].promoGain; u->booty += p[u->victim].value + PST[p[u->victim].pst + u->to]; @@ -1431,13 +1527,13 @@ UnMake(UndoInfo *u) } void -GenCapts(int sqr, int victimValue) +GenCapts (int sqr, int victimValue) { // generate all moves that capture the piece on the given square - int i, range, att = attacks[2*sqr + stm]; + int i, att = attacks[2*sqr + stm]; //printf("GenCapts(%c%d,%d) %08x\n",sqr%BW+'a',sqr/BW,victimValue,att); if(!att) return; // no attackers at all! for(i=0; i<8; i++) { // try all rays - int x, v, jumper, jcapt=0; + int x, v, jcapt=0; if(att & attackMask[i]) { // attacked by move in this direction v = -kStep[i]; x = sqr; while( board[x+=v] == EMPTY ); // scan towards source until we encounter a 'stop' @@ -1513,11 +1609,61 @@ GenCapts(int sqr, int victimValue) NewCapture(x, SPECIAL + 9*i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // hit and run } break; + case T: // Lion-Dog move (awful!) + if(d > 3) break; + NewCapture(x, sqr + victimValue - SORTKEY(attacker), p[attacker].promoFlag); + att -= one[i]; + if(d == 3) { // check if we can take one or two intermediates (with higher piece index) with it + if((board[x-v] & TYPE) == xstm && board[x-v] > board[sqr]) { + NewCapture(x, SPECIAL + 64 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. first + if((board[x-2*v] & TYPE) == xstm && board[x-2*v] > board[sqr]) + NewCapture(x, SPECIAL + 80 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. both + } else if((board[x-2*v] & TYPE) == xstm && board[x-2*v] > board[sqr]) + NewCapture(x, SPECIAL + 72 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. second + } else if(d == 2) { // check if we can take intermediate with it + if((board[x-v] & TYPE) == xstm && board[x-v] > board[sqr]) { + NewCapture(x, SPECIAL + 9*i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. first, stop at 2nd + NewCapture(x, SPECIAL + 88 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // shoot 2nd, take 1st + if(board[sqr-v] == EMPTY || (board[sqr-v] & TYPE) == xstm && board[sqr-v] > board[sqr]) + NewCapture(x, SPECIAL + 80 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. 1st and 2nd + } else if(board[sqr-v] == EMPTY || (board[sqr-v] & TYPE) == xstm && board[sqr-v] > board[sqr]) + NewCapture(x, SPECIAL + 72 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. 2nd + } else { // d=1; can move on to second, or move back for igui + NewCapture(x, SPECIAL + 8*i + (i^4) + victimValue, p[attacker].promoFlag); // igui + if(board[sqr-v] == EMPTY) { // 2nd empty + NewCapture(x, SPECIAL + 9*i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. 1st and run to 2nd + if(board[sqr-2*v] == EMPTY || (board[sqr-2*v] & TYPE) == xstm && board[sqr-2*v] > board[sqr]) + NewCapture(x, SPECIAL + 72 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. 1st, end on 3rd + } else if((board[sqr-v] & TYPE) == stm) { // 2nd own + if(board[sqr-2*v] == EMPTY || (board[sqr-2*v] & TYPE) == xstm && board[sqr-2*v] > board[sqr]) + NewCapture(x, SPECIAL + 72 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. 1st, end on 3rd + } else if((board[sqr-v] & TYPE) == xstm && board[sqr-v] > board[sqr]) { + NewCapture(x, SPECIAL + 9*i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. 1st, capture and stop at 2nd + NewCapture(x, SPECIAL + 88 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // shoot 2nd + if(board[sqr-2*v] == EMPTY || (board[sqr-2*v] & TYPE) == xstm && board[sqr-2*v] > board[sqr]) + NewCapture(x, SPECIAL + 80 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. 1st and 2nd + } + } + break; case J: // plain jump (as in KY, PH) if(d != 2) break; + case I: // jump + step (as in Wa TF) + if(d > 2) break; NewCapture(x, sqr + victimValue - SORTKEY(attacker), p[attacker].promoFlag); att -= one[i]; break; + case W: // jump + locust jump + 3-slide (Werewolf) + if(d > 2) break; + NewCapture(x, sqr + victimValue - SORTKEY(attacker), p[attacker].promoFlag); + att -= one[i]; + if(d == 2) { // check if we can take intermediate with it + if((board[x-v] & TYPE) == xstm && board[x-v] > board[sqr]) + NewCapture(x, SPECIAL + 9*i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. + } else { // d=1; can move on to second + if(board[sqr-v] == EMPTY || (board[sqr-v] & TYPE) == xstm && board[sqr-v] > board[sqr]) + NewCapture(x, SPECIAL + 9*i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // hit and run + } + break; case C: // FIDE Pawn if(d != 1) break; NewCapture(x, sqr + victimValue - SORTKEY(attacker), p[attacker].promoFlag); @@ -1538,7 +1684,7 @@ GenCapts(int sqr, int victimValue) for(i=0; i<8; i++) { // scan all knight jumps to locate source int x = sqr - nStep[i], attacker = board[x]; if(attacker == EMPTY || (attacker & TYPE) != stm) continue; - if(p[attacker].range[i] <= L && p[attacker].range[i] >= S || p[attacker].range[i] == N) { // has Knight jump in our direction + if(p[attacker].range[i] == L || p[attacker].range[i] < W && p[attacker].range[i] >= S || p[attacker].range[i] == N) { // has Knight jump in our direction NewCapture(x, sqr + victimValue, p[attacker].promoFlag); // plain jump (as in N) if(p[attacker].range[i] < N) { // Lion power; generate double captures over two possible intermediates int v = kStep[i]; // leftish path @@ -1848,6 +1994,7 @@ if(PATH) printf("# probe hash index=%x hit=%d\n", index, hit),fflush(stdout); if(hit >= 0) { bestScore = hashTable[index].score[hit]; hashMove = hashTable[index].move[hit]; + if((bestScore <= alpha || hashTable[index].flag[hit] & H_LOWER) && (bestScore >= beta || hashTable[index].flag[hit] & H_UPPER) ) { iterDep = resDep = hashTable[index].depth[hit]; bestMoveNr = 0; @@ -2048,7 +2195,7 @@ attacks += 2*bsize; MapFromScratch(attacks); // for as long as incremental update does not work. //if(flag & depth >= 0) printf("%2d:%d mapped %d/%d %s\n", depth, iterDep, curMove, msp, MoveToText(moveStack[curMove], 0)); //if(PATH) pmap(attacks, stm); - if(chuFlag && p[tb.victim].value == LVAL) {// verify legality of Lion capture in Chu Shogi + if(chuFlag && (p[tb.victim].value == LVAL || p[tb.epVictim[0]].value == LVAL)) {// verify legality of Lion capture in Chu Shogi score = 0; if(p[tb.piece].value == LVAL) { // Ln x Ln: can make Ln 'vulnerable' (if distant and not through intemediate > GB) if(dist[tb.from-tb.to] != 1 && attacks[2*tb.to + stm] && p[tb.epVictim[0]].value <= 50) @@ -2174,7 +2321,7 @@ pplist() for(i=0; i<182; i++) { printf("%3d. %3d %3d %4d %02x %d %d %x %3d %4d ", i, p[i].value, p[i].promo, p[i].pos, p[i].promoFlag&255, p[i].mobWeight, p[i].qval, p[i].bulk, p[i].promoGain, p[i].pst); for(j=0; j<8; j++) printf(" %2d", p[i].range[j]); - if(i<2 || i>11) printf("\n"); else printf(" %02x\n", fireFlags[i-2]&255); + if(i<2 || i>11) printf("\n"); else printf(" %02x %d\n", fireFlags[i-2]&255, p[i].ranking); } printf("last: %d / %d\nroyal %d / %d\n", last[WHITE], last[BLACK], royal[WHITE], royal[BLACK]); } @@ -2197,6 +2344,7 @@ pbytes (unsigned char *b) for(i=BH-1; i>=0; i--) { for(j=0; j 'Z' ? 'a' - 'A' : 0; - if((currentVariant == V_CHESS || currentVariant == V_SHATRANJ || currentVariant == V_LION || + if((currentVariant == V_CHESS || currentVariant == V_SHATRANJ || currentVariant == V_LION || currentVariant == V_WOLF || currentVariant == V_MAKRUK || currentVariant == V_SHO) && *fen - n == 'N' // In Chess N is Knight, not Lion || table[2* (*fen - 'A' - n)] == '.') *p++ = *fen; else { *p++ = ':'; @@ -2384,20 +2534,22 @@ MoveToText (MOVE move, int multiLine) char *promoChar = ""; if(f == t) { sprintf(buf, "@@@@"); return buf; } // null-move notation in WB protocol buf[0] = '\0'; - if(t >= SPECIAL) { // kludgy! Print as side effect non-standard WB command to remove victims from double-capture (breaks hint command!) + if(t >= SPECIAL) { + if(t < CASTLE) { // castling is printed as a single move, implying its side effects int e = f + epList[t - SPECIAL]; -// printf("take %c%d\n", e%BW+'a', e/BW+ONE); - sprintf(buf, "%c%d%c%d,", f%BW+'a', f/BW+ONE, e%BW+'a', e/BW+ONE); f = e; - if(multiLine) printf("move %s\n", buf), buf[0] = '\0'; if(ep2List[t - SPECIAL]) { - e = g + ep2List[t - SPECIAL]; + int e2 = f + ep2List[t - SPECIAL]; // printf("take %c%d\n", e%BW+'a', e/BW+ONE); - sprintf(buf+strlen(buf), "%c%d%c%d,", f%BW+'a', f/BW+ONE, e%BW+'a', e/BW+ONE); f = e; - if(multiLine) printf("move %s\n", buf), buf[0] = '\0'; + sprintf(buf+strlen(buf), "%c%d%c%d,", f%BW+'a', f/BW+ONE, e2%BW+'a', e2/BW+ONE); f = e2; + if(multiLine) printf("move %s\n", buf), buf[0] = '\0'; } +// printf("take %c%d\n", e%BW+'a', e/BW+ONE); + sprintf(buf, "%c%d%c%d,", f%BW+'a', f/BW+ONE, e%BW+'a', e/BW+ONE); f = e; + if(multiLine) printf("move %s\n", buf), buf[0] = '\0'; + } t = g + toList[t - SPECIAL]; } - if(move & PROMOTE) promoChar = currentVariant == V_MAKRUK ? "m" : repDraws ? "q" : "+"; + if(move & PROMOTE) promoChar = currentVariant == V_MAKRUK ? "m" : currentVariant == V_WOLF ? "r" : repDraws ? "q" : "+"; sprintf(buf+strlen(buf), "%c%d%c%d%s", f%BW+'a', f/BW+ONE, t%BW+'a', t/BW+ONE, promoChar); return buf; } @@ -2405,7 +2557,7 @@ MoveToText (MOVE move, int multiLine) int ReadSquare (char *p, int *sqr) { - int i=0, f, r; + int f, r; f = p[0] - 'a'; r = atoi(p + 1) - ONE; *sqr = r*BW + f; @@ -2425,7 +2577,13 @@ MapFromScratch(attacks); Search(-INF-1, INF+1, 0, QSdepth+1, 0, sup1 & ~PROMOTE, sup2, INF); postThinking++; - listStart = retFirst; listEnd = msp = retMSP; + listStart = retFirst; msp = retMSP; + if(currentVariant == V_LION) GenCastlings(); listEnd = msp; + for(i=listStart; i> SQLEN & SQUARE; + if(to >= SPECIAL) continue; + if(p[board[to]].ranking == 5 && p[board[from]].ranking < 4) moveStack[i] |= PROMOTE; + } } MOVE @@ -2442,17 +2600,40 @@ ParseMove (char *moveText) e = t; moveText += ReadSquare(moveText, &t); for(i=0; i<8; i++) if(f + kStep[i] == e) break; - if(i >= 8) return INVALID; // this rejects Lion Dog 2+1 and 2-1 moves! - for(j=0; j<8; j++) if(e + kStep[j] == t) break; - if(j >= 8) return INVALID; // this rejects Lion Dog 1+2 moves! - t2 = SPECIAL + 8*i + j; + if(i >= 8) { // first leg not King step. Try Lion Dog 2+1 or 2-1 + for(i=0; i<8; i++) if(f + 2*kStep[i] == e) break; + if(i >= 8) return INVALID; // not even that + if(f + 3*kStep[i] == t) t2 = SPECIAL + 72 + i; // 2+1 + else if(f + kStep[i] == t) t2 = SPECIAL + 88 + i; // 2-1 + else return INVALID; + } else if(f + 3*kStep[i] == t) { // Lion Dog 1+2 move + t2 = SPECIAL + 64 + i; + } else if(*moveText == ',') { // 3rd leg follows! + if(f + 2*kStep[i] != t) return INVALID; // 3-leg moves must be linear! + moveText += ReadSquare(moveText, &e); + if(e != t) return INVALID; // must again continue with same piece + moveText += ReadSquare(moveText, &t); + if(f + 3*kStep[i] == t) t2 = SPECIAL + 80 + i; // 1+1+1 + else if(f + kStep[i] == t) t2 = SPECIAL + 88 + i; // 2-1 entered as 1+1-1 + else return INVALID; + } else { + for(j=0; j<8; j++) if(e + kStep[j] == t) break; + if(j >= 8) return INVALID; // this rejects Lion Dog 1+2 moves! + t2 = SPECIAL + 8*i + j; + } } else if(chessFlag && board[f] != EMPTY && p[board[f]].value == pVal && board[t] == EMPTY) { // Pawn to empty, could be e.p. if(t == f + BW + 1) t2 = SPECIAL + 16; else if(t == f + BW - 1) t2 = SPECIAL + 48; else if(t == f - BW + 1) t2 = SPECIAL + 20; else if(t == f - BW - 1) t2 = SPECIAL + 52; // fake double-move + } else if(currentVariant == V_LION && board[f] != EMPTY && p[board[f]].value == 280 && (t-f == 2 || f-t == 2)) { // castling + if(t == f+2 && f < BW) t2 = CASTLE; else + if(t == f-2 && f < BW) t2 = CASTLE + 1; else + if(t == f+2 && f > BW) t2 = CASTLE + 2; else + if(t == f-2 && f > BW) t2 = CASTLE + 3; } ret = f<= listEnd) { @@ -2500,6 +2681,7 @@ Highlight(char *coords) for(i=listStart; i>SQLEN & SQUARE)) { int t = moveStack[i] & SQUARE; + if(t >= CASTLE) t = toList[t - SPECIAL]; else // decode castling if(t >= SPECIAL) { int e = sqr + epList[t - SPECIAL]; // decode b[e] = 'C'; @@ -2517,9 +2699,13 @@ Highlight(char *coords) int e, t = moveStack[i] & SQUARE; if(t < SPECIAL) continue; // only special moves e = lastLift + epList[t - SPECIAL]; // decode + if(sqr == lastLift + ep2List[t - SPECIAL]) { // second leg of 3-leg move + b[e] = 'C'; cnt++; + continue; + } t = lastLift + toList[t - SPECIAL]; if(e != sqr) continue; - b[t] = (!boardCopy[t] ? 'Y' : 'R'); cnt++; + if(!b[t]) b[t] = (!boardCopy[t] ? 'Y' : 'R'); cnt++; } } if(!cnt) return; @@ -2565,7 +2751,7 @@ printf("# limits %d, %d, %d mode = %d\n", tlim1, tlim2, tlim3, abortFlag); int SearchBestMove (MOVE *move, MOVE *ponderMove) { - int score, i; + int score; printf("# SearchBestMove\n"); startTime = GetTickCount(); nodes = 0; @@ -2644,18 +2830,21 @@ printf("# ponder hit\n"); } } + int main() { - int engineSide=NONE; // side played by engine + int engineSide=NONE; // side played by engine MOVE move; int i, score, curVarNr; - Init(V_CHU); // Chu + setvbuf(stdin, NULL, _IOLBF, 1024); // buffering more than one line flaws test for pending input! + + Init(V_CHU); // Chu seed = startTime = GetTickCount(); moveNr = 0; // initialize random while(1) { // infinite loop - fflush(stdout); // make sure everything is printed before we do something that might take time + fflush(stdout); // make sure everything is printed before we do something that might take time *inBuf = 0; if(moveNr >= 20) randomize = OFF; //if(moveNr >20) printf("resign\n"); @@ -2702,7 +2891,7 @@ pboard(board); } stm = MakeMove2(stm, move); // assumes MakeMove returns new side to move gameMove[moveNr++] = move; // remember game - printf("move %s\n", MoveToText(pMove, 1)); + printf("move %s%s\n", MoveToText(pMove, 1), p[undoInfo.victim].ranking == 5 && p[undoInfo.piece].ranking < 4 ? "w" : ""); listEnd = 0; continue; // go check if we should ponder } @@ -2817,8 +3006,13 @@ pboard(board); Init(curVarNr = i); stm = Setup2(NULL); break; } } + if(currentVariant == V_WOLF) + printf("setup (PNBR...........WKpnbr...........wk) 8x8+0_fairy rnbwkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBWKBNR w 0 1\n"); if(currentVariant == V_SHO) printf("setup (PNBRLSE..G.+++++++Kpnbrlse..g.+++++++k) 9x9+0_shogi lnsgkgsnl/1r2e2b1/ppppppppp/9/9/9/PPPPPPPPP/1B2E2R1/LNSGKGSNL w 0 1\n"); + if(currentVariant == V_WA) + printf("setup (P.C.EVLO.WGHDF.TRSXOM.+.+..+++.+++++..+++++Kp.c.evlo.wghdf.trsxom.+.+..+++.+++++..+++++k) 11x11+0_chu " + "hmolvkwgcdx/1e3s3f1/ppprppptppp/3p3p3/11/11/11/3P3P3/PPPTPPPRPPP/1F3S3E1/XDCGWKVLOMH w 0 1\n"); repStack[199] = hashKeyH, checkStack[199] = 0; continue; } @@ -2827,5 +3021,6 @@ pboard(board); if(!strcmp(command, "remove")) { stm = TakeBack(2); continue; } printf("Error: unknown command\n"); } + return 0; }