Adapt piece assignment in Werewolf Chess to XBoard 4.9

[hachu.git] / hachu.c

diff --git a/hachu.c b/hachu.c
index f1db2ee..7575900 100644 (file)
--- a/hachu.c
+++ b/hachu.c
@@ -511,7 +511,7 @@ VariantDesc variants[] = {
   { 16,  8,  8, 1, V_SHATRANJ,"shatranj",shatArray}, // Shatranj\r
   { 16,  8,  8, 3, V_MAKRUK,  "makruk",  thaiArray}, // Makruk\r
   { 16,  8,  8, 1, V_LION,    "lion",    lionArray}, // Mighty Lion\r
-  { 22, 11, 11, 3, V_WA,      "washogi", waArray},   // Wa\r
+  { 22, 11, 11, 3, V_WA,      "wa-shogi",waArray},   // Wa\r
   { 16,  8,  8, 1, V_WOLF,    "werewolf",wolfArray},   // Wa\r
 \r
   { 0, 0, 0, 0, 0 }, // sentinel\r
@@ -2195,7 +2195,7 @@ attacks += 2*bsize;
 MapFromScratch(attacks); // for as long as incremental update does not work.\r
 //if(flag & depth >= 0) printf("%2d:%d mapped %d/%d %s\n", depth, iterDep, curMove, msp, MoveToText(moveStack[curMove], 0));\r
 //if(PATH) pmap(attacks, stm);\r
-      if(chuFlag && p[tb.victim].value == LVAL) {// verify legality of Lion capture in Chu Shogi\r
+      if(chuFlag && (p[tb.victim].value == LVAL || p[tb.epVictim[0]].value == LVAL)) {// verify legality of Lion capture in Chu Shogi\r
        score = 0;\r
        if(p[tb.piece].value == LVAL) {          // Ln x Ln: can make Ln 'vulnerable' (if distant and not through intemediate > GB)\r
          if(dist[tb.from-tb.to] != 1 && attacks[2*tb.to + stm] && p[tb.epVictim[0]].value <= 50)\r
@@ -3007,12 +3007,17 @@ pboard(board);
             }\r
          }\r
           if(currentVariant == V_WOLF)\r
-            printf("setup (PNBR...........WKpnbr...........wk) 8x8+0_fairy rnbwkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBWKBNR w 0 1\n");\r
+            printf("setup (PNBR......................WKpnbr......................wk) 8x8+0_fairy rnbwkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBWKBNR w 0 1\n");\r
           if(currentVariant == V_SHO)\r
             printf("setup (PNBRLSE..G.+++++++Kpnbrlse..g.+++++++k) 9x9+0_shogi lnsgkgsnl/1r2e2b1/ppppppppp/9/9/9/PPPPPPPPP/1B2E2R1/LNSGKGSNL w 0 1\n");\r
           if(currentVariant == V_WA)\r
-            printf("setup (P.C.EVLO.WGHDF.TRSXOM.+.+..+++.+++++..+++++Kp.c.evlo.wghdf.trsxom.+.+..+++.+++++..+++++k) 11x11+0_chu "\r
-                                                       "hmolvkwgcdx/1e3s3f1/ppprppptppp/3p3p3/11/11/11/3P3P3/PPPTPPPRPPP/1F3S3E1/XDCGWKVLOMH w 0 1\n");\r
+            printf("setup (P..^S^FV..^LW^OH.F.^R.E....R...D.GOL^M..^H.M.C.^CU.^W/.......^V.^P.^U..^DS.^GXK"\r
+                          "p..^s^fv..^lw^oh.f.^r.e....r...d.gol^m..^h.m.c.^cu.^w/.......^v.^p.^u..^ds.^gxk) 11x11+0_chu "\r
+                                                       "hmlcvkwgudo/1e3s3f1/ppprpppxppp/3p3p3/11/11/11/3P3P3/PPPXPPPRPPP/1F3S3E1/ODUGWKVCLMH w 0 1\n"\r
+                   "piece P& fW\npiece O& fR\npiece H& fRbW2\npiece U& fWbF\npiece L& fWbF\npiece M& vWfF\npiece G& vWfF\npiece C& sWfF\n"\r
+                   "piece +P& WfF\npiece +O& K\npiece +H& vN\npiece +U& BfW\npiece +L& vRfF3bFsW\npiece +M& FfW\npiece +G& sRvW\npiece +C& vRsWfF\n"\r
+                   "piece D& sbWfF\npiece V& FfW\npiece W& WfF\npiece S& sRvW\npiece R& FfRbW\npiece F& BfW\npiece X& FvWAvD\n"\r
+                   "piece +D& WfF\npiece +V& FfsW\npiece +W& K\npiece +S& R\npiece +R& FvWAvD\npiece +F& BvRsW\npiece E& vRfF3bFsW\n");\r
          repStack[199] = hashKeyH, checkStack[199] = 0;\r
           continue;\r
         }\r