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.53 by root, Sun Aug 19 09:27:08 2007 UTC vs.
Revision 1.82 by root, Sat Apr 3 22:30:21 2010 UTC

1#!@PERL@ 1#!@PERL@
2
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#
2 24
3use strict; 25use strict;
4 26
5my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
6my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
… …
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 Digest::MD5;
27use Carp;
28use Coro::Channel; 53use Coro::Channel;
29use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
30 57
31$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
32 59
33sub usage { 60sub usage {
34 warn <<EOF; 61 warn <<EOF;
… …
66 tan => 12, 93 tan => 12,
67); 94);
68 95
69END { system "rm", "-rf", $TMPDIR } 96END { system "rm", "-rf", $TMPDIR }
70 97
71Event->signal (signal => "INT", cb => sub { exit 1 }); 98my $s_INT = EV::signal INT => sub { exit 1 };
72Event->signal (signal => "TERM", cb => sub { exit 1 }); 99my $s_TERM = EV::signal TERM => sub { exit 1 };
100
101our %hash;
102
103# here we could try to avoid collisions and reduce chksum size further
104sub make_hash($\$\$;$) {
105 my ($id, $dataref, $hashref, $clen) = @_;
106
107 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
108
109 if (exists $hash{$hash}) {
110 # hahs collinion, but some files are simply identical
111 if (${$hash{$hash}[1]} ne $$dataref) {
112 warn "hash collision $hash{$hash}[0] vs. $id\n";
113 exit 1;
114 } else {
115 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
116 }
117 }
118 $hash{$hash} = [$id, $dataref, $hashref];
119
120 $$hashref = $hash;
121}
73 122
74mkdir $TMPDIR, 0700 123mkdir $TMPDIR, 0700
75 or die "$TMPDIR: $!"; 124 or die "$TMPDIR: $!";
76 125
77sub fork_sub(&) { 126sub fork_sub(&) {
… …
97 if (!-f "$path/regions") { 146 if (!-f "$path/regions") {
98 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 147 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
99 exit 1 unless $FORCE; 148 exit 1 unless $FORCE;
100 } 149 }
101 150
102 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 151 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
152 "$path/.", "$DATADIR/maps/.",
153 "--exclude", "CVS", "--exclude", "/world-precomposed",
154 "--delete", "--delete-excluded"
103 and die "map installation failed.\n"; 155 and die "map installation failed.\n";
104 156
105 print "maps installed successfully.\n"; 157 print "maps installed successfully.\n";
106} 158}
107 159
… …
170 if ($w % $T || $h % $T) { 222 if ($w % $T || $h % $T) {
171 warn "$path: weird png size ($w $h), skipping.\n"; 223 warn "$path: weird png size ($w $h), skipping.\n";
172 next; 224 next;
173 } 225 }
174 226
227 (my $base = $stem) =~ s/^.*\///;
228
229 my $fi = $FACEINFO{$base};
230 unless ($fi) {
231 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
232 #next;
233 }
234
235 my $arc = $fi->{arc} || { };
236
175 unless ($path =~ /~$/) { 237 unless ($path =~ /~$/) {
176 # possibly enlarge 238 # possibly enlarge
177 if (0 > aio_stat "$stem.64x64.png") { 239 if (0 > aio_stat "$stem.64x64.png") {
178 my $other = "$stem.64x64.png~"; 240 my $other = "$stem.64x64.png~";
179 241
180 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 242 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
181 fork_sub { 243 fork_sub {
182 my $CROP; 244 my $CROP;
183 my $SRC = "png:\Q$path\E"; 245 my $SRC = "png:\Q$path\E";
184 246
185 # check if this is a wall. ultra-ugly. ultra-ultra-ugly. 247 my $is_floor = $arc->{is_floor};
248 my $is_wall = 0;
249
250 my ($wall_pfx, $wall_dir, $wall_sfx);
251
252 if (
253 !$is_floor
254 && !$arc->{alive}
255 && $arc->{move_block} eq "all"
186 if ($path =~ /^(.*\/wall\/.*_)([0-9A-F])(\.x11.*\.png)$/) { 256 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
257 ) {
187 my ($pfx, $dir, $sfx) = ($1, hex $2, $3); 258 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
188 #check for 0..F images to be sure(?) this is a wall 259
189 unless (grep { !-e sprintf "%s%X%s", $pfx, $_, $sfx } 0..15) { 260 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
261 $is_wall = 1;
262 }
263 }
264
265 if ($is_wall || $is_floor) {
190 # add a 4px border and add other images around it 266 # add a 4px border and add other images around it
191 $CROP = "-shave 8x8 +repage"; 267 $CROP = "-shave 8x8 +repage";
192 268
193 $w += 8; 269 $w += 8;
194 $h += 8; 270 $h += 8;
195 271
196 $SRC = "-size ${w}x${h} xc:transparent"; 272 $SRC = "-size ${w}x${h} xc:transparent";
197 $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; 273 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
198 274
199 # 8 surrounding images 275 # 8 surrounding images
200 for ( 276 for (
201 # x y b r0 r1 277 # x y b r0 r1
202 [-1, -1, 0, 6], 278 [-1, -1, 0, 6],
203 [ 0, -1, 1, 10, 14], 279 [ 0, -1, 1, 10, 14],
204 [+1, -1, 0, 12], 280 [+1, -1, 0, 12],
205 281
206 [-1, 0, 8, 5, 7], 282 [-1, 0, 8, 5, 7],
207 # 283 #
208 [+1, 0, 2, 5, 13], 284 [+1, 0, 2, 5, 13],
209 285
210 [-1, +1, 0, 3], 286 [-1, +1, 0, 3],
211 [ 0, +1, 4, 10, 11], 287 [ 0, +1, 4, 10, 11],
212 [+1, +1, 0, 9], 288 [+1, +1, 0, 9],
213 ) { 289 ) {
214 my ($x, $y, $d, $r0, $r1) = @$_; 290 my ($x, $y, $d, $r0, $r1) = @$_;
291
292 my $tile = $is_floor ? $path
293 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
294 : die;
295
215 $SRC .= sprintf " png:%s%X%s -geometry %+d%+d -composite", 296 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
216 "\Q$pfx", 297 "\Q$tile",
217 ($dir & $d) ? $r1 : $r0,
218 "\Q$sfx",
219 $x * ($w - 8) + 4, 298 $x * ($w - 8) + 4,
220 $y * ($h - 8) + 4; 299 $y * ($h - 8) + 4;
221 }
222 } 300 }
223 } 301 }
224 302
225 system "convert -depth 8 $SRC rgba:-" 303 system "convert -depth 8 $SRC rgba:-"
226 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 304 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
… …
243 fork_sub { 321 fork_sub {
244 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 322 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
245 system $OPTIPNG, "-i0", "-q", "$other~"; 323 system $OPTIPNG, "-i0", "-q", "$other~";
246 324
247 # reduce smoothfaces >10000 bytes 325 # reduce smoothfaces >10000 bytes
326 # obsolete, no longer required
248 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 327 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
249 my $ncolor = 256; 328 my $ncolor = 256;
250 while () { 329 while () {
251 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 330 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
252 system $OPTIPNG, "-i0", "-q", "$other~~"; 331 system $OPTIPNG, "-i0", "-q", "$other~~";
253 last if 10000 > -s "$other~~"; 332 last if 10000 > -s "$other~~";
… …
349 push @ARC, $o; 428 push @ARC, $o;
350 for (my $m = $o; $m; $m = $m->{more}) { 429 for (my $m = $o; $m; $m = $m->{more}) {
351 $ARC{$m->{_name}} = $m; 430 $ARC{$m->{_name}} = $m;
352 } 431 }
353 432
354 $o->{editor_folder} = $dir; 433 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
355 434
356 my $visibility = delete $o->{visibility}; 435 my $visibility = delete $o->{visibility};
357 my $magicmap = delete $o->{magicmap}; 436 my $magicmap = delete $o->{magicmap};
358 437
359 # find upper left corner :/ 438 # find upper left corner :/
… …
399 facings => $facings, 478 facings => $facings,
400 frames => \@frames, 479 frames => \@frames,
401 }; 480 };
402 } 481 }
403 482
404 for my $face ($o->{face} || (), @{$anim || []}) { 483 for ($o->{face} || (), @{$anim || []}) {
405 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 484 next if /^facings\s/;
406 485
486 my $face = $_;
487 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
488
407 my $info = $FACEINFO{$face} ||= {}; 489 my $info = $FACEINFO{$face} ||= { };
408
409 $info->{arc} = $o; 490 $info->{arc} = $o;
491
492 next if $face =~ /^blank.x11$|^empty.x11$/;
493
410 $info->{visibility} = $visibility if defined $visibility; 494 $info->{visibility} = $visibility if defined $visibility;
411 $info->{magicmap} = $magicmap if defined $magicmap; 495 $info->{magicmap} = $magicmap if defined $magicmap;
412 } 496 }
413 497
414 if (my $smooth = delete $o->{smoothface}) { 498 if (my $smooth = delete $o->{smoothface}) {
415 my %kv =split /\s+/, $smooth; 499 my %kv = split /\s+/, $smooth;
416 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 500 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
417 while (my ($face, $smooth) = each %kv) { 501 while (my ($face, $smooth) = each %kv) {
502 $FACEINFO{$smooth}{arc} = $o;
503
418 $FACEINFO{$face}{smooth} = $smooth; 504 $FACEINFO{$face}{smooth} = $smooth;
419 $FACEINFO{$face}{smoothlevel} = $level; 505 $FACEINFO{$face}{smoothlevel} = $level;
420 } 506 }
421 } 507 }
422 } 508 }
… …
462 my ($dir, $file, $type) = @$job; 548 my ($dir, $file, $type) = @$job;
463 549
464 my $data; 550 my $data;
465 aio_load "$dir/$file", $data; 551 aio_load "$dir/$file", $data;
466 552
467 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 553 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
468 554
469 next if $meta && !exists $meta->{$file}; 555 utf8::decode $dir;
556 utf8::decode $file;
557
558 # a meta file for resources is now mandatory
559 unless (exists $meta->{$file}) {
560 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
561 next;
562 }
470 563
471 $meta = { 564 $meta = {
472 %{ $meta->{"" } || {} }, 565 %{ $meta->{"" } || {} },
473 %{ $meta->{$file} || {} }, 566 %{ $meta->{$file} || {} },
474 }; 567 };
… …
487 $file =~ s/\.res$//; 580 $file =~ s/\.res$//;
488 $file =~ s/\.(ogg|wav|jpg|png)$//; 581 $file =~ s/\.(ogg|wav|jpg|png)$//;
489 582
490 substr $dir, 0, 1 + length $PATH, ""; 583 substr $dir, 0, 1 + length $PATH, "";
491 584
585 if (my $filter = $meta->{cfutil_filter}) {
586 if ($filter eq "yaml2json") {
587 $data = JSON::XS::encode_json YAML::XS::Load $data;
588 } elsif ($filter eq "json2json") {
589 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
590 } elsif ($filter eq "perl2json") {
591 $data = eval $data; die if $@;
592 $data = JSON::XS::encode_json $data;
593 } else {
594 warn "$dir/$file: unknown filter $filter, skipping\n";
595 }
596 }
597
492 $RESOURCE{"$dir/$file"} = { 598 $RESOURCE{"$dir/$file"} = {
493 type => (delete $meta->{type}) || $type, 599 type => (exists $meta->{type} ? delete $meta->{type} : $type),
494 data => $data, 600 data => $data,
495 chksum => (Digest::MD5::md5 $data),
496 %$meta ? (meta => $meta) : (), 601 %$meta ? (meta => $meta) : (),
497 }; 602 };
498 } 603 }
499 } 604 }
500 605
… …
505 IO::AIO::aioreq_pri 4; 610 IO::AIO::aioreq_pri 4;
506 IO::AIO::aio_scandir $path, 4, sub { 611 IO::AIO::aio_scandir $path, 4, sub {
507 my ($dirs, $nondirs) = @_; 612 my ($dirs, $nondirs) = @_;
508 613
509 find_files "$path/$_" 614 find_files "$path/$_"
510 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 615 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
511 616
512 my $dir = $path; 617 my $dir = $path;
513 substr $dir, 0, 1 + length $PATH, ""; 618 substr $dir, 0, 1 + length $PATH, "";
514 619
515 for my $file (@$nondirs) { 620 for my $file (@$nondirs) {
… …
520 } elsif ($dir =~ /^sound(?:\/|$)/) { 625 } elsif ($dir =~ /^sound(?:\/|$)/) {
521 $c_res->put ([$path, $file, 5]) # FT_SOUND 626 $c_res->put ([$path, $file, 5]) # FT_SOUND
522 if $file =~ /\.(wav|ogg)$/; 627 if $file =~ /\.(wav|ogg)$/;
523 628
524 } elsif ($dir =~ /^res(?:\/|$)/) { 629 } elsif ($dir =~ /^res(?:\/|$)/) {
630 if ($file =~ /\.(jpg|png)$/) {
525 $c_res->put ([$path, $file, 0]) # FT_FACE 631 $c_res->put ([$path, $file, 0]) # FT_FACE
526 if $file =~ /\.(jpg|png)$/; 632 } elsif ($file =~ /\.(res)$/) {
527 $c_res->put ([$path, $file, 7]) # FT_RSRC 633 $c_res->put ([$path, $file, 6]) # FT_RSRC
528 if $file =~ /\.(res)$/; 634 } else {
635 $c_res->put ([$path, $file, undef]);
636 }
529 637
530 } elsif ($file =~ /\.png$/) { 638 } elsif ($file =~ /\.png$/) {
531 push @c_png, ["$path/$file", 0]; 639 push @c_png, ["$path/$file", 0];
532 640
533 } elsif ($file =~ /\.trs$/) { 641 } elsif ($file =~ /\.trs$/) {
… …
539 } else { 647 } else {
540 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 648 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
541 } 649 }
542 } 650 }
543 }; 651 };
652 }
653
654 sub generate_plurals {
655# use Lingua::EN::Inflect ();
656# Lingua::EN::Inflect::classical;
657# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
658# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
659#
660# for my $a (@ARC) {
661# my $name = $a->{name} || $a->{_name};
662#
663# next unless $a->{name_pl};
664# next if $a->{invisible};
665# next if $a->{is_floor};
666# next if $a->{no_pick};
667#
668# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
669# my $pl = $test =~ /^(?:eq|p:.)$/
670# ? $name
671# : Lingua::EN::Inflect::PL $name;
672#
673# if ($pl ne $a->{name_pl}) {
674# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
675# }
676# }
544 } 677 }
545 678
546 sub inst_arch($) { 679 sub inst_arch($) {
547 my (undef, $path) = @_; 680 my (undef, $path) = @_;
548 681
… …
571 my @a_res = map +(async \&process_res), 1..2; 704 my @a_res = map +(async \&process_res), 1..2;
572 my @a_trs = map +(async \&process_trs), 1..2; 705 my @a_trs = map +(async \&process_trs), 1..2;
573 706
574 IO::AIO::flush; 707 IO::AIO::flush;
575 708
576 $c_res->put (undef) for @a_res; 709 $c_res->shutdown;
577 $c_arc->put (undef) for @a_arc; 710 $c_arc->shutdown;
578 $c_trs->put (undef) for @a_trs; 711 $c_trs->shutdown;
579 712
580 print "start file scan, arc, res processing...\n" if $VERBOSE; 713 print "start file scan, arc, res processing...\n" if $VERBOSE;
581 714
582 $_->join for @a_arc; # need to parse all archetypes before png processing 715 $_->join for @a_arc; # need to parse all archetypes before png processing
583 716
584 print "end arc, start png processing...\n" if $VERBOSE; 717 print "end arc, start png processing...\n" if $VERBOSE;
585 718
586 # four png crunchers work fine for my 2x smp machine 719 # eight png crunchers work fine for my 4x smp machine
587 my @a_png = map +(async \&process_png), 1..4; 720 my @a_png = map +(async \&process_png), 1..8;
588 721
589 $_->join for (@a_trs, @a_res, @a_png); 722 $_->join for (@a_trs, @a_res, @a_png);
590 723
591 print "scanning done, processing results...\n" if $VERBOSE; 724 print "scanning done, processing results...\n" if $VERBOSE;
592 { 725 {
593 # remove path prefix from editor_folder 726 # remove path prefix from editor_folder
727 $_->{editor_folder} =~ /^\x00/
594 substr $_->{editor_folder}, 0, 1 + length $path, "" 728 and substr $_->{editor_folder}, 0, 2 + length $path, ""
595 for values %ARC; 729 for values %ARC;
596 730
597 print "resolving inheritance tree...\n" if $VERBOSE; 731 print "resolving inheritance tree...\n" if $VERBOSE;
598 # resolve inherit 732 # resolve inherit
599 while () { 733 while () {
600 my $progress; 734 my $progress;
601 my $loop; 735 my $loop;
602 736
603 for my $o (values %ARC) { 737 for my $o (values %ARC) {
604 if (my $other = $o->{inherit}) { 738 for my $other (split /,/, $o->{inherit}) {
605 if (my $s = $ARC{$other}) { 739 if (my $s = $ARC{$other}) {
606 if ($s->{inherit}) { 740 if ($s->{inherit}) {
607 $loop = $s; 741 $loop = $s;
608 } else { 742 } else {
609 delete $o->{inherit}; 743 delete $o->{inherit};
… …
628 } 762 }
629 763
630 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 764 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
631 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 765 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
632 766
767 print "generating plurals...\n" if $VERBOSE;
768 generate_plurals;
769
633 print "writing archetypes...\n" if $VERBOSE; 770 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
634 open my $fh, ">:utf8", "$DATADIR/archetypes~" 771 open my $fh, ">:utf8", "$DATADIR/archetypes~"
635 or die "$DATADIR/archetypes~: $!"; 772 or die "$DATADIR/archetypes~: $!";
636 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 773 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
637 } 774 }
638 775
639 { 776 {
640 print "writing treasures...\n" if $VERBOSE; 777 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
641 open my $fh, ">:utf8", "$DATADIR/treasures~" 778 open my $fh, ">:utf8", "$DATADIR/treasures~"
642 or die "$DATADIR/treasures~: $!"; 779 or die "$DATADIR/treasures~: $!";
643 print $fh $TRS; 780 print $fh $TRS;
644 } 781 }
645 782
… …
647 print "processing facedata...\n" if $VERBOSE; 784 print "processing facedata...\n" if $VERBOSE;
648 while (my ($k, $v) = each %FACEINFO) { 785 while (my ($k, $v) = each %FACEINFO) {
649 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 786 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
650 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 787 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
651 788
789 make_hash $k, $v->{data32}, $v->{hash32};
790 make_hash $k, $v->{data64}, $v->{hash64};
791
652 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 792 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
653 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 793 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
654
655 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
656 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
657 794
658 if (my $magicmap = $v->{magicmap}) { 795 if (my $magicmap = $v->{magicmap}) {
659 $magicmap =~ y/A-Z_\-/a-z/d; 796 $magicmap =~ y/A-Z_\-/a-z/d;
660 $v->{magicmap} = $COLOR{$magicmap}; 797 $v->{magicmap} = $COLOR{$magicmap};
661 } 798 }
662 799
663 delete $v->{arc}; 800 delete $v->{arc};
664 } 801 }
665 802
666 print "writing facedata...\n" if $VERBOSE; 803 print "processing resources...\n" if $VERBOSE;
804 my $enc = JSON::XS->new->utf8->canonical->relaxed;
805 while (my ($k, $v) = each %RESOURCE) {
806
807 if ($v->{type} & 1) {
808 # prepend meta info
809
810 my $meta = $enc->encode ({
811 name => $k,
812 %{ $v->{meta} || {} },
813 });
814
815 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
816 }
817
818 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
819 }
820
821 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
822 scalar keys %FACEINFO,
823 scalar keys %ANIMINFO,
824 scalar keys %RESOURCE
825 if $VERBOSE;
826
667 open my $fh, ">:perlio", "$DATADIR/facedata~" 827 open my $fh, ">:perlio", "$DATADIR/facedata~"
668 or die "$DATADIR/facedata~: $!"; 828 or die "$DATADIR/facedata~: $!";
669 829
670 print $fh freeze { 830 print $fh nfreeze {
671 version => 2, 831 version => 2,
672 faceinfo => \%FACEINFO, 832 faceinfo => \%FACEINFO,
673 animinfo => \%ANIMINFO, 833 animinfo => \%ANIMINFO,
674 resource => \%RESOURCE, 834 resource => \%RESOURCE,
675 }; 835 };
836
676 } 837 }
677 838
678 print "committing files...\n" if $VERBOSE; 839 print "committing files...\n" if $VERBOSE;
679 840
680 for (qw(archetypes facedata treasures)) { 841 for (qw(archetypes facedata treasures)) {

Diff Legend

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