Clarify license
[fairymax.git] / fairymax.c
index 4db818e..5df22c2 100644 (file)
@@ -1,13 +1,16 @@
 /***************************************************************************/\r
-/*                               fairy-Max,                                */\r
+/*                               Fairy-Max,                                */\r
 /* Version of the sub-2KB (source) micro-Max Chess program, fused to a     */\r
 /* generic WinBoard interface, loading its move-generator tables from file */\r
 /***************************************************************************/\r
 \r
      /*****************************************************************/\r
      /*                      LICENCE NOTIFICATION                     */\r
-     /* Fairy-Max 4.8 is free software, and you have my permission do */\r
-     /* with it whatever you want, whether it is commercial or not.   */\r
+     /* Fairy-Max 4.8 is free software, released in the public domain */\r
+     /* so that you have my permission do with it whatever you want,  */\r
+     /* whether it is commercial or not, at your own risk. Those that */\r
+     /* are not comfortable with this, can also use or redistribute   */\r
+     /* it under the GNU Public License or the MIT License.           */\r
      /* Note, however, that Fairy-Max can easily be configured through*/\r
      /* its fmax.ini file to play Chess variants that are legally pro-*/\r
      /* tected by patents, and that to do so would also require per-  */\r
@@ -18,7 +21,7 @@
      /*****************************************************************/\r
 \r
 #define MULTIPATH\r
-#define VERSION "4.8O"\r
+#define VERSION "4.8V"\r
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
 \r
 #ifdef WIN32 \r
 #    include <windows.h>\r
+#    define CPUtime 1000.*clock\r
 #else\r
 #    include <sys/time.h>\r
+#    include <sys/times.h>\r
+#    include <unistd.h>\r
      int GetTickCount() // with thanks to Tord\r
      { struct timeval t;\r
        gettimeofday(&t, NULL);\r
        return t.tv_sec*1000 + t.tv_usec/1000;\r
      }\r
+     double CPUtime()\r
+     {  // get CPU time used by process, converted to 'MILLICLOCKS'\r
+       struct tms cpuTimes;\r
+       static int cps = 0;\r
+       if(!cps) cps = sysconf(_SC_CLK_TCK);\r
+       times(&cpuTimes);\r
+       return ((double)(cpuTimes.tms_utime + cpuTimes.tms_stime) * CLOCKS_PER_SEC * 1000)/cps;\r
+     }\r
 #endif\r
 \r
 int StartKey;\r
@@ -68,10 +82,10 @@ int StartKey;
 #endif\r
 \r
 /* make unique integer from engine move representation */\r
-#define PACK_MOVE 256*K + L;\r
+#define PACK_MOVE 256*K + L + (PromPiece << 16) + (GT<<24);\r
 \r
 /* convert intger argument back to engine move representation */\r
-#define UNPACK_MOVE(A) K = (A)>>8 & 255; L = (A) & 255;\r
+#define UNPACK_MOVE(A) K = (A)>>8 & 255; L = (A) & 255; PromPiece = (A)>>16 & 255; GT = (A)>>24 & 255;\r
 \r
 /* Global variables visible to engine. Normally they */\r
 /* would be replaced by the names under which these  */\r
@@ -87,19 +101,23 @@ int MovesLeft;
 int MaxDepth;\r
 int Post;\r
 int Fifty;\r
-int UnderProm;\r
 int GameNr;\r
 int Resign;\r
+char Cambodian[80] = "makruk";\r
 int Threshold = 800;\r
+int drawMoves = 50;\r
 int Score;\r
 int makruk;\r
+int prom, pm, gating, succession, hill;\r
 char piecename[32], piecetype[32], blacktype[32];\r
+char selectedFairy[80];\r
 char *inifile = INI_FILE;\r
+char info[999];\r
 \r
 int Ticks, tlim, Setup, SetupQ;\r
 \r
 int GameHistory[1024];\r
-char HistoryBoards[1024][STATE], setupPosition[131];\r
+char HistoryBoards[1024][STATE], setupPosition[162];\r
 int GamePtr, HistPtr;\r
 \r
 #define W while\r
@@ -109,7 +127,7 @@ int GamePtr, HistPtr;
 int U=(1<<23)-1;\r
 struct _ {int K,V;char X,Y,D,F;} *A;           /* hash table, 16M+8 entries*/\r
 \r
-int M=136,S=128,I=8e3,Q,O,K,N,j,R,J,Z,LL,      /* M=0x88                   */\r
+int M=136,S=128,I=8e3,Q,O,K,N,j,R,J,Z,LL,GT,   /* M=0x88                   */\r
 BW,BH,sh,\r
 w[16]={0,2,2,-1,7,8,12,23,7,5},                /* relative piece values    */\r
 o[256],\r
@@ -117,7 +135,7 @@ oo[32],                                        /* initial piece setup      */
 of[256],\r
 od[16];                                        /* 1st dir. in o[] per piece*/\r
 \r
-signed char L,pl[17],\r
+signed char L,pl[32],\r
 b[513],                                        /* board: 16x8+dummy, + PST */\r
 T[4104],                                       /* hash translation table   */\r
 centr[32],\r
@@ -126,7 +144,7 @@ n[]=".*XKNBRQEWFMACHG?x+knbrqewfmachg";        /* piece symbols on printout*/
 int pv[10000],*sp=pv; // triangular array\r
 int margin;\r
 \r
