--- deliantra/server/utils/cfutil.in	2011/02/07 20:27:11	1.110
+++ deliantra/server/utils/cfutil.in	2012/11/11 05:53:12	1.124
@@ -2,23 +2,23 @@
 
 #
 # This file is part of Deliantra, the Roguelike Realtime MMORPG.
-#  
-# Copyright (©) 2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
-#  
+#
+# Copyright (©) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+#
 # Deliantra is free software: you can redistribute it and/or modify it under
 # the terms of the Affero GNU General Public License as published by the
 # Free Software Foundation, either version 3 of the License, or (at your
 # option) any later version.
-#  
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
-#  
+#
 # You should have received a copy of the Affero GNU General Public License
 # and the GNU General Public License along with this program. If not, see
 # <http://www.gnu.org/licenses/>.
-#  
+#
 # The authors can be reached via e-mail to <support@deliantra.net>
 #
 
@@ -30,7 +30,7 @@
 my $DATADIR     = "@datadir@/@PACKAGE@";
 
 my $CONVERT  = "@CONVERT@";
-#my $IDENTIFY = "@IDENTIFY@";
+my $IDENTIFY = "@IDENTIFY@";
 my $OPTIPNG  = "@OPTIPNG@";
 my $RSYNC    = "@RSYNC@";
 my $PNGNQ    = "@PNGNQ@";
@@ -40,17 +40,20 @@
 use POSIX ();
 use Carp;
 
-use Coro::EV;
-use AnyEvent;
 use YAML::XS ();
+use Digest::MD5 ();
+use Storable ();
 use JSON::XS ();
 use IO::AIO ();
-use Digest::MD5 ();
+use Compress::LZF ();
 
+use AnyEvent;
 use Coro 5.12;
+use Coro::EV;
 use Coro::AIO;
 use Coro::Util;
 use Coro::Channel;
+use Coro::AnyEvent;
 use Coro::Storable; $Storable::canonical = 1;
 
 use Deliantra;
@@ -106,8 +109,8 @@
 
 END { system "rm", "-rf", $TMPDIR }
 
-my $s_INT  = EV::signal INT  => sub { exit 1 };
-my $s_TERM = EV::signal TERM => sub { exit 1 };
+my $s_INT  = AE::signal INT  => sub { exit 1 };
+my $s_TERM = AE::signal TERM => sub { exit 1 };
 
 our %hash;
 
