X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=dart%2FDart.pm;h=7adec4a41fc72980caee0df5cdf1957f6ba5f4fb;hb=da910f7d4d8727251856247e0653d18be917a425;hp=8ceee1723b4d6ec9de2a725effb6fe3763a194d1;hpb=8ac06bcb3f87262342da16851a89bb27907aee99;p=svn42.git

diff --git a/dart/Dart.pm b/dart/Dart.pm
index 8ceee17..7adec4a 100644
--- a/dart/Dart.pm
+++ b/dart/Dart.pm
@@ -25,6 +25,18 @@ sub new
 }
 
 
+sub get_color
+{
+  my $self=shift;
+  my ($mul,$zahl)=@_;
+  my @zahlen =  qw/20 1 18 4 13 6 10 15 2 17 3 19 7 16 8 11 14 9 12 5 25/;
+  my $counter=0;
+  $counter++ while($zahl != shift @zahlen and @zahlen);
+  $mul=0 if $mul >1;
+  my $result = ($counter+$mul )%2;
+  return $result;
+}
+
 sub init
 {
   my $self=shift;
@@ -81,6 +93,7 @@ sub run
     if ($mult =~/^\d$/)
     {
       die "Unexpected input" if not $number=~/^\d+$/;
+      next if not $self->{current_shoot_count} < $self->{max_shoots_per_player};
       $self->shoot($mult,$number);
     } elsif ($mult eq 'btn') {
       $self->next_player();
@@ -92,6 +105,9 @@ sub run
       $self->reset_game();
     } elsif ($mult eq 'quit') {
       return;
+    } else {
+      # shitty input
+      next;
     }
     push @history, Clone::clone($self);
     $self->callback('before_shoot');
@@ -188,6 +204,12 @@ sub get_next_active_player
   return ($current_player,$new_round);
 }
 
+sub finish_player_round
+{
+  my $self=shift;
+  $self->{current_shoot_count} = $self->{max_shoots_per_player};
+}
+
 sub next_round
 {
   my $self=shift;
@@ -203,7 +225,8 @@ sub win
   if ($self->{active_player_count}==1)
   {
     $self->next_player();
-    $self->lose();
+    $self->shout('lose');
+    $self->deactivate_current_player($self->{player_count}-$self->{active_player_count}+1);
   }
 }
 
@@ -215,7 +238,8 @@ sub lose
   if ($self->{active_player_count}==1)
   {
     $self->next_player();
-    $self->win();
+    $self->shout('win');
+    $self->deactivate_current_player($self->{active_player_count});
   }
 }