--- deliantra/server/utils/cfutil.in	2007/04/10 09:35:24	1.23
+++ deliantra/server/utils/cfutil.in	2007/04/18 09:38:58	1.29
@@ -22,7 +22,7 @@
 use Coro::AIO;
 use POSIX ();
 use Digest::MD5;
-use Storable; $Storable::canonical = 1;
+use Coro::Storable; $Storable::canonical = 1;
 
 sub usage {
    warn <<EOF;
@@ -70,7 +70,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";
@@ -84,11 +84,11 @@
 }
 
 {
+   our %ANIMINFO;
    our %FACEINFO;
-   our @ARC;
+   our %ARC;
    our $TRS;
    our $NFILE;
-   our %ANIM;
 
    our $QUANTIZE = "+dither -colorspace RGB -colors 256";
 
@@ -257,7 +257,7 @@
 
          my $arc = read_arch "$dir/$file";
          for my $o (values %$arc) {
-            push @ARC, $o;
+            $ARC{$o->{_name}} = $o;
 
             $o->{editor_folder} = $dir;
 
@@ -278,7 +278,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};
@@ -286,17 +286,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 || []}) {
@@ -364,9 +374,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";
@@ -384,16 +400,43 @@
       );
 
       {
-         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};
+                        %$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} } values %ARC];
       }
 
       {
@@ -417,11 +460,14 @@
          open my $fh, ">:perlio", "$DATADIR/facedata~"
             or die "$DATADIR/facedata~: $!";
 
-         $FACEINFO{""} = { version => 1};
-         print $fh Storable::nfreeze \%FACEINFO;
+         print $fh freeze {
+            version => 2,
+            faceinfo => \%FACEINFO,
+            animinfo => \%ANIMINFO,
+         };
       }
 
-      for (qw(archetypes facedata animations treasures)) {
+      for (qw(archetypes facedata treasures)) {
          chmod 0644, "$DATADIR/$_~";
          rename "$DATADIR/$_~", "$DATADIR/$_"
             or die "$DATADIR/$_: $!";