int Resign;\r
char Cambodian[80] = "makruk";\r
int Threshold = 800;\r
+int drawMoves = 50;\r
int Score;\r
int makruk;\r
int prom, pm, gating, succession, hill;\r
}\r
if(z&S&&K-I) /* move pending: check legal*/\r
{if(v+I&&x==K&y==L>==GT) /* if move found */\r
- {Q=-e-i;O=F;LL=L;prom=gt;\r
+ {Q=-e-i;O=F;LL=L;prom=gt&15;\r
if(b[y]-u&15)prom=b[y]-=PromPiece, /* (under-)promotion: */\r
Q-=abs(w[prom&=15])-w[p]-(6*S>>sh), /* correct piece & score & */\r
Z+=PromPiece; /* invalidate hash */\r
a->D=99;a->V=0; /* lock game in hash as draw*/\r
R-=i/FAC; /*** total captd material ***/\r
Fifty = t|p<3?0:Fifty+1;\r
+ if(centr[p]==5)b[257+y]-=5;\r
sp=ps;\r
return l;} /* & not in check, signal */\r
v=m; /* (prevent fail-lows on */\r
J=f;Z=g;\r
if(h){h=0;goto A;} /* redo after doing old best*/\r
}\r
- s=t;v=r^flag>>12; /* calc. alternated vector */\r
+ s=t&&2&~rg|~t&16^k;v=r^flag>>12; /* platform & toggled vector*/\r
if(flag&15^4|u&32|| /* no double or moved before*/\r
p>2&!(flag&S)&& /* no P & no virgin jump, */\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 if(flag&64)t=flag&128?0:t,flag&=63;else F=y; /* enable e.p. */\r
- if(s&&flag&8)t=0,flag^=flag>>4&15; /* hoppers go to next phase */\r
- if(--rg<0&!(flag&S)) /* zig-zag piece? (w. delay)*/\r
+ if(s&&flag&8&&!(y=rg&1?y-r:y,t=0) /* hoppers go to next phase */\r
+ ||!(flag&S)&&!rg--) /* zig-zag piece? (w. delay)*/\r
r=v,flag^=flag>>4&15; /* alternate vector & mode */\r
}W(!t); /* if not capt. continue ray*/\r
}}\r
}\r
return 3;\r
}\r
- if(Fifty >=100) {\r
+ if(Fifty >= 2*drawMoves) {\r
printf("1/2-1/2 {Draw by fifty move rule}\n");\r
return 4;\r
}\r
{\r
printf("feature option=\"Resign -check %d\"\n", Resign);\r
printf("feature option=\"Resign Threshold -spin %d 200 1200\"\n", Threshold);\r
+ printf("feature option=\"Claim draw after -spin %d 0 200\"\n", drawMoves);\r
printf("feature option=\"Ini File -file %s\"\n", inifile);\r
printf("feature option=\"Multi-PV Margin -spin %d 0 1000\"\n", margin);\r
printf("feature option=\"Variant fairy selects -combo "); PrintVariants(1); printf("\"\n");\r
/* We have found variant, or if none specified, are at beginning of file */\r
if(fscanf(f, "%dx%d", &BW, &BH)!=2 || BW>12 || BH!=8)\r
{ printf("telluser unsupported board size %dx%d\n",BW,BH); exit(0); }\r
- makruk = 0; if(fscanf(f, "=%d", &i)) makruk=64; // new method to indicate deviant zone depth (for now assumes 3)\r
+ makruk = 0; if(fscanf(f, "=%d", &i)) makruk=67-i; // new method to indicate deviant zone depth (for now assumes 3)\r
\r
for(i=0; i<BW; i++) fscanf(f, "%d", oo+i);\r
for(i=0; i<BW; i++) fscanf(f, "%d", oo+i+16);\r
}\r
while(fscanf(f, " # %[^\n]", pieceToChar)) printf("piece %s\n", pieceToChar);\r
fclose(f);\r
+ if(makruk != 64) makruk = 0; // 66 was kludge to interpret "=1" suffix in asean for setting up 3rd-rank Pawns\r
}\r
\r
int main(int argc, char **argv)\r
tlim = (0.6-0.06*(BW-8))*(TimeLeft+(m-1)*TimeInc)/(m+7);\r
if(tlim>TimeLeft/15) tlim = TimeLeft/15;\r
PromPiece = 0; /* Always promote to Queen ourselves */\r
+ for(N=K=0;K<S;K++)N+=b[K]?b[K]&16?S:1:0; /* count pieces for detecting bare King */\r
+ if(w[3]<0&w[4]<0){if(N>>8<2)centr[4]=5;if(!(N&S-2))centr[3]=5;Z+=R>4;R=4;}\r
+printf("# %d+%d pieces, centr = (%d,%d)\n", N&63, N>>7, centr[3], centr[4]);\r
N=0;K=I;\r
if(hill) centr[3] = R>20 ? 1 : 22-R;\r
if (D(Side,-I,I,Q,O,LL|S,3)==I) {\r
m = GetTickCount() - Ticks;\r
printf("# times @ %u: real=%d cpu=%1.0f\n", m + Ticks, m,\r
(CPUtime() - cpuT)/CLOCKS_PER_SEC);\r
+printf("# promo = %d (%c) GT = %d\n", prom, prom + '`', GT); \r
printf("move ");\r
printf("%c%c%c%c",'a'+(K&15),'0'+BH-(K>>4),\r
'a'+(L&15),'0'+BH-(L>>4));\r
if(sscanf(line+7, "MultiVariation Margin=%d", &margin) == 1) continue;\r
if(sscanf(line+7, "Variant fairy selects=%s", selectedFairy+6) == 1) continue;\r
if(sscanf(line+7, "Makruk rules=%s", Cambodian) == 1) continue;\r
+ if(sscanf(line+7, "Claim draw after=%d", &drawMoves) == 1) continue;\r
continue;\r
}\r
if (!strcmp(command, "go")) {\r
GT = (Side == WHITE ? piecetype : blacktype)[line[4]&31];\r
if(GT) PromPiece = (Side == WHITE ? 7 : 7+pm) - GT, GT |= 32 + Side;\r
{char *c=line; K=c[0]-16*c[1]+799;L=c[2]-16*c[3]+799; }\r
- if(w[GT&15] == -1) L = S; // spoil move for promotion to King\r
+ if(w[GT&15] == -1 || w[GT&15]%10 == 3) L = S; // spoil move for promotion to King (or when marked non-promoting)\r
if (m & line[1] != '@')\r
/* doesn't have move syntax */\r
printf("Error (unknown command): %s\n", command);\r