--- deliantra/server/utils/cfutil.in	2007/04/26 00:39:18	1.31
+++ deliantra/server/utils/cfutil.in	2007/06/10 02:51:46	1.36
@@ -8,7 +8,7 @@
 my $DATADIR     = "@datadir@/@PACKAGE@";
 
 my $CONVERT  = "@CONVERT@";
-my $IDENTIFY = "@IDENTIFY@";
+#my $IDENTIFY = "@IDENTIFY@";
 my $OPTIPNG  = "@OPTIPNG@";
 my $RSYNC    = "@RSYNC@";
 my $PNGNQ    = "@PNGNQ@";
@@ -45,6 +45,22 @@
 my $TMPDIR  = "/tmp/cfutil$$~";
 my $TMPFILE = "aaaa0";
 
+our %COLOR = (
+   black      =>  0,
+   white      =>  1,
+   navy       =>  2,
+   red        =>  3,
+   orange     =>  4,
+   blue       =>  5,
+   darkorange =>  6,
+   green      =>  7,
+   lightgreen =>  8,
+   grey       =>  9,
+   brown      => 10,
+   gold       => 11,
+   tan        => 12,
+);
+
 END { system "rm", "-rf", $TMPDIR }
 
 Event->signal (signal => "INT",  cb => sub { exit 1 });
@@ -179,7 +195,7 @@
                      if ($stem =~ /_S\./ && (-s "$other~") > 10000) {
                         my $ncolor = 256;
                         while () {
-                           system "<\Q$other~\E $PNGNQ -n$ncolor >\Q$other~~\E";
+                           system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
                            system $OPTIPNG, "-i0", "-q", "$other~~";
                            last if 10000 > -s "$other~~";
                            $ncolor = int $ncolor * 0.9;
@@ -188,7 +204,7 @@
 
                         printf "reduced %s from %d to %d bytes using %d colours.\n",
                               $other, -s "$other~", -s "$other~~", $ncolor
-                           if $VERBOSE > 0;
+                           if $VERBOSE >= 2;
                         rename "$other~~", "$other~";
                      }
 
@@ -303,8 +319,8 @@
 
                $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
 
-               my $visibility = delete $o->{visibility} if exists $o->{visibility};
-               my $magicmap   = delete $o->{magicmap}   if exists $o->{magicmap};
+               $visibility = delete $o->{visibility} if exists $o->{visibility};
+               $magicmap   = delete $o->{magicmap}   if exists $o->{magicmap};
 
                my $anim = delete $o->{anim};
 
@@ -388,7 +404,7 @@
             } elsif ($file =~ /\.arc$/) {
                push @arc, [$path, $file];
             } else {
-               warn "ignoring $path/$file\n" if $VERBOSE >= 2;
+               warn "ignoring $path/$file\n" if $VERBOSE >= 3;
             }
          }
       };
@@ -459,6 +475,9 @@
             }
          }
 
+         # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
+         @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
+
          open my $fh, ">:utf8", "$DATADIR/archetypes~"
             or die "$DATADIR/archetypes~: $!";
          print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
@@ -480,6 +499,11 @@
 
             $v->{chksum32} = Digest::MD5::md5 $v->{data32};
             $v->{chksum64} = Digest::MD5::md5 $v->{data64};
+
+            if (my $magicmap = $v->{magicmap}) {
+               $magicmap =~ y/A-Z_\-/a-z/d;
+               $v->{magicmap} = $COLOR{$magicmap};
+            }
          }
 
          open my $fh, ">:perlio", "$DATADIR/facedata~"