-pboard()\r
+void pboard()\r
 {int i;\r
  i=-1;W(++i<128)printf(" %c",(i&15)==BW&&(i+=15-BW)?10:n[b[i]&31]);\r
 }\r
@@ -135,9 +153,9 @@ pboard()
 D(k,q,l,e,E,z,n)        /* recursive minimax search, k=moving side, n=depth*/\r
 int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/\r
 {                       /* e=score, z=prev.dest; J,Z=hashkeys; return score*/\r
- int j,r,m,v,d,h,i,F,G,P,V,f=J,g=Z,C,s,flag,FF,*ps=sp;\r
- signed char t,p,u,x,y,X,Y,H,B;\r
- struct _*a=A+(J+(k+S)*E&U-1);                 /* lookup pos. in hash table*/\r
+ int j,r,m,v,d,h,i,F,G,P,V,f=J,g=Z,C,s,flag,FF,*ps=sp,kk=S;\r
+ signed char t,p,u,x,y,X,Y,H,B,gt,rg,rk;\r
+ struct _*a=A+(J+(k+S)*E&U);                   /* lookup pos. in hash table*/\r
  *sp++=0;\r
  q-=q<e;l-=l<=e;                               /* adj. window: delay bonus */\r
  d=a->D;m=a->V;X=a->F;Y=a->Y;                  /* resume at stored depth   */\r
@@ -157,11 +175,12 @@ 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   */\r
    if(u&&(u&16)==k)                            /*  own piece (inefficient!)*/\r
    {r=p=u&15;                                  /* p = piece type (set r>0) */\r
+    if(hill&&w[p]<0&b[385+x])m=I,d=98;         /* King on the hill: we won */\r
     j=od[p];                                   /* first step vector f.piece*/\r
     W(r=o[++j])                                /* loop over directions o[] */\r
     {A:                                        /* resume normal after best */\r
      flag=h?3:of[j];                           /* move modes (for fairies) */\r
-     y=x;F=FF=G=S;                             /* (x,y)=move, (F,G)=castl.R*/\r
+     y=x;F=FF=G=S;rg=flag>>10&3;               /* (x,y)=move, (F,G)=castl.R*/\r
      do{                                       /* y traverses ray, or:     */\r
       H=y=h?Y^h:y+r;                           /* sneak in prev. best move */\r
       if(flag&1<<8)H=y=(y&15)>13?y+BW:(y&15)>=BW?y-BW:y; /* cylinder board */\r
@@ -174,25 +193,28 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
       }\r
 #endif\r
       m=E<16|(E^112)<16&&flag&1&y-E<2&E-y<2?I:m;      /* bad castling  */\r
-      if(p<3&y==E)H=z&127;                     /* shift capt.sqr. H if e.p.*/\r
+      if(p<3&y==E&flag)H=z&127;                /* shift capt.sqr. H if e.p.*/\r
       t=b[H];\r
       if(flag&1+!t)                            /* mode (capt/nonc) allowed?*/\r
       {if(t&&(t&16)==k)break;                  /* capture own              */\r
        i=w[t&15]+((t&192)>>sh);                /* value of capt. piece t   */\r
-       if(i<0)m=I,d=98;                        /* K capture                */\r
+       if(i<0&&(pl[t&31]<2||                   /* K capture, (of last K),  */\r
+        t>>3&kk!=H&kk!=S||(kk=H,i=-i,0)))m=I,d=98;/* or duple check: cutoff*/\r
        if(m>=l&d>1)goto C;                     /* abort on fail high       */\r
        v=d-1?e:i-p;                            /*** MVV/LVA scoring if d=1**/\r
        if(d-!t>1)                              /*** all captures if d=2  ***/\r
-       {v=centr[p]?b[x+257]-b[y+257]:0;        /* center positional pts.   */\r
-        if(!(G&S))b[FF]=b[G],v+=50;            /* castling: put R & score  */\r
-        b[G]=b[H]=b[x]=0;b[y]=u|32;            /* do move, set non-virgin  */\r
+       {v=gt=0;G:                              /* retry move with gating   */\r
+        v+=centr[p]*(b[x+257]-b[y+257]);       /* center positional pts.   */\r
+        if(G-S)b[FF]=(rk=b[G])|32,v+=50;       /* castling: put R & score  */\r
+        b[G]=b[H]=0;b[x]=gt;b[y]=u|32;         /* do move, set non-virgin  */\r
+        pl[t&31]-=!!t;                         /* updat victim piece count */\r
         v-=w[p]>0|R<EG?0:20;                   /*** freeze K in mid-game ***/\r
         if(p<3)                                /* pawns:                   */\r
         {v-=9*((x-2&M||b[x-2]-u)+              /* structure, undefended    */\r
                (x+2&M||b[x+2]-u)               /*        squares plus bias */\r
               +(w[b[x^16]&15]<0))              /*** cling to magnetic K ***/\r
               +(R-76>>2);                      /* end-game Pawn-push bonus */\r
-         b[y]+=V=y+r+1&S?647-p:2*(u&y+16&32);  /* upgrade P or convert to Q*/\r
+         b[y]+=V=y+r+1&S?647-p|pm:2*(u&y+16&32);/*upgrade P or convert to Q*/\r
          if(V&makruk)b[y]=u|7,V=480;           /* Makruk promotion on 6th  */\r
          V>>=sh;                               /* for Shatranj promo to F  */\r
          i+=V;                                 /* promotion / passer bonus */\r
@@ -202,7 +224,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    ****/\r
         if(z&S)V=m-margin>q?m-margin:q;        /* multiPV                  */\r
         C=d-1-(d>5&p>2&!t&!h);                 /* nw depth, reduce non-cpt.*/\r
-        C=R<EG|P-I|d<3||t&&p-3?C:d;            /* extend 1 ply if in-check */\r
+        C=R<EG|P-I|d<3||t&&w[p]>0?C:d;         /* extend 1 ply if in-check */\r
         do\r
          s=C>2|v>V?-D(16-k,-l,-V,-v,/*** futility, recursive eval. of reply */\r
                                      F,y&255,C):v;\r
@@ -213,42 +235,52 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
          *ps=256*x+y;\r
         }\r
         if(z&S&&K-I)                           /* move pending: check legal*/\r
-        {if(v+I&&x==K&y==L)                    /*   if move found          */\r
-         {Q=-e-i;O=F;LL=L;\r
-          if(b[y]-u&15)b[y]-=PromPiece,        /* under-promotion, correct */\r
-                       J+=PromPiece;           /*  piece & invalidate hash */\r
+        {if(v+I&&x==K&y==L&gt==GT)             /*   if move found          */\r
+         {Q=-e-i;O=F;LL=L;prom=gt&15;\r
+          if(b[y]-u&15)prom=b[y]-=PromPiece,   /* (under-)promotion:       */\r
+           Q-=abs(w[prom&=15])-w[p]-(6*S>>sh), /*  correct piece & score & */\r
+                       Z+=PromPiece;           /*  invalidate hash         */\r
           a->D=99;a->V=0;                      /* lock game in hash as draw*/\r
           R-=i/FAC;                            /*** total captd material ***/\r
           Fifty = t|p<3?0:Fifty+1;\r
+          if(centr[p]==5)b[257+y]-=5;\r
           sp=ps;\r
                      return l;}                /*   & not in check, signal */\r
          v=m;                                  /* (prevent fail-lows on    */\r
         }                                      /*   K-capt. replies)       */\r
-        J=f;Z=g;\r
-        SHAMAX( pl[k]+=!!t; )\r
-        b[G]=b[FF];b[FF]=b[y]=0;b[x]=u;b[H]=t; /* undo move,G can be dummy */\r
+        SHAMAX( pl[k]+=!!t; ) pl[t&31]+=!!t;\r
+        b[G]=rk;b[FF]=b[y]=0;b[x]=u;b[H]=t;    /* undo move,G can be dummy */\r
        }                                       /*          if non-castling */\r
-       if(z&S&&Post&K==I&d>2&v>V&v<l){int *p=ps;char X,Y;\r
-        printf("%2d ",d-2);\r
-        printf("%6d ",v);\r
-        printf("%8d %10d",(GetTickCount()-Ticks)/10,N);\r
-        while(*p){X=*p>>8;Y=*p++;\r
-        printf(" %c%c%c%c",'a'+(X&15),'8'-(X>>4),'a'+(Y&15),'8'-(Y>>4&7));}\r
-        printf("\n");fflush(stdout);\r
-       }
+       if(z&S&&K==I&d>2&v>V&v<l){int *p=ps;char X,Y;\r
+        if(Post){\r
+         printf("%2d ",d-2);\r
+         printf("%6d ",v);\r
+         printf("%8d %10d",(GetTickCount()-Ticks)/10,N);\r
+         while(*p){X=*p>>8;Y=*p++;\r
+         printf(" %c%c%c%c",'a'+(X&15),'8'-(X>>4),'a'+(Y&15),'8'-(Y>>4&7));}\r
+         printf("\n");fflush(stdout);\r
+        }GT=gt;                                /* In root, remember gated  */\r
+       }\r
        if(v>m)                                 /* new best, update max,best*/\r
         m=v,X=x,Y=y|S&F;                       /* mark non-double with S   */\r
+       if(gating&&!(u&32)&&p>2&&d-!t>1){       /* virgin non-Pawn: gate    */\r
+        pl[(gt|=k+40)-27]++;                   /* prev. gated back in hand */\r
+        if(m>=l)goto C;                        /* loop skips cutoff :-(    */\r
+        W(++gt<k+43)if(pl[gt-27]){             /* look if more to gate     */\r
+         pl[gt-27]--;v=10;goto G;              /* remove from hand & retry */\r
+       }}\r
+       J=f;Z=g;\r
        if(h){h=0;goto A;}                      /* redo after doing old best*/\r
       }\r
-      s=t;v=r^flag>>12;                        /* calc. alternated vector  */\r
+      s=t&&2&~rg|~t&16^k;v=r^flag>>12;         /* platform & toggled vector*/\r
       if(flag&15^4|u&32||                      /* no double or moved before*/\r
-         p>2&&                                 /* no P & no lateral K move,*/\r
+         p>2&!(flag&S)&&                       /* no P & no virgin jump,   */\r
          ((b[G=r<0?x&~15:BW-1|x&112]^32)<33    /* no virgin R in corner G, */\r
          ||b[G^1]|b[G^2]|b[FF=y+v-r])          /* no 2 empty sq. next to R */\r
         )t+=flag&4;                            /* fake capt. for nonsliding*/\r
-      else F=y;                                /* enable e.p.              */\r
-      if(s&&flag&8)t=0,flag^=flag>>4&15;       /* hoppers go to next phase */\r
-      if(!(flag&S))                            /* zig-zag piece?           */\r
+      else if(flag&64)t=flag&128?0:t,flag&=63;else F=y; /* enable e.p.     */\r
+      if(s&&flag&8&&!(y=rg&1?y-r:y,t=0)        /* hoppers go to next phase */\r
+         ||!(flag&S)&&!rg--)                   /* zig-zag piece? (w. delay)*/\r
        r=v,flag^=flag>>4&15;                   /* alternate vector & mode  */\r
      }W(!t);                                   /* if not capt. continue ray*/\r
    }}\r
@@ -299,7 +331,7 @@ if(z&4*S)K=X,L=Y&~S;
 \r
 int PrintResult(int s)\r
 {\r
-        int i, j, k, cnt=0;\r
+        int j, k, cnt=0;\r
 \r
         /* search last 50 states with this stm for third repeat */\r
         for(j=2; j<=100 && j <= HistPtr; j+=2)\r
@@ -331,13 +363,6 @@ int PrintResult(int s)
                         printf("1-0 {Bare King}\n");\r
                 return 5;\r
         }\r
-        if(cnt>-I+1 && K==0 && L==0) {\r
-                if (s == WHITE)\r
-                        printf("0-1 {Stalemate}\n");\r
-                else\r
-                        printf("1-0 {Stalemate}\n");\r
-                return 2;\r
-        }\r
 #else\r
         if(cnt>-I+1 && K==0 && L==0) {\r
                 printf("1/2-1/2 {Stalemate}\n");\r
@@ -347,11 +372,15 @@ int PrintResult(int s)
         if(cnt==-I+1) {\r
                 if (s == WHITE)\r
                         printf("0-1 {Black mates}\n");\r
-                else\r
+                else {\r
+                        if(succession) { // suppress loss claim if black might be able to replace its King by promotion\r
+                            for(j=0;j<BW;j++)if((b[j+96]&31)==18)return 0;\r
+                        }\r
                         printf("1-0 {White mates}\n");\r
+                }\r
                 return 3;\r
         }\r
-        if(Fifty >=100) {\r
+        if(Fifty >= 2*drawMoves) {\r
                 printf("1/2-1/2 {Draw by fifty move rule}\n");\r
                 return 4;\r
         }\r
@@ -359,32 +388,42 @@ int PrintResult(int s)
 }\r
 \r
 \r
-InitEngine()\r
+void InitEngine()\r
 {\r
- int i, j;\r
-\r
  N=32*S+7;W(N-->S+3)T[N]=rand()>>9;\r
  srand(GetTickCount());\r
 }\r
 \r
-InitGame()\r
+void InitGame()\r
 {\r
- int i,j;\r
+ int i,k=0;\r
 \r
+ Side = WHITE; Q=0; O=S;\r
+ Fifty = 0; R = 0;\r
  for(i=0;i<16*BH;i++)b[i]=0;\r
+ for(i=0;i<32;i++)pl[i]=0;\r
  K=BW;W(K--)\r
- {b[K]=oo[K+16]+16;b[K+112]=oo[K];b[K+16]=18;b[K+96]=1; /* initial board setup*/\r
-  L=8;W(L--)b[16*L+K+257]=(K-BW/2)*(K-BW/2)+(L-3.5)*(L-3.5); /* center-pts table   */\r
+ {b[K]=oo[K+16]+16;b[K+112]=oo[K];b[K+16+16*!!makruk]=18;b[K+96-16*!!makruk]=1; /* initial board setup*/\r
+  pl[oo[K+16]+16]++;pl[oo[K]]++;pl[18]++;pl[1]++;\r
+  if(w[oo[K+16]+16] == -1)pl[oo[K+16]+16]=1;\r
+  if(w[oo[K]] == -1)pl[oo[K]]=1;\r
+  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   */\r
  }                                                   /*(in unused half b[])*/\r
- Side = WHITE; Q=0; O=S;\r
- Fifty = 0; R = 0;\r
- for(i=0; i<BW; i++) if(i!=3) R += (w[oo[i]]/FAC) + (w[oo[i+16]]/FAC);\r
- UnderProm = -1; pl[WHITE] = pl[BLACK] = 2*BW;\r
+ 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 */\r
+ for(i=0; i<BW; i++) {\r
+  R += abs(w[oo[i]])/FAC + abs(w[oo[i+16]])/FAC;\r
+  Q += abs(w[oo[i]]) - abs(w[oo[i+16]]) + w[1] - w[2];\r
+  if(w[oo[i]] < 0) k = w[oo[i]];\r
+ }\r
+ R -= 2*(-k/FAC);\r
+ pl[WHITE] = pl[BLACK] = 2*BW; \r
+ pm = !pl[BLACK+7] && pl[BLACK+9] && pl[WHITE+7] ? 2 : 0; // Unlike white, black has no 'Q', so promote to 9, which he does have.\r
+ if(gating) pl[14] = pl[15] = pl[30] = pl[31] = 1, R += 2*(w[9]/FAC + w[10]/FAC);\r
 }\r
 \r
 void CopyBoard(int s)\r
 {\r
-        int i, j, k, cnt=0;\r
+        int i, j;\r
 \r
         /* copy game representation of engine to HistoryBoard */\r
         /* don't forget castling rights and e.p. state!       */\r
@@ -393,9 +432,9 @@ void CopyBoard(int s)
             HistoryBoards[s][BW*i+j] = b[16*i+j]|64*(16*i+j==O);\r
 }\r
                                          \r
-void PrintVariants()\r
+void PrintVariants(int combo)\r
 {\r
-        int i, j, count=0; char c, buf[80];\r
+        int count=0, total=0; char c=EOF+1, buf[80];\r
         FILE *f;\r
 \r
         f = fopen(INI_FILE, "r");\r
@@ -406,45 +445,58 @@ void PrintVariants()
            while(fscanf(f, "Game: %s", buf) != 1 && c != EOF) \r
                while((c = fgetc(f)) != EOF && c != '\n');\r
            if(c == EOF) break;\r
-           if(count++) printf(",");\r
-           printf("%s", buf);\r
+           total++;\r
+           if(*buf < 'a' || combo == (strstr(buf, "fairy/") != buf)) continue;\r
+           if(combo && count == 0) strcpy(selectedFairy, buf);\r
+           if(count++) printf(combo ? " /// " : ",");\r
+           printf("%s", combo ? buf+6 : buf);\r
         } while(c != EOF);\r
 \r
         fclose(f);\r
+        if(!combo && total != count) printf("%sfairy", count ? "," : "");\r
 }\r
 \r
 void PrintOptions()\r
 {\r
        printf("feature option=\"Resign -check %d\"\n", Resign);\r
        printf("feature option=\"Resign Threshold -spin %d 200 1200\"\n", Threshold);\r
+       printf("feature option=\"Claim draw after -spin %d 0 200\"\n", drawMoves);\r
        printf("feature option=\"Ini File -file %s\"\n", inifile);\r
        printf("feature option=\"Multi-PV Margin -spin %d 0 1000\"\n", margin);\r
-       printf("feature option=\"Playing Style ;-) -combo Brilliant /// *Brave /// Beautiful\"\n");\r
+       printf("feature option=\"Variant fairy selects -combo "); PrintVariants(1); printf("\"\n");\r
+       printf("feature option=\"Makruk rules -combo makruk /// Cambodian /// Ai-wok\"\n");\r
        printf("feature option=\"Dummy Slider Example -slider 20 0 100\"\n");\r
-       printf("feature option=\"Dummy String Example -file happy birthday!\"\n");\r
+       printf("feature option=\"Dummy String Example -string happy birthday!\"\n");\r
        printf("feature option=\"Dummy Path Example -path .\"\n");\r
+       printf("feature option=\"Info -button\"\n");\r
        printf("feature option=\"Clear Hash -button\"\n");\r
        printf("feature done=1\n");\r
 }\r
                                          \r
-int LoadGame(char *name)\r
+void LoadGame(char *name)\r
 {\r
-        int i, j, count=0; char c, buf[80];\r
+        int i, j, ptc=0, count=0; char c, buf[80], pieceToChar[80], parent[80];\r
         static int currentVariant;\r
         FILE *f;\r
 \r
         f = fopen(inifile, "r");\r
         if(f==NULL)\r
-        {   printf("telluser piece-desription file '%s'  not found\n", inifile);\r
+        {   printf("telluser piece-description file '%s'  not found\n", inifile);\r
             exit(0);\r
         }\r
         if(fscanf(f, "version 4.8(%c)", &c)!=1 || c != 'w')\r
         { printf("telluser incompatible fmax.ini file\n"); exit(0); }\r
 \r
+        gating = succession = 0;\r
         if(name != NULL)\r
         {  /* search for game name in definition file */\r
-           while(fscanf(f, "Game: %s", buf)!=1 || strcmp(name, buf) ) {\r
-               while((c = fgetc(f)) != EOF && c != '\n');\r
+           if(!strcmp(name, "makruk")) name = Cambodian; else\r
+           if(!strcmp(name, "fairy")) name = selectedFairy;\r
+           gating = !strcmp(name, "seirawan");\r
+           while((ptc=fscanf(f, "Game: %s # %s # %s", buf, pieceToChar, parent))==0 || strcmp(name, buf) ) {\r
+               char *p = info;\r
+               while((c = fgetc(f)) != EOF && c != '\n') *p++ = c;\r
+               if(*info == '/') *p = 0; else *info = 0; // remember last line before Game if it was comment\r
                count++;\r
                if(c == EOF) {\r
                    printf("telluser variant %s not supported\n", name);\r
@@ -458,6 +510,7 @@ int LoadGame(char *name)
         /* We have found variant, or if none specified, are at beginning of file */\r
         if(fscanf(f, "%dx%d", &BW, &BH)!=2 || BW>12 || BH!=8)\r
         { printf("telluser unsupported board size %dx%d\n",BW,BH); exit(0); }\r
+        makruk = 0; if(fscanf(f, "=%d", &i)) makruk=67-i; // new method to indicate deviant zone depth (for now assumes 3)\r
 \r
         for(i=0; i<BW; i++) fscanf(f, "%d", oo+i);\r
         for(i=0; i<BW; i++) fscanf(f, "%d", oo+i+16);\r
@@ -472,23 +525,38 @@ int LoadGame(char *name)
             { od[++i]=j; centr[i] = c>='a';\r
               blacktype[c&31]=i; piecename[i]=c&31;\r
               if(piecetype[c&31]==0) piecetype[c&31]=i; // only first\r
+              succession |= w[i] < -4;         // expendable royalty; assume we can promote to it\r
             }\r
             j++; o[j]=0;\r
             /* printf("# c='%c' i=%d od[i]=%d j=%d (%3d,%8x)\n",c?c:' ',i,od[i],j,o[j-1],of[j-1]); /**/\r
             c=0; if(i>15 || j>255) break;\r
         }\r
 \r
+       sh = w[7] < 250 ? 3 : 0; hill = (w[3] == -2);\r
+        if(ptc > 1) { // setup board in GUI, by sending it pieceToCharTable and FEN\r
+            if(ptc == 2) printf("setup (%s) ", pieceToChar);\r
+            else printf("setup (%s) %dx%d+0_%s ", pieceToChar, BW, BH, parent);\r
+            for(i=0; i<BW; i++) printf("%c", piecename[oo[i+16]]+'`'); printf("/");\r
+            if(makruk) printf("8/");\r
+            for(i=0; i<BW; i++) printf("%c", piecename[2]+'`'); printf("/");\r
+            for(i=2+!!makruk; i<BH-2-!!makruk; i++) printf("%d/", BW);\r
+            for(i=0; i<BW; i++) printf("%c", piecename[1]+'@'); printf("/");\r
+            if(makruk) printf("8/");\r
+            for(i=0; i<BW; i++) printf("%c", oo[i] ? piecename[oo[i]]+'@' : '1'); printf(" w KQkq - 0 1\n");\r
+        }\r
+       while(fscanf(f, " # %[^\n]", pieceToChar)) printf("piece %s\n", pieceToChar);\r
         fclose(f);\r
-       sh = w[7] < 250 ? 3 : 0;\r
-       makruk = w[7]==181 ? 64 : 0; // w[7] is used as kludge to enable makruk promotions\r
+       if(makruk == 66) makruk = 8; // 66 was kludge to interpret "=1" suffix in asean for setting up 3rd-rank Pawns\r
 }\r
 \r
 int main(int argc, char **argv)\r
 {\r
-        int Computer, MaxTime, MaxMoves, TimeInc, sec, i, j;\r
-        char line[256], command[256], c, cc;\r
+        int Computer, MaxTime, MaxMoves, TimeInc, sec, i;\r
+        char line[256], command[256], c;\r
         int m, nr;\r
-        FILE *f;\r
+        double cpuT;\r
+\r
+        if(argc > 1 && !strcmp(argv[1], "-v")) argc++, argv--, printf("%s\n", VERSION), exit(0);\r
 \r
         if(argc>1 && sscanf(argv[1], "%d", &m)==1)\r
         { U = (1<<m)-1; argc--; argv++; }\r
@@ -498,8 +566,6 @@ int main(int argc, char **argv)
        signal(SIGINT, SIG_IGN);\r
         printf("tellics say     " NAME " " VERSION "\n");\r
         printf("tellics say     by H.G. Muller\n");\r
-        printf("tellics say Gothic Chess is protected by U.S. patent #6,481,716 by Ed Trice.\n");\r
-        printf("tellics say Falcon Chess is protected by U.S. patent #5,690,334 by George W. Duke\n");\r
         InitEngine();\r
         LoadGame(NULL);\r
         InitGame();\r
@@ -520,24 +586,27 @@ int main(int argc, char **argv)
                         /* the game have to be done in this time. */\r
                         /* If MaxMoves=1 any leftover time is lost*/\r
                         Ticks = GetTickCount();\r
+                        cpuT = CPUtime(); printf("# times @ %u\n", Ticks);\r
                         m = MovesLeft<=0 ? 40 : MovesLeft;\r
                         tlim = (0.6-0.06*(BW-8))*(TimeLeft+(m-1)*TimeInc)/(m+7);\r
                         if(tlim>TimeLeft/15) tlim = TimeLeft/15;\r
                         PromPiece = 0; /* Always promote to Queen ourselves */\r
+                        for(N=K=0;K<S;K++)N+=b[K]?b[K]&16?S:1:0; /* count pieces for detecting bare King */\r
+                        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;}\r
+printf("# %d+%d pieces, centr = (%d,%d) R=%d\n", N&63, N>>7, centr[3], centr[4], R);\r
                         N=0;K=I;\r
+                        if(hill) centr[3] = R>20 ? 1 : 22-R;\r
                         if (D(Side,-I,I,Q,O,LL|S,3)==I) {\r
                             Side ^= BLACK^WHITE;\r
-                            if(UnderProm>=0 && UnderProm != L)\r
-                            {    printf("tellics I hate under-promotions!\n");\r
-                                 printf("resign { underpromotion } \n");\r
-                                 Computer = EMPTY;\r
-                                 continue;\r
-                            } else UnderProm = -1;\r
+                            m = GetTickCount() - Ticks;\r
+                            printf("# times @ %u: real=%d cpu=%1.0f\n", m + Ticks, m,\r
+                                      (CPUtime() - cpuT)/CLOCKS_PER_SEC);\r
+printf("# promo = %d (%c) GT = %d\n", prom, prom + '`', GT); \r
                             printf("move ");\r
                             printf("%c%c%c%c",'a'+(K&15),'0'+BH-(K>>4),\r
                                           'a'+(L&15),'0'+BH-(L>>4));\r
+                           if(prom)printf("%c",piecename[prom]+'a'-1);\r
                             printf("\n");\r
-                            m = GetTickCount() - Ticks;\r
 \r
                             /* time-control accounting */\r
                             TimeLeft -= m;\r
@@ -563,7 +632,7 @@ int main(int argc, char **argv)
                         continue;\r
                }\r
                if (!fgets(line, 256, stdin))\r
-                       return;\r
+                       return 1;\r
                if (line[0] == '\n')\r
                        continue;\r
                sscanf(line, "%s", command);\r
@@ -572,9 +641,9 @@ int main(int argc, char **argv)
                 if (!strcmp(command, "protover")) {\r
                         printf("feature myname=\"" NAME " " VERSION "\"\n");\r
                         printf("feature memory=1\n");\r
-                        printf("feature setboard=0 ping=1 done=0\n");\r
+                        printf("feature setboard=0 xedit=1 ping=1 done=0\n");\r
                         printf("feature variants=\"");\r
-                        PrintVariants();\r
+                        PrintVariants(0);\r
                         printf("\"\n");\r
                        PrintOptions();\r
                         continue;\r
@@ -615,7 +684,7 @@ int main(int argc, char **argv)
                }\r
                if (!strcmp(command, "quit"))\r
                         /* exit engine */\r
-                       return;\r
+                       return 0;\r
                if (!strcmp(command, "force")) {\r
                         /* computer plays neither */\r
                         Computer = EMPTY;\r
@@ -623,12 +692,14 @@ int main(int argc, char **argv)
                }\r
                if (!strcmp(command, "white")) {\r
                         /* set white to move in current position */\r
+                        if(Side == BLACK) Q = -Q;\r
                         Side     = WHITE;\r
                         Computer = BLACK;\r
                        continue;\r
                }\r
                if (!strcmp(command, "black")) {\r
                         /* set blck to move in current position */\r
+                        if(Side == WHITE) Q = -Q;\r
                         Side     = BLACK;\r
                         Computer = WHITE;\r
                        continue;\r
@@ -694,8 +765,12 @@ int main(int argc, char **argv)
                        if(sscanf(line+7, "Ini File=%s", filename) == 1) {\r
                                inifile = filename; continue;\r
                        }\r
-                       if(sscanf(line+7, "Clear Hash") == 1) for(i=0; i<U; i++) A->K = 0;\r
+                       if(sscanf(line+7, "Clear Hash%c", &c) == 1) for(i=0; i<=U; i++) A->K = 0;\r
+                       if(sscanf(line+7, "Info%c", &c) == 1) printf("telluser %s\n", info+3);\r
                        if(sscanf(line+7, "MultiVariation Margin=%d", &margin) == 1) continue;\r
+                       if(sscanf(line+7, "Variant fairy selects=%s", selectedFairy+6) == 1) continue;\r
+                       if(sscanf(line+7, "Makruk rules=%s", Cambodian) == 1) continue;\r
+                       if(sscanf(line+7, "Claim draw after=%d", &drawMoves) == 1) continue;\r
                        continue;\r
                }\r
                if (!strcmp(command, "go")) {\r
@@ -731,9 +806,9 @@ int main(int argc, char **argv)
                         InitGame();\r
                        if(Setup) {\r
                            for(i=0; i<128; i++) b[i] = setupPosition[i];\r
+                           for(i=0; i<32; i++) pl[i] = setupPosition[i+130];\r
                            Side = setupPosition[128]; Q = SetupQ;\r
-                           pl[WHITE] = setupPosition[129];\r
-                           pl[BLACK] = setupPosition[130];\r
+                           R = setupPosition[129];\r
                        }\r
                        for(i=0; i<=U; i++) A[i].D = A[i].K = 0; // clear hash table\r
                         for(nr=0; nr<GamePtr; nr++) {\r
@@ -758,13 +833,14 @@ int main(int argc, char **argv)
                        continue;\r
                }\r
                 if (!strcmp(command, "edit")) {\r
-                        int color = WHITE, p;\r
+                        int color = WHITE, p, r;\r
 \r
                         while(fgets(line, 256, stdin)) {\r
                                 m = line[0];\r
                                 if(m=='.') break;\r
                                 if(m=='#') {\r
                                         for(i=0; i<128; i++) b[i]=0;\r
+                                        for(i=0; i<32; i++) pl[i]=0;\r
                                         Q=0; R=0; O=S;\r
                                         pl[WHITE]=pl[BLACK]=0;\r
                                         continue;\r
@@ -774,62 +850,81 @@ int main(int argc, char **argv)
                                         Q = -Q;\r
                                         continue;\r
                                 }\r
-                                if( m >= 'A' && m <= 'Z' && piecetype[m&31]\r
-                                    && line[1] >= 'a' && line[1] <= 'a'+BW-1\r
+                                if( m >= 'A' && m <= 'Z' && piecetype[m&31]) {\r
+                                    p = (color == WHITE ? piecetype : blacktype)[line[0]&31];\r
+                                    if(line[1] == '@') { // stuff holdings\r
+                                        pl[color+p+5] = m = line[2] - '0';\r
+                                        pl[BLACK+WHITE-color]+=m;pl[p+color]+=m;\r
+                                        Q+=m*w[p]; R+=m*(w[p]/FAC);\r
+                                        continue;\r
+                                    } else\r
+                                    if(line[1] >= 'a' && line[1] <= 'a'+BW-1\r
                                     && line[2] >= '1' && line[2] <= '0'+BH) {\r
-                                        m = line[1]-16*line[2]+799;\r
-                                        switch(p = (color == WHITE ? piecetype : blacktype)[line[0]&31])\r
+                                        m = line[1]-16*line[2]+799; r = m & 0x70;\r
+                                        switch(p)\r
                                         {\r
                                         case 1:\r
                                         case 2:\r
                                             if(color==WHITE)\r
-                                                 b[m]=(m&0x70)==0x60?1:33,\r
-                                                 Q+=w[1];\r
-                                            else b[m]=(m&0x70)==0x10?18:50,\r
-                                                 Q+=w[2];\r
+                                                 b[m]=r==0x10?161:r==0x20?97:r==0x60?1:33,\r
+                                                 Q+=w[1]+(r==0x10?S:r==0x20?64:0);\r
+                                            else b[m]=r==0x60?178:r==0x50?114:r==0x10?18:50,\r
+                                                 Q+=w[2]+(r==0x60?S:r==0x50?64:0);\r
                                             break;\r
                                         default:\r
                                             b[m]=p+color+32; // assume non-virgin\r
-                                            if(w[p]<0) { // Royal piece on original square: virgin
-                                               if(color==BLACK && m<0x10 && p==oo[m+16] ||\r
-                                                   color==WHITE && m>0x6F && p==oo[m-0x70]) b[m] -= 32;
-                                           } else { Q+=w[p]; R+=w[p]/FAC; }
-                                            if((m==0x00 || m==BW-1   ) && color==BLACK && p==oo[m+16] ||\r
-                                               (m==0x70 || m==0x6F+BW) && color==WHITE && p==oo[m-0x70])\r
-                                                b[m] &= ~32; // corner piece as in original setup: virgin\r
+                                           if(color==BLACK && m<0x10 && p==oo[m+16] || // but make virgin on original square\r
+                                               color==WHITE && m>0x6F && p==oo[m-0x70]) b[m] -= 32;\r
+                                            if(w[p]<0) { // Royal piece on original square: virgin\r
+                                                Q-=w[p]; // assume value was flipped to indicate royalty\r
+                                                if(pl[p+color])R-=w[p]/FAC; // capturable King, add to material\r
+                                           } else { Q+=w[p]; R+=w[p]/FAC; }\r
                                        case 0: // undefined piece, ignore\r
                                             break;\r
                                         }\r
-                                        pl[BLACK+WHITE-color]++;\r
+                                        pl[BLACK+WHITE-color]++;pl[p+color]++;\r
+                                        if(w[p+color] == -1)pl[p+color]=1; // fake we have one if value = -1, to thwart extinction condition\r
                                         continue;\r
+                                    }\r
                                 }\r
                         }\r
                         if(Side != color) Q = -Q;\r
                        GamePtr = HistPtr = 0; Setup = 1; SetupQ = Q; // start anew\r
                        for(i=0; i<128; i++) setupPosition[i] = b[i]; // remember position\r
                        setupPosition[128] = Side;\r
-                       setupPosition[129] = pl[WHITE];\r
-                       setupPosition[130] = pl[BLACK];\r
+                       setupPosition[129] = R;\r
+                       for(i=0; i<32; i++) setupPosition[i+130] = pl[i];\r
+                       Computer = EMPTY; // after edit: force mode!\r
                        continue;\r
                }\r
                 /* command not recognized, assume input move */\r
                 m = line[0]<'a' | line[0]>='a'+BW | line[1]<'1' | line[1]>='1'+BH |\r
                     line[2]<'a' | line[2]>='a'+BW | line[3]<'1' | line[3]>='1'+BH;\r
-                if(line[4] == '\n') line[4] = piecename[7];\r
-                PromPiece = 7 - (Side == WHITE ? piecetype : blacktype)[line[4]&31];\r
-                   if(PromPiece == 7) PromPiece = 0;\r
+                if(line[4] == '\n') line[4] = 0;\r
+                GT = (Side == WHITE ? piecetype : blacktype)[line[4]&31];\r
+                if(GT) PromPiece = (Side == WHITE ? 7 : 7+pm) - GT, GT |= 32 + Side;\r
                 {char *c=line; K=c[0]-16*c[1]+799;L=c[2]-16*c[3]+799; }\r
-                if (m)\r
+                if(w[GT&15] == -1 || w[GT&15]%10 == 3) L = S; // spoil move for promotion to King (or when marked non-promoting)\r
+                if (m & line[1] != '@')\r
                         /* doesn't have move syntax */\r
                        printf("Error (unknown command): %s\n", command);\r
-                else if(D(Side,-I,I,Q,O,LL|S,3)!=I) {\r
+                else { int i=-1;\r
+                    if(b[L] && (b[L]&16) == Side && w[b[L]&15] < 0) // capture own King: castling\r
+                    { i=K; K = L; L = i>L ? i-1 : i+2; }\r
+                   if(w[GT&15] < -1) pl[GT&31]++, J+=89729; // promotion to royal piece\r
+                    if((b[K]&15) < 3) GT = 0; // Pawn => true promotion rather than gating\r
+                    if(D(Side,-I,I,Q,O,LL|S,3)!=I) {\r
                         /* did have move syntax, but illegal move */\r
                         printf("Illegal move:%s\n", line);\r
-                } else {  /* legal move, perform it */\r
+                    } else {  /* legal move, perform it */\r
+                        if(i >= 0) b[i]=b[K],b[K]=0; // reverse Seirawan gating\r
                         GameHistory[GamePtr++] = PACK_MOVE;\r
                         Side ^= BLACK^WHITE;\r
                         CopyBoard(HistPtr=HistPtr+1&1023);\r
                         if(PrintResult(Side)) Computer = EMPTY;\r
+                   }\r
+\r
                }\r
        }\r
+       return 0;\r
 }\r