X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=bcc123caaefcfdad2bcf1fdc53ade30aa3ed0581;hp=330d47b5beab0d7a133a21cc470cf04f7a67a26b;hb=46a1a11685a2cc15b69b95a3af6aaf177027c25f;hpb=b5519a3874a3c50ff1e37a4372749ca9fd6c89c5

diff --git a/remoteglot.pl b/remoteglot.pl
old mode 100644
new mode 100755
index 330d47b..bcc123c
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -23,7 +23,7 @@ $| = 1;
 my $server = "freechess.org";
 my $target = "Sesse";
 # my $engine = "/usr/games/toga2";
-my $engine = "wine rybka22-mpw32.exe";
+my $engine = "wine Rybkav2.3.2a.mp.w32.exe";
 
 open(UCILOG, ">ucilog.txt")
 	or die "ucilog.txt: $!";
@@ -148,7 +148,7 @@ sub parse_infos {
 			$uciinfo{'pv'} = [ @x[1..$#x] ];
 			last;
 		}
-		if ($x[0] eq 'UCI_AnalyseMode' || $x[0] eq 'setting' || $x[0] eq 'contempt') {
+		if ($x[0] eq 'string' || $x[0] eq 'UCI_AnalyseMode' || $x[0] eq 'setting' || $x[0] eq 'contempt') {
 			last;
 		}
 
@@ -190,11 +190,28 @@ sub style12_to_fen {
 	# en passant
 	my $ep = "-";
 	if ($x[10] != -1) {
-		$ep = (qw(a b c d e f g h))[$x[10]];
+		my $col = $x[10];
+		my $nep = (qw(a b c d e f g h))[$col];
+
+		if ($x[9] eq 'B') {
+			$nep .= "3";
+		} else {
+			$nep .= "6";
+		}
+		
+		#
+		# Showing the en passant square when actually no capture can be made
+		# seems to confuse at least Rybka. Thus, check if there's actually
+		# a pawn of the opposite side that can do the en passant move, and if
+		# not, just lie -- it doesn't matter anyway. I'm unsure what's the
+		# "right" thing as per the standard, though.
+		#
 		if ($x[9] eq 'B') {
-			$ep .= "3";
+			$ep = $nep if ($col > 0 && substr($board[4], $col-1, 1) eq 'p');
+			$ep = $nep if ($col < 7 && substr($board[4], $col+1, 1) eq 'p');
 		} else {
-			$ep .= "6";
+			$ep = $nep if ($col > 0 && substr($board[3], $col-1, 1) eq 'P');
+			$ep = $nep if ($col < 7 && substr($board[3], $col+1, 1) eq 'P');
 		}
 	}
 	$fen .= " ";
@@ -243,7 +260,7 @@ sub prettyprint_pv {
 	}
 
 	# white long castling
-	if ($pv eq 'e1b1' && $piece eq 'K') {
+	if ($pv eq 'e1c1' && $piece eq 'K') {
 		my @nb = @$board;
 
 		# king
@@ -252,7 +269,7 @@ sub prettyprint_pv {
 		
 		# rook
 		substr($nb[7], 0, 1, '-');
-		substr($nb[7], 2, 1, 'R');
+		substr($nb[7], 3, 1, 'R');
 				
 		return ('0-0-0', prettyprint_pv(\@nb, @pvs));
 	}
@@ -273,7 +290,7 @@ sub prettyprint_pv {
 	}
 
 	# black long castling
-	if ($pv eq 'e8b8' && $piece eq 'k') {
+	if ($pv eq 'e8c8' && $piece eq 'k') {
 		my @nb = @$board;
 
 		# king
@@ -282,7 +299,7 @@ sub prettyprint_pv {
 		
 		# rook
 		substr($nb[0], 0, 1, '-');
-		substr($nb[0], 2, 1, 'R');
+		substr($nb[0], 3, 1, 'R');
 				
 		return ('0-0-0', prettyprint_pv(\@nb, @pvs));
 	}
@@ -373,16 +390,24 @@ sub output_screen {
 	if (defined($uciinfo{'score_mate'})) {
 		printf "  Mate in %d\n", $uciinfo{'score_mate'};
 	} else {
-		my $score = $uciinfo{'score_cp'} * 0.01;
-		if ($ficsinfo{'toplay'} eq 'B') {
-			$score = -$score;
+		if (exists($uciinfo{'score_cp'})) {
+			my $score = $uciinfo{'score_cp'} * 0.01;
+			if ($ficsinfo{'toplay'} eq 'B') {
+				$score = -$score;
+			}
+			printf "  Score: %+5.2f\n", $score;
 		}
-		printf "  Score: %+5.2f\n", $score;
 	}
-	print  "  PV: ", join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv'}}));
-	print  "\n";
-	printf "  %u nodes, %7u nodes/sec, depth %u ply",
-		$uciinfo{'nodes'}, $uciinfo{'nps'}, $uciinfo{'depth'};
+
+	if (exists($ficsinfo{'board'})) {
+		print  "  PV: ", join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv'}}));
+		print  "\n";
+	}
+
+	if (exists($uciinfo{'nodes'}) && exists($uciinfo{'nps'}) && exists($uciinfo{'depth'})) {
+		printf "  %u nodes, %7u nodes/sec, depth %u ply",
+			$uciinfo{'nodes'}, $uciinfo{'nps'}, $uciinfo{'depth'};
+	}
 	if (exists($uciinfo{'tbhits'})) {
 		printf ", %u Nalimov hits", $uciinfo{'tbhits'};
 	}