X-Git-Url: http://winboard.nl/cgi-bin?p=fairymax.git;a=blobdiff_plain;f=fairymax.c;h=f20bb1f536678ae6f55f3af2efedbc859105a161;hp=c893b3705487af214b7eeb286e958558b1fc191a;hb=d0e4774e9509e069ef252a071be2bdd497c810dd;hpb=d48770f03a5cbc9a6c1f0606af25ceb73887c012

diff --git a/fairymax.c b/fairymax.c
index c893b37..f20bb1f 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -18,7 +18,7 @@
      /*****************************************************************/
 
 #define MULTIPATH
-#define VERSION "4.8S"
+#define VERSION "4.8T"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -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,rg;
+ 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 */
@@ -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 ***/
@@ -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){
@@ -342,6 +342,11 @@ int PrintResult(int s)
             }
           differs: ;
         }
+
+
+
+
+
         K=I;
         cnt = D(s,-I,I,Q,O,LL|4*S,3);
 #ifdef SHATRANJ
@@ -438,7 +443,7 @@ void PrintVariants(int combo)
                while((c = fgetc(f)) != EOF && c != '\n');
            if(c == EOF) break;
            total++;
-           if(combo == (strstr(buf, "fairy/") != buf)) continue;
+           if(*buf < 'a' || combo == (strstr(buf, "fairy/") != buf)) continue;
            if(combo && count == 0) strcpy(selectedFairy, buf);
            if(count++) printf(combo ? " /// " : ",");
            printf("%s", combo ? buf+6 : buf);
@@ -455,7 +460,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");
@@ -465,7 +470,7 @@ void PrintOptions()
                                          
 void LoadGame(char *name)
 {
-        int i, j, ptc, count=0; char c, buf[80], pieceToChar[80];
+        int i, j, ptc=0, count=0; char c, buf[80], pieceToChar[80], parent[80];
         static int currentVariant;
         FILE *f;
 
@@ -480,10 +485,10 @@ 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) ) {
+           while((ptc=fscanf(f, "Game: %s # %s # %s", buf, pieceToChar, parent))==0 || strcmp(name, buf) ) {
                while((c = fgetc(f)) != EOF && c != '\n');
                count++;
                if(c == EOF) {
@@ -498,6 +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)
 
         for(i=0; i<BW; i++) fscanf(f, "%d", oo+i);
         for(i=0; i<BW; i++) fscanf(f, "%d", oo+i+16);
@@ -521,13 +527,15 @@ 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
+        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);
             for(i=0; i<BW; i++) printf("%c", piecename[oo[i+16]]+'`'); printf("/");
+            if(makruk) printf("8/");
             for(i=0; i<BW; i++) printf("%c", piecename[2]+'`'); printf("/");
-            for(i=2; i<BH-2; i++) printf("%d/", BW);
+            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");
         }
 }
@@ -746,7 +754,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")) {
@@ -899,6 +907,8 @@ int main(int argc, char **argv)
                         CopyBoard(HistPtr=HistPtr+1&1023);
                         if(PrintResult(Side)) Computer = EMPTY;
 		    }
+
 		}
 	}
+	return 0;
 }