@@ -115,12 +118,12 @@
 sub make_hash($\$\$;$) {
    my ($id, $dataref, $hashref, $clen) = @_;
 
-   my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
+   my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 5;
 
    if (exists $hash{$hash}) {
       # hash collision, but some files are simply identical
       if (${$hash{$hash}[1]} ne $$dataref)  {
-         warn "hash collision $hash{$hash}[0] vs. $id\n";
+         warn "ERROR: hash collision $hash{$hash}[0] vs. $id (increase the default \$clen in make_hash?)\n";
          exit 1;
       } else {
          print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
@@ -131,10 +134,15 @@
    $$hashref = $hash;
 }
 
+sub optipng($) {
+   system $OPTIPNG, "-o5", "-i0", "-q", $_[0];
+   die "$_[0] has zero size, aborting." unless -s $_[0];
+}
+
 mkdir $TMPDIR, 0700
    or die "$TMPDIR: $!";
 
-sub fork_sub(&) {
+sub fork_exec(&) {
    my ($cb) = @_;
 
    if (my $pid = fork) {
@@ -149,13 +157,42 @@
    }
 }
 
+sub imgsize($) {
+   open my $fh, "-|", $IDENTIFY, qw(-ping -format %w,%h --), $_[0]
+      or die "$IDENTIFY: $!";
+
+   Coro::AnyEvent::readable $fh;
+
+   my ($w, $h) = split /,/, <$fh>;
+
+   ($w+0, $h+0)
+}
+
+# make $dst from $src, if not uptodate, by calling $how
+sub make_file($$$) {
+   my ($src, $dst, $how) = @_;
+
+   my $t = (aio_stat $dst) ? -1 : (stat _)[9];
+
+   for (ref $src ? @$src : $src) {
+      aio_stat $_
+         and die "$_: $!";
+
+      if ((stat _)[9] > $t) {
+         # outdated, redo
+         $how->();
+         last;
+      }
+   }
+}
+
 sub inst_maps($) {
    my (undef, $path) = @_;
 
    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";
+      warn "ERROR: '$path' does not look like a maps directory ('regions' file is missing).\n";
       exit 1 unless $FORCE;
    }
 
@@ -175,6 +212,7 @@
    our @ARC;
    our %ARC;
    our $TRS;
+   our %PNG;
    our $NFILE;
    our $PATH;
 
@@ -185,11 +223,19 @@
 
    our @c_png;
 
-   sub commit_png($$$$) {
-      my ($stem, $name, $data, $T) = @_;
+   # texture catalog size, in 64x64 tiles
+   sub TC_W() { 1024 / 64 }
+   sub TC_H() { 1024 / 64 }
+
+   our @TC = ([]); # texture catalogs
+   
+   sub commit_png($$$$$$) {
+      my ($stem, $name, $data, $T, $w, $h) = @_;
 
-      $FACEINFO{$name}{"stem"}   = substr $stem, 1 + length $PATH;
+      $FACEINFO{$name}{stem}     = substr $stem, 1 + length $PATH;
       $FACEINFO{$name}{"data$T"} = $data;
+      $FACEINFO{$name}{w}        = $w;
+      $FACEINFO{$name}{h}        = $h;
    }
 
    sub process_png {
@@ -201,7 +247,7 @@
          my ($size, $mtime) = (stat _)[7,9];
 
          if (0 > aio_load $path, $png) {
-            warn "$path: $!, skipping.\n";
+            warn "ERROR: $path: $!, skipping.\n";
             next;
          }
 
@@ -213,25 +259,25 @@
          } elsif ($stem =~ s/\.64x64\.png~?$//) {
             $T = 64;
          } else {
-            warn "$path: weird filename, skipping.\n";
+            warn "ERROR: $path: weird filename, skipping.\n";
             next;
          }
 
          # quickly extract width and height of the (necessarily PNG) image
          unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
-            warn "$path: not a recognized png file, skipping.\n";
+            warn "ERROR: $path: not a recognized png file, skipping.\n";
             next;
          }
 
          my ($w, $h) = unpack "NN", $1;
 
          if ($w < $T || $h < $T) {
-            warn "$path: too small ($w $h), skipping.\n";
+            warn "ERROR: $path: too small ($w $h), skipping.\n";
             next;
          }
 
          if ($w % $T || $h % $T) {
-            warn "$path: weird png size ($w $h), skipping.\n";
+            warn "ERROR: $path: weird png size ($w $h), skipping.\n";
             next;
          }
 
@@ -250,8 +296,8 @@
             if (0 > aio_stat "$stem.64x64.png") {
                my $other = "$stem.64x64.png~";
 
-               if (0 > aio_lstat $other or (-M _) > (-M $path)) {
-                  fork_sub {
+               make_file $path, $other, sub {
+                  fork_exec {
                      my $CROP;
                      my $SRC = "png:\Q$path\E";
 
@@ -311,15 +357,14 @@
                         }
                      }
 
-                     system "convert -depth 8 $SRC rgba:-"
+                     system "$CONVERT -depth 8 $SRC rgba:-"
                           . "| $exec_prefix/bin/cfhq2xa $w $h 0"
-                          . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
+                          . "| $CONVERT -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
                         and die "convert/cfhq2xa pipeline error: status $? ($!)";
-                     system $OPTIPNG, "-i0", "-q", "$other~";
-                     die "$other~ has zero size, aborting." unless -s "$other~";
+                     optipng "$other~";
                      rename "$other~", $other;
                   };
-               }
+               };
 
                push @c_png, [$other, !$CACHE];
             }
@@ -328,10 +373,10 @@
             if (0 > aio_stat "$stem.32x32.png") {
                my $other = "$stem.32x32.png~";
 
-               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, "-i0", "-q", "$other~";
+               make_file $path, $other, sub {
+                  fork_exec {
+                     system "$CONVERT png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
+                     optipng "$other~";
 
                      # reduce smoothfaces >10000 bytes
                      # obsolete, no longer required
@@ -339,7 +384,7 @@
                         my $ncolor = 256;
                         while () {
                            system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
-                           system $OPTIPNG, "-i0", "-q", "$other~~";
+                           optipng "$other~~";
                            last if 10000 > -s "$other~~";
                            $ncolor = int $ncolor * 0.9;
                            $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
@@ -354,7 +399,7 @@
                      die "$other~ has zero size, aborting." unless -s "$other~";
                      rename "$other~", $other;
                   };
-               }
+               };
 
                #warn "scaled down $path to $other\n";#d#
                push @c_png, [$other, !$CACHE];
@@ -363,6 +408,56 @@
 
          (my $face = $stem) =~ s/^.*\///;
 
+         for (@{ $fi->{derive} }) {
+            my ($dir, $type) = @$_;
+
+            my $geom = "${T}x${T}";
+            my $dpath = "$dir/$type:$face.$geom.png~";
+
+            if ($type eq "buildmaterial") {
+               my $ov = "$PATH/mapbuilding/buildmaterial.png";
+               make_file [$path, $ov], $dpath, sub {
+                  fork_exec {
+                     system "$CONVERT -size 64x64 xc:transparent \\( \Q$path\E -geometry 52x52+6+6 \\) -composite \Q$ov\E -composite -geometry $geom png:\Q$dpath\E~";
+                     optipng "$dpath~";
+                     rename "$dpath~", $dpath;
+                  };
+               };
+            } elsif ($type eq "buildmaterial-box") {
+               my $ov = "$PATH/mapbuilding/buildmaterial-box.png";
+               make_file [$path, $ov], $dpath, sub {
+                  fork_exec {
+                     system "$CONVERT \Q$ov\E "
+                            . "\\( \Q$path\E -trim -geometry 34x31\\> "
+                            . "-gravity center -background transparent -extent 37x34 +gravity "
+                            . "-geometry +22+6 \\) -composite "
+                            . "-geometry $geom png:\Q$dpath\E~";
+                     optipng "$dpath~";
+                     rename "$dpath~", $dpath;
+                  };
+               };
+            } elsif ($type eq "buildmaterial-sbox") {
+               my $ov = "$PATH/mapbuilding/buildmaterial-sbox.png";
+               make_file [$path, $ov], $dpath, sub {
+                  fork_exec {
+                     system "$CONVERT \Q$ov\E "
+                            . "\\( \Q$path\E -trim -geometry 16x24\\> "
+                            . "-gravity center -background transparent -extent 18x26 +gravity "
+                            . "-geometry +26+16 \\) -composite "
+                            . "-geometry $geom png:\Q$dpath\E~";
+                     optipng "$dpath~";
+                     rename "$dpath~", $dpath;
+                  };
+               };
+            } else {
+               warn "ERROR: facename $type:$face contains unsupported derivation type.\n";
+            }
+
+            aio_load $dpath, my $png;
+            IO::AIO::aio_unlink $dpath unless $CACHE;
+            commit_png "$dir/$type:$face", "$type:$face", $png, $T, 1, 1;
+         }
+
          # split all bigfaces, but avoid smoothfaces (*_S)
          if (($w > $T || $h > $T) && $face !~ /_S\./) {
             # split
@@ -376,9 +471,9 @@
             }
 
             my $mtime = (lstat $path)[9];
-            my @todo = grep { $_->[3] <= $mtime } @tile;
+            my @todo = grep { $_->[3] < $mtime } @tile;
             if (@todo) {
-               fork_sub {
+               fork_exec {
                   open my $convert, "|-", $CONVERT,
                      "png:-",
                      (map {
@@ -401,8 +496,7 @@
 
                   # pass 2, optimise, and rename
                   for (@todo) {
-                     system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
-                     die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
+                     optipng "$_->[2]~";
                      rename "$_->[2]~", $_->[2];
                   }
                };
@@ -416,14 +510,14 @@
                   die "$path: unable to read tile +$x+$y, aborting.\n";
                }
                IO::AIO::aio_unlink $file unless $CACHE;
-               commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
+               commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T, 1, 1;
             }
          } else {
             # use as-is (either small, use smooth)
-            commit_png $stem, $face, $png, $T;
+            commit_png $stem, $face, $png, $T, $w / $T, $h / $T;
          }
 
-         aio_unlink $path if $delete;
+         IO::AIO::aio_unlink $path if $delete;
       }
    }
 
@@ -433,7 +527,7 @@
 
       my $data;
       if (0 > aio_load $path, $data) {
-         warn "$path: $!, skipping.\n";
+         warn "ERROR: $path: $!, skipping.\n";
          return;
       }
 
@@ -449,9 +543,9 @@
          $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
 
          (my $fgi = $COLOR{$fg})
-            // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n";
+            // warn "ERROR: $path: $face specifies unknown foreground colour '$fg'.\n";
          (my $bgi = $COLOR{$bg})
-            // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n";
+            // warn "ERROR: $path: $face specifies unknown background colour '$bg'.\n";
 
          my $fi = $FACEINFO{$face} ||= { };
          $fi->{visibility} = $visibility * 1;
@@ -530,8 +624,13 @@
                   my $face = $_;
                   $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
 
-                  my $info = $FACEINFO{$face} ||= { };
-                  $info->{arc} = $o;
+                  # handle derived faces
+                  if ($face =~ /^([^:]+):(.*)/) {
+                     my ($type, $base) = ($1, $2);
+                     push @{ $FACEINFO{$base}{derive} }, [$dir, $type];
+                  }
+
+                  $FACEINFO{$face}{arc} = $o;
 
                   next if $face =~ /^blank.x11$|^empty.x11$/;
                }
@@ -557,7 +656,7 @@
 
       my $trs;
       if (0 > aio_load $path, $trs) {
-         warn "$path: $!, skipping.\n";
+         warn "ERROR: $path: $!, skipping.\n";
          return;
       }
 
@@ -572,7 +671,7 @@
          if (0 < aio_load $_[0], $data) {
             if ($_[1]) {
                $data = eval { $_[1]->($data) };
-               warn "$_[0]: $@" if $@;
+               warn "ERROR: $_[0]: $@" if $@;
             }
          }
 
@@ -582,11 +681,79 @@
       $FILECACHE{$_[0]}
    }
 
