/*****************************************************************/\r
\r
#define MULTIPATH\r
-#define VERSION "4.8S"\r
+#define VERSION "4.8T"\r
\r
#include <stdio.h>\r
#include <stdlib.h>\r
int Fifty;\r
int GameNr;\r
int Resign;\r
-int Cambodian;\r
+char Cambodian[80] = "makruk";\r
int Threshold = 800;\r
int Score;\r
int makruk;\r
int k,q,l,e,E,z,n; /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/\r
{ /* e=score, z=prev.dest; J,Z=hashkeys; return score*/\r
int j,r,m,v,d,h,i,F,G,P,V,f=J,g=Z,C,s,flag,FF,*ps=sp,kk=S;\r
- signed char t,p,u,x,y,X,Y,H,B,gt;\r
+ signed char t,p,u,x,y,X,Y,H,B,gt,rg,rk;\r
struct _*a=A+(J+(k+S)*E&U); /* lookup pos. in hash table*/\r
*sp++=0;\r
q-=q<e;l-=l<=e; /* adj. window: delay bonus */\r
W(r=o[++j]) /* loop over directions o[] */\r
{A: /* resume normal after best */\r
flag=h?3:of[j]; /* move modes (for fairies) */\r
- y=x;F=FF=G=S; /* (x,y)=move, (F,G)=castl.R*/\r
+ y=x;F=FF=G=S;rg=flag>>10&3; /* (x,y)=move, (F,G)=castl.R*/\r
do{ /* y traverses ray, or: */\r
H=y=h?Y^h:y+r; /* sneak in prev. best move */\r
if(flag&1<<8)H=y=(y&15)>13?y+BW:(y&15)>=BW?y-BW:y; /* cylinder board */\r
if(d-!t>1) /*** all captures if d=2 ***/\r
{v=gt=0;G: /* retry move with gating */\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
+ if(G-S)b[FF]=(rk=b[G])|32,v+=50; /* castling: put R & score */\r
b[G]=b[H]=0;b[x]=gt;b[y]=u|32; /* do move, set non-virgin */\r
pl[t&31]-=!!t; /* updat victim piece count */\r
v-=w[p]>0|R<EG?0:20; /*** freeze K in mid-game ***/\r
{if(v+I&&x==K&y==L>==GT) /* if move found */\r
{Q=-e-i;O=F;LL=L;prom=gt;\r
if(b[y]-u&15)prom=b[y]-=PromPiece, /* (under-)promotion: */\r
- Q-=abs(w[prom&=15])-w[p]-6*S, /* correct piece & score & */\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
v=m; /* (prevent fail-lows on */\r
} /* K-capt. replies) */\r
SHAMAX( pl[k]+=!!t; ) pl[t&31]+=!!t;\r
- b[G]=b[FF];b[FF]=b[y]=0;b[x]=u;b[H]=t; /* undo move,G can be dummy */\r
+ b[G]=rk;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&&K==I&d>2&v>V&v<l){int *p=ps;char X,Y;\r
if(Post){\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(!(flag&S)) /* zig-zag piece? */\r
+ if(--rg<0&!(flag&S)) /* 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
differs: ;\r
}\r
+\r
+\r
+\r
+\r
+\r
K=I;\r
cnt = D(s,-I,I,Q,O,LL|4*S,3);\r
#ifdef SHATRANJ\r
while((c = fgetc(f)) != EOF && c != '\n');\r
if(c == EOF) break;\r
total++;\r
- if(combo == (strstr(buf, "fairy/") != buf)) continue;\r
+ if(*buf < 'a' || combo == (strstr(buf, "fairy/") != buf)) continue;\r
if(combo && count == 0) strcpy(selectedFairy, buf);\r
if(count++) printf(combo ? " /// " : ",");\r
printf("%s", combo ? buf+6 : buf);\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
- printf("feature option=\"Cambodian Makruk rules -check %d\"\n", Cambodian);\r
+ printf("feature option=\"Makruk rules -combo makruk /// Cambodian /// Ai-wok\"\n");\r
printf("feature option=\"Dummy Slider Example -slider 20 0 100\"\n");\r
printf("feature option=\"Dummy String Example -string happy birthday!\"\n");\r
printf("feature option=\"Dummy Path Example -path .\"\n");\r
\r
void LoadGame(char *name)\r
{\r
- int i, j, ptc, count=0; char c, buf[80], pieceToChar[80];\r
+ int i, j, ptc=0, count=0; char c, buf[80], pieceToChar[80], parent[80];\r
static int currentVariant;\r
FILE *f;\r
\r
gating = succession = 0;\r
if(name != NULL)\r
{ /* search for game name in definition file */\r
- if(!strcmp(name, "makruk") && Cambodian) name = "cambodian"; else\r
+ if(!strcmp(name, "makruk")) name = Cambodian; else\r
if(!strcmp(name, "fairy")) name = selectedFairy;\r
gating = !strcmp(name, "seirawan");\r
- while((ptc=fscanf(f, "Game: %s # %s", buf, pieceToChar))==0 || strcmp(name, buf) ) {\r
+ while((ptc=fscanf(f, "Game: %s # %s # %s", buf, pieceToChar, parent))==0 || strcmp(name, buf) ) {\r
while((c = fgetc(f)) != EOF && c != '\n');\r
count++;\r
if(c == EOF) {\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
\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
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
- if(name == selectedFairy) {\r
- printf(ptc == 1 ? "setup " : "setup (%s) ", pieceToChar); // setup board in GUI\r
+ if(ptc > 1) { // setup board in GUI, by sending it pieceToCharTable and FEN\r
+ if(ptc == 2) printf("setup (%s) ", pieceToChar);\r
+ else printf("setup (%s) %dx%d+0_%s ", pieceToChar, BW, BH, parent);\r
for(i=0; i<BW; i++) printf("%c", piecename[oo[i+16]]+'`'); printf("/");\r
+ if(makruk) printf("8/");\r
for(i=0; i<BW; i++) printf("%c", piecename[2]+'`'); printf("/");\r
- for(i=2; i<BH-2; i++) printf("%d/", BW);\r
+ for(i=2+!!makruk; i<BH-2-!!makruk; i++) printf("%d/", BW);\r
for(i=0; i<BW; i++) printf("%c", piecename[1]+'@'); printf("/");\r
+ if(makruk) printf("8/");\r
for(i=0; i<BW; i++) printf("%c", piecename[oo[i]]+'@'); printf(" w KQkq - 0 1\n");\r
}\r
}\r
if(sscanf(line+7, "Clear Hash%c", &c) == 1) for(i=0; i<=U; i++) A->K = 0;\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, "Cambodian Makruk rules=%d", &Cambodian) == 1) continue;\r
+ if(sscanf(line+7, "Makruk rules=%s", Cambodian) == 1) continue;\r
continue;\r
}\r
if (!strcmp(command, "go")) {\r
CopyBoard(HistPtr=HistPtr+1&1023);\r
if(PrintResult(Side)) Computer = EMPTY;\r
}\r
+\r
}\r
}\r
+ return 0;\r
}\r
projects / fairymax.git / blobdiff