--- deliantra/server/ext/Jeweler.pm	2007/07/31 09:40:15	1.18
+++ deliantra/server/ext/Jeweler.pm	2007/12/17 08:03:22	1.23
@@ -26,13 +26,12 @@
 sub read_config {
    my ($filename) = @_;
 
-   unless (-e $filename) {
-      warn "$filename doesn't exists! no config for jeweler skill loaded!\n";
+   if (my $meta = $cf::RESOURCE{$filename}) {
+      $CFG = cf::decode_json $meta->{data};
+   } else {
+      warn "$filename doesn't exist! no config for jeweler skill loaded!\n";
       $CFG = {};
-      return
    }
-
-   $CFG = YAML::LoadFile $filename;
 }
 
 sub getcfg {
@@ -179,9 +178,8 @@
          $r->wiz_analyze ($pl);
       }
    }
-   if ($hadunid) {
-      $pl->message ("You couldn't identify the other rings and not analyze them!");
-   }
+   $pl->message ("You couldn't identify the other rings and not analyze them!")
+      if $hadunid;
 }
 
 # this function converts metals/minerals into a raw ring (of adornment)
@@ -205,7 +203,7 @@
    }
 
    unless ($xp_gain > 0) {
-      warn "WARNING: xp gain isn't > 0 in convesion '$outarch'\n";
+      warn "WARNING: xp gain isn't > 0 in conversion '$outarch'\n";
       return;
    }
 
@@ -223,17 +221,17 @@
 
    my $outarchval = cf::arch::find ($outarch)->value;
 
-   my $nrof = int ($archvalsum / (($outarchval || 1000) * $outarchvalfact));
+   my $nrof = int $archvalsum / (($outarchval || 1000) * $outarchvalfact);
    if ($nrof) {
-      # XXX: yes, i know what i'm doing here, i don't set nrof, but it didn't work somehow (pls. chek sometimes)
-      for (1..$nrof) {
+      # XXX: yes, I know what I'm doing here, I don't set nrof, but it didn't work somehow (pls. check sometimes)
+      for (1 .. $nrof) {
          $chdl->put (my $ob = cf::object::new $outarch);
          $ob->set_animation (cf::rndm $ob->num_animations)
             if ($ob->type == cf::RING);
          $ob->flag (cf::FLAG_IDENTIFIED, 1);
       }
 
-      my $xp_sum = ($xp_gain * $nrof);
+      my $xp_sum = $xp_gain * $nrof;
 
       if ($xp_sum) {
          $pl->ob->message ("You got $xp_sum xp by making $nrof ${outarch}s");
@@ -357,7 +355,7 @@
    my ($self, $obj) = @_;
 
    return undef unless $self->{cauldron};
-   $obj->insert_ob_in_ob ($self->{cauldron});
+   $self->{cauldron}->insert ($obj);
 }
 
 =back
@@ -479,7 +477,7 @@
 sub improve_ring_by_plan {
    my ($self, $plan, $ring) = @_;
 
-   $ring = dclone ($ring);
+   $ring = do { my $guard = Coro::Storable::guard; dclone $ring };
 
    my $ingred = $self->{ingredients};
    my $impr = {};
@@ -573,7 +571,7 @@
 sub check_costs {
    my ($self, $costs, $do_remove) = @_;
 
-   my $costs = dclone ($costs);
+   my $costs = do { my $guard = Coro::Storable::guard; dclone $costs };
 
    for my $key (keys %$costs) {
       my @grepar;
@@ -1067,9 +1065,6 @@
    my $stat_split = Jeweler::getcfg (diamond_split => $category);
 
    my $sum = sum (@$stat_split);
-   if ($sum < (1 - 0.0001)) {
-      warn "JEWELER BUG: sum (@$stat_split) = $sum < 1 for $category!";
-   }
 
    my $emarch = cf::arch::find 'emerald';
    my $saarch = cf::arch::find 'sapphire';