+   # convert an image and a palette to some indexed 2d-matrix structure
+   sub process_plt {
+      my ($base, $plt) = @_;
+
+      my ($w, $h) = imgsize "$base.png";
+
+      $w * $h
+         or die "$base.png: unable to identify correct size\n";
+
+      my @plt;
+      my %map;
+
+      for (split /\n/, $plt) {
+         next unless /\S/;
+         next if /^\s*#/;
+
+         /^([0-9a-fA-F]{3,6})\s*(.*?)\s*$/
+            or die "unparseable palette entry for $base.plt: $_";
+
+         my ($rgb, $name) = ($1, $2);
+
+         $rgb =~ s/^(.)(.)(.)$/$1$1$2$2$3$3/;
+
+         $map{pack "H*", $rgb} = chr @plt;
+         push @plt, $name;
+      }
+
+      make_file ["$base.plt", "$base.png"], "$base.tbl~", sub {
+         warn "building $base\n" if $VERBOSE >= 3;
+
+         fork_exec {
+            open my $png, "-|", $CONVERT, qw(-depth 8 --), "$base.png", "rgb:"
+               or die "$base.png: $!";
+
+            local $/;
+            $png = <$png>;
+
+            $w * $h * 3 == length $png
+               or die "$base.png: failed to read enough data from file\n";
+
+            $png =~ s/(...)/$map{$1}/ge;
+
+            $w * $h == length $png
+               or die "$base.png: failed to map all data - wrong palette?\n";
+
+            {
+               open my $fh, ">:raw", "$base.tbl~~"
+                  or die "$base.tbl~~: $!";
+               syswrite $fh, $png;
+            }
+
+            rename "$base.tbl~~", "$base.tbl~";
+         };
+      };
+
+      0 <= aio_load "$base.tbl~", my $tbl
+         or die "$base.tbl~: $!";
+
+      IO::AIO::aio_unlink "$base.tbl~" unless $CACHE;
+
+      Compress::LZF::compress nfreeze {
+         w   => $w,
+         h   => $h,
+         plt => \@plt,
+         tbl => $tbl,
+      }
+   }
+
    sub process_res {
       my ($dir, $file, $type) = @_;
 
-      my $data;
-      aio_load "$dir/$file", $data;
+      0 <= aio_load "$dir/$file", my $data
+         or die "$dir/$file: $!";
 
       my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
 
@@ -604,7 +771,7 @@
          %{ $meta->{$file} || {} },
       };
 
