X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=dart%2Fdart-schiffe.pl;h=0f6a70c44f71baab1002cc607f252d25680fdb44;hb=01cf6e586417cb534458e7ba337279d5ab7e6e72;hp=9b72464b9cb84f53d89dfc060ab09a81504f90c9;hpb=fc75445f2ac3d6e49391ba4af7c7dd2233aed3c6;p=svn42.git

diff --git a/dart/dart-schiffe.pl b/dart/dart-schiffe.pl
index 9b72464..0f6a70c 100755
--- a/dart/dart-schiffe.pl
+++ b/dart/dart-schiffe.pl
@@ -1,12 +1,12 @@
 #!/usr/bin/perl
 use strict;
 use Dart;
-
+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 /;
 our %x = array_to_hash(@x);
 our %y = array_to_hash(@y);
-our @schiffe = reverse sort qw/ 3 4 5 /;
+our @schiffe = reverse sort qw/ 4 5 6 /;
 
 $|=1;
 my (@player) = @ARGV;
@@ -23,11 +23,12 @@ exit $dart->run();
 
 sub array_to_hash
 {
-  my @array;
+  my @array=@_;
   my %hash;
+  my $i=1;
   for my $key (@array)
   {
-    $hash{$key}=1;
+    $hash{$key}=$i++;
   }
   return %hash;
 }
@@ -41,36 +42,39 @@ sub init
   {
     $self->get_player($player_idx)->{sel_x}=0;
     $self->get_player($player_idx)->{sel_y}=0;
-    for my $x (@x)
+    $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 (@y)
+      for my $y (@main::y)
       {
         $self->get_player($player_idx)->{score}->{$x}{$y}=0;
       }
     }
-    for my $schiff (@schiffe)
+    for my $schiff (@main::schiffe)
     {
       my $valid=0;
-      while(not $valid)
+      VALIDSHIP: while(not $valid)
       {
-        my $x_start_idx = int(rand(scalar @x));
-        my $y_start_idx = int(rand(scalar @y));
+        my $x_start_idx = int(rand(scalar @main::x));
+        my $y_start_idx = int(rand(scalar @main::y));
         my $direction = int(rand(2));
-        my $x_stop_idx = $x_start_idx + $schiff * $direction;
-        my $y_stop_idx = $y_start_idx + $schiff * (1-$direction);
-        next if ($x_stop_idx > $#x) or ($y_stop_idx > $#y);
-        for my $x_idx ($x_start_idx..$x_stop_idx)
+        my $x_stop_idx = $x_start_idx + ($schiff-1) * $direction;
+        my $y_stop_idx = $y_start_idx + ($schiff-1) * (1-$direction);
+        #next if ($x_stop_idx > $#main::x) or ($y_stop_idx > $#main::y);
+        for my $x_idx ($x_start_idx-1 .. $x_stop_idx+1)
         {
-          for my $y_idx ($y_start_idx .. $y_stop_idx)
+          for my $y_idx ($y_start_idx-1 .. $y_stop_idx+1)
           {
-            next if $self->get_player($player_idx)->{score}->{$x[$x_idx]}{$y[$y_idx]};
+            next VALIDSHIP if $self->get_player($player_idx)->{score}->{$main::x[$x_idx % @main::x]}{$main::y[$y_idx % @main::y]};
           }
         }
-        for my $x_idx ($x_start_idx..$x_stop_idx)
+        for my $x_idx ($x_start_idx .. $x_stop_idx)
         {
           for my $y_idx ($y_start_idx .. $y_stop_idx)
           {
-            $self->get_player($player_idx)->{score}->{$x[$x_idx]}{$y[$y_idx]}="s";
+            $self->get_player($player_idx)->{score}->{$main::x[$x_idx % @main::x]}{$main::y[$y_idx % @main::y]}="s";
           }
         }
         $valid=1;
@@ -82,9 +86,9 @@ sub init
 sub win_condition
 {
   my ($self) = @_;
-  for my $x (@x)
+  for my $x (@main::x)
   {
-    for my $y (@y)
+    for my $y (@main::y)
     {
       return if $self->get_current_player()->{score}->{$x}{$y} eq 's';
     }
@@ -97,31 +101,65 @@ sub shoot
   my $self=shift;
   my ($mult,$zahl)=@_;
   my $player=$self->get_current_player();
+  delete ($player->{last_hit});
 
-  if ( (not $x{$zahl}) and (not $y{$zahl}) )
+  if ( (not $main::x{$zahl}) and (not $main::y{$zahl}) )
   {
     $self->shout("miss");
     return;
-  } elsif ($x{$zahl}) { 
+  } elsif ($main::x{$zahl}) { 
     $player->{sel_x}=$zahl;
-  } elsif ($y{$zahl}) { 
+    $player->{mult_x}=$mult;
+  } elsif ($main::y{$zahl}) { 
     $player->{sel_y}=$zahl;
+    $player->{mult_y}=$mult;
   }
   $self->shout_last_shoot();
   if ($player->{sel_x} && $player->{sel_y})
   {
-    my $x = $player->{sel_x};
-    my $y = $player->{sel_y};
+    my $x_middle = $player->{sel_x};
+    my $y_middle = $player->{sel_y};
+    my $mult_x = $player->{mult_x};
+    my $mult_y = $player->{mult_y};
+    $player->{last_hit}={sel_x=>$x_middle, sel_y=>$y_middle, mult_x=>$mult_x, mult_y=>$mult_y};
     $player->{sel_x}=0;
     $player->{sel_y}=0;
-    if ($player->{score}->{$x}{$y} eq 's')
+    $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;
+    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}++;
+        }
+      }
+    }
+
+    if ($sound{scored})
     {
       $self->shout("scored");
-      $player->{score}->{$x}{$y} = 'X';
-    } elsif (not $player->{score}->{$x}{$y}) {  
-      $player->{score}->{$x}{$y} = 'o';
+    } elsif ($sound{miss}) {
+      $self->shout("miss");
+    } elsif ($sound{scho}) {
       $self->shout("scho");
     }
+
   }
   $self->win() if &win_condition($self);
 }
@@ -129,24 +167,52 @@ sub shoot
 sub print_score
 {
   my ($self)=@_;
+  my $player = $self->get_current_player();
+  my $sel_x= $player->{sel_x};
+  my $sel_y= $player->{sel_y};
+  my $mult_x=$player->{mult_x};
+  my $mult_y=$player->{mult_y};
   printf STDERR "Runde\t%d\n\n",$self->{round};
-  printf STDERR "Player\t%s\n\n",$self->get_current_player()->{name};
-  printf STDERR "x\t%d\n",$self->get_current_player()->{sel_x};
-  printf STDERR "y\t%d\n",$self->get_current_player()->{sel_y};
+  printf STDERR "Player\t%s\t\tSchuss\t%d\n\n",$player->{name},$self->{current_shoot_count};
+  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 "  ";
+    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 );
 
-    for my $x (@x)
+    }
+    print STDERR "\n";
+    for my $x (@main::x)
     {
-      for my $y (@y)
+      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)
       {
+        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;
+          print STDERR "  $field";
         } else {
-          print STDERR "?";
+          print STDERR "  .";
         }
+        print STDERR color('reset') if $sel_y &&  (abs($main::y{$y} - $main::y{$sel_y}) < $mult_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 );
+
+    }
   print STDERR "\n\n";
 }