/*****************************************************************/\r
\r
#define MULTIPATH\r
-#define VERSION "4.8N"\r
+#define VERSION "4.8O"\r
\r
#include <stdio.h>\r
#include <stdlib.h>\r
int Resign;\r
int Threshold = 800;\r
int Score;\r
-char piecename[32], piecetype[32];\r
+int makruk;\r
+char piecename[32], piecetype[32], blacktype[32];\r
char *inifile = INI_FILE;\r
\r
int Ticks, tlim, Setup, SetupQ;\r
v=d-1?e:i-p; /*** MVV/LVA scoring if d=1**/\r
if(d-!t>1) /*** all captures if d=2 ***/\r
{v=centr[p]?b[x+257]-b[y+257]:0; /* center positional pts. */\r
+ if(!(G&S))b[FF]=b[G],v+=50; /* castling: put R & score */\r
b[G]=b[H]=b[x]=0;b[y]=u|32; /* do move, set non-virgin */\r
- if(!(G&S))b[FF]=k+6,v+=50; /* castling: put R & score */\r
v-=w[p]>0|R<EG?0:20; /*** freeze K in mid-game ***/\r
if(p<3) /* pawns: */\r
{v-=9*((x-2&M||b[x-2]-u)+ /* structure, undefended */\r
+(w[b[x^16]&15]<0)) /*** cling to magnetic K ***/\r
+(R-76>>2); /* end-game Pawn-push bonus */\r
b[y]+=V=y+r+1&S?647-p:2*(u&y+16&32); /* upgrade P or convert to Q*/\r
+ if(V&makruk)b[y]=u|7,V=480; /* Makruk promotion on 6th */\r
V>>=sh; /* for Shatranj promo to F */\r
i+=V; /* promotion / passer bonus */\r
} if(z&S && GamePtr<6) v+=(rand()>>10&31)-16;\r
} /* K-capt. replies) */\r
J=f;Z=g;\r
SHAMAX( pl[k]+=!!t; )\r
- b[G]=k+6;b[FF]=b[y]=0;b[x]=u;b[H]=t; /* undo move,G can be dummy */\r
+ b[G]=b[FF];b[FF]=b[y]=0;b[x]=u;b[H]=t; /* undo move,G can be dummy */\r
} /* if non-castling */\r
- if(z&S&&Post&v>V&v<l){int *p=ps;char X,Y;\r
+ if(z&S&&Post&K==I&d>2&v>V&v<l){int *p=ps;char X,Y;\r
printf("%2d ",d-2);\r
printf("%6d ",v);\r
printf("%8d %10d",(GetTickCount()-Ticks)/10,N);\r
while(*p){X=*p>>8;Y=*p++;\r
printf(" %c%c%c%c",'a'+(X&15),'8'-(X>>4),'a'+(Y&15),'8'-(Y>>4&7));}\r
printf("\n");fflush(stdout);\r
- } if(v>m) /* new best, update max,best*/\r
+ }
+ if(v>m) /* new best, update max,best*/\r
m=v,X=x,Y=y|S&F; /* mark non-double with S */\r
if(h){h=0;goto A;} /* redo after doing old best*/\r
}\r
- s=t;\r
+ s=t;v=r^flag>>12; /* calc. alternated vector */\r
if(flag&15^4|u&32|| /* no double or moved before*/\r
p>2&& /* no P & no lateral K move,*/\r
- (b[G=r<0?x&~15:BW-1|x&112]-k-6 /* no virgin R in corner G, */\r
- ||b[G^1]|b[G^2]|b[FF=r<0?G+3:G-2]) /* no 2 empty sq. next to R */\r
+ ((b[G=r<0?x&~15:BW-1|x&112]^32)<33 /* no virgin R in corner G, */\r
+ ||b[G^1]|b[G^2]|b[FF=y+v-r]) /* no 2 empty sq. next to R */\r
)t+=flag&4; /* fake capt. for nonsliding*/\r
else F=y; /* enable e.p. */\r
if(s&&flag&8)t=0,flag^=flag>>4&15; /* hoppers go to next phase */\r
if(!(flag&S)) /* zig-zag piece? */\r
- r^=flag>>12,flag^=flag>>4&15; /* alternate vector & mode */\r
+ r=v,flag^=flag>>4&15; /* alternate vector & mode */\r
}W(!t); /* if not capt. continue ray*/\r
}}\r
if((++x&15)>=BW)x=x+16&112; /* next sqr. of board, wrap */\r
for(i=0; i<BW; i++) fscanf(f, "%d", oo+i+16);\r
for(i= 0; i<=U; i++)\r
A[i].K = A[i].D = A[i].X = A[i].Y = A[i].F = 0; /* clear hash */\r
- for(i=0; i<32; i++) piecetype[i] = 0;\r
+ for(i=0; i<32; i++) piecetype[i] = blacktype[i] = 0;\r
\r
i=0; j=-1; c=0;\r
while(fscanf(f, "%d,%x", o+j, of+j)==2 ||\r
fscanf(f,"%c:%d",&c, w+i+1)==2)\r
{ if(c)\r
{ od[++i]=j; centr[i] = c>='a';\r
- piecetype[c&31]=i; piecename[i]=c&31;\r
+ blacktype[c&31]=i; piecename[i]=c&31;\r
+ if(piecetype[c&31]==0) piecetype[c&31]=i; // only first\r
}\r
j++; o[j]=0;\r
/* printf("# c='%c' i=%d od[i]=%d j=%d (%3d,%8x)\n",c?c:' ',i,od[i],j,o[j-1],of[j-1]); /**/\r
\r
fclose(f);\r
sh = w[7] < 250 ? 3 : 0;\r
+ makruk = w[7]==181 ? 64 : 0; // w[7] is used as kludge to enable makruk promotions\r
}\r
\r
int main(int argc, char **argv)\r
&& line[1] >= 'a' && line[1] <= 'a'+BW-1\r
&& line[2] >= '1' && line[2] <= '0'+BH) {\r
m = line[1]-16*line[2]+799;\r
- switch(p = piecetype[line[0]&31])\r
+ switch(p = (color == WHITE ? piecetype : blacktype)[line[0]&31])\r
{\r
case 1:\r
case 2:\r
else b[m]=(m&0x70)==0x10?18:50,\r
Q+=w[2];\r
break;\r
- case 3: // can castle, normally King\r
- b[m]=3+color+32;\r
- if(m==BW>>1 && color==BLACK ||\r
- m==0x70+(BW>>1) && color==WHITE)\r
- b[m] -= 32;\r
- break;\r
- case 6: // can castle, normally Rook\r
- b[m]=6+color+32;\r
- if((m==0x00 || m==BW-1 ) && color==BLACK ||\r
- (m==0x70 || m==0x6F+BW) && color==WHITE)\r
- b[m] -= 32;\r
- Q+=w[6]; R+=w[6]/FAC;\r
- break;\r
default:\r
- b[m]=p+color;\r
- Q+=w[p]; R+=w[p]/FAC;\r
- case 0: // undefined piece, ignore\r
+ b[m]=p+color+32; // assume non-virgin\r
+ if(w[p]<0) { // Royal piece on original square: virgin
+ if(color==BLACK && m<0x10 && p==oo[m+16] ||\r
+ color==WHITE && m>0x6F && p==oo[m-0x70]) b[m] -= 32;
+ } else { Q+=w[p]; R+=w[p]/FAC; }
+ if((m==0x00 || m==BW-1 ) && color==BLACK && p==oo[m+16] ||\r
+ (m==0x70 || m==0x6F+BW) && color==WHITE && p==oo[m-0x70])\r
+ b[m] &= ~32; // corner piece as in original setup: virgin\r
+ case 0: // undefined piece, ignore\r
break;\r
}\r
pl[BLACK+WHITE-color]++;\r
m = line[0]<'a' | line[0]>='a'+BW | line[1]<'1' | line[1]>='1'+BH |\r
line[2]<'a' | line[2]>='a'+BW | line[3]<'1' | line[3]>='1'+BH;\r
if(line[4] == '\n') line[4] = piecename[7];\r
- PromPiece = 7 - piecetype[line[4]&31];\r
+ PromPiece = 7 - (Side == WHITE ? piecetype : blacktype)[line[4]&31];\r
if(PromPiece == 7) PromPiece = 0;\r
{char *c=line; K=c[0]-16*c[1]+799;L=c[2]-16*c[3]+799; }\r
if (m)\r
projects / fairymax.git / blobdiff