-      if ($meta->{license} =~ s/^#//) {
+      if (exists $meta->{license} && $meta->{license} =~ s/^#//) { # exists == avoid autovivification
          $meta->{license} = ({
             "pd"              => "Public Domain",
             "gpl"             => "GNU General Public License, version 3.0 or any later",
@@ -613,7 +780,7 @@
             "cc/by/2.5"       => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
             "cc/by/3.0"       => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
          })->{$meta->{license}}
-           || warn "$dir/$file: license tag '$meta->{license}' not found.";
+           || warn "ERROR: $dir/$file: license tag '$meta->{license}' not found.";
       }
 
       if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
@@ -623,9 +790,9 @@
       $file =~ s/\.res$//;
       $file =~ s/\.(ogg|wav|jpg|png)$//;
 
-      substr $dir, 0, 1 + length $PATH, "";
-
-      if (my $filter = $meta->{cfutil_filter}) {
+      if ($file =~ s/\.plt$//) {
+         $data = process_plt "$dir/$file", $data;
+      } elsif (my $filter = delete $meta->{cfutil_filter}) {
          if ($filter eq "yaml2json") {
             $data = JSON::XS::encode_json YAML::XS::Load $data;
          } elsif ($filter eq "json2json") {
@@ -634,15 +801,19 @@
             $data = eval $data; die if $@;
             $data = JSON::XS::encode_json $data;
          } else {
-            warn "$dir/$file: unknown filter $filter, skipping\n";
+            warn "ERROR: $dir/$file: unknown filter $filter, skipping\n";
          }
       }
 
-      $RESOURCE{"$dir/$file"} = {
+      substr $dir, 0, 1 + length $PATH, "";
+
+      my %info = (
          type   => (exists $meta->{type} ? delete $meta->{type} : $type),
          data   => $data,
          %$meta ? (meta => $meta) : (),
-      };
+      );
+
+      $RESOURCE{"$dir/$file"} = \%info;
    }
 
    sub process_any {
@@ -685,11 +856,11 @@
                   } elsif ($file =~ /\.(res)$/) {
                      $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
                   } else {
-                     $c_any->put ([\&process_res, $path, $file, undef]);
+                     $c_any->put ([\&process_res, $path, $file, 6]); # was type undef, but now meta files are mandatory, so any mentioned file surely has a purpose
                   }
 
                } elsif ($file =~ /\.png$/) {
-                  push @c_png, ["$path/$file", 0];
+                  $PNG{$file} = $path;
 
                } elsif ($file =~ /\.faceinfo$/) {
                   $c_any->put ([\&process_faceinfo, $path, $file]);
@@ -752,11 +923,11 @@
             "\n";
 
       if (!-d "$path/treasures") {
-         warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
+         warn "FATAL: '$path' does not look like an arch directory ('treasures' directory is missing).\n";
          exit 1 unless $FORCE;
       }
 
-      print "start file scan, arc, any processing...\n" if $VERBOSE;
+      print "starting file scan, arc, any processing...\n" if $VERBOSE;
 
       my @a_arc = map +(async \&process_arc), 1..2;
       my @a_any = map +(async \&process_any), 1..4;
@@ -767,17 +938,41 @@
       $c_any->shutdown;
 
       $_->join for @a_arc; # need to parse all archetypes before png processing
+      print "finished arc processing...\n" if $VERBOSE;
+
+      # fill png queue
+      for (keys %FACEINFO) {
+         # we only expect source pngs to exist for non-derived
+         # faces, i.e. no split tiles (+x+x) and no face derivates
+         # (xxx:)
+         /^[^:]+\....$/
+            or next;
+
+         my $seen;
+
+         if (exists $PNG{"$_.32x32.png"}) {
+            push @c_png, ["$PNG{\"$_.32x32.png\"}/$_.32x32.png"];
+            $seen = 1;
+         }
+         if (exists $PNG{"$_.64x64.png"}) {
+            push @c_png, ["$PNG{\"$_.64x64.png\"}/$_.64x64.png"];
+            $seen = 1;
+         }
+
+         warn "ERROR: $_: face not found, expect problems.\n"
+            unless $seen;
+      }
 
-      print "end arc, start png processing...\n" if $VERBOSE;
+      print "starting png processing...\n" if $VERBOSE;
 
       # eight png crunchers work fine for my 4x smp machine
       my @a_png = map +(async \&process_png), 1..8;
 
-      print "end any processing...\n" if $VERBOSE;
       $_->join for @a_any;
+      print "finished any processing...\n" if $VERBOSE;
 
-      print "end png processing...\n" if $VERBOSE;
       $_->join for @a_png;
+      print "finished png processing...\n" if $VERBOSE;
 
       print "scanning done, processing results...\n" if $VERBOSE;
       {
@@ -805,7 +1000,7 @@
                         ++$progress;
                      }
                   } else {
-                     warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
+                     warn "ERROR: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
                      delete $ARC{$o->{_name}};
                   }
                }
