diff --git a/Irpg/Action.pm b/Irpg/Action.pm index 7700e24f42b267373b05ed4f2025adb0f9699ce5..24aeb80da3bc336001c3e13592539278ea59f61b 100644 --- a/Irpg/Action.pm +++ b/Irpg/Action.pm @@ -21,10 +21,6 @@ my $rps; =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}}; - } } @@ -53,7 +49,7 @@ sub itemsum { } if (!exists($rps->{$user})) { return -1; } #$sum += int($rps->{$user}{item}{$_}) for keys(%{$rps->{$user}{item}}); - $sum += int foreach map { m/(\d+).*/ } values(%{$rps->{$user}{item}}); + $sum += int foreach map { m/(\d+)\D?/ } 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) : @@ -248,10 +244,10 @@ sub perform_action { my $p1roll = int(rand($p1sum));# * $p1atk); my $p2roll = int(rand($p2sum));# * $p2def); my $ret; - $ret = {p1sum=>$p1sum, p2sum=>$p2sum, - p1roll=>$p1roll, p2roll=>$p2roll, - p1atk=>$p1atk, p2def=>$p2def, - vict=>0}; + $ret = {p1sum=>$p1sum, p2sum=>$p2sum, + p1roll=>$p1roll, p2roll=>$p2roll, + p1atk=>$p1atk, p2def=>$p2def, + vict=>0}; if ($p1roll*$p1atk >= $p2roll*$p2def) { # VICTORY $ret->{vict}++; @@ -487,7 +483,6 @@ sub consume_action { return unless (exists($rps->{$player})); $rps->{$player}{actions}--; push $rps->{$player}{next_a}, 3600; - Irpg::Utils::execute_delayed(3600, \&new_action, $player); } sub new_action { diff --git a/Irpg/Main.pm b/Irpg/Main.pm index bc679cfd204bccb73fad95d4d30771895d29e229..376d702a6a22fff43216f06bf19c4bcd1a568958 100644 --- a/Irpg/Main.pm +++ b/Irpg/Main.pm @@ -318,8 +318,6 @@ sub rpcheck { # check levels, update database @{$rps->{$k}{next_a}} = grep { $_ > 0 } map { $_ - ($curtime - $$lasttime_ref) } @{$rps->{$k}{next_a}}; - #$rps->{$k}{next_a} -= ($curtime - $$lasttime_ref); - #$rps->{$k}{next_a} = 0 if ($rps->{$k}{next_a} < 0); $rps->{$k}{idled} += ($curtime - $$lasttime_ref); if ($rps->{$k}{next} < 1) { $rps->{$k}{level}++;