X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=4ccdac7e4b873d69143194795f2e6f71e0715806;hp=0729409e482d070138bb925b5e5b1cc30a680c42;hb=6f6ae45314e4f9876ab4fa9b9ba50e0c6a5e8371;hpb=2e02751eebe4f5ed406e0f61c6f6eadae0193a41

diff --git a/remoteglot.pl b/remoteglot.pl
index 0729409..4ccdac7 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -573,7 +573,7 @@ sub output_screen {
 				my $key = $pretty_move;
 				my $line = sprintf("  %-6s %6s %3s  %s",
 					$pretty_move,
-					short_score($info, $pos_calculating_second_engine, $mpv, 0),
+					short_score($info, $pos_calculating_second_engine, $mpv),
 					"d" . $info->{'depth' . $mpv},
 					join(', ', @pretty_pv));
 				push @refutation_lines, [ $key, $line ];
@@ -603,6 +603,7 @@ sub output_json {
 	$json->{'position'} = $pos_calculating->to_json_hash();
 	$json->{'id'} = $engine->{'id'};
 	$json->{'score'} = long_score($info, $pos_calculating, '');
+	$json->{'short_score'} = short_score($info, $pos_calculating, '');
 
 	$json->{'nodes'} = $info->{'nodes'};
 	$json->{'nps'} = $info->{'nps'};
@@ -632,7 +633,7 @@ sub output_json {
 					sort_key => $pretty_move,
 					depth => $info->{'depth' . $mpv},
 					score_sort_key => score_sort_key($info, $pos_calculating, $mpv, 0),
-					pretty_score => short_score($info, $pos_calculating, $mpv, 0),
+					pretty_score => short_score($info, $pos_calculating, $mpv),
 					pretty_move => $pretty_move,
 					pv_pretty => \@pretty_pv,
 				};
@@ -656,13 +657,9 @@ sub uciprint {
 }
 
 sub short_score {
-	my ($info, $pos, $mpv, $invert) = @_;
-
-	$invert //= 0;
-	if ($pos->{'toplay'} eq 'B') {
-		$invert = !$invert;
-	}
+	my ($info, $pos, $mpv) = @_;
 
+	my $invert = ($pos->{'toplay'} eq 'B');
 	if (defined($info->{'score_mate' . $mpv})) {
 		if ($invert) {
 			return sprintf "M%3d", -$info->{'score_mate' . $mpv};
@@ -673,7 +670,11 @@ sub short_score {
 		if (exists($info->{'score_cp' . $mpv})) {
 			my $score = $info->{'score_cp' . $mpv} * 0.01;
 			if ($score == 0) {
-				return " 0.00";
+				if ($info->{'tablebase'}) {
+					return "TB draw";
+				} else {
+					return " 0.00";
+				}
 			}
 			if ($invert) {
 				$score = -$score;
@@ -693,10 +694,10 @@ sub score_sort_key {
 		my $score;
 		if ($mate > 0) {
 			# Side to move mates
-			$mate = 99999 - $mate;
+			$score = 99999 - $mate;
 		} else {
 			# Side to move is getting mated (note the double negative for $mate)
-			$mate = -99999 - $mate;
+			$score = -99999 - $mate;
 		}
 		if ($invert) {
 			$score = -$score;
@@ -860,7 +861,7 @@ sub handle_tb_lookup_return {
 			# position in the meantime, we might query a completely
 			# different position! But that's fine.
 		} else {
-			die "Unknown response state state " . $response->{'Response'}{'StateString'};
+			die "Unknown response state " . $state;
 		}
 
 		# Wait a second before we schedule another one.