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.64 by root, Mon Dec 17 08:50:15 2007 UTC vs.
Revision 1.100 by root, Wed Oct 6 03:44:55 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;
19use YAML::Syck (); 45use YAML::XS ();
20use JSON::XS (); 46use JSON::XS ();
21use IO::AIO (); 47use IO::AIO ();
22use File::Temp; 48use Digest::MD5 ();
23use Crossfire; 49
24use Coro; 50use Coro 5.12;
25use Coro::AIO; 51use Coro::AIO;
26use Coro::Util; 52use Coro::Util;
27use POSIX ();
28use Carp;
29use Coro::Channel; 53use Coro::Channel;
30use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
31 57
32$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
33 59
34sub usage { 60sub usage {
35 warn <<EOF; 61 warn <<EOF;
… …
48my $VERBOSE = 1; 74my $VERBOSE = 1;
49my $CACHE = 0; 75my $CACHE = 0;
50my $FORCE; 76my $FORCE;
51my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
52my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
53 80
54our %COLOR = ( 81our %COLOR = (
55 black => 0, 82 black => 0,
56 white => 1, 83 white => 1,
57 navy => 2, 84 navy => 2,
… …
67 tan => 12, 94 tan => 12,
68); 95);
69 96
70END { system "rm", "-rf", $TMPDIR } 97END { system "rm", "-rf", $TMPDIR }
71 98
72Event->signal (signal => "INT", cb => sub { exit 1 }); 99my $s_INT = EV::signal INT => sub { exit 1 };
73Event->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}
74 123
75mkdir $TMPDIR, 0700 124mkdir $TMPDIR, 0700
76 or die "$TMPDIR: $!"; 125 or die "$TMPDIR: $!";
77 126
78sub fork_sub(&) { 127sub fork_sub(&) {
… …
107 and die "map installation failed.\n"; 156 and die "map installation failed.\n";
108 157
109 print "maps installed successfully.\n"; 158 print "maps installed successfully.\n";
110} 159}
111 160
161our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
162
163# used to create crude text glyphs for text-based clients
164sub autoglyph {
165 my ($stem, $face) = @_;
166
167 if ($stem =~ /^wall\/|Nimwall/) {
168 return $WALL_SUFFIX[hex $1]
169 if $stem =~ /(_[0-9A-F]).x11/;
170
171 "█"
172
173 } elsif ($stem =~ /^traps\//) {
174 "☠"
175
176 } elsif ($stem =~ /^armour\/shield/) {
177 "Ø"
178
179 } elsif ($stem =~ /^armour\//) {
180 "A"
181
182 } elsif ($stem =~ /^weapon\//) {
183 "†"
184
185 } elsif ($stem =~ /^readable\//) {
186 "✉"
187
188 } elsif ($stem =~ /^river\//) {
189 "~"
190
191 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
192 "·"
193
194 } elsif ($stem =~ /^spells\//) {
195 "!"
196
197 } elsif ($stem =~ /^player\//) {
198 "\@"
199
200 } elsif ($stem =~ /^(?:monster|misc|class|connect|gods|indoor|inorganic|mining|music|skills).*\/(.)/) {
201 $1
202
203 } else {
204 substr $stem, 0, 1
205 }
206}
207
112{ 208{
113 our %ANIMINFO; 209 our %ANIMINFO;
114 our %FACEINFO; 210 our %FACEINFO;
115 our %RESOURCE; 211 our %RESOURCE;
116 our @ARC; 212 our @ARC;
… …
125 our $c_trs = new Coro::Channel; 221 our $c_trs = new Coro::Channel;
126 our $c_res = new Coro::Channel; 222 our $c_res = new Coro::Channel;
127 223
128 our @c_png; 224 our @c_png;
129 225
130 sub commit_png($$$) { 226 sub commit_png($$$$) {
131 my ($name, $data, $T) = @_; 227 my ($stem, $name, $data, $T) = @_;
132 228
229 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
133 $FACEINFO{$name}{"data$T"} = $data; 230 $FACEINFO{$name}{"data$T"} = $data;
134 } 231 }
135 232
136 sub process_png { 233 sub process_png {
137 while (@c_png) { 234 while (@c_png) {
… …
273 fork_sub { 370 fork_sub {
274 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 371 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
275 system $OPTIPNG, "-i0", "-q", "$other~"; 372 system $OPTIPNG, "-i0", "-q", "$other~";
276 373
277 # reduce smoothfaces >10000 bytes 374 # reduce smoothfaces >10000 bytes
375 # obsolete, no longer required
278 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 376 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
279 my $ncolor = 256; 377 my $ncolor = 256;
280 while () { 378 while () {
281 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 379 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
282 system $OPTIPNG, "-i0", "-q", "$other~~"; 380 system $OPTIPNG, "-i0", "-q", "$other~~";
283 last if 10000 > -s "$other~~"; 381 last if 10000 > -s "$other~~";
… …
354 452
355 if (0 > aio_load $file, $tile) { 453 if (0 > aio_load $file, $tile) {
356 die "$path: unable to read tile +$x+$y, aborting.\n"; 454 die "$path: unable to read tile +$x+$y, aborting.\n";
357 } 455 }
358 IO::AIO::aio_unlink $file unless $CACHE; 456 IO::AIO::aio_unlink $file unless $CACHE;
359 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 457 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
360 } 458 }
361 } else { 459 } else {
362 # use as-is (either small, use smooth) 460 # use as-is (either small, use smooth)
363 commit_png $face, $png, $T; 461 commit_png $stem, $face, $png, $T;
364 } 462 }
365 463
366 aio_unlink $path if $delete; 464 aio_unlink $path if $delete;
367 } 465 }
368 } 466 }
… …
379 push @ARC, $o; 477 push @ARC, $o;
380 for (my $m = $o; $m; $m = $m->{more}) { 478 for (my $m = $o; $m; $m = $m->{more}) {
381 $ARC{$m->{_name}} = $m; 479 $ARC{$m->{_name}} = $m;
382 } 480 }
383 481
384 $o->{editor_folder} = $dir; 482 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
385 483
386 my $visibility = delete $o->{visibility}; 484 my $visibility = delete $o->{visibility};
387 my $magicmap = delete $o->{magicmap}; 485 my $magicmap = delete $o->{magicmap};
486 my $glyph = delete $o->{glyph};
388 487
389 # find upper left corner :/ 488 # find upper left corner :/
390 # omg, this is sooo broken 489 # omg, this is sooo broken
391 my ($dx, $dy); 490 my ($dx, $dy);
392 for (my $o = $o; $o; $o = $o->{more}) { 491 for (my $o = $o; $o; $o = $o->{more}) {
… …
402 501
403 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 502 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
404 503
405 $visibility = delete $o->{visibility} if exists $o->{visibility}; 504 $visibility = delete $o->{visibility} if exists $o->{visibility};
406 $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 505 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
506 $glyph = delete $o->{glyph} if exists $o->{glyph};
407 507
408 my $anim = delete $o->{anim}; 508 my $anim = delete $o->{anim};
409 509
410 if ($anim) { 510 if ($anim) {
411 # possibly add $ext to the animation name to avoid 511 # possibly add $ext to the animation name to avoid
… …
442 542
443 next if $face =~ /^blank.x11$|^empty.x11$/; 543 next if $face =~ /^blank.x11$|^empty.x11$/;
444 544
445 $info->{visibility} = $visibility if defined $visibility; 545 $info->{visibility} = $visibility if defined $visibility;
446 $info->{magicmap} = $magicmap if defined $magicmap; 546 $info->{magicmap} = $magicmap if defined $magicmap;
547 $info->{glyph} = $glyph if defined $glyph;
447 } 548 }
448 549
449 if (my $smooth = delete $o->{smoothface}) { 550 if (my $smooth = delete $o->{smoothface}) {
450 my %kv = split /\s+/, $smooth; 551 my %kv = split /\s+/, $smooth;
451 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 552 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
520 if ($meta->{license} =~ s/^#//) { 621 if ($meta->{license} =~ s/^#//) {
521 $meta->{license} = ({ 622 $meta->{license} = ({
522 "pd" => "Public Domain", 623 "pd" => "Public Domain",
523 "gpl" => "GNU General Public License, version 3.0 or any later", 624 "gpl" => "GNU General Public License, version 3.0 or any later",
524 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 625 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
626 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
525 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 627 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
526 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 628 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
527 })->{$meta->{license}} 629 })->{$meta->{license}}
528 || warn "$dir/$file: license tag '$meta->{license}' not found."; 630 || warn "$dir/$file: license tag '$meta->{license}' not found.";
529 } 631 }
530 632
633 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
634 ($meta->{author} = $1) =~ s/_/ /g;
635 }
636
531 $file =~ s/\.res$//; 637 $file =~ s/\.res$//;
532 $file =~ s/\.(ogg|wav|jpg|png)$//; 638 $file =~ s/\.(ogg|wav|jpg|png)$//;
533 639
534 substr $dir, 0, 1 + length $PATH, ""; 640 substr $dir, 0, 1 + length $PATH, "";
535 641
536 if (my $filter = $meta->{cfutil_filter}) { 642 if (my $filter = $meta->{cfutil_filter}) {
537 if ($filter eq "yaml2json") { 643 if ($filter eq "yaml2json") {
538 $data = JSON::XS::encode_json YAML::Syck::Load $data; 644 $data = JSON::XS::encode_json YAML::XS::Load $data;
645 } elsif ($filter eq "json2json") {
646 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
647 } elsif ($filter eq "perl2json") {
648 $data = eval $data; die if $@;
649 $data = JSON::XS::encode_json $data;
539 } else { 650 } else {
540 warn "$dir/$file: unknown filter $filter, skipping\n"; 651 warn "$dir/$file: unknown filter $filter, skipping\n";
541 } 652 }
542 } 653 }
543 654
… …
556 IO::AIO::aioreq_pri 4; 667 IO::AIO::aioreq_pri 4;
557 IO::AIO::aio_scandir $path, 4, sub { 668 IO::AIO::aio_scandir $path, 4, sub {
558 my ($dirs, $nondirs) = @_; 669 my ($dirs, $nondirs) = @_;
559 670
560 find_files "$path/$_" 671 find_files "$path/$_"
561 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 672 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
562 673
563 my $dir = $path; 674 my $dir = $path;
564 substr $dir, 0, 1 + length $PATH, ""; 675 substr $dir, 0, 1 + length $PATH, "";
565 676
566 for my $file (@$nondirs) { 677 for my $file (@$nondirs) {
… …
574 685
575 } elsif ($dir =~ /^res(?:\/|$)/) { 686 } elsif ($dir =~ /^res(?:\/|$)/) {
576 if ($file =~ /\.(jpg|png)$/) { 687 if ($file =~ /\.(jpg|png)$/) {
577 $c_res->put ([$path, $file, 0]) # FT_FACE 688 $c_res->put ([$path, $file, 0]) # FT_FACE
578 } elsif ($file =~ /\.(res)$/) { 689 } elsif ($file =~ /\.(res)$/) {
579 $c_res->put ([$path, $file, 7]) # FT_RSRC 690 $c_res->put ([$path, $file, 6]) # FT_RSRC
580 } else { 691 } else {
581 $c_res->put ([$path, $file, undef]); 692 $c_res->put ([$path, $file, undef]);
582 } 693 }
583 694
584 } elsif ($file =~ /\.png$/) { 695 } elsif ($file =~ /\.png$/) {
… …
593 } else { 704 } else {
594 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 705 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
595 } 706 }
596 } 707 }
597 }; 708 };
709 }
710
711 sub generate_plurals {
712# use Lingua::EN::Inflect ();
713# Lingua::EN::Inflect::classical;
714# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
715# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
716#
717# for my $a (@ARC) {
718# my $name = $a->{name} || $a->{_name};
719#
720# next unless $a->{name_pl};
721# next if $a->{invisible};
722# next if $a->{is_floor};
723# next if $a->{no_pick};
724#
725# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
726# my $pl = $test =~ /^(?:eq|p:.)$/
727# ? $name
728# : Lingua::EN::Inflect::PL $name;
729#
730# if ($pl ne $a->{name_pl}) {
731# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
732# }
733# }
598 } 734 }
599 735
600 sub inst_arch($) { 736 sub inst_arch($) {
601 my (undef, $path) = @_; 737 my (undef, $path) = @_;
602 738
… …
625 my @a_res = map +(async \&process_res), 1..2; 761 my @a_res = map +(async \&process_res), 1..2;
626 my @a_trs = map +(async \&process_trs), 1..2; 762 my @a_trs = map +(async \&process_trs), 1..2;
627 763
628 IO::AIO::flush; 764 IO::AIO::flush;
629 765
630 $c_res->put (undef) for @a_res; 766 $c_res->shutdown;
631 $c_arc->put (undef) for @a_arc; 767 $c_arc->shutdown;
632 $c_trs->put (undef) for @a_trs; 768 $c_trs->shutdown;
633 769
634 print "start file scan, arc, res processing...\n" if $VERBOSE; 770 print "start file scan, arc, res processing...\n" if $VERBOSE;
635 771
636 $_->join for @a_arc; # need to parse all archetypes before png processing 772 $_->join for @a_arc; # need to parse all archetypes before png processing
637 773
638 print "end arc, start png processing...\n" if $VERBOSE; 774 print "end arc, start png processing...\n" if $VERBOSE;
639 775
640 # four png crunchers work fine for my 2x smp machine 776 # eight png crunchers work fine for my 4x smp machine
641 my @a_png = map +(async \&process_png), 1..4; 777 my @a_png = map +(async \&process_png), 1..8;
642 778
643 $_->join for (@a_trs, @a_res, @a_png); 779 $_->join for (@a_trs, @a_res, @a_png);
644 780
645 print "scanning done, processing results...\n" if $VERBOSE; 781 print "scanning done, processing results...\n" if $VERBOSE;
646 { 782 {
647 # remove path prefix from editor_folder 783 # remove path prefix from editor_folder
784 $_->{editor_folder} =~ /^\x00/
648 substr $_->{editor_folder}, 0, 1 + length $path, "" 785 and substr $_->{editor_folder}, 0, 2 + length $path, ""
649 for values %ARC; 786 for values %ARC;
650 787
651 print "resolving inheritance tree...\n" if $VERBOSE; 788 print "resolving inheritance tree...\n" if $VERBOSE;
652 # resolve inherit 789 # resolve inherit
653 while () { 790 while () {
654 my $progress; 791 my $progress;
655 my $loop; 792 my $loop;
656 793
657 for my $o (values %ARC) { 794 for my $o (values %ARC) {
658 if (my $other = $o->{inherit}) { 795 for my $other (split /,/, $o->{inherit}) {
659 if (my $s = $ARC{$other}) { 796 if (my $s = $ARC{$other}) {
660 if ($s->{inherit}) { 797 if ($s->{inherit}) {
661 $loop = $s; 798 $loop = $s;
662 } else { 799 } else {
663 delete $o->{inherit}; 800 delete $o->{inherit};
… …
682 } 819 }
683 820
684 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 821 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
685 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 822 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
686 823
824 print "generating plurals...\n" if $VERBOSE;
825 generate_plurals;
826
687 print "writing archetypes...\n" if $VERBOSE; 827 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
688 open my $fh, ">:utf8", "$DATADIR/archetypes~" 828 open my $fh, ">:utf8", "$DATADIR/archetypes~"
689 or die "$DATADIR/archetypes~: $!"; 829 or die "$DATADIR/archetypes~: $!";
690 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 830 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
691 } 831 }
692 832
693 { 833 {
694 print "writing treasures...\n" if $VERBOSE; 834 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
695 open my $fh, ">:utf8", "$DATADIR/treasures~" 835 open my $fh, ">:utf8", "$DATADIR/treasures~"
696 or die "$DATADIR/treasures~: $!"; 836 or die "$DATADIR/treasures~: $!";
697 print $fh $TRS; 837 print $fh $TRS;
698 } 838 }
699 839
… …
701 print "processing facedata...\n" if $VERBOSE; 841 print "processing facedata...\n" if $VERBOSE;
702 while (my ($k, $v) = each %FACEINFO) { 842 while (my ($k, $v) = each %FACEINFO) {
703 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 843 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
704 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 844 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
705 845
846 make_hash $k, $v->{data32}, $v->{hash32};
847 make_hash $k, $v->{data64}, $v->{hash64};
848
706 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 849 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
707 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 850 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
708 851
709 if (my $magicmap = $v->{magicmap}) { 852 if (my $magicmap = $v->{magicmap}) {
710 $magicmap =~ y/A-Z_\-/a-z/d; 853 $magicmap =~ y/A-Z_\-/a-z/d;
711 $v->{magicmap} = $COLOR{$magicmap}; 854 $v->{magicmap} = $COLOR{$magicmap};
712 } 855 }
713 856
857 my $stem = delete $v->{stem};
858 $v->{glyph} //= autoglyph $stem, $v;
859 utf8::encode $v->{glyph};
860 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
861
714 delete $v->{arc}; 862 delete $v->{arc};
715 } 863 }
716 864
717 print "writing facedata...\n" if $VERBOSE; 865 print "processing resources...\n" if $VERBOSE;
866 my $enc = JSON::XS->new->utf8->canonical->relaxed;
867 while (my ($k, $v) = each %RESOURCE) {
868
869 if ($v->{meta} && $v->{meta}{datadir}) {
870 delete $RESOURCE{$k};
871
872 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
873
874 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
875 open my $fh, ">:raw", "$DATADIR/$k~"
876 or die "$DATADIR/$k~: $!";
877 syswrite $fh, $v->{data};
878 push @COMMIT, $k;
879
880 } else {
881 if ($v->{type} & 1) {
882 # prepend meta info
883
884 my $meta = $enc->encode ({
885 name => $k,
886 %{ $v->{meta} || {} },
887 });
888
889 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
890 }
891
892 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
893 }
894 }
895
896 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
897 scalar keys %FACEINFO,
898 scalar keys %ANIMINFO,
899 scalar keys %RESOURCE
900 if $VERBOSE;
901
718 open my $fh, ">:perlio", "$DATADIR/facedata~" 902 open my $fh, ">:perlio", "$DATADIR/facedata~"
719 or die "$DATADIR/facedata~: $!"; 903 or die "$DATADIR/facedata~: $!";
720 904
721 print $fh freeze { 905 print $fh nfreeze {
722 version => 2, 906 version => 2,
723 faceinfo => \%FACEINFO, 907 faceinfo => \%FACEINFO,
724 animinfo => \%ANIMINFO, 908 animinfo => \%ANIMINFO,
725 resource => \%RESOURCE, 909 resource => \%RESOURCE,
726 }; 910 };
911
727 } 912 }
728 913
729 print "committing files...\n" if $VERBOSE; 914 print "committing files...\n" if $VERBOSE;
730 915
731 for (qw(archetypes facedata treasures)) { 916 for (qw(archetypes facedata treasures), @COMMIT) {
732 chmod 0644, "$DATADIR/$_~"; 917 chmod 0644, "$DATADIR/$_~";
733 rename "$DATADIR/$_~", "$DATADIR/$_" 918 rename "$DATADIR/$_~", "$DATADIR/$_"
734 or die "$DATADIR/$_: $!"; 919 or die "$DATADIR/$_: $!";
735 } 920 }
736 921

Diff Legend

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