--- deliantra/server/ext/Jeweler.pm	2007/04/10 17:46:22	1.14
+++ deliantra/server/ext/Jeweler.pm	2007/07/21 16:06:22	1.17
@@ -221,7 +221,7 @@
    my $archvalsum = $ingred->value ($ingr_grp, $srcarchname);
    $ingred->remove ($ingr_grp, $srcarchname);
 
-   my $outarchval = cf::arch::find ($outarch)->clone->value;
+   my $outarchval = cf::arch::find ($outarch)->value;
 
    my $nrof = int ($archvalsum / (($outarchval || 1000) * $outarchvalfact));
    if ($nrof) {
@@ -240,7 +240,7 @@
          $pl->ob->change_exp ($xp_sum, "jeweler", cf::SK_EXP_SKILL_ONLY);
       }
    } else {
-      $pl->ob->message ("You fail to make something, propably you used not enough source material?");
+      $pl->ob->message ("You fail to make something, probably you used not enough source material?");
    }
 }
 
@@ -282,7 +282,7 @@
    my @c =
       grep {
          $_->flag (cf::FLAG_IS_CAULDRON)
-            and $_->arch->name eq $arch_name
+            and $_->arch->archname eq $arch_name
       } @map_stack;
 
    $self->{cauldron} = $c[0];
@@ -400,7 +400,7 @@
    my ($self, $group, $archname) = @_;
 
    my @objs = grep {
-      $_->arch->name eq $archname
+      $_->arch->archname eq $archname
    } @{$self->{ingredients}->{$group} || []};
 
    my $sum = 0;
@@ -427,7 +427,7 @@
 
    for (@{$ingred->{$group}}) {
       if (defined $archname) {
-         if ($_->arch->name eq $archname) {
+         if ($_->arch->archname eq $archname) {
             Jeweler::Util::remove ($_);
          } else {
             push @out, $_;
@@ -666,11 +666,11 @@
    my $pearch = cf::arch::find 'pearl';
    my $ruarch = cf::arch::find 'ruby';
    my $diarch = cf::arch::find 'gem';
-   my $value  =   $emarch->clone->value * $costs->{emerald}
-                + $saarch->clone->value * $costs->{sapphire}
-                + $pearch->clone->value * $costs->{pearl}
-                + $ruarch->clone->value * $costs->{ruby}
-                + $diarch->clone->value * $costs->{gem};
+   my $value  =   $emarch->value * $costs->{emerald}
+                + $saarch->value * $costs->{sapphire}
+                + $pearch->value * $costs->{pearl}
+                + $ruarch->value * $costs->{ruby}
+                + $diarch->value * $costs->{gem};
 
    $value
 }
@@ -785,7 +785,7 @@
    $obj->{spec}{food}  = $stats->food;
 
    $obj->{name} = $thing->name;
-   $obj->{arch} = $thing->arch->name;
+   $obj->{arch} = $thing->arch->archname;
    $obj->{face} = $thing->face;
 
    $obj->{value} = $thing->value;
@@ -1032,13 +1032,13 @@
    my $ruarch = cf::arch::find 'ruby';
    my $diarch = cf::arch::find 'gem';
 
-   my $sumvalue = $diarch->clone->value * $diamonds;
+   my $sumvalue = $diarch->value * $diamonds;
 
-   $cost->{emerald}  += ceil $sumvalue * $stat_split->[0] / max 1, $emarch->clone->value;
-   $cost->{sapphire} += ceil $sumvalue * $stat_split->[1] / max 1, $saarch->clone->value;
-   $cost->{pearl}    += ceil $sumvalue * $stat_split->[2] / max 1, $pearch->clone->value;
-   $cost->{ruby}     += ceil $sumvalue * $stat_split->[3] / max 1, $ruarch->clone->value;
-   $cost->{gem}      += ceil $sumvalue * $stat_split->[4] / max 1, $diarch->clone->value;
+   $cost->{emerald}  += ceil $sumvalue * $stat_split->[0] / max 1, $emarch->value;
+   $cost->{sapphire} += ceil $sumvalue * $stat_split->[1] / max 1, $saarch->value;
+   $cost->{pearl}    += ceil $sumvalue * $stat_split->[2] / max 1, $pearch->value;
+   $cost->{ruby}     += ceil $sumvalue * $stat_split->[3] / max 1, $ruarch->value;
+   $cost->{gem}      += ceil $sumvalue * $stat_split->[4] / max 1, $diarch->value;
 }
 
 package Jeweler::Util;
@@ -1105,12 +1105,12 @@
          $thing->title eq $match
             and $check_true++;
       } else { # $i % 3 == 2
-         $thing->arch->name eq $match
+         $thing->arch->archname eq $match
             and $check_true++;
       }
       $i++;
    }
-   #d# warn "CHECK $check_true | $check_cnts | [".(join ',', @matchar).":".join (",", ($thing->name, $thing->title, $thing->arch->name))."\n";
+   #d# warn "CHECK $check_true | $check_cnts | [".(join ',', @matchar).":".join (",", ($thing->name, $thing->title, $thing->arch->archname))."\n";
    return 1 if $check_true && $check_cnts == $check_true;
    return 0;
 }
@@ -1119,7 +1119,7 @@
    my ($ingred, $group, @matchar) = @_;
 
    for my $thing (@{$ingred->{$group} || []}) {
-   #d# warn sprintf "DEB:(%s,%s,%s)<->%s\n", $thing->name, $thing->title, $thing->arch->name, "@matchar"; #d#
+   #d# warn sprintf "DEB:(%s,%s,%s)<->%s\n", $thing->name, $thing->title, $thing->arch->archname, "@matchar"; #d#
       if (check_for_match ($thing, @matchar)) {
          return $thing;
       }