@@ -851,9 +1046,12 @@
 
       {
          print "processing facedata...\n" if $VERBOSE;
-         while (my ($k, $v) = each %FACEINFO) {
-            length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n";
-            length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
+         
+         for my $k (sort keys %FACEINFO) {
+            my $v = $FACEINFO{$k};
+
+            length $v->{data32} or warn "ERROR: face '$k' has no png32 - this will not work.\n";
+            length $v->{data64} or warn "ERROR: face '$k' has no png64 - this will not work.\n";
 
             make_hash $k, $v->{data32}, $v->{hash32};
             make_hash $k, $v->{data64}, $v->{hash64};
@@ -861,16 +1059,57 @@
             #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
             #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
 
-            $v->{glyph}      // warn "WARNING: face '$k' has glyph.";
-            $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
-            $v->{magicmap}   // warn "WARNING: face '$k' has foreground colour.";
+            $v->{glyph}      // warn "ERROR: face '$k' has no glyph - missing faceinfo entry?\n";
+            $v->{visibility} // warn "ERROR: face '$k' has no visibility info - missing faceinfo entry?\n";
+            $v->{magicmap}   // warn "ERROR: face '$k' has no foreground colour - missing faceinfo entry?\n";
+
+            if (0 && $v->{w} == 1 && $v->{h} == 1) { # texture catalogs
+               my $id = @TC;
+               my $n  = @{ $TC[-1] };
+               my $x  =     $n % TC_W;
+               my $y  = int $n / TC_W;
+
+               push @{ $TC[-1] }, [$v, $x, $y];
 
-            delete @$v{qw(arc stem)}; # not used by the server
+               $v->{tc} = [$id, $x, $y];
+
+               push @TC, [] if $n == TC_W * TC_H - 1; # start new texture if full
+            }
+
+            delete @$v{qw(w h arc stem derive)}; # not used by the server
+         }
+
+if (0) { #d# texture catalogs
+         print "creating texture catalogs...\n" if $VERBOSE;
+
+         for my $id (0 .. $#TC) {
+            my $tc = $TC[$id];
+
+            my $cmd = "$CONVERT -depth 8 -size " . (TC_W * 64) . "x" . (TC_H * 64) . " xc:transparent";
+            my $idx = "a";
+
+            for (@$tc) {
+               my $path = "$TMPDIR/tc" . $idx++;
+
+               open my $fh, ">:perlio", $path
+                  or die "$path: $!";
+               syswrite $fh, $_->[0]{data64};
+
+               my $x = $_->[1] * 64;
+               my $y = $_->[2] * 64;
+
+               $cmd .= " png:\Q$path\E -geometry +$x+$y -composite";
+            }
+
+            system "$cmd png:\Q$TMPDIR/tc$id\E";
+            optipng "$TMPDIR/tc$id";
          }
+}
 
          print "processing resources...\n" if $VERBOSE;
          my $enc = JSON::XS->new->utf8->canonical->relaxed;
-         while (my ($k, $v) = each %RESOURCE) {
+         for my $k (sort keys %RESOURCE) {
+            my $v = $RESOURCE{$k};
 
             if ($v->{meta} && $v->{meta}{datadir}) {
                delete $RESOURCE{$k};
@@ -899,14 +1138,45 @@
             }
          }
 
-         printf "writing facedata (%d faces, %d anims, %d resources)...\n",
+         printf "writing facedata...\n" if $VERBOSE;
+
+         {
+            open my $fh, ">:perlio", "$DATADIR/facedata~"
+               or die "$DATADIR/facedata~: $!";
+
+            print $fh "FACEDATA";
+            my $fofs = 8;
+
+            my $put = sub {
+               my $len = length $_[0];
+               my $ofs = $fofs;
+
+               print $fh $_[0];
+               $fofs += $len;
+
+               ($len, $ofs)
+            };
+
+            for (values %FACEINFO) {
+               ($_->{size32}, $_->{fofs32}) = $put->(delete $_->{data32});
+               ($_->{size64}, $_->{fofs64}) = $put->(delete $_->{data64});
+            }
+
+            for (values %RESOURCE) {
+               ($_->{size}, $_->{fofs}) = $put->(delete $_->{data});
+            }
+
+            close $fh;
+         }
+
+         printf "writing faceinfo (%d faces, %d anims, %d resources)...\n",
             scalar keys %FACEINFO,
             scalar keys %ANIMINFO,
             scalar keys %RESOURCE
                if $VERBOSE;
 
-         open my $fh, ">:perlio", "$DATADIR/facedata~"
-            or die "$DATADIR/facedata~: $!";
+         open my $fh, ">:perlio", "$DATADIR/faceinfo~"
+            or die "$DATADIR/faceinfo~: $!";
 
          print $fh nfreeze {
             version => 2,
@@ -914,12 +1184,11 @@
             animinfo => \%ANIMINFO,
             resource => \%RESOURCE,
          };
-
       }
 
       print "committing files...\n" if $VERBOSE;
 
-      for (qw(archetypes facedata treasures), @COMMIT) {
+      for (qw(archetypes faceinfo facedata treasures), @COMMIT) {
          chmod 0644, "$DATADIR/$_~";
          rename "$DATADIR/$_~", "$DATADIR/$_"
             or die "$DATADIR/$_: $!";