X-Git-Url: http://winboard.nl/cgi-bin?p=fairymax.git;a=blobdiff_plain;f=fairymax.c;h=28d92d64db2c15586c897ca4b5fdc812b1f22e1c;hp=6f420ae8969c7fb5d4e1ec4d9a46219a082d72b7;hb=e5d8f9eaa9066ee587678aa88aef646e87bab756;hpb=b170de109dfcfa9db25c93006f9e1ef417243aa9

diff --git a/fairymax.c b/fairymax.c
index 6f420ae..28d92d6 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -100,7 +100,7 @@ int Post;
 int Fifty;
 int GameNr;
 int Resign;
-int Cambodian;
+char Cambodian[80] = "makruk";
 int Threshold = 800;
 int Score;
 int makruk;
@@ -149,7 +149,7 @@ D(k,q,l,e,E,z,n)        /* recursive minimax search, k=moving side, n=depth*/
 int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
 {                       /* e=score, z=prev.dest; J,Z=hashkeys; return score*/
  int j,r,m,v,d,h,i,F,G,P,V,f=J,g=Z,C,s,flag,FF,*ps=sp,kk=S;
- signed char t,p,u,x,y,X,Y,H,B,gt;
+ signed char t,p,u,x,y,X,Y,H,B,gt,rg,rk;
  struct _*a=A+(J+(k+S)*E&U);                   /* lookup pos. in hash table*/
  *sp++=0;
  q-=q<e;l-=l<=e;                               /* adj. window: delay bonus */
@@ -174,7 +174,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
     W(r=o[++j])                                /* loop over directions o[] */
     {A:                                        /* resume normal after best */
      flag=h?3:of[j];                           /* move modes (for fairies) */
-     y=x;F=FF=G=S;                             /* (x,y)=move, (F,G)=castl.R*/
+     y=x;F=FF=G=S;rg=flag>>10&3;               /* (x,y)=move, (F,G)=castl.R*/
      do{                                       /* y traverses ray, or:     */
       H=y=h?Y^h:y+r;                           /* sneak in prev. best move */
       if(flag&1<<8)H=y=(y&15)>13?y+BW:(y&15)>=BW?y-BW:y; /* cylinder board */
@@ -199,7 +199,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
        if(d-!t>1)                              /*** all captures if d=2  ***/
        {v=gt=0;G:                              /* retry move with gating   */
         v+=centr[p]?b[x+257]-b[y+257]:0;       /* center positional pts.   */
-        if(!(G&S))b[FF]=b[G],v+=50;            /* castling: put R & score  */
+        if(G-S)b[FF]=(rk=b[G])|32,v+=50;       /* castling: put R & score  */
         b[G]=b[H]=0;b[x]=gt;b[y]=u|32;         /* do move, set non-virgin  */
         pl[t&31]-=!!t;                         /* updat victim piece count */
         v-=w[p]>0|R<EG?0:20;                   /*** freeze K in mid-game ***/
@@ -218,7 +218,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
         v+=e+i;V=m>q?m:q;                      /*** new eval & alpha    ****/
         if(z&S)V=m-margin>q?m-margin:q;        /* multiPV                  */
         C=d-1-(d>5&p>2&!t&!h);                 /* nw depth, reduce non-cpt.*/
-        C=R<EG|P-I|d<3||t&&p-3?C:d;            /* extend 1 ply if in-check */
+        C=R<EG|P-I|d<3||t&&w[p]>0?C:d;         /* extend 1 ply if in-check */
         do
          s=C>2|v>V?-D(16-k,-l,-V,-v,/*** futility, recursive eval. of reply */
                                      F,y&255,C):v;
@@ -232,7 +232,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
         {if(v+I&&x==K&y==L&gt==GT)             /*   if move found          */
          {Q=-e-i;O=F;LL=L;prom=gt;
           if(b[y]-u&15)prom=b[y]-=PromPiece,   /* (under-)promotion:       */
-           Q-=abs(w[prom&=15])-w[p]-6*S,       /*  correct piece & score & */
+           Q-=abs(w[prom&=15])-w[p]-(6*S>>sh), /*  correct piece & score & */
                        Z+=PromPiece;           /*  invalidate hash         */
           a->D=99;a->V=0;                      /* lock game in hash as draw*/
           R-=i/FAC;                            /*** total captd material ***/
@@ -242,7 +242,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
          v=m;                                  /* (prevent fail-lows on    */
         }                                      /*   K-capt. replies)       */
         SHAMAX( pl[k]+=!!t; ) pl[t&31]+=!!t;
-        b[G]=b[FF];b[FF]=b[y]=0;b[x]=u;b[H]=t; /* undo move,G can be dummy */
+        b[G]=rk;b[FF]=b[y]=0;b[x]=u;b[H]=t;    /* undo move,G can be dummy */
        }                                       /*          if non-castling */
        if(z&S&&K==I&d>2&v>V&v<l){int *p=ps;char X,Y;
         if(Post){
@@ -273,7 +273,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
         )t+=flag&4;                            /* fake capt. for nonsliding*/
       else if(flag&64)t=flag&128?0:t,flag&=63;else F=y; /* enable e.p.     */
       if(s&&flag&8)t=0,flag^=flag>>4&15;       /* hoppers go to next phase */
-      if(!(flag&S))                            /* zig-zag piece?           */
+      if(--rg<0&!(flag&S))                     /* zig-zag piece? (w. delay)*/
        r=v,flag^=flag>>4&15;                   /* alternate vector & mode  */
      }W(!t);                                   /* if not capt. continue ray*/
    }}
@@ -455,7 +455,7 @@ void PrintOptions()
 	printf("feature option=\"Ini File -file %s\"\n", inifile);
 	printf("feature option=\"Multi-PV Margin -spin %d 0 1000\"\n", margin);
 	printf("feature option=\"Variant fairy selects -combo "); PrintVariants(1); printf("\"\n");
-	printf("feature option=\"Cambodian Makruk rules -check %d\"\n", Cambodian);
+	printf("feature option=\"Makruk rules -combo makruk /// cambodian /// ai-wok\"\n");
 	printf("feature option=\"Dummy Slider Example -slider 20 0 100\"\n");
 	printf("feature option=\"Dummy String Example -string happy birthday!\"\n");
 	printf("feature option=\"Dummy Path Example -path .\"\n");
@@ -480,7 +480,7 @@ void LoadGame(char *name)
         gating = succession = 0;
         if(name != NULL)
         {  /* search for game name in definition file */
-           if(!strcmp(name, "makruk") && Cambodian) name = "cambodian"; else
+           if(!strcmp(name, "makruk")) name = Cambodian; else
            if(!strcmp(name, "fairy")) name = selectedFairy;
            gating = !strcmp(name, "seirawan");
            while((ptc=fscanf(f, "Game: %s # %s", buf, pieceToChar))==0 || strcmp(name, buf) ) {
@@ -498,6 +498,7 @@ void LoadGame(char *name)
         /* We have found variant, or if none specified, are at beginning of file */
         if(fscanf(f, "%dx%d", &BW, &BH)!=2 || BW>12 || BH!=8)
         { printf("telluser unsupported board size %dx%d\n",BW,BH); exit(0); }
+        makruk = 0; if(fscanf(f, "=%d", &i)) makruk=64; // new method to indicate deviant zone depth (for now assumes 3)
 
         for(i=0; i<BW; i++) fscanf(f, "%d", oo+i);
         for(i=0; i<BW; i++) fscanf(f, "%d", oo+i+16);
@@ -521,7 +522,6 @@ void LoadGame(char *name)
 
         fclose(f);
 	sh = w[7] < 250 ? 3 : 0;
-	makruk = w[7]==181 ? 64 : 0; // w[7] is used as kludge to enable makruk promotions
         if(name == selectedFairy) {
             printf(ptc == 1 ? "setup " : "setup (%s) ", pieceToChar); // setup board in GUI
             for(i=0; i<BW; i++) printf("%c", piecename[oo[i+16]]+'`'); printf("/");
@@ -746,7 +746,7 @@ int main(int argc, char **argv)
 			if(sscanf(line+7, "Clear Hash%c", &c) == 1) for(i=0; i<=U; i++) A->K = 0;
 			if(sscanf(line+7, "MultiVariation Margin=%d", &margin) == 1) continue;
 			if(sscanf(line+7, "Variant fairy selects=%s", selectedFairy+6) == 1) continue;
-			if(sscanf(line+7, "Cambodian Makruk rules=%d", &Cambodian) == 1) continue;
+			if(sscanf(line+7, "Makruk rules=%s", Cambodian) == 1) continue;
 			continue;
 		}
 		if (!strcmp(command, "go")) {