X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=9589df7fed3dd4b77c3748da66f83eeda740ec22;hb=1791a18da3fdc051bdc8d1942827fd30a0cc2333;hp=568a08f363eaf1c5267772948b67ac799c4e9119;hpb=25b177d809f72250a6ec78df11fb84ccff1fe4ad;p=fairymax.git

diff --git a/fairymax.c b/fairymax.c
index 568a08f..9589df7 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -102,6 +102,7 @@ int GameNr;
 int Resign;
 char Cambodian[80] = "makruk";
 int Threshold = 800;
+int drawMoves = 50;
 int Score;
 int makruk;
 int prom, pm, gating, succession, hill;
@@ -231,13 +232,14 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
         }
         if(z&S&&K-I)                           /* move pending: check legal*/
         {if(v+I&&x==K&y==L&gt==GT)             /*   if move found          */
-         {Q=-e-i;O=F;LL=L;prom=gt;
+         {Q=-e-i;O=F;LL=L;prom=gt&15;
           if(b[y]-u&15)prom=b[y]-=PromPiece,   /* (under-)promotion:       */
            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 ***/
           Fifty = t|p<3?0:Fifty+1;
+          if(centr[p]==5)b[257+y]-=5;
           sp=ps;
                      return l;}                /*   & not in check, signal */
          v=m;                                  /* (prevent fail-lows on    */
@@ -266,15 +268,15 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
        J=f;Z=g;
        if(h){h=0;goto A;}                      /* redo after doing old best*/
       }
-      s=t;v=r^flag>>12;                        /* calc. alternated vector  */
+      s=t&&2&~rg|~t&16^k;v=r^flag>>12;         /* platform & toggled vector*/
       if(flag&15^4|u&32||                      /* no double or moved before*/
          p>2&!(flag&S)&&                       /* no P & no virgin jump,   */
          ((b[G=r<0?x&~15:BW-1|x&112]^32)<33    /* no virgin R in corner G, */
          ||b[G^1]|b[G^2]|b[FF=y+v-r])          /* no 2 empty sq. next to R */
         )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(--rg<0&!(flag&S))                     /* zig-zag piece? (w. delay)*/
+      if(s&&flag&8&&!(y=rg&1?y-r:y,t=0)        /* hoppers go to next phase */
+         ||!(flag&S)&&!rg--)                   /* zig-zag piece? (w. delay)*/
        r=v,flag^=flag>>4&15;                   /* alternate vector & mode  */
      }W(!t);                                   /* if not capt. continue ray*/
    }}
@@ -374,7 +376,7 @@ int PrintResult(int s)
                 }
                 return 3;
         }
-        if(Fifty >=100) {
+        if(Fifty >= 2*drawMoves) {
                 printf("1/2-1/2 {Draw by fifty move rule}\n");
                 return 4;
         }
@@ -458,6 +460,7 @@ void PrintOptions()
 	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=\"Makruk rules -combo makruk /// Cambodian /// Ai-wok\"\n");
+	printf("feature option=\"Claim draw after -spin %d 0 200\"\n", drawMoves);
 	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");
@@ -500,7 +503,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)
+        makruk = 0; if(fscanf(f, "=%d", &i)) makruk=67-i; // 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);
@@ -536,6 +539,7 @@ void LoadGame(char *name)
         }
 	while(fscanf(f, " # %[^\n]", pieceToChar)) printf("piece %s\n", pieceToChar);
         fclose(f);
+	if(makruk != 64) makruk = 0; // 66 was kludge to interpret "=1" suffix in asean for setting up 3rd-rank Pawns
 }
 
 int main(int argc, char **argv)
@@ -580,6 +584,9 @@ int main(int argc, char **argv)
                         tlim = (0.6-0.06*(BW-8))*(TimeLeft+(m-1)*TimeInc)/(m+7);
                         if(tlim>TimeLeft/15) tlim = TimeLeft/15;
                         PromPiece = 0; /* Always promote to Queen ourselves */
+                        for(N=K=0;K<S;K++)N+=b[K]?b[K]&16?S:1:0; /* count pieces for detecting bare King */
+                        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;}
+printf("# %d+%d pieces, centr = (%d,%d)\n", N&63, N>>7, centr[3], centr[4]);
                         N=0;K=I;
                         if(hill) centr[3] = R>20 ? 1 : 22-R;
                         if (D(Side,-I,I,Q,O,LL|S,3)==I) {
@@ -587,6 +594,7 @@ int main(int argc, char **argv)
                             m = GetTickCount() - Ticks;
                             printf("# times @ %u: real=%d cpu=%1.0f\n", m + Ticks, m,
                                       (CPUtime() - cpuT)/CLOCKS_PER_SEC);
+printf("# promo = %d (%c) GT = %d\n", prom, prom + '`', GT); 
                             printf("move ");
                             printf("%c%c%c%c",'a'+(K&15),'0'+BH-(K>>4),
                                           'a'+(L&15),'0'+BH-(L>>4));
@@ -754,6 +762,7 @@ int main(int argc, char **argv)
 			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, "Makruk rules=%s", Cambodian) == 1) continue;
+			if(sscanf(line+7, "Claim draw after=%d", &drawMoves) == 1) continue;
 			continue;
 		}
 		if (!strcmp(command, "go")) {
@@ -887,7 +896,7 @@ int main(int argc, char **argv)
                 GT = (Side == WHITE ? piecetype : blacktype)[line[4]&31];
                 if(GT) PromPiece = (Side == WHITE ? 7 : 7+pm) - GT, GT |= 32 + Side;
                 {char *c=line; K=c[0]-16*c[1]+799;L=c[2]-16*c[3]+799; }
-                if(w[GT&15] == -1) L = S; // spoil move for promotion to King
+                if(w[GT&15] == -1 || w[GT&15]%10 == 3) L = S; // spoil move for promotion to King (or when marked non-promoting)
                 if (m & line[1] != '@')
                         /* doesn't have move syntax */
 			printf("Error (unknown command): %s\n", command);