Consider attacks to CTF square in Jeson Mor
authorFabian Fichter <ianfab@users.noreply.github.com>
Fri, 24 Jan 2020 15:16:51 +0000 (16:16 +0100)
committerFabian Fichter <ianfab@users.noreply.github.com>
Fri, 24 Jan 2020 15:16:51 +0000 (16:16 +0100)
jesonmor STC
LLR: 4.87 (-2.94,2.94) [0.00,10.00]
Total: 765 W: 472 L: 292 D: 1
http://www.variantfishtest.org:6543/tests/view/5e29ec386e23db46beba4cd4

jesonmor LTC
LLR: 2.95 (-2.94,2.94) [0.00,10.00]
Total: 3514 W: 1832 L: 1679 D: 3
http://www.variantfishtest.org:6543/tests/view/5e29eebb6e23db46beba4cd7

src/evaluate.cpp

index 86f383a..fe6b986 100644 (file)
@@ -892,7 +892,7 @@ namespace {
             {
                 Square s2 = pop_lsb(&target_squares);
                 int dist =  distance(s1, s2)
-                          + (isKingCTF ? popcount(pos.attackers_to(s2, Them)) : 0)
+                          + (isKingCTF || pos.flag_move() ? popcount(pos.attackers_to(s2, Them)) : 0)
                           + !!(pos.pieces(Us) & s2);
                 score += make_score(2500, 2500) / (1 + scale * dist * dist);
             }