skillbot: skillbot.pl comparison

Fixed some stuff after talking to dom -- yeah it could have been done simpler if he told me yesterday :P

comparison

equal deleted inserted replaced

-:48df6d55427b
+:8b631d17dfd0
 	}
 	# lists the chars in order of shortest training time
 	if ($msg =~ /^\!next/i) {
 		my $nreply = "Training: ";
-		my (@fc) = (order_friend_copy @friends);
-		foreach (@fc)
+		for my $f (sort { $a->{skill}->finish_time <=> $b->{skill}->finish_time } grep(defined $_->{skill}, @friends)) {
-			$nreply .= $_->{char}->name . " (" . $_->{skill}->time_remaining . ") | ";
+			$nreply .= $f->{char}->name . " (" . $f->{skill}->time_remaining . ") | ";
+		}
 		$self->privmsg('#' . $config{channel}, $nreply);
 	}
 }
 					   encode("utf8", $text)));
 		delete $f->{skill};
 	});
 }
-=pod
-Returns a copy of the input @friends that is ordered by training time
-and doesnt contain any chars that are not in training.
-=cut
-sub order_friend_copy
-{
-	my @friendcopy;
-	foreach ($_)
-		push(@friendcopy, $_) unless defined($_->{char}->skill->in_training);
-	sort { $a->{skill}->finish_time <=> $b->{skill}->finish_time } @friendcopy;
-	return @friendcopy;
-}
 END {
 	cleanup_and_die();
 }

Mercurial > hg > skillbot