Let hoppers change direction, use range bits as offset

[fairymax.git] / fairymax.c

diff --git a/fairymax.c b/fairymax.c
index 72dba19..9b3adc7 100644 (file)
--- a/fairymax.c
+++ b/fairymax.c
@@ -104,7 +104,7 @@ char Cambodian[80] = "makruk";
 int Threshold = 800;\r
 int Score;\r
 int makruk;\r
-int prom, pm, gating, succession;\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
@@ -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   */\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
@@ -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**/\r
        if(d-!t>1)                              /*** all captures if d=2  ***/\r
        {v=gt=0;G:                              /* retry move with gating   */\r
-        v+=centr[p]?b[x+257]-b[y+257]:0;       /* center positional pts.   */\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
@@ -265,15 +266,15 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
        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;v=r^flag>>12;                        /* capt & alternated vector */\r
       if(flag&15^4|u&32||                      /* no double or moved before*/\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 if(flag&64)t=flag&128?0:t,flag&=63;else F=y; /* enable e.p.     */\r
-      if(s&&flag&8)t=0,flag^=flag>>4&15;       /* hoppers go to next phase */\r
-      if(--rg<0&!(flag&S))                     /* zig-zag piece? (w. delay)*/\r
+      if(s&&flag&8&&!(y-=rg*r,t=0)             /* hoppers go to next phase */\r
+         ||!(flag&S)&&--rg<0)                  /* 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
@@ -400,8 +401,9 @@ void InitGame()
   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)*(K-BW/2)+(L-3.5)*(L-3.5); /* center-pts table   */\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
+ 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
@@ -520,7 +522,7 @@ void LoadGame(char *name)
             c=0; if(i>15 || j>255) break;\r
         }\r
 \r
-       sh = w[7] < 250 ? 3 : 0;\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
@@ -579,6 +581,7 @@ int main(int argc, char **argv)
                         if(tlim>TimeLeft/15) tlim = TimeLeft/15;\r
                         PromPiece = 0; /* Always promote to Queen ourselves */\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
                             m = GetTickCount() - Ticks;\r