--- deliantra/server/utils/cfutil.in	2007/08/20 22:09:04	1.57
+++ deliantra/server/utils/cfutil.in	2007/12/28 12:44:45	1.67
@@ -16,9 +16,11 @@
 use Getopt::Long;
 use Coro::Event;
 use AnyEvent;
+use YAML::Syck ();
+use JSON::XS ();
 use IO::AIO ();
 use File::Temp;
-use Crossfire;
+use Deliantra;
 use Coro;
 use Coro::AIO;
 use Coro::Util;
@@ -98,7 +100,10 @@
       exit 1 unless $FORCE;
    }
 
-   system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
+   system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
+          "$path/.", "$DATADIR/maps/.",
+          "--exclude", "CVS", "--exclude", "/world-precomposed",
+          "--delete", "--delete-excluded"
       and die "map installation failed.\n";
 
    print "maps installed successfully.\n";
@@ -175,12 +180,11 @@
 
          my $fi = $FACEINFO{$base};
          unless ($fi) {
-            warn "$path: <$base> not referenced by any archetype, skipping.\n";
-            next;
+            #warn "$path: <$base> not referenced by any archetype, skipping.\n";
+            #next;
          }
 
-         my $arc = $FACEINFO{$base}{arc}
-            or die "FATAL: internal error <$base>, cannot continue";
+         my $arc = $fi->{arc} || { };
 
          unless ($path =~ /~$/) {
             # possibly enlarge
@@ -427,8 +431,11 @@
                   };
                }
 
-               for my $face ($o->{face} || (), @{$anim || []}) {
-                  next if $face =~ /^facings\s/;
+               for ($o->{face} || (), @{$anim || []}) {
+                  next if /^facings\s/;
+
+                  my $face = $_;
+                  $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
 
                   my $info = $FACEINFO{$face} ||= { };
                   $info->{arc} = $o;
@@ -494,9 +501,16 @@
          my $data;
          aio_load "$dir/$file", $data;
 
-         my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
+         my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
+
+         utf8::decode $dir;
+         utf8::decode $file;
 
-         next if $meta && !exists $meta->{$file};
+         # a meta file for resources is now mandatory
+         unless (exists $meta->{$file}) {
+            warn "skipping $dir/$file\n" if $VERBOSE >= 3;
+            next;
+         }
 
          $meta = {
             %{ $meta->{""   } || {} },
@@ -519,8 +533,21 @@
 
          substr $dir, 0, 1 + length $PATH, "";
 
+         if (my $filter = $meta->{cfutil_filter}) {
+            if ($filter eq "yaml2json") {
+               $data = JSON::XS::encode_json YAML::Syck::Load $data;
+            } elsif ($filter eq "json2json") {
+               $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
+            } elsif ($filter eq "perl2json") {
+               $data = eval $data; die if $@;
+               $data = JSON::XS::encode_json $data;
+            } else {
+               warn "$dir/$file: unknown filter $filter, skipping\n";
+            }
+         }
+
          $RESOURCE{"$dir/$file"} = {
-            type   => (delete $meta->{type}) || $type,
+            type   => (exists $meta->{type} ? delete $meta->{type} : $type),
             data   => $data,
             %$meta ? (meta => $meta) : (),
          };
@@ -551,10 +578,13 @@
                   if $file =~ /\.(wav|ogg)$/;
 
             } elsif ($dir =~ /^res(?:\/|$)/) {
-               $c_res->put ([$path, $file, 0]) # FT_FACE
-                  if $file =~ /\.(jpg|png)$/;
-               $c_res->put ([$path, $file, 7]) # FT_RSRC
-                  if $file =~ /\.(res)$/;
+               if ($file =~ /\.(jpg|png)$/) {
+                  $c_res->put ([$path, $file, 0]) # FT_FACE
+               } elsif ($file =~ /\.(res)$/) {
+                  $c_res->put ([$path, $file, 6]) # FT_RSRC
+               } else {
+                  $c_res->put ([$path, $file, undef]);
+               }
 
             } elsif ($file =~ /\.png$/) {
                push @c_png, ["$path/$file", 0];
@@ -662,7 +692,7 @@
          print "writing archetypes...\n" if $VERBOSE;
          open my $fh, ">:utf8", "$DATADIR/archetypes~"
             or die "$DATADIR/archetypes~: $!";
-         print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
+         print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
       }
 
       {