- return v == VALUE_NONE ? VALUE_NONE
- : v >= VALUE_MATE_IN_MAX_PLY ? VALUE_MATE - v > 99 - r50c ? VALUE_MATE_IN_MAX_PLY : v - ply
- : v <= VALUE_MATED_IN_MAX_PLY ? VALUE_MATE + v > 99 - r50c ? VALUE_MATED_IN_MAX_PLY : v + ply : v;
+ if (v == VALUE_NONE)
+ return VALUE_NONE;
+
+ if (v >= VALUE_TB_WIN_IN_MAX_PLY) // TB win or better
+ {
+ if (v >= VALUE_MATE_IN_MAX_PLY && VALUE_MATE - v > 99 - r50c)
+ return VALUE_MATE_IN_MAX_PLY - 1; // do not return a potentially false mate score
+
+ return v - ply;
+ }
+
+ if (v <= VALUE_TB_LOSS_IN_MAX_PLY) // TB loss or worse
+ {
+ if (v <= VALUE_MATED_IN_MAX_PLY && VALUE_MATE + v > 99 - r50c)
+ return VALUE_MATED_IN_MAX_PLY + 1; // do not return a potentially false mate score
+
+ return v + ply;
+ }
+
+ return v;