new highlightting schiffe verschenken

diff --git a/dart/dart-schiffe.pl b/dart/dart-schiffe.pl
index 0f6a70c..5eb5bed 100755 (executable)
--- a/dart/dart-schiffe.pl
+++ b/dart/dart-schiffe.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 use strict;
 use Dart;
+use Clone;
 use Term::ANSIColor;
 our @x= qw/ 20 1 18 4 13 6 10 15 2 17 /;
 our @y = qw/ 3 19 7 16 8 11 14 9 12 5 /;
@@ -38,6 +39,13 @@ sub array_to_hash
 sub init
 {
   my $self=shift;
+  for my $x (@main::x)
+  {
+    for my $y (@main::y)
+    {
+      $self->{empty_matrix}->{$x}{$y}=0;
+    }
+  }
   for my $player_idx (0..($self->{player_count}-1))
   {
     $self->get_player($player_idx)->{sel_x}=0;
@@ -45,13 +53,9 @@ sub init
     $self->get_player($player_idx)->{mult_x}=0;
     $self->get_player($player_idx)->{mult_y}=0;
     delete ($self->get_player($player_idx)->{last_hit});
-    for my $x (@main::x)
-    {
-      for my $y (@main::y)
-      {
-        $self->get_player($player_idx)->{score}->{$x}{$y}=0;
-      }
-    }
+    $self->get_player($player_idx)->{score}=Clone::clone($self->{empty_matrix});
+    $self->get_player($player_idx)->{highlight}{shoot}=Clone::clone($self->{empty_matrix});
+    $self->get_player($player_idx)->{highlight}{selected}=Clone::clone($self->{empty_matrix});
     for my $schiff (@main::schiffe)
     {
       my $valid=0;
@@ -96,12 +100,61 @@ sub win_condition
   return 1;
 }
 
+sub magic_for
+{
+  my $self=shift;
+  my ($x_middle,$mult_x,$y_middle,$mult_y,$sub) = @_;
+  #warn  join "\t",($x_middle,$mult_x,$y_middle,$mult_y,$sub);
+  my @return;
+  die "no function" if not ref $sub;
+  my $start_x = $x_middle  ? $main::x{$x_middle}-1 - $mult_x+1 : 0;
+  my $stop_x  = $x_middle  ? $main::x{$x_middle}-1 + $mult_x-1 : $#main::x;
+  my $start_y = $y_middle  ? $main::y{$y_middle}-1 - $mult_y+1 : 0;
+  my $stop_y  = $y_middle  ? $main::y{$y_middle}-1 + $mult_y-1 : $#main::y;
+  for my $x_idx ($start_x..$stop_x) 
+  {
+    my $x = $x_idx> $#main::x ? $main::x[$x_idx-@main::x] : $main::x[$x_idx]; 
+    for my $y_idx ($start_y..$stop_y) 
+    {
+      my $y = $y_idx> $#main::y ? $main::y[$y_idx-@main::y] : $main::y[$y_idx]; 
+      push @return, $sub->($self,$x,$y);
+    }
+  }
+  return @return;
+}
+
+sub set_highlight_selected
+{
+  my ($self,$x,$y) = @_;
+  $self->get_current_player->{highlight}{selected}{$x}{$y}=1;
+}
+
+sub set_shoot
+{
+  my ($self,$x,$y) = @_;
+  my $return;
+  my $player=$self->get_current_player();
+  $player->{highlight}{shoot}->{$x}{$y} = 1;
+  if ($player->{score}->{$x}{$y} eq 's')
+  {
+    $return = 'scored';
+    $player->{score}->{$x}{$y} = 'X';
+  } elsif (not $player->{score}->{$x}{$y}) {  
+    $player->{score}->{$x}{$y} = 'o';
+    $return = 'miss';
+  } elsif ($player->{score}->{$x}{$y} eq 'o') {  
+    $return = 'scho';
+  }
+  return $return;
+}
+
 sub shoot
 {
   my $self=shift;
   my ($mult,$zahl)=@_;
   my $player=$self->get_current_player();
   delete ($player->{last_hit});
+  $player->{highlight}{shoot}=Clone::clone($self->{empty_matrix});
 
   if ( (not $main::x{$zahl}) and (not $main::y{$zahl}) )
   {
@@ -110,13 +163,16 @@ sub shoot
   } elsif ($main::x{$zahl}) { 
     $player->{sel_x}=$zahl;
     $player->{mult_x}=$mult;
+    &magic_for($self,$zahl,$mult,undef,undef,\&set_highlight_selected);
   } elsif ($main::y{$zahl}) { 
     $player->{sel_y}=$zahl;
     $player->{mult_y}=$mult;
+    &magic_for($self,undef,undef,$zahl,$mult,\&set_highlight_selected);
   }
   $self->shout_last_shoot();
   if ($player->{sel_x} && $player->{sel_y})
   {
+    $player->{highlight}{selected}=Clone::clone($self->{empty_matrix});
     my $x_middle = $player->{sel_x};
     my $y_middle = $player->{sel_y};
     my $mult_x = $player->{mult_x};
@@ -126,31 +182,9 @@ sub shoot
     $player->{sel_y}=0;
     $player->{mult_x}=0;
     $player->{mult_y}=0;
-
-    my $start_x = $main::x{$x_middle}-1 - $mult_x+1;
-    my $stop_x = $main::x{$x_middle}-1 + $mult_x-1;
-    my $start_y = $main::y{$y_middle}-1 - $mult_y+1;
-    my $stop_y = $main::y{$y_middle}-1 + $mult_y-1;
+    my @sound_refs = &magic_for($self,$x_middle,$mult_x,$y_middle,$mult_y,\&set_shoot);
     my %sound;
-    for my $x_idx ($start_x..$stop_x) 
-    {
-      my $x = $x_idx> $#main::x ? $main::x[$x_idx-@main::x] : $main::x[$x_idx]; 
-      for my $y_idx ($start_y..$stop_y) 
-      {
-        my $y = $y_idx> $#main::y ? $main::y[$y_idx-@main::y] : $main::y[$y_idx]; 
-        if ($player->{score}->{$x}{$y} eq 's')
-        {
-          $sound{scored}++;
-          $player->{score}->{$x}{$y} = 'X';
-        } elsif (not $player->{score}->{$x}{$y}) {  
-          $player->{score}->{$x}{$y} = 'o';
-          $sound{miss}++;
-        } elsif ($player->{score}->{$x}{$y} eq 'o') {  
-          $sound{scho}++;
-        }
-      }
-    }
-
+    map {$sound{$_}++}  @sound_refs;
     if ($sound{scored})
     {
       $self->shout("scored");
@@ -164,6 +198,42 @@ sub shoot
   $self->win() if &win_condition($self);
 }
 
+
+# print with color
+sub prcl
+{
+  my $self = shift;
+  my ($color,@what)=@_;
+  print STDERR color($color) if defined $color;
+  print STDERR @what;
+  print STDERR color('reset');
+}
+
+sub get_color
+{
+  my $self = shift;
+  my ($x,$y)=@_;
+  my $player = $self->get_current_player();
+  if ($player->{highlight}{shoot}{$x}{$y})
+  {
+    return 'bold red';
+  } elsif ($player->{highlight}{selected}{$x}{$y}) {
+    return 'bold green';
+  } elsif ($player->{score}{$x}{$y} eq 'o') {
+    return 'blue';
+  } elsif ($player->{score}{$x}{$y} eq 'X') {
+    return 'bold yellow';
+  }
+  return 'white';
+}
+
+sub prxy
+{
+  my $self = shift;
+  my ($x,$y,@what)=@_;
+  &prcl($self,&get_color($self,$x,$y),@what);
+}
+
 sub print_score
 {
   my ($self)=@_;
@@ -177,42 +247,32 @@ sub print_score
   printf STDERR "x:  %dx%2d\n",$player->{mult_x},$player->{sel_x};
   printf STDERR "y:  %dx%2d\n",$player->{mult_y},$player->{sel_y};
 
-    print STDERR "  ";
+  print STDERR "  ";
+  for my $y (@main::y)
+  {
+    printf STDERR " %2d",$y;
+  }
+  print STDERR "\n";
+  for my $x (@main::x)
+  {
+    printf STDERR "%2d",$x;
     for my $y (@main::y)
     {
-      print STDERR color('bold green') if $sel_y &&  (abs($main::y{$y} - $main::y{$sel_y}) < $mult_y );
-      printf STDERR " %2d",$y;
-      print STDERR color('reset') if $sel_y &&  (abs($main::y{$y} - $main::y{$sel_y}) < $mult_y );
-
-    }
-    print STDERR "\n";
-    for my $x (@main::x)
-    {
-      print STDERR color 'bold green' if $sel_x &&  (abs($main::x{$x} - $main::x{$sel_x}) < $mult_x );
-      printf STDERR "%2d",$x;
-      for my $y (@main::y)
+      my $field = $self->get_current_player()->{score}->{$x}{$y};
+      if ($field eq 'X' or $field eq 'o')
       {
-        print STDERR color('bold green') if $sel_y &&  (abs($main::y{$y} - $main::y{$sel_y}) < $mult_y );
-        my $field = $self->get_current_player()->{score}->{$x}{$y};
-        if ($field eq 'X' or $field eq 'o')
-        {
-          print STDERR "  $field";
-        } else {
-          print STDERR "  .";
-        }
-        print STDERR color('reset') if $sel_y &&  (abs($main::y{$y} - $main::y{$sel_y}) < $mult_y );
+        &prxy($self,$x,$y,"  $field");
+      } else {
+        &prxy($self,$x,$y,"  .");
       }
-      printf STDERR "  %d",$x;
-      print STDERR color 'reset';
-      print STDERR "\n";
-    }
-    print STDERR "  ";
-    for my $y (@main::y)
-    {
-      print STDERR color('bold green') if $sel_y &&  (abs($main::y{$y} - $main::y{$sel_y}) < $mult_y );
-      printf STDERR " %2d",$y;
-      print STDERR color('reset') if $sel_y &&  (abs($main::y{$y} - $main::y{$sel_y}) < $mult_y );
-
     }
+    printf STDERR "  %d",$x;
+    print STDERR "\n";
+  }
+  print STDERR "  ";
+  for my $y (@main::y)
+  {
+    printf STDERR " %2d",$y;
+  }
   print STDERR "\n\n";
 }