X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=Position.pm;h=9d90cfc777e2576dcd275815c8089774040ecc8d;hp=9333bcd58af514badb9a7b31463a4c00763da609;hb=0a124edc28c716548327826127a9145da091a3d0;hpb=1c3cd7877f58e65919bc870f1945be115b5ec2d1

diff --git a/Position.pm b/Position.pm
index 9333bcd..9d90cfc 100644
--- a/Position.pm
+++ b/Position.pm
@@ -28,6 +28,8 @@ sub new {
 	$pos->{'player_b'} = $x[18];
 	$pos->{'player_w'} =~ s/^W?[FCIG]M//;
 	$pos->{'player_b'} =~ s/^W?[FCIG]M//;
+	$pos->{'white_clock'} = $x[24];
+	$pos->{'black_clock'} = $x[25];
 	$pos->{'move_num'} = $x[26];
 	if ($x[27] =~ /([a-h][1-8])-([a-h][1-8])/) {
 		$pos->{'last_move_uci'} = $1 . $2;
@@ -73,27 +75,12 @@ sub fen {
 	my $ep = "-";
 	if ($pos->{'ep_file_num'} != -1) {
 		my $col = $pos->{'ep_file_num'};
-		my $nep = (qw(a b c d e f g h))[$col];
+		$ep = (qw(a b c d e f g h))[$col];
 
 		if ($pos->{'toplay'} eq 'B') {
-			$nep .= "3";
+			$ep .= "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 ($pos->{'toplay'} eq 'B') {
-			$ep = $nep if ($col > 0 && $pos->{'board'}[4][$col-1] eq 'p');
-			$ep = $nep if ($col < 7 && $pos->{'board'}[4][$col+1] eq 'p');
-		} else {
-			$ep = $nep if ($col > 0 && $pos->{'board'}[3][$col-1] eq 'P');
-			$ep = $nep if ($col < 7 && $pos->{'board'}[3][$col+1] eq 'P');
+			$ep .= "6";
 		}
 	}
 	$fen .= " ";
@@ -110,6 +97,35 @@ sub fen {
 	return $fen;
 }
 
+# Returns a compact bit string describing the same data as fen(),
+# except for the half-move and full-move clock.
+sub bitpacked_fen {
+	my $pos = shift;
+	my $board = $pos->{'board'}->bitpacked_fen();
+
+	my $bits = "";
+	if ($pos->{'toplay'} eq 'W') {
+		$bits .= "0";
+	} else {
+		$bits .= "1";
+	}
+
+	$bits .= $pos->{'white_castle_k'};
+	$bits .= $pos->{'white_castle_q'};
+	$bits .= $pos->{'black_castle_k'};
+	$bits .= $pos->{'black_castle_q'};
+
+	my $col = $pos->{'ep_file_num'};
+	if ($col == -1) {
+		$bits .= "0";
+	} else {
+		$bits .= "1";
+		$bits .= (qw(000 001 010 011 100 101 110 111))[$col];
+	}
+
+	return $board . pack('b*', $bits);
+}
+
 sub to_json_hash {
 	my $pos = shift;
 	my $json = { %$pos, fen => $pos->fen() };