ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.62 by root, Mon Sep 10 18:30:30 2007 UTC vs.
Revision 1.94 by root, Wed Oct 6 00:18:14 2010 UTC

1#!@PERL@ 1#!@PERL@
2 2
3use strict; 3#
4# This file is part of Deliantra, the Roguelike Realtime MMORPG.
5#
6# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
7#
8# Deliantra is free software: you can redistribute it and/or modify it under
9# the terms of the Affero GNU General Public License as published by the
10# Free Software Foundation, either version 3 of the License, or (at your
11# option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU General Public License for more details.
17#
18# You should have received a copy of the Affero GNU General Public License
19# and the GNU General Public License along with this program. If not, see
20# <http://www.gnu.org/licenses/>.
21#
22# The authors can be reached via e-mail to <support@deliantra.net>
23#
24
25use common::sense;
4 26
5my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
6my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
7my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
… …
12my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@"; 36my $PNGNQ = "@PNGNQ@";
15 37
16use Getopt::Long; 38use Getopt::Long;
39use File::Temp;
40use POSIX ();
41use Carp;
42
17use Coro::Event; 43use Coro::EV;
18use AnyEvent; 44use AnyEvent;
45use YAML::XS ();
46use JSON::XS ();
19use IO::AIO (); 47use IO::AIO ();
20use File::Temp; 48use Digest::MD5 ();
21use Crossfire; 49
22use Coro; 50use Coro 5.12;
23use Coro::AIO; 51use Coro::AIO;
24use Coro::Util; 52use Coro::Util;
25use POSIX ();
26use Carp;
27use Coro::Channel; 53use Coro::Channel;
28use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
29 57
30$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
31 59
32sub usage { 60sub usage {
33 warn <<EOF; 61 warn <<EOF;
… …
46my $VERBOSE = 1; 74my $VERBOSE = 1;
47my $CACHE = 0; 75my $CACHE = 0;
48my $FORCE; 76my $FORCE;
49my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
50my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
51 80
52our %COLOR = ( 81our %COLOR = (
53 black => 0, 82 black => 0,
54 white => 1, 83 white => 1,
55 navy => 2, 84 navy => 2,
… …
65 tan => 12, 94 tan => 12,
66); 95);
67 96
68END { system "rm", "-rf", $TMPDIR } 97END { system "rm", "-rf", $TMPDIR }
69 98
70Event->signal (signal => "INT", cb => sub { exit 1 }); 99my $s_INT = EV::signal INT => sub { exit 1 };
71Event->signal (signal => "TERM", cb => sub { exit 1 }); 100my $s_TERM = EV::signal TERM => sub { exit 1 };
101
102our %hash;
103
104# here we could try to avoid collisions and reduce chksum size further
105sub make_hash($\$\$;$) {
106 my ($id, $dataref, $hashref, $clen) = @_;
107
108 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
109
110 if (exists $hash{$hash}) {
111 # hash collision, but some files are simply identical
112 if (${$hash{$hash}[1]} ne $$dataref) {
113 warn "hash collision $hash{$hash}[0] vs. $id\n";
114 exit 1;
115 } else {
116 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
117 }
118 }
119 $hash{$hash} = [$id, $dataref, $hashref];
120
121 $$hashref = $hash;
122}
72 123
73mkdir $TMPDIR, 0700 124mkdir $TMPDIR, 0700
74 or die "$TMPDIR: $!"; 125 or die "$TMPDIR: $!";
75 126
76sub fork_sub(&) { 127sub fork_sub(&) {
… …
105 and die "map installation failed.\n"; 156 and die "map installation failed.\n";
106 157
107 print "maps installed successfully.\n"; 158 print "maps installed successfully.\n";
108} 159}
109 160
161our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
162
163sub autoglyph {
164 my ($stem, $face) = @_;
165
166 if ($stem =~ /^wall\/|Nimwall/) {
167 return $WALL_SUFFIX[hex $1]
168 if $stem =~ $stem =~ /(_[0-9A-F]).x11/;
169
170 "+"
171
172 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
173 "."
174
175 } elsif ($stem =~ /^player\//) {
176 "\@"
177
178 } else {
179 substr $stem, 0, 1
180 }
181}
182
110{ 183{
111 our %ANIMINFO; 184 our %ANIMINFO;
112 our %FACEINFO; 185 our %FACEINFO;
113 our %RESOURCE; 186 our %RESOURCE;
114 our @ARC; 187 our @ARC;
… …
123 our $c_trs = new Coro::Channel; 196 our $c_trs = new Coro::Channel;
124 our $c_res = new Coro::Channel; 197 our $c_res = new Coro::Channel;
125 198
126 our @c_png; 199 our @c_png;
127 200
128 sub commit_png($$$) { 201 sub commit_png($$$$) {
129 my ($name, $data, $T) = @_; 202 my ($stem, $name, $data, $T) = @_;
130 203
204 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
131 $FACEINFO{$name}{"data$T"} = $data; 205 $FACEINFO{$name}{"data$T"} = $data;
132 } 206 }
133 207
134 sub process_png { 208 sub process_png {
135 while (@c_png) { 209 while (@c_png) {
… …
271 fork_sub { 345 fork_sub {
272 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 346 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
273 system $OPTIPNG, "-i0", "-q", "$other~"; 347 system $OPTIPNG, "-i0", "-q", "$other~";
274 348
275 # reduce smoothfaces >10000 bytes 349 # reduce smoothfaces >10000 bytes
350 # obsolete, no longer required
276 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 351 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
277 my $ncolor = 256; 352 my $ncolor = 256;
278 while () { 353 while () {
279 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 354 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
280 system $OPTIPNG, "-i0", "-q", "$other~~"; 355 system $OPTIPNG, "-i0", "-q", "$other~~";
281 last if 10000 > -s "$other~~"; 356 last if 10000 > -s "$other~~";
… …
352 427
353 if (0 > aio_load $file, $tile) { 428 if (0 > aio_load $file, $tile) {
354 die "$path: unable to read tile +$x+$y, aborting.\n"; 429 die "$path: unable to read tile +$x+$y, aborting.\n";
355 } 430 }
356 IO::AIO::aio_unlink $file unless $CACHE; 431 IO::AIO::aio_unlink $file unless $CACHE;
357 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 432 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
358 } 433 }
359 } else { 434 } else {
360 # use as-is (either small, use smooth) 435 # use as-is (either small, use smooth)
361 commit_png $face, $png, $T; 436 commit_png $stem, $face, $png, $T;
362 } 437 }
363 438
364 aio_unlink $path if $delete; 439 aio_unlink $path if $delete;
365 } 440 }
366 } 441 }
… …
377 push @ARC, $o; 452 push @ARC, $o;
378 for (my $m = $o; $m; $m = $m->{more}) { 453 for (my $m = $o; $m; $m = $m->{more}) {
379 $ARC{$m->{_name}} = $m; 454 $ARC{$m->{_name}} = $m;
380 } 455 }
381 456
382 $o->{editor_folder} = $dir; 457 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
383 458
384 my $visibility = delete $o->{visibility}; 459 my $visibility = delete $o->{visibility};
385 my $magicmap = delete $o->{magicmap}; 460 my $magicmap = delete $o->{magicmap};
461 my $glyph = delete $o->{glyph};
386 462
387 # find upper left corner :/ 463 # find upper left corner :/
388 # omg, this is sooo broken 464 # omg, this is sooo broken
389 my ($dx, $dy); 465 my ($dx, $dy);
390 for (my $o = $o; $o; $o = $o->{more}) { 466 for (my $o = $o; $o; $o = $o->{more}) {
… …
400 476
401 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 477 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
402 478
403 $visibility = delete $o->{visibility} if exists $o->{visibility}; 479 $visibility = delete $o->{visibility} if exists $o->{visibility};
404 $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 480 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
481 $glyph = delete $o->{glyph} if exists $o->{glyph};
405 482
406 my $anim = delete $o->{anim}; 483 my $anim = delete $o->{anim};
407 484
408 if ($anim) { 485 if ($anim) {
409 # possibly add $ext to the animation name to avoid 486 # possibly add $ext to the animation name to avoid
… …
440 517
441 next if $face =~ /^blank.x11$|^empty.x11$/; 518 next if $face =~ /^blank.x11$|^empty.x11$/;
442 519
443 $info->{visibility} = $visibility if defined $visibility; 520 $info->{visibility} = $visibility if defined $visibility;
444 $info->{magicmap} = $magicmap if defined $magicmap; 521 $info->{magicmap} = $magicmap if defined $magicmap;
522 $info->{glyph} = $glyph if defined $glyph;
445 } 523 }
446 524
447 if (my $smooth = delete $o->{smoothface}) { 525 if (my $smooth = delete $o->{smoothface}) {
448 my %kv = split /\s+/, $smooth; 526 my %kv = split /\s+/, $smooth;
449 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 527 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
497 my ($dir, $file, $type) = @$job; 575 my ($dir, $file, $type) = @$job;
498 576
499 my $data; 577 my $data;
500 aio_load "$dir/$file", $data; 578 aio_load "$dir/$file", $data;
501 579
502
503 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 580 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
504 581
505 utf8::decode $dir; 582 utf8::decode $dir;
506 utf8::decode $file; 583 utf8::decode $file;
507 584
… …
519 if ($meta->{license} =~ s/^#//) { 596 if ($meta->{license} =~ s/^#//) {
520 $meta->{license} = ({ 597 $meta->{license} = ({
521 "pd" => "Public Domain", 598 "pd" => "Public Domain",
522 "gpl" => "GNU General Public License, version 3.0 or any later", 599 "gpl" => "GNU General Public License, version 3.0 or any later",
523 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 600 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
601 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
524 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 602 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
525 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 603 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
526 })->{$meta->{license}} 604 })->{$meta->{license}}
527 || warn "$dir/$file: license tag '$meta->{license}' not found."; 605 || warn "$dir/$file: license tag '$meta->{license}' not found.";
528 } 606 }
529 607
608 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
609 ($meta->{author} = $1) =~ s/_/ /g;
610 }
611
530 $file =~ s/\.res$//; 612 $file =~ s/\.res$//;
531 $file =~ s/\.(ogg|wav|jpg|png)$//; 613 $file =~ s/\.(ogg|wav|jpg|png)$//;
532 614
533 substr $dir, 0, 1 + length $PATH, ""; 615 substr $dir, 0, 1 + length $PATH, "";
534 616
617 if (my $filter = $meta->{cfutil_filter}) {
618 if ($filter eq "yaml2json") {
619 $data = JSON::XS::encode_json YAML::XS::Load $data;
620 } elsif ($filter eq "json2json") {
621 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
622 } elsif ($filter eq "perl2json") {
623 $data = eval $data; die if $@;
624 $data = JSON::XS::encode_json $data;
625 } else {
626 warn "$dir/$file: unknown filter $filter, skipping\n";
627 }
628 }
629
535 $RESOURCE{"$dir/$file"} = { 630 $RESOURCE{"$dir/$file"} = {
536 type => (delete $meta->{type}) || $type, 631 type => (exists $meta->{type} ? delete $meta->{type} : $type),
537 data => $data, 632 data => $data,
538 %$meta ? (meta => $meta) : (), 633 %$meta ? (meta => $meta) : (),
539 }; 634 };
540 } 635 }
541 } 636 }
… …
547 IO::AIO::aioreq_pri 4; 642 IO::AIO::aioreq_pri 4;
548 IO::AIO::aio_scandir $path, 4, sub { 643 IO::AIO::aio_scandir $path, 4, sub {
549 my ($dirs, $nondirs) = @_; 644 my ($dirs, $nondirs) = @_;
550 645
551 find_files "$path/$_" 646 find_files "$path/$_"
552 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 647 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
553 648
554 my $dir = $path; 649 my $dir = $path;
555 substr $dir, 0, 1 + length $PATH, ""; 650 substr $dir, 0, 1 + length $PATH, "";
556 651
557 for my $file (@$nondirs) { 652 for my $file (@$nondirs) {
… …
562 } elsif ($dir =~ /^sound(?:\/|$)/) { 657 } elsif ($dir =~ /^sound(?:\/|$)/) {
563 $c_res->put ([$path, $file, 5]) # FT_SOUND 658 $c_res->put ([$path, $file, 5]) # FT_SOUND
564 if $file =~ /\.(wav|ogg)$/; 659 if $file =~ /\.(wav|ogg)$/;
565 660
566 } elsif ($dir =~ /^res(?:\/|$)/) { 661 } elsif ($dir =~ /^res(?:\/|$)/) {
662 if ($file =~ /\.(jpg|png)$/) {
567 $c_res->put ([$path, $file, 0]) # FT_FACE 663 $c_res->put ([$path, $file, 0]) # FT_FACE
568 if $file =~ /\.(jpg|png)$/; 664 } elsif ($file =~ /\.(res)$/) {
569 $c_res->put ([$path, $file, 7]) # FT_RSRC 665 $c_res->put ([$path, $file, 6]) # FT_RSRC
570 if $file =~ /\.(res)$/; 666 } else {
667 $c_res->put ([$path, $file, undef]);
668 }
571 669
572 } elsif ($file =~ /\.png$/) { 670 } elsif ($file =~ /\.png$/) {
573 push @c_png, ["$path/$file", 0]; 671 push @c_png, ["$path/$file", 0];
574 672
575 } elsif ($file =~ /\.trs$/) { 673 } elsif ($file =~ /\.trs$/) {
… …
581 } else { 679 } else {
582 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 680 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
583 } 681 }
584 } 682 }
585 }; 683 };
684 }
685
686 sub generate_plurals {
687# use Lingua::EN::Inflect ();
688# Lingua::EN::Inflect::classical;
689# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
690# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
691#
692# for my $a (@ARC) {
693# my $name = $a->{name} || $a->{_name};
694#
695# next unless $a->{name_pl};
696# next if $a->{invisible};
697# next if $a->{is_floor};
698# next if $a->{no_pick};
699#
700# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
701# my $pl = $test =~ /^(?:eq|p:.)$/
702# ? $name
703# : Lingua::EN::Inflect::PL $name;
704#
705# if ($pl ne $a->{name_pl}) {
706# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
707# }
708# }
586 } 709 }
587 710
588 sub inst_arch($) { 711 sub inst_arch($) {
589 my (undef, $path) = @_; 712 my (undef, $path) = @_;
590 713
… …
613 my @a_res = map +(async \&process_res), 1..2; 736 my @a_res = map +(async \&process_res), 1..2;
614 my @a_trs = map +(async \&process_trs), 1..2; 737 my @a_trs = map +(async \&process_trs), 1..2;
615 738
616 IO::AIO::flush; 739 IO::AIO::flush;
617 740
618 $c_res->put (undef) for @a_res; 741 $c_res->shutdown;
619 $c_arc->put (undef) for @a_arc; 742 $c_arc->shutdown;
620 $c_trs->put (undef) for @a_trs; 743 $c_trs->shutdown;
621 744
622 print "start file scan, arc, res processing...\n" if $VERBOSE; 745 print "start file scan, arc, res processing...\n" if $VERBOSE;
623 746
624 $_->join for @a_arc; # need to parse all archetypes before png processing 747 $_->join for @a_arc; # need to parse all archetypes before png processing
625 748
626 print "end arc, start png processing...\n" if $VERBOSE; 749 print "end arc, start png processing...\n" if $VERBOSE;
627 750
628 # four png crunchers work fine for my 2x smp machine 751 # eight png crunchers work fine for my 4x smp machine
629 my @a_png = map +(async \&process_png), 1..4; 752 my @a_png = map +(async \&process_png), 1..8;
630 753
631 $_->join for (@a_trs, @a_res, @a_png); 754 $_->join for (@a_trs, @a_res, @a_png);
632 755
633 print "scanning done, processing results...\n" if $VERBOSE; 756 print "scanning done, processing results...\n" if $VERBOSE;
634 { 757 {
635 # remove path prefix from editor_folder 758 # remove path prefix from editor_folder
759 $_->{editor_folder} =~ /^\x00/
636 substr $_->{editor_folder}, 0, 1 + length $path, "" 760 and substr $_->{editor_folder}, 0, 2 + length $path, ""
637 for values %ARC; 761 for values %ARC;
638 762
639 print "resolving inheritance tree...\n" if $VERBOSE; 763 print "resolving inheritance tree...\n" if $VERBOSE;
640 # resolve inherit 764 # resolve inherit
641 while () { 765 while () {
642 my $progress; 766 my $progress;
643 my $loop; 767 my $loop;
644 768
645 for my $o (values %ARC) { 769 for my $o (values %ARC) {
646 if (my $other = $o->{inherit}) { 770 for my $other (split /,/, $o->{inherit}) {
647 if (my $s = $ARC{$other}) { 771 if (my $s = $ARC{$other}) {
648 if ($s->{inherit}) { 772 if ($s->{inherit}) {
649 $loop = $s; 773 $loop = $s;
650 } else { 774 } else {
651 delete $o->{inherit}; 775 delete $o->{inherit};
… …
670 } 794 }
671 795
672 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 796 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
673 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 797 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
674 798
799 print "generating plurals...\n" if $VERBOSE;
800 generate_plurals;
801
675 print "writing archetypes...\n" if $VERBOSE; 802 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
676 open my $fh, ">:utf8", "$DATADIR/archetypes~" 803 open my $fh, ">:utf8", "$DATADIR/archetypes~"
677 or die "$DATADIR/archetypes~: $!"; 804 or die "$DATADIR/archetypes~: $!";
678 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 805 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
679 } 806 }
680 807
681 { 808 {
682 print "writing treasures...\n" if $VERBOSE; 809 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
683 open my $fh, ">:utf8", "$DATADIR/treasures~" 810 open my $fh, ">:utf8", "$DATADIR/treasures~"
684 or die "$DATADIR/treasures~: $!"; 811 or die "$DATADIR/treasures~: $!";
685 print $fh $TRS; 812 print $fh $TRS;
686 } 813 }
687 814
… …
689 print "processing facedata...\n" if $VERBOSE; 816 print "processing facedata...\n" if $VERBOSE;
690 while (my ($k, $v) = each %FACEINFO) { 817 while (my ($k, $v) = each %FACEINFO) {
691 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 818 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
692 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 819 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
693 820
821 make_hash $k, $v->{data32}, $v->{hash32};
822 make_hash $k, $v->{data64}, $v->{hash64};
823
694 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 824 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
695 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 825 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
696 826
697 if (my $magicmap = $v->{magicmap}) { 827 if (my $magicmap = $v->{magicmap}) {
698 $magicmap =~ y/A-Z_\-/a-z/d; 828 $magicmap =~ y/A-Z_\-/a-z/d;
699 $v->{magicmap} = $COLOR{$magicmap}; 829 $v->{magicmap} = $COLOR{$magicmap};
700 } 830 }
701 831
832 my $stem = delete $v->{stem};
833 $v->{glyph} //= autoglyph $stem, $v;
834 utf8::encode $v->{glyph};
835 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
836
702 delete $v->{arc}; 837 delete $v->{arc};
703 } 838 }
704 839
705 print "writing facedata...\n" if $VERBOSE; 840 print "processing resources...\n" if $VERBOSE;
841 my $enc = JSON::XS->new->utf8->canonical->relaxed;
842 while (my ($k, $v) = each %RESOURCE) {
843
844 if ($v->{meta} && $v->{meta}{datadir}) {
845 delete $RESOURCE{$k};
846
847 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
848
849 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
850 open my $fh, ">:raw", "$DATADIR/$k~"
851 or die "$DATADIR/$k~: $!";
852 syswrite $fh, $v->{data};
853 push @COMMIT, $k;
854
855 } else {
856 if ($v->{type} & 1) {
857 # prepend meta info
858
859 my $meta = $enc->encode ({
860 name => $k,
861 %{ $v->{meta} || {} },
862 });
863
864 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
865 }
866
867 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
868 }
869 }
870
871 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
872 scalar keys %FACEINFO,
873 scalar keys %ANIMINFO,
874 scalar keys %RESOURCE
875 if $VERBOSE;
876
706 open my $fh, ">:perlio", "$DATADIR/facedata~" 877 open my $fh, ">:perlio", "$DATADIR/facedata~"
707 or die "$DATADIR/facedata~: $!"; 878 or die "$DATADIR/facedata~: $!";
708 879
709 print $fh freeze { 880 print $fh nfreeze {
710 version => 2, 881 version => 2,
711 faceinfo => \%FACEINFO, 882 faceinfo => \%FACEINFO,
712 animinfo => \%ANIMINFO, 883 animinfo => \%ANIMINFO,
713 resource => \%RESOURCE, 884 resource => \%RESOURCE,
714 }; 885 };
886
715 } 887 }
716 888
717 print "committing files...\n" if $VERBOSE; 889 print "committing files...\n" if $VERBOSE;
718 890
719 for (qw(archetypes facedata treasures)) { 891 for (qw(archetypes facedata treasures), @COMMIT) {
720 chmod 0644, "$DATADIR/$_~"; 892 chmod 0644, "$DATADIR/$_~";
721 rename "$DATADIR/$_~", "$DATADIR/$_" 893 rename "$DATADIR/$_~", "$DATADIR/$_"
722 or die "$DATADIR/$_: $!"; 894 or die "$DATADIR/$_: $!";
723 } 895 }
724 896

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines