Skip mobility danger for drop variants

shogi STC
LLR: 2.95 (-2.94,2.94) [0.00,10.00]
Total: 1223 W: 671 L: 551 D: 1
http://www.variantfishtest.org:6543/tests/view/5feb75826e23db221d9e978d

shogi LTC
LLR: 2.95 (-2.94,2.94) [0.00,10.00]
Total: 1463 W: 788 L: 665 D: 10
http://www.variantfishtest.org:6543/tests/view/5feb876b6e23db221d9e979d

crazyhouse STC
LLR: 2.96 (-2.94,2.94) [-10.00,5.00]
Total: 2044 W: 1019 L: 967 D: 58
http://www.variantfishtest.org:6543/tests/view/5feb78aa6e23db221d9e9790

crazyhouse LTC
LLR: 2.98 (-2.94,2.94) [-10.00,5.00]
Total: 2570 W: 1260 L: 1212 D: 98
http://www.variantfishtest.org:6543/tests/view/5febb3ab6e23db221d9e979f

minishogi STC
LLR: 2.95 (-2.94,2.94) [-10.00,5.00]
Total: 1559 W: 808 L: 751 D: 0
http://www.variantfishtest.org:6543/tests/view/5feb793c6e23db221d9e9793

minishogi LTC
LLR: 2.96 (-2.94,2.94) [-10.00,5.00]
Total: 1724 W: 890 L: 834 D: 0
http://www.variantfishtest.org:6543/tests/view/5febb3c26e23db221d9e97a1

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 67aafa0..b5bb3de 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -772,7 +772,7 @@ namespace {
                  +  98 * popcount(pos.blockers_for_king(Us))
                  +  69 * kingAttacksCount[Them] * (2 + 8 * pos.check_counting() + pos.captures_to_hand()) / 2
                  +   3 * kingFlankAttack * kingFlankAttack / 8
-                 +       mg_value(mobility[Them] - mobility[Us])
+                 +       mg_value(mobility[Them] - mobility[Us]) * !pos.captures_to_hand()
                  - 873 * !(pos.major_pieces(Them) || pos.captures_to_hand())
                        * 2 / (2 + 2 * pos.check_counting() + 2 * pos.two_boards() + 2 * pos.makpong()
                                 + (pos.king_type() != KING) * (pos.diagonal_lines() ? 1 : 2))