diff --git a/Irpg/Action.pm b/Irpg/Action.pm index 55993f0f54b692ead121e15e6baf50760e00b6d6..ec9ac67422e9fab9e85a06b492b3a77b55c27d10 100644 --- a/Irpg/Action.pm +++ b/Irpg/Action.pm @@ -20,11 +20,11 @@ my $rps; =item SCALAR (ref) - reference to the players hash =cut sub init_pkg { - ($opts, $rps, $primnick_ref) = @_; - foreach my $user (keys %$rps) { - map { Irpg::Utils::execute_delayed($_, \&new_action, $user) } - @{$rps->{$user}{next_a}}; - } + ($opts, $rps, $primnick_ref) = @_; + foreach my $user (keys %$rps) { + map { Irpg::Utils::execute_delayed($_, \&new_action, $user) } + @{$rps->{$user}{next_a}}; + } } @@ -52,7 +52,8 @@ sub itemsum { return $sum+1; } if (!exists($rps->{$user})) { return -1; } - $sum += int($rps->{$user}{item}{$_}) for keys(%{$rps->{$user}{item}}); + #$sum += int($rps->{$user}{item}{$_}) for keys(%{$rps->{$user}{item}}); + $sum += int foreach map { s/(\d+).*/$1/ } values(%{$rps->{$user}{item}}); if ($battle) { $sum = $rps->{$user}{alignment} eq 'Evil' ? int(0.5+$sum*.9) : $rps->{$user}{alignment} eq 'Good' ? int(0.5+$sum*1.1) : @@ -493,7 +494,7 @@ sub consume_action { my $player = shift; return unless (exists($rps->{$player})); $rps->{$player}{actions}--; - push $rps->{$player}{next_a}, 3600; + push $rps->{$player}{next_a}, 3600; Irpg::Utils::execute_delayed(3600, \&new_action, $player); }