--- deliantra/server/ext/Jeweler.pm	2007/12/17 08:03:22	1.23
+++ deliantra/server/ext/Jeweler.pm	2008/04/10 15:35:16	1.25
@@ -166,11 +166,13 @@
    my ($sk, $chdl, $pl, $input_level) = @_;
 
    my $hadunid = 0;
+   my $found   = 0;
    for ($chdl->grep_by_type (cf::RING, cf::AMULET)) {
       if (!$_->flag (cf::FLAG_IDENTIFIED) && $_->need_identify) {
          $hadunid = 1;
          next;
       }
+      $found = 1;
       my $r = Jeweler::Object->new (object => $_);
       my $msg = $r->analyze ($sk, $pl, $input_level);
       $pl->message ($r->to_string . ": " . $msg);
@@ -180,6 +182,8 @@
    }
    $pl->message ("You couldn't identify the other rings and not analyze them!")
       if $hadunid;
+   $pl->message ("You couldn't find anything in the bench to analyse!")
+      unless $found;
 }
 
 # this function converts metals/minerals into a raw ring (of adornment)
@@ -717,8 +721,12 @@
       my $lvl   = $self->power_to_level (\$desc);
       my $scosts = $self->calc_value_from_cost ($costs);
 
-      $pl->message ("costs: " . (join (', ', map { "$_: " . sprintf "%.2f", $costs->{$_} } keys %$costs)) . " (".($scosts / 5000)." royalties)");
-      $pl->message ("level: " . $desc);
+      $pl->message ("costs: "
+                    . (join ', ', map { "$_: " . sprintf "%.2f", $costs->{$_} } keys %$costs)
+                    . " ("
+                    . ($scosts / "royalty"->cf::arch::find->value)
+                    . " royalties)");
+      $pl->message ("level: $desc");
    } else {
       $pl->message ("level: impossible to make, due to impossible resistancy configuration");
    }