X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=remoteglot.pl;h=1b2e49a8d89057d6cbe0fc3edaadf21ee8582747;hb=6851dc53ed0d8873ee2c7cbbc1422eea752f4a32;hp=6b423f691573fafa8c85761e5e4abc41cb6e0754;hpb=d3db57677e015c6e3371df0acb7549447a9db771;p=remoteglot

diff --git a/remoteglot.pl b/remoteglot.pl
index 6b423f6..1b2e49a 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -18,12 +18,17 @@ use warnings;
 
 # Configuration
 my $server = "freechess.org";
-my $target = "22";
+my $target = "224";
 # my $engine = "/usr/games/toga2";
 my $engine = "wine Rybkav2.3.2a.mp.w32.exe";
 my $telltarget = undef;   # undef to be silent
 my @tell_intervals = (5, 20, 60, 120, 240, 480, 960);  # after each move
 my $uci_assume_full_compliance = 1;                    # dangerous :-)
+my @masters = (
+	'Sesse',
+	'Sessse',
+	'Sesssse'
+);
 
 # Program starts here
 $SIG{ALRM} = sub { output_screen(); };
@@ -148,6 +153,21 @@ while (1) {
 			#
 			$t->cmd("date");
 		}
+		if ($line =~ /^([A-Za-z]+)(?:\([A-Z]+\))* tells you: (.*)$/) {
+			my ($who, $msg) = ($1, $2);
+
+			next if (grep { $_ eq $who } (@masters) == 0);
+	
+			if ($msg =~ /^fics (.*?)$/) {
+				$t->cmd("tell $who Executing '$1' on FICS.");
+				$t->cmd($1);
+			} elsif ($msg =~ /^uci (.*?)$/) {
+				$t->cmd("tell $who Sending '$1' to the engine.");
+				print UCIWRITE "$1\n";
+			} else {
+				$t->cmd("tell $who Couldn't understand '$msg', sorry.");
+			}
+		}
 		#print "FICS: [$line]\n";
 		$sleep = 0;
 	}
@@ -354,17 +374,42 @@ sub style12_to_fen {
 	$fen .= $x[26];
 
 	$pos{'fen'} = $fen;
+	$pos{'move_num'} = $x[26];
 
 	return \%pos;
 }
 
+sub prefix_pv {
+	my ($move_num, $toplay) = @_;
+
+	if ($toplay eq 'B') {
+		return "$move_num. ..";
+	} else {
+		return "";
+	}
+}
+
 sub prettyprint_pv {
-	my ($board, @pvs) = @_;
-	
+	my ($board, $move_num, $toplay, @pvs) = @_;
+
+	if (!defined($board) || !defined($move_num) || !defined($toplay)) {
+		die "Missing data";
+	}
 	if (scalar @pvs == 0 || !defined($pvs[0])) {
 		return ();
 	}
-	
+
+	my ($prefix, $next_move, $next_toplay);
+	if ($toplay eq 'W') {
+		$prefix = "$move_num.";
+		$next_move = $move_num;
+		$next_toplay = 'B';
+	} else {
+		$prefix = "";
+		$next_move = $move_num + 1;
+		$next_toplay = 'W';
+	}
+
 	my @nb = @$board;
 
 	my $pv = shift @pvs;
@@ -379,6 +424,12 @@ sub prettyprint_pv {
 	if ($piece eq '-') {
 		die "Invalid move";
 	}
+	if ($piece eq uc($piece) && $toplay eq 'B') {
+		die "Black tried to move a white piece";
+	}
+	if ($piece eq lc($piece) && $toplay eq 'W') {
+		die "White tried to move a black piece";
+	}
 
 	# white short castling
 	if ($pv eq 'e1g1' && $piece eq 'K') {
@@ -390,7 +441,7 @@ sub prettyprint_pv {
 		substr($nb[7], 7, 1, '-');
 		substr($nb[7], 5, 1, 'R');
 				
-		return ('0-0', prettyprint_pv(\@nb, @pvs));
+		return ($prefix . '0-0', prettyprint_pv(\@nb, $next_move, $next_toplay, @pvs));
 	}
 
 	# white long castling
@@ -403,7 +454,7 @@ sub prettyprint_pv {
 		substr($nb[7], 0, 1, '-');
 		substr($nb[7], 3, 1, 'R');
 				
-		return ('0-0-0', prettyprint_pv(\@nb, @pvs));
+		return ($prefix . '0-0-0', prettyprint_pv(\@nb, $next_move, $next_toplay, @pvs));
 	}
 
 	# black short castling
@@ -416,7 +467,7 @@ sub prettyprint_pv {
 		substr($nb[0], 7, 1, '-');
 		substr($nb[0], 5, 1, 'r');
 				
-		return ('0-0', prettyprint_pv(\@nb, @pvs));
+		return ($prefix . '0-0', prettyprint_pv(\@nb, $next_move, $next_toplay, @pvs));
 	}
 
 	# black long castling
@@ -429,7 +480,7 @@ sub prettyprint_pv {
 		substr($nb[0], 0, 1, '-');
 		substr($nb[0], 3, 1, 'r');
 				
-		return ('0-0-0', prettyprint_pv(\@nb, @pvs));
+		return ($prefix . '0-0-0', prettyprint_pv(\@nb, $next_move, $next_toplay, @pvs));
 	}
 
 	# check if the from-piece is a pawn
@@ -516,7 +567,7 @@ sub prettyprint_pv {
 		$pretty .= '+';
 	}
 
-	return ($pretty, prettyprint_pv(\@nb, @pvs));
+	return ($prefix . $pretty, prettyprint_pv(\@nb, $next_move, $next_toplay, @pvs));
 }
 
 sub output_screen {
@@ -532,12 +583,18 @@ sub output_screen {
 	eval {
 		my $dummy;
 		if (exists($uciinfo{'pv'})) {
-			$dummy = prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}});
+			$dummy = prettyprint_pv($pos_calculating->{'board'},
+				$pos_calculating->{'move_num'},
+				$pos_calculating->{'toplay'},
+				@{$uciinfo{'pv'}});
 		}
 	
 		my $mpv = 1;
 		while (exists($uciinfo{'pv' . $mpv})) {
-			$dummy = prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}});
+			$dummy = prettyprint_pv($pos_calculating->{'board'},
+				$pos_calculating->{'move_num'},
+				$pos_calculating->{'toplay'},
+				@{$uciinfo{'pv' . $mpv}});
 			++$mpv;
 		}
 	};
