[ViewVC] Diff of: cvs/deliantra/server/ext/jeweler.ext

Comparing deliantra/server/ext/jeweler.ext (file contents):
Revision 1.13 by elmex, Mon Oct 15 17:52:04 2007 UTC vs.
Revision 1.15 by root, Mon Dec 17 08:03:22 2007 UTC

 #! perl
-use Data::Dumper;
+use strict;
 use Jeweler;
 use List::Util qw/max min sum/;
-use strict;
 sub ingred_alias {
    my ($ing) = @_;
    my %aliases = (
             my $plan   = $ingred->get_plan;
             if ($plan) {
                my @ring = $ingred->get_ring;
+               if (!@ring) {
+                  # actually the algorithm cant
+                  $pl->message ("You slap yourself, you forgot the jewelery!");
+                  return;
-               if ((@ring > 1) || ($ring[0]->nrof > 1)) {
+               } elsif ((@ring > 1) || (grep { $_->nrof > 1 } @ring)) {
                   # actually the algorithm cant handle more than one improvement at a time
                   $pl->message ("You can't manage to improve more than one thing at a time!");
                   return;
-               } elsif (@ring < 1) {
-                  # actually the algorithm cant
-                  $pl->message ("You slap yourself, you forgot the jewelery!");
-                  return;
                } else {
                   my $ringo = Jeweler::Object->new (object => $ring[0]);
                   my $iring = $ingred->improve_ring_by_plan ($plan, $ringo);
                   my $c1    = $ringo->calc_costs;
                   my $c2    = $iring->calc_costs;
       };
       $@ and warn "ERROR: $@\n";
    }
 );
-Jeweler::read_config "$DATADIR/jeweler.yaml";
+Jeweler::read_config "res/jeweler.yaml";

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines