--- deliantra/server/utils/cfutil.in	2007/03/12 17:26:41	1.12
+++ deliantra/server/utils/cfutil.in	2007/04/26 00:50:03	1.33
@@ -11,6 +11,7 @@
 my $IDENTIFY = "@IDENTIFY@";
 my $OPTIPNG  = "@OPTIPNG@";
 my $RSYNC    = "@RSYNC@";
+my $PNGNQ    = "@PNGNQ@";
 
 use Getopt::Long;
 use Coro::Event;
@@ -22,6 +23,7 @@
 use Coro::AIO;
 use POSIX ();
 use Digest::MD5;
+use Coro::Storable; $Storable::canonical = 1;
 
 sub usage {
    warn <<EOF;
@@ -69,37 +71,40 @@
 sub inst_maps($) {
    my (undef, $path) = @_;
 
-   print "installing '$path' to '$DATADIR/maps'\n\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";
       exit 1 unless $FORCE;
    }
 
-   system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded";
+   system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
+      and die "map installation failed.\n";
+
+   print "maps installed successfully.\n";
 }
 
 {
-   our %PNG32;
+   our %ANIMINFO;
    our %FACEINFO;
    our @ARC;
+   our %ARC;
    our $TRS;
    our $NFILE;
-   our %ANIM;
-   our $SMOOTH;
+
+   our $QUANTIZE = "+dither -colorspace RGB -colors 256";
 
    our (@png, @trs, @arc); # files we are interested in
 
-   sub commit_png {
-      my ($name, $data) = @_;
+   sub commit_png($$$) {
+      my ($name, $data, $T) = @_;
 
-      $PNG32{$name} = $data;
-      $FACEINFO{$name} ||= {};
+      $FACEINFO{$name}{"data$T"} = $data;
    }
 
    sub process_png {
       while (@png) {
-         my $path = pop @png;
+         my ($path, $delete) = @{pop @png};
 
          my $png;
          aio_lstat $path;
@@ -110,22 +115,26 @@
             next;
          }
 
+         my $stem = $path;
+         my $T;
+
+         if ($stem =~ s/\.32x32\.png~?$//) {
+            $T = 32;
+         } elsif ($stem =~ s/\.64x64\.png~?$//) {
+            $T = 64;
+         } else {
+            warn "$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 recongized png file, skipping.\n";
+            warn "$path: not a recognized png file, skipping.\n";
             next;
          }
 
          my ($w, $h) = unpack "NN", $1;
 
-         (my $face = $path) =~ s/^.*\///;
-         my $T = 32;
-
-         unless ($face =~ s/\.base\.(...)\.png$/.$1/) {
-            warn "$path: weird filename, skipping.\n";
-            next;
-         }
-
          if ($w < $T || $h < $T) {
             warn "$path: too small ($w $h), skipping.\n";
             next;
@@ -136,6 +145,66 @@
             next;
          }
 
+         unless ($path =~ /~$/) {
+            # possibly enlarge
+            if (0 > aio_stat "$stem.64x64.png") {
+               my $other = "$stem.64x64.png~";
+
+               if (0 > aio_lstat $other or (-M _) > (-M $path)) {
+                  my $wrap = 0; # for the time being
+                  fork_sub {
+                     system "convert png:\Q$path\E -depth 8 rgba:-"
+                          . "| $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, "-i0", "-q", "$other~";
+                     die "$other~ has zero size, aborting." unless -s "$other~";
+                     rename "$other~", $other;
+                  };
+               }
+
+               push @png, [$other, !$CACHE];
+            }
+
+            # possibly scale down
+            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~";
+
+                     # reduce smoothfaces >10000 bytes
+                     if ($stem =~ /_S\./ && (-s "$other~") > 10000) {
+                        my $ncolor = 256;
+                        while () {
+                           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;
+                           $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 >= 2;
+                        rename "$other~~", "$other~";
+                     }
+
+                     die "$other~ has zero size, aborting." unless -s "$other~";
+                     rename "$other~", $other;
+                  };
+               }
+
+               #warn "scaled down $path to $other\n";#d#
+               push @png, [$other, !$CACHE];
+            }
+         }
+
+         (my $face = $stem) =~ s/^.*\///;
+
+         # split all bigfaces, but avoid smoothfaces (*_S)
          if (($w > $T || $h > $T) && $face !~ /_S\./) {
             # split
             my @tile;
@@ -159,7 +228,8 @@
                            "+clone",
                            -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T),
                            "+repage",
-                           -write => "png:$_->[2]~",
+                           -quality => "00",
+                           -write => "png32:$_->[2]~",
                            "+delete",
                            ")",
                         )
@@ -173,6 +243,7 @@
                   # pass 2, optimise, and rename
                   for (@todo) {
                      system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
+                     die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
                      rename "$_->[2]~", $_->[2];
                   }
                };
@@ -186,12 +257,14 @@
                   die "$path: unable to read tile +$x+$y, aborting.\n";
                }
                IO::AIO::aio_unlink $file unless $CACHE;
-               commit_png $x|$y ? "$face+$x+$y" : $face, $tile;
+               commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T;
             }
          } else {
             # use as-is (either small, use smooth)
-            commit_png $face, $png;
+            commit_png $face, $png, $T;
          }
+
+         aio_unlink $path if $delete;
       }
    }
 
@@ -205,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;
 
@@ -225,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};
@@ -233,17 +309,27 @@
                my $anim = delete $o->{anim};
 
                if ($anim) {
+                  # possibly add $ext to the animation name to avoid
+                  # the need to specify archnames for all parts
+                  # of a multipart archetype.
                   $o->{animation} = "$o->{_name}";
+                  my $facings = 1;
+                  my @frames;
 
                   for (@$anim) {
-                     $_ .= $ext unless /^facings\s|^blank.x11$|^empty.x11$/;
+                     if (/^facings\s+(\d+)/) {
+                        $facings = $1*1;
+                     } elsif (/^blank.x11$|^empty.x11$/) {
+                        push @frames, $_;
+                     } else {
+                        push @frames, "$_$ext";
+                     }
                   }
 
-                  $ANIM{"$o->{_name}$ext"} =
-                     join "", map "$_\n",
-                        "anim $o->{_name}",
-                        @$anim,
-                        "mina";
+                  $ANIMINFO{$o->{animation}} = {
+                     facings => $facings,
+                     frames  => \@frames,
+                  };
                }
 
                for my $face ($o->{face} || (), @{$anim || []}) {
@@ -256,7 +342,12 @@
                }
 
                if (my $smooth = delete $o->{smoothface}) {
-                  $SMOOTH .= "$smooth\n";
+                  my %kv =split /\s+/, $smooth;
+                  my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
+                  while (my ($face, $smooth) = each %kv) {
+                     $FACEINFO{$face}{smooth}      = $smooth;
+                     $FACEINFO{$face}{smoothlevel} = $level;
+                  }
                }
             }
          }
@@ -291,13 +382,13 @@
 
          for my $file (@$nondirs) {
             if ($file =~ /\.png$/) {
-               push @png, "$path/$file";
+               push @png, ["$path/$file", 0];
             } elsif ($file =~ /\.trs$/) {
                push @trs, [$path, $file];
             } elsif ($file =~ /\.arc$/) {
                push @arc, [$path, $file];
             } else {
-               warn "ignoring $path/$file\n" if $VERBOSE >= 2;
+               warn "ignoring $path/$file\n" if $VERBOSE >= 3;
             }
          }
       };
@@ -306,7 +397,15 @@
    sub inst_arch($) {
       my (undef, $path) = @_;
 
-      print "installing '$path' to '$DATADIR'\n\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";
@@ -317,28 +416,52 @@
       IO::AIO::flush;
 
       $_->join for (
-         (async \&process_png), (async \&process_png),
+         # four png crunchers work fine for my 2x smp machine
+         (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),
          (async \&process_trs), (async \&process_trs),
          (async \&process_arc), (async \&process_arc),
       );
 
       {
-         open my $fh, ">:utf8", "$DATADIR/animations~"
-            or die "$DATADIR/animations~: $!";
-         print $fh join "", map $ANIM{$_}, sort keys %ANIM
-      }
+         # 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;
-      }
-
-      {
-         open my $fh, ">:utf8", "$DATADIR/smooth~"
-            or die "$DATADIR/smooth~: $!";
-         print $fh $SMOOTH;
+         print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
       }
 
       {
@@ -349,25 +472,33 @@
 
       {
          while (my ($k, $v) = each %FACEINFO) {
-            $v->{data32} ||= delete $PNG32{$k};
-         }
-
-         while (my ($k, $v) = each %FACEINFO) {
             length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
+            length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
+
+            length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
+            #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
 
             $v->{chksum32} = Digest::MD5::md5 $v->{data32};
+            $v->{chksum64} = Digest::MD5::md5 $v->{data64};
          }
 
-         open my $fh, ">:perlio", "$DATADIR/faces~"
-            or die "$DATADIR/faces~: $!";
+         open my $fh, ">:perlio", "$DATADIR/facedata~"
+            or die "$DATADIR/facedata~: $!";
 
-         print $fh Storable::nfreeze \%FACEINFO;
+         print $fh freeze {
+            version => 2,
+            faceinfo => \%FACEINFO,
+            animinfo => \%ANIMINFO,
+         };
       }
 
-      for (qw(archetypes faces animations treasures smooth)) {
+      for (qw(archetypes facedata treasures)) {
          chmod 0644, "$DATADIR/$_~";
-         rename "$DATADIR/$_~", "$DATADIR/$_";
+         rename "$DATADIR/$_~", "$DATADIR/$_"
+            or die "$DATADIR/$_: $!";
       }
+
+      print "archetype data installed successfully.\n";
    }
 }