[ViewVC] Diff of: cvs/deliantra/Deliantra/Deliantra.pm

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.82 by root, Tue Feb 6 23:53:26 2007 UTC vs.
Revision 1.85 by root, Wed Feb 7 00:44:18 2007 UTC

  adamant    =>  256,
  liquid     =>  512,
  tin        => 1024,
  bone       => 2048,
  ice        => 4096,
+ # guesses
+ runestone  =>   12,
+ bronze     =>   18,
+ "ancient wood" => 20,
+ glass      =>   36,
+ marble     =>   66,
+ ice        =>   68,
+ stone      =>   70,
+ stone      =>   80,
+ cloth      =>  136,
+ ironwood   =>  144,
+ adamantium =>  258,
+ glacium    =>  260,
+ blood      =>  544,
 ;
 # object as in "Object xxx", i.e. archetypes
 sub normalize_object($) {
    my ($ob) = @_;
             delete $ob->{material};
          } else {
             warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
             delete $ob->{material}; # assume materilname is more specific and nuke material
          }
+      } elsif (my $name = $MATERIAL{$ob->{material}}) {
+         delete $ob->{material};
+         $ob->{materialname} = $name;
       } else {
-         if (my $name = $MATERIAL{$ob->{material}}) {
+         warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
-            delete $ob->{material};
-            $ob->{materialname} = $name;
-         }
       }
    }
    # nuke outdated or never supported fields
    delete @$ob{qw(

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