X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=Position.pm;h=2e368f29fbbf7d8110edcc9c91472dc1821e5ae9;hp=1a02d61d86f28626aff845546b79ddbde6e487c5;hb=5243478f883e4997134e3abc8da57b7680129c89;hpb=48957832d49cb870c610721bbda9ba24d060b324

diff --git a/Position.pm b/Position.pm
index 1a02d61..2e368f2 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;
@@ -112,7 +114,14 @@ sub fen {
 
 sub to_json_hash {
 	my $pos = shift;
-	my $json = { %$pos, board => undef, fen => $pos->fen() };
+	my $json = { %$pos, fen => $pos->fen() };
+	delete $json->{'board'};
+	delete $json->{'prettyprint_cache'};
+	delete $json->{'black_castle_k'};
+	delete $json->{'black_castle_q'};
+	delete $json->{'white_castle_k'};
+	delete $json->{'white_castle_q'};
+	delete $json->{'time_since_100move_rule_reset'};
 	if ($json->{'player_w'} =~ /^base64:(.*)$/) {
 		$json->{'player_w'} = MIME::Base64::decode_base64($1);
 	}
@@ -127,6 +136,11 @@ sub parse_pretty_move {
 	return $pos->{'board'}->parse_pretty_move($move, $pos->{'toplay'});
 }
 
+sub num_pieces {
+	my ($pos) = @_;
+	return $pos->{'board'}->num_pieces();
+}
+
 # Returns a new Position object.
 sub make_move {
         my ($pos, $from_row, $from_col, $to_row, $to_col, $promo) = @_;
@@ -190,6 +204,16 @@ sub make_move {
 	return bless $np;
 }
 
+# Returns a new Position object, and the parsed UCI move.
+sub make_pretty_move {
+	my ($pos, $move) = @_;
+
+	my ($from_row, $from_col, $to_row, $to_col, $promo) = $pos->parse_pretty_move($move);
+	my $uci_move = Board::move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo);
+	$pos = $pos->make_move($from_row, $from_col, $to_row, $to_col, $promo);
+	return ($pos, $uci_move);
+}
+
 sub _pos_to_square {
         my ($row, $col) = @_;
         return sprintf("%c%d", ord('a') + $col, 8 - $row);