X-Git-Url: http://winboard.nl/cgi-bin?p=fairymax.git;a=blobdiff_plain;f=fairymax.c;h=5df22c20e28ca706ede553c0db616316619dee94;hp=f80bfe383db2ea1750106d3d26b372b05b0192bb;hb=HEAD;hpb=d50bf1dd9d15885041ab284421a9a8297c4cea33

diff --git a/fairymax.c b/fairymax.c
index f80bfe3..5df22c2 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -1,13 +1,16 @@
 /***************************************************************************/
-/*                               fairy-Max,                                */
+/*                               Fairy-Max,                                */
 /* Version of the sub-2KB (source) micro-Max Chess program, fused to a     */
 /* generic WinBoard interface, loading its move-generator tables from file */
 /***************************************************************************/
 
      /*****************************************************************/
      /*                      LICENCE NOTIFICATION                     */
-     /* Fairy-Max 4.8 is free software, and you have my permission do */
-     /* with it whatever you want, whether it is commercial or not.   */
+     /* Fairy-Max 4.8 is free software, released in the public domain */
+     /* so that you have my permission do with it whatever you want,  */
+     /* whether it is commercial or not, at your own risk. Those that */
+     /* are not comfortable with this, can also use or redistribute   */
+     /* it under the GNU Public License or the MIT License.           */
      /* Note, however, that Fairy-Max can easily be configured through*/
      /* its fmax.ini file to play Chess variants that are legally pro-*/
      /* tected by patents, and that to do so would also require per-  */
@@ -18,7 +21,7 @@
      /*****************************************************************/
 
 #define MULTIPATH
-#define VERSION "4.8S"
+#define VERSION "4.8V"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -102,12 +105,14 @@ int GameNr;
 int Resign;
 char Cambodian[80] = "makruk";
 int Threshold = 800;
+int drawMoves = 50;
 int Score;
 int makruk;
-int prom, pm, gating, succession;
+int prom, pm, gating, succession, hill;
 char piecename[32], piecetype[32], blacktype[32];
 char selectedFairy[80];
 char *inifile = INI_FILE;
+char info[999];
 
 int Ticks, tlim, Setup, SetupQ;
 
@@ -170,6 +175,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
   do{u=b[x];                                   /* scan board looking for   */
    if(u&&(u&16)==k)                            /*  own piece (inefficient!)*/
    {r=p=u&15;                                  /* p = piece type (set r>0) */
+    if(hill&&w[p]<0&b[385+x])m=I,d=98;         /* King on the hill: we won */
     j=od[p];                                   /* first step vector f.piece*/
     W(r=o[++j])                                /* loop over directions o[] */
     {A:                                        /* resume normal after best */
@@ -198,7 +204,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
        v=d-1?e:i-p;                            /*** MVV/LVA scoring if d=1**/
        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.   */
+        v+=centr[p]*(b[x+257]-b[y+257]);       /* center positional pts.   */
         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 */
@@ -230,13 +236,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    */
@@ -265,15 +272,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*/
    }}
@@ -342,7 +349,6 @@ int PrintResult(int s)
             }
           differs: ;
         }
-
         K=I;
         cnt = D(s,-I,I,Q,O,LL|4*S,3);
 #ifdef SHATRANJ
@@ -374,7 +380,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;
         }
@@ -401,8 +407,9 @@ void InitGame()
   pl[oo[K+16]+16]++;pl[oo[K]]++;pl[18]++;pl[1]++;
   if(w[oo[K+16]+16] == -1)pl[oo[K+16]+16]=1;
   if(w[oo[K]] == -1)pl[oo[K]]=1;
-  L=8;W(L--)b[16*L+K+257]=(K-BW/2)*(K-BW/2)+(L-3.5)*(L-3.5); /* center-pts table   */
+  L=8;W(L--)b[16*L+K+257]=(K-BW/2+hill/2.)*(K-BW/2+hill/2.)+(L-3.5)*(L-3.5); /* center-pts table   */
  }                                                   /*(in unused half b[])*/