@@ -568,6 +625,27 @@ sub output_screen {
 			}
 		}
 	}
+			
+	my @text_pvs = ();
+	if (exists($uciinfo{'pv1'}) && exists($uciinfo{'pv2'})) {
+		# multi-PV
+		my $mpv = 1;
+		while (exists($uciinfo{'pv' . $mpv})) {
+			$text_pvs[$mpv] = prefix_pv($pos_calculating->{'move_num'}, $pos_calculating->{'toplay'}) .
+				join(' ', prettyprint_pv($pos_calculating->{'board'},
+					$pos_calculating->{'move_num'},
+					$pos_calculating->{'toplay'},
+					@{$uciinfo{'pv' . $mpv}}));
+			++$mpv;
+		}
+	} else {
+		# single-PV
+		$text_pvs[0] = prefix_pv($pos_calculating->{'move_num'}, $pos_calculating->{'toplay'}) .
+			join(' ', prettyprint_pv($pos_calculating->{'board'},
+				$pos_calculating->{'move_num'},
+				$pos_calculating->{'toplay'},
+				@{$uciinfo{'pv'}}));
+	}
 
 	if (exists($uciinfo{'pv1'}) && exists($uciinfo{'pv2'})) {
 		# multi-PV
@@ -588,16 +666,14 @@ sub output_screen {
 			}
 
 			$text .= ":\n";
-			$text .= "  " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}})) . "\n";
-			$text .= "\n";
+			$text .= "  $text_pvs[$mpv]\n\n";
 			++$mpv;
 		}
 	} else {
 		# single-PV
 		my $score = long_score(\%uciinfo, $pos_calculating, '');
 		$text .= "  $score\n" if defined($score);
-		$text .=  "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}}));
-		$text .=  "\n";
+		$text .= "  PV: $text_pvs[0]\n";
 
 		if (exists($uciinfo{'nodes'}) && exists($uciinfo{'nps'}) && exists($uciinfo{'depth'})) {
 			$text .= sprintf "  %u nodes, %7u nodes/sec, depth %u ply",
@@ -641,16 +717,14 @@ sub output_screen {
 				$tell_text .= sprintf " (%2u ply)", $uciinfo{'depth' . $mpv};
 			}
 
-			$tell_text .= ": ";
-			$tell_text .= join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}}));
-			$tell_text .= "\n";
+			$tell_text .= ": $text_pvs[$mpv]\n";
 			++$mpv;
 		}
 	} else {
 		# single-PV
 		my $score = long_score(\%uciinfo, $pos_calculating, '');
 		$tell_text .= "  $score\n" if defined($score);
-		$tell_text .= "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}}));
+		$tell_text .= "  PV: $text_pvs[0]";
 		if (exists($uciinfo{'depth'})) {
 			$tell_text .= sprintf " (depth %u ply)", $uciinfo{'depth'};
 		}