Keep track of piece pairs, with configurable bonus

[fairymax.git] / fairymax.c

diff --git a/fairymax.c b/fairymax.c
index ffa6ca8..9782ba4 100644 (file)
--- a/fairymax.c
+++ b/fairymax.c
@@ -73,7 +73,7 @@ int StartKey;
 #else\r
 #    define FAC 128\r
 #    define EG  10\r
-#    define NAME "Fairy-Max"\r
+#    define NAME "Pair-o-Max"\r
 #    define SHAMAX(x)\r
 #    define FMAX(x) x\r
 #endif\r
@@ -130,7 +130,7 @@ oo[32],                                        /* initial piece setup      */
 of[256],\r
 od[16];                                        /* 1st dir. in o[] per piece*/\r
 \r
-signed char L,pl[32],\r
+signed char L,pl[32],pb[32],\r
 b[513],                                        /* board: 16x8+dummy, + PST */\r
 T[4104],                                       /* hash translation table   */\r
 centr[32],\r
@@ -201,7 +201,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
         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]=0;b[x]=gt;b[y]=u|32;         /* do move, set non-virgin  */\r
-        pl[t&31]-=!!t;                         /* updat victim piece count */\r
+        i+=-((pl[t&31]-=!!t)&1)&pb[t&31];/* update piece count, pair bonus */\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
@@ -404,6 +404,7 @@ void InitGame()
  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
+  Q += (pl[i]>>1)*pb[i] -(pl[i+16]>>1)*pb[i];\r
   if(w[oo[i]] < 0) k = w[oo[i]];\r
  }\r
  R -= 2*(-k/FAC);\r
@@ -512,6 +513,8 @@ void LoadGame(char *name)
               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
+            } else {\r
+              if(!o[j]) pb[i] = pb[i+16] = of[j--]; // hand-set pair bonus\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
@@ -808,7 +811,7 @@ 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
@@ -835,16 +838,16 @@ int main(int argc, char **argv)
                                     } 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
+                                        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
@@ -857,7 +860,7 @@ int main(int argc, char **argv)
                                        case 0: // undefined piece, ignore\r
                                             break;\r
                                         }\r
-                                        pl[BLACK+WHITE-color]++;pl[p+color]++;\r
+                                        pl[BLACK+WHITE-color]++; if(pl[p+color]++&1) Q+=pb[p];\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