ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Games-Go-SimpleBoard/SimpleBoard.pm
(Generate patch)

Comparing Games-Go-SimpleBoard/SimpleBoard.pm (file contents):
Revision 1.10 by root, Wed Jun 25 20:49:38 2008 UTC vs.
Revision 1.14 by elmex, Thu Jul 24 08:58:02 2008 UTC

… …
100 100
101sub new { 101sub new {
102 my $class = shift; 102 my $class = shift;
103 my $size = shift; 103 my $size = shift;
104 104
105 unless ($size > 0) {
106 Carp::croak ("no board size given!");
107 }
108
105 bless { 109 bless {
106 max => $size - 1, 110 max => $size - 1,
107 size => $size, 111 size => $size,
108 board => [map [(0) x $size], 1 .. $size], 112 board => [map [(0) x $size], 1 .. $size],
109 captures => [0, 0], # captures 113 captures => [0, 0], # captures
… …
126 130
127 my $max = $self->{max}; 131 my $max = $self->{max};
128 132
129 while (@nodes) { 133 while (@nodes) {
130 my ($x, $y) = @{pop @nodes}; 134 my ($x, $y) = @{pop @nodes};
135
131 unless ($seen{$x,$y}++) { 136 unless ($seen{$x,$y}++) {
132 if ($board->[$x][$y] & $mark) { 137 if ($board->[$x][$y] & $mark) {
133 push @found, [$x, $y]; 138 push @found, [$x, $y];
134 139
135 push @nodes, [$x-1, $y] unless $seen{$x-1, $y} || $x <= 0; 140 push @nodes, [$x-1, $y] unless $seen{$x-1, $y} || $x <= 0;
… …
253 my ($own, $opp) = 258 my ($own, $opp) =
254 $set & MARK_B 259 $set & MARK_B
255 ? (MARK_B, MARK_W) 260 ? (MARK_B, MARK_W)
256 : (MARK_W, MARK_B); 261 : (MARK_W, MARK_B);
257 262
258 my (@capture, $suicide); 263 my (@capture, @suicide);
259 264
260 push @capture, $self->capture ($opp, $x-1, $y) if $x > 0 && $board->[$x-1][$y] & $opp; 265 push @capture, $self->capture ($opp, $x-1, $y) if $x > 0 && $board->[$x-1][$y] & $opp;
261 push @capture, $self->capture ($opp, $x+1, $y) if $x < $self->{max} && $board->[$x+1][$y] & $opp; 266 push @capture, $self->capture ($opp, $x+1, $y) if $x < $self->{max} && $board->[$x+1][$y] & $opp;
262 push @capture, $self->capture ($opp, $x, $y-1) if $y > 0 && $board->[$x][$y-1] & $opp; 267 push @capture, $self->capture ($opp, $x, $y-1) if $y > 0 && $board->[$x][$y-1] & $opp;
263 push @capture, $self->capture ($opp, $x, $y+1) if $y < $self->{max} && $board->[$x][$y+1] & $opp; 268 push @capture, $self->capture ($opp, $x, $y+1) if $y < $self->{max} && $board->[$x][$y+1] & $opp;
… …
268 # remove captured stones 273 # remove captured stones
269 $self->{captures}[$own == MARK_B ? COLOUR_BLACK : COLOUR_WHITE] += @capture; 274 $self->{captures}[$own == MARK_B ? COLOUR_BLACK : COLOUR_WHITE] += @capture;
270 $self->{board}[$_->[0]][$_->[1]] = 0 275 $self->{board}[$_->[0]][$_->[1]] = 0
271 for @capture; 276 for @capture;
272 277
273 $suicide += $self->capture ($own, $x, $y); 278 push @suicide, $self->capture ($own, $x, $y);
274 279
275 ${ $_->[5] } ||= !(@capture || $suicide); 280 ${ $_->[5] } ||= !(@capture || @suicide);
276 281
282 if (@suicide) {
283 $self->{board}[$_->[0]][$_->[1]] = 0
284 for @suicide;
285
277 if (!$suicide && @capture == 1) { 286 } elsif (!@suicide && @capture == 1) {
278 # possible ko. now check liberties on placed stone 287 # possible ko. now check liberties on placed stone
279 288
280 my $libs; 289 my $libs;
281 290
282 $libs++ if $x > 0 && !($board->[$x-1][$y] & $opp); 291 $libs++ if $x > 0 && !($board->[$x-1][$y] & $opp);
… …
311sub is_valid_move { 320sub is_valid_move {
312 my ($self, $colour, $x, $y, $may_suicide) = @_; 321 my ($self, $colour, $x, $y, $may_suicide) = @_;
313 322
314 my $board = $self->{board}; 323 my $board = $self->{board};
315 324
316 return if $board->[$x][$y] & (MARK_B | MARK_W | MARK_KO); 325 return if $board->[$x][$y] & (MARK_B | MARK_W | MARK_KO)
326 && !($board->[$x][$y] & MARK_GRAYED);
317 327
318 if ($may_suicide) { 328 if ($may_suicide) {
319 return 1; 329 return 1;
320 } else { 330 } else {
321 my ($own, $opp) = $colour == COLOUR_BLACK 331 my ($own, $opp) = $colour == COLOUR_BLACK

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines