--- deliantra/server/utils/cfutil.in	2007/04/13 05:08:51	1.25
+++ deliantra/server/utils/cfutil.in	2007/04/26 00:39:18	1.31
@@ -11,6 +11,7 @@
 my $IDENTIFY = "@IDENTIFY@";
 my $OPTIPNG  = "@OPTIPNG@";
 my $RSYNC    = "@RSYNC@";
+my $PNGNQ    = "@PNGNQ@";
 
 use Getopt::Long;
 use Coro::Event;
@@ -70,7 +71,7 @@
 sub inst_maps($) {
    my (undef, $path) = @_;
 
-   print "installing '$path' to '$DATADIR/maps'\n";
+   print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
 
    if (!-f "$path/regions") {
       warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
@@ -87,6 +88,7 @@
    our %ANIMINFO;
    our %FACEINFO;
    our @ARC;
+   our %ARC;
    our $TRS;
    our $NFILE;
 
@@ -155,7 +157,7 @@
                           . "| $exec_prefix/bin/cfhq2xa $w $h $wrap"
                           . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~"
                              and die "convert/hq2xa pipeline error: status $? ($!)";
-                     system $OPTIPNG, "-o5", "-i0", "-q", "$other~";
+                     system $OPTIPNG, "-i0", "-q", "$other~";
                      die "$other~ has zero size, aborting." unless -s "$other~";
                      rename "$other~", $other;
                   };
@@ -171,7 +173,25 @@
                if (0 > aio_lstat $other or (-M _) > (-M $path)) {
                   fork_sub {
                      system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
-                     system $OPTIPNG, "-o5", "-i0", "-q", "$other~";
+                     system $OPTIPNG, "-i0", "-q", "$other~";
+
+                     # reduce smoothfaces >10000 bytes
+                     if ($stem =~ /_S\./ && (-s "$other~") > 10000) {
+                        my $ncolor = 256;
+                        while () {
+                           system "<\Q$other~\E $PNGNQ -n$ncolor >\Q$other~~\E";
+                           system $OPTIPNG, "-i0", "-q", "$other~~";
+                           last if 10000 > -s "$other~~";
+                           $ncolor = int $ncolor * 0.9;
+                           $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
+                        }
+
+                        printf "reduced %s from %d to %d bytes using %d colours.\n",
+                              $other, -s "$other~", -s "$other~~", $ncolor
+                           if $VERBOSE > 0;
+                        rename "$other~~", "$other~";
+                     }
+
                      die "$other~ has zero size, aborting." unless -s "$other~";
                      rename "$other~", $other;
                   };
@@ -258,6 +278,9 @@
          my $arc = read_arch "$dir/$file";
          for my $o (values %$arc) {
             push @ARC, $o;
+            for (my $m = $o; $m; $m = $m->{more}) {
+               $ARC{$m->{_name}} = $m;
+            }
 
             $o->{editor_folder} = $dir;
 
@@ -278,7 +301,7 @@
 
                my $ext = $x|$y ? "+$x+$y" : "";
 
-               $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/;
+               $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};
@@ -374,9 +397,15 @@
    sub inst_arch($) {
       my (undef, $path) = @_;
 
-      print "installing '$path' to '$DATADIR'\n",
-            "(this can take a long time if you run this\n",
-            "for the first time or do not use --cache).\n";
+      print "\n",
+            "Installing '$path' to '$DATADIR'\n",
+            "\n",
+            "This can take a long time if you run this\n",
+            "for the first time or do not use --cache.\n",
+            "\n",
+            "Unless you run verbosely, all following warning\n",
+            "or error messages indicate serious problems.\n",
+            "\n";
 
       if (!-d "$path/treasures") {
          warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
@@ -394,10 +423,45 @@
       );
 
       {
+         # remove path prefix from editor_folder
+         substr $_->{editor_folder}, 0, 1 + length $path, ""
+            for values %ARC;
+
+         # resolve inherit
+         while () {
+            my $progress;
+            my $loop;
+
+            for my $o (values %ARC) {
+               if (my $other = $o->{inherit}) {
+                  if (my $s = $ARC{$other}) {
+                     if ($s->{inherit}) {
+                        $loop = $s;
+                     } else {
+                        delete $o->{inherit};
+                        my %s = %$s;
+                        delete @s{qw(_name more name name_pl)};
+                        %$o = ( %s, %$o );
+                        ++$progress;
+                     }
+                  } else {
+                     warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
+                     delete $ARC{$o->{_name}};
+                  }
+               }
+            }
+
+            unless ($progress) {
+               die "inheritance loop detected starting at archetype '$loop->{_name}', aborting.\n"
+                  if $loop;
+
+               last;
+            }
+         }
+
          open my $fh, ">:utf8", "$DATADIR/archetypes~"
             or die "$DATADIR/archetypes~: $!";
-         substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC;
-         print $fh Crossfire::archlist_to_string \@ARC;
+         print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
       }
 
       {