+ b[385+16*3+BW/2]=b[385+16*4+BW/2]=b[385+16*3+BW/2-1]=b[385+16*4+BW/2-1]=1; /* hill */
  for(i=0; i<BW; i++) {
   R += abs(w[oo[i]])/FAC + abs(w[oo[i+16]])/FAC;
   Q += abs(w[oo[i]]) - abs(w[oo[i+16]]) + w[1] - w[2];
@@ -453,6 +460,7 @@ void PrintOptions()
 {
 	printf("feature option=\"Resign -check %d\"\n", Resign);
 	printf("feature option=\"Resign Threshold -spin %d 200 1200\"\n", Threshold);
+	printf("feature option=\"Claim draw after -spin %d 0 200\"\n", drawMoves);
 	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");
@@ -460,13 +468,14 @@ void PrintOptions()
 	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");
+	printf("feature option=\"Info -button\"\n");
 	printf("feature option=\"Clear Hash -button\"\n");
 	printf("feature done=1\n");
 }
                                          
 void LoadGame(char *name)
 {
-        int i, j, ptc, count=0; char c, buf[80], pieceToChar[80], parent[80];
+        int i, j, ptc=0, count=0; char c, buf[80], pieceToChar[80], parent[80];
         static int currentVariant;
         FILE *f;
 
@@ -485,7 +494,9 @@ void LoadGame(char *name)
            if(!strcmp(name, "fairy")) name = selectedFairy;
            gating = !strcmp(name, "seirawan");
            while((ptc=fscanf(f, "Game: %s # %s # %s", buf, pieceToChar, parent))==0 || strcmp(name, buf) ) {
-               while((c = fgetc(f)) != EOF && c != '\n');
+               char *p = info;
+               while((c = fgetc(f)) != EOF && c != '\n') *p++ = c;
+               if(*info == '/') *p = 0; else *info = 0; // remember last line before Game if it was comment
                count++;
                if(c == EOF) {
                    printf("telluser variant %s not supported\n", name);
@@ -499,7 +510,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);
@@ -521,8 +532,7 @@ void LoadGame(char *name)
             c=0; if(i>15 || j>255) break;
         }
 
-        fclose(f);
-	sh = w[7] < 250 ? 3 : 0;
+	sh = w[7] < 250 ? 3 : 0; hill = (w[3] == -2);
         if(ptc > 1) { // setup board in GUI, by sending it pieceToCharTable and FEN
             if(ptc == 2) printf("setup (%s) ", pieceToChar);
             else printf("setup (%s) %dx%d+0_%s ", pieceToChar, BW, BH, parent);
@@ -532,8 +542,11 @@ void LoadGame(char *name)
             for(i=2+!!makruk; i<BH-2-!!makruk; i++) printf("%d/", BW);
             for(i=0; i<BW; i++) printf("%c", piecename[1]+'@'); printf("/");
             if(makruk) printf("8/");
-            for(i=0; i<BW; i++) printf("%c", piecename[oo[i]]+'@'); printf(" w KQkq - 0 1\n");
+            for(i=0; i<BW; i++) printf("%c", oo[i] ? piecename[oo[i]]+'@' : '1'); printf(" w KQkq - 0 1\n");
         }
+	while(fscanf(f, " # %[^\n]", pieceToChar)) printf("piece %s\n", pieceToChar);
+        fclose(f);
+	if(makruk == 66) makruk = 8; // 66 was kludge to interpret "=1" suffix in asean for setting up 3rd-rank Pawns
 }
 
 int main(int argc, char **argv)
@@ -543,6 +556,8 @@ int main(int argc, char **argv)
         int m, nr;
         double cpuT;
 
+        if(argc > 1 && !strcmp(argv[1], "-v")) argc++, argv--, printf("%s\n", VERSION), exit(0);
+
         if(argc>1 && sscanf(argv[1], "%d", &m)==1)
         { U = (1<<m)-1; argc--; argv++; }
         A = (struct _ *) calloc(U+1, sizeof(struct _));
@@ -551,8 +566,6 @@ int main(int argc, char **argv)
 	signal(SIGINT, SIG_IGN);
         printf("tellics say     " NAME " " VERSION "\n");
         printf("tellics say     by H.G. Muller\n");
-        printf("tellics say Gothic Chess is protected by U.S. patent #6,481,716 by Ed Trice.\n");
-        printf("tellics say Falcon Chess is protected by U.S. patent #5,690,334 by George W. Duke\n");
         InitEngine();
         LoadGame(NULL);
         InitGame();
@@ -578,12 +591,17 @@ 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<2*S)centr[4]=5,Z+=R>4,R=4;if(!(N&S-2))centr[3]=5,Z+=R>4,R=4;}
+printf("# %d+%d pieces, centr = (%d,%d) R=%d\n", N&63, N>>7, centr[3], centr[4], R);
                         N=0;K=I;
+                        if(hill) centr[3] = R>20 ? 1 : 22-R;
                         if (D(Side,-I,I,Q,O,LL|S,3)==I) {
                             Side ^= BLACK^WHITE;
                             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));
@@ -748,9 +766,11 @@ int main(int argc, char **argv)
 				inifile = filename; continue;
 			}
 			if(sscanf(line+7, "Clear Hash%c", &c) == 1) for(i=0; i<=U; i++) A->K = 0;
+			if(sscanf(line+7, "Info%c", &c) == 1) printf("telluser %s\n", info+3);
 			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")) {
@@ -884,7 +904,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);
@@ -903,6 +923,8 @@ int main(int argc, char **argv)
                         CopyBoard(HistPtr=HistPtr+1&1023);
                         if(PrintResult(Side)) Computer = EMPTY;
 		    }
+
 		}
 	}
+	return 0;
 }