--- deliantra/maps/perl/Jeweler.pm	2006/09/08 16:22:14	1.6
+++ deliantra/maps/perl/Jeweler.pm	2006/09/12 15:48:17	1.7
@@ -271,7 +271,7 @@
    my @c =
       grep {
          $_->flag (cf::FLAG_IS_CAULDRON)
-            and $_->archetype->name eq $arch_name
+            and $_->arch->name eq $arch_name
       } @map_stack;
 
    $self->{cauldron} = $c[0];
@@ -382,7 +382,7 @@
    my ($self, $group, $archname) = @_;
 
    my @objs = grep {
-      $_->archetype->name eq $archname
+      $_->arch->name eq $archname
    } @{$self->{ingredients}->{$group} || []};
 
    my $sum = 0;
@@ -409,7 +409,7 @@
 
    for (@{$ingred->{$group}}) {
       if (defined $archname) {
-         if ($_->archetype->name eq $archname) {
+         if ($_->arch->name eq $archname) {
             Jeweler::Util::remove ($_);
          } else {
             push @out, $_;
@@ -661,7 +661,7 @@
                } grep { $r->{resist}->{$_} } @Jeweler::RESISTS),
                (map {
                   my $rv = $r->{stat}->{$_};
-                  "(" . (lc $_) . ($rv > 0 ? '+' : '') . $rv . ")"
+                  "(" . (ucfirst lc $_) . ($rv > 0 ? '+' : '') . $rv . ")"
                } grep { $r->{stat}->{$_} } keys %{$r->{stat}}),
                (map {
                   my $rv = $r->{spec}->{$_};
@@ -693,7 +693,7 @@
    $obj->{spec}{food}  = $stats->food;
 
    $obj->{name} = $thing->name;
-   $obj->{arch} = $thing->archetype->name;
+   $obj->{arch} = $thing->arch->name;
    $obj->{face} = $thing->face;
 
    $self->{hash} = $obj
@@ -983,7 +983,7 @@
          $thing->title eq $match
             and return 1;
       } else { # $i % 3 == 2
-         $thing->archetype->name eq $match
+         $thing->arch->name eq $match
             and return 1;
       }
       $i++;