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

diff --git a/fairymax.c b/fairymax.c
index 94edc78..568a08f 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,11 +100,11 @@ int Post;
 int Fifty;
 int GameNr;
 int Resign;
-int Cambodian;
+char Cambodian[80] = "makruk";
 int Threshold = 800;
 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;
@@ -170,6 +170,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 +199,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 */
@@ -400,8 +401,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];
@@ -438,7 +440,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 +457,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 +467,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 +482,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) {
@@ -520,16 +522,20 @@ void LoadGame(char *name)
             c=0; if(i>15 || j>255) break;
         }
 
-        fclose(f);
-	sh = w[7] < 250 ? 3 : 0;
-        if(name == selectedFairy) {
-            printf(ptc == 1 ? "setup " : "setup (%s) ", pieceToChar); // setup board in GUI
+	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);
             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("/");
-            for(i=0; i<BW; i++) printf("%c", piecename[oo[i]]+'@'); printf(" w KQkq - 0 1\n");
+            if(makruk) printf("8/");
+            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);
 }
 
 int main(int argc, char **argv)
@@ -575,6 +581,7 @@ int main(int argc, char **argv)
                         if(tlim>TimeLeft/15) tlim = TimeLeft/15;
                         PromPiece = 0; /* Always promote to Queen ourselves */
                         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;
@@ -746,7 +753,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 +906,8 @@ int main(int argc, char **argv)
                         CopyBoard(HistPtr=HistPtr+1&1023);
                         if(PrintResult(Side)) Computer = EMPTY;
 		    }
+
 		}
 	}
+	return 0;
 }