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.48 by root, Tue Jul 31 02:24:43 2007 UTC vs.
Revision 1.74 by root, Wed Oct 28 04:10:46 2009 UTC

… …
12my $OPTIPNG = "@OPTIPNG@"; 12my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 13my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@"; 14my $PNGNQ = "@PNGNQ@";
15 15
16use Getopt::Long; 16use Getopt::Long;
17use File::Temp;
18use POSIX ();
19use Carp;
20
17use Coro::Event; 21use Coro::EV;
18use AnyEvent; 22use AnyEvent;
23use YAML::XS ();
24use JSON::XS ();
19use IO::AIO (); 25use IO::AIO ();
20use File::Temp; 26
21use Crossfire;
22use Coro; 27use Coro 5.12;
23use Coro::AIO; 28use Coro::AIO;
24use POSIX (); 29use Coro::Util;
25use Digest::MD5; 30use Coro::Channel;
26use Carp;
27use Coro::Storable; $Storable::canonical = 1; 31use Coro::Storable; $Storable::canonical = 1;
32
33use Deliantra;
28 34
29$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 35$SIG{QUIT} = sub { Carp::cluck "QUIT" };
30 36
31sub usage { 37sub usage {
32 warn <<EOF; 38 warn <<EOF;
… …
64 tan => 12, 70 tan => 12,
65); 71);
66 72
67END { system "rm", "-rf", $TMPDIR } 73END { system "rm", "-rf", $TMPDIR }
68 74
69Event->signal (signal => "INT", cb => sub { exit 1 }); 75my $s_INT = EV::signal INT => sub { exit 1 };
70Event->signal (signal => "TERM", cb => sub { exit 1 }); 76my $s_TERM = EV::signal TERM => sub { exit 1 };
71 77
72mkdir $TMPDIR, 0700 78mkdir $TMPDIR, 0700
73 or die "$TMPDIR: $!"; 79 or die "$TMPDIR: $!";
74 80
75sub fork_sub(&) { 81sub fork_sub(&) {
… …
95 if (!-f "$path/regions") { 101 if (!-f "$path/regions") {
96 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 102 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
97 exit 1 unless $FORCE; 103 exit 1 unless $FORCE;
98 } 104 }
99 105
100 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 106 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
107 "$path/.", "$DATADIR/maps/.",
108 "--exclude", "CVS", "--exclude", "/world-precomposed",
109 "--delete", "--delete-excluded"
101 and die "map installation failed.\n"; 110 and die "map installation failed.\n";
102 111
103 print "maps installed successfully.\n"; 112 print "maps installed successfully.\n";
104} 113}
105 114
… …
113 our $NFILE; 122 our $NFILE;
114 our $PATH; 123 our $PATH;
115 124
116 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 125 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
117 126
118 our (@png, @trs, @arc, @res); # files we are interested in 127 our $c_arc = new Coro::Channel;
128 our $c_trs = new Coro::Channel;
129 our $c_res = new Coro::Channel;
130
131 our @c_png;
119 132
120 sub commit_png($$$) { 133 sub commit_png($$$) {
121 my ($name, $data, $T) = @_; 134 my ($name, $data, $T) = @_;
122 135
123 $FACEINFO{$name}{"data$T"} = $data; 136 $FACEINFO{$name}{"data$T"} = $data;
124 } 137 }
125 138
126 sub process_png { 139 sub process_png {
127 while (@png) { 140 while (@c_png) {
128 my ($path, $delete) = @{pop @png}; 141 my ($path, $delete) = @{pop @c_png};
129 142
130 my $png; 143 my $png;
131 aio_lstat $path; 144 aio_lstat $path;
132 my ($size, $mtime) = (stat _)[7,9]; 145 my ($size, $mtime) = (stat _)[7,9];
133 146
… …
164 if ($w % $T || $h % $T) { 177 if ($w % $T || $h % $T) {
165 warn "$path: weird png size ($w $h), skipping.\n"; 178 warn "$path: weird png size ($w $h), skipping.\n";
166 next; 179 next;
167 } 180 }
168 181
182 (my $base = $stem) =~ s/^.*\///;
183
184 my $fi = $FACEINFO{$base};
185 unless ($fi) {
186 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
187 #next;
188 }
189
190 my $arc = $fi->{arc} || { };
191
169 unless ($path =~ /~$/) { 192 unless ($path =~ /~$/) {
170 # possibly enlarge 193 # possibly enlarge
171 if (0 > aio_stat "$stem.64x64.png") { 194 if (0 > aio_stat "$stem.64x64.png") {
172 my $other = "$stem.64x64.png~"; 195 my $other = "$stem.64x64.png~";
173 196
174 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 197 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
175 my $wrap = 0; # for the time being
176 fork_sub { 198 fork_sub {
199 my $CROP;
200 my $SRC = "png:\Q$path\E";
201
202 my $is_floor = $arc->{is_floor};
203 my $is_wall = 0;
204
205 my ($wall_pfx, $wall_dir, $wall_sfx);
206
207 if (
208 !$is_floor
209 && !$arc->{alive}
210 && $arc->{move_block} eq "all"
211 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
212 ) {
213 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
214
215 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
216 $is_wall = 1;
217 }
218 }
219
220 if ($is_wall || $is_floor) {
221 # add a 4px border and add other images around it
222 $CROP = "-shave 8x8 +repage";
223
224 $w += 8;
225 $h += 8;
226
227 $SRC = "-size ${w}x${h} xc:transparent";
228 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
229
230 # 8 surrounding images
231 for (
232 # x y b r0 r1
233 [-1, -1, 0, 6],
234 [ 0, -1, 1, 10, 14],
235 [+1, -1, 0, 12],
236
237 [-1, 0, 8, 5, 7],
238 #
239 [+1, 0, 2, 5, 13],
240
241 [-1, +1, 0, 3],
242 [ 0, +1, 4, 10, 11],
243 [+1, +1, 0, 9],
244 ) {
245 my ($x, $y, $d, $r0, $r1) = @$_;
246
247 my $tile = $is_floor ? $path
248 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
249 : die;
250
251 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
252 "\Q$tile",
253 $x * ($w - 8) + 4,
254 $y * ($h - 8) + 4;
255 }
256 }
257
177 system "convert png:\Q$path\E -depth 8 rgba:-" 258 system "convert -depth 8 $SRC rgba:-"
178 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 259 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
179 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" 260 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
180 and die "convert/hq2xa pipeline error: status $? ($!)"; 261 and die "convert/cfhq2xa pipeline error: status $? ($!)";
181 system $OPTIPNG, "-i0", "-q", "$other~"; 262 system $OPTIPNG, "-i0", "-q", "$other~";
182 die "$other~ has zero size, aborting." unless -s "$other~"; 263 die "$other~ has zero size, aborting." unless -s "$other~";
183 rename "$other~", $other; 264 rename "$other~", $other;
184 }; 265 };
185 } 266 }
186 267
187 push @png, [$other, !$CACHE]; 268 push @c_png, [$other, !$CACHE];
188 } 269 }
189 270
190 # possibly scale down 271 # possibly scale down
191 if (0 > aio_stat "$stem.32x32.png") { 272 if (0 > aio_stat "$stem.32x32.png") {
192 my $other = "$stem.32x32.png~"; 273 my $other = "$stem.32x32.png~";
… …
195 fork_sub { 276 fork_sub {
196 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 277 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
197 system $OPTIPNG, "-i0", "-q", "$other~"; 278 system $OPTIPNG, "-i0", "-q", "$other~";
198 279
199 # reduce smoothfaces >10000 bytes 280 # reduce smoothfaces >10000 bytes
281 # obsolete, no longer required
200 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 282 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
201 my $ncolor = 256; 283 my $ncolor = 256;
202 while () { 284 while () {
203 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 285 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
204 system $OPTIPNG, "-i0", "-q", "$other~~"; 286 system $OPTIPNG, "-i0", "-q", "$other~~";
205 last if 10000 > -s "$other~~"; 287 last if 10000 > -s "$other~~";
… …
217 rename "$other~", $other; 299 rename "$other~", $other;
218 }; 300 };
219 } 301 }
220 302
221 #warn "scaled down $path to $other\n";#d# 303 #warn "scaled down $path to $other\n";#d#
222 push @png, [$other, !$CACHE]; 304 push @c_png, [$other, !$CACHE];
223 } 305 }
224 } 306 }
225 307
226 (my $face = $stem) =~ s/^.*\///; 308 (my $face = $stem) =~ s/^.*\///;
227 309
… …
288 aio_unlink $path if $delete; 370 aio_unlink $path if $delete;
289 } 371 }
290 } 372 }
291 373
292 sub process_arc { 374 sub process_arc {
293 while (@arc) { 375 while (my $job = $c_arc->get) {
294 my ($dir, $file) = @{pop @arc}; 376 my ($dir, $file) = @$job;
295 377
296 my $arc; 378 my $arc;
297 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 379 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
298 380
299 my $arc = read_arch "$dir/$file"; 381 my $arc = read_arch "$dir/$file";
… …
351 facings => $facings, 433 facings => $facings,
352 frames => \@frames, 434 frames => \@frames,
353 }; 435 };
354 } 436 }
355 437
356 for my $face ($o->{face} || (), @{$anim || []}) { 438 for ($o->{face} || (), @{$anim || []}) {
357 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 439 next if /^facings\s/;
358 440
441 my $face = $_;
442 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
443
359 my $info = $FACEINFO{$face} ||= {}; 444 my $info = $FACEINFO{$face} ||= { };
445 $info->{arc} = $o;
446
447 next if $face =~ /^blank.x11$|^empty.x11$/;
360 448
361 $info->{visibility} = $visibility if defined $visibility; 449 $info->{visibility} = $visibility if defined $visibility;
362 $info->{magicmap} = $magicmap if defined $magicmap; 450 $info->{magicmap} = $magicmap if defined $magicmap;
363 } 451 }
364 452
365 if (my $smooth = delete $o->{smoothface}) { 453 if (my $smooth = delete $o->{smoothface}) {
366 my %kv =split /\s+/, $smooth; 454 my %kv = split /\s+/, $smooth;
367 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 455 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
368 while (my ($face, $smooth) = each %kv) { 456 while (my ($face, $smooth) = each %kv) {
457 $FACEINFO{$smooth}{arc} = $o;
458
369 $FACEINFO{$face}{smooth} = $smooth; 459 $FACEINFO{$face}{smooth} = $smooth;
370 $FACEINFO{$face}{smoothlevel} = $level; 460 $FACEINFO{$face}{smoothlevel} = $level;
371 } 461 }
372 } 462 }
373 } 463 }
374 } 464 }
375 } 465 }
376 } 466 }
377 467
378 sub process_trs { 468 sub process_trs {
379 while (@trs) { 469 while (my $job = $c_trs->get) {
380 my ($dir, $file) = @{pop @trs}; 470 my ($dir, $file) = @$job;
381 my $path = "$dir/$file"; 471 my $path = "$dir/$file";
382 472
383 my $trs; 473 my $trs;
384 if (0 > aio_load $path, $trs) { 474 if (0 > aio_load $path, $trs) {
385 warn "$path: $!, skipping.\n"; 475 warn "$path: $!, skipping.\n";
… …
394 484
395 sub load_cached($;$) { 485 sub load_cached($;$) {
396 unless (exists $FILECACHE{$_[0]}) { 486 unless (exists $FILECACHE{$_[0]}) {
397 my $data; 487 my $data;
398 if (0 < aio_load $_[0], $data) { 488 if (0 < aio_load $_[0], $data) {
489 if ($_[1]) {
399 $data = $_[1]->($data) 490 $data = eval { $_[1]->($data) };
400 if $_[1]; 491 warn "$_[0]: $@" if $@;
492 }
401 } 493 }
402 494
403 $FILECACHE{$_[0]} = $data; 495 $FILECACHE{$_[0]} = $data;
404 } 496 }
405 497
406 $FILECACHE{$_[0]} 498 $FILECACHE{$_[0]}
407 } 499 }
408 500
409 sub process_res { 501 sub process_res {
410 while (@res) { 502 while (my $job = $c_res->get) {
411 my ($dir, $file, $type) = @{pop @res}; 503 my ($dir, $file, $type) = @$job;
412 504
413 my $data; 505 my $data;
414 aio_load "$dir/$file", $data; 506 aio_load "$dir/$file", $data;
415 507
416 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 508 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
509
510 utf8::decode $dir;
511 utf8::decode $file;
512
513 # a meta file for resources is now mandatory
514 unless (exists $meta->{$file}) {
515 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
516 next;
517 }
417 518
418 $meta = { 519 $meta = {
419 %{ $meta->{"" } || {} }, 520 %{ $meta->{"" } || {} },
420 %{ $meta->{$file} || {} }, 521 %{ $meta->{$file} || {} },
421 }; 522 };
422 523
524 if ($meta->{license} =~ s/^#//) {
525 $meta->{license} = ({
526 "pd" => "Public Domain",
527 "gpl" => "GNU General Public License, version 3.0 or any later",
528 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
529 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
530 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
531 })->{$meta->{license}}
532 || warn "$dir/$file: license tag '$meta->{license}' not found.";
533 }
534
423 $file =~ s/\.res$//; 535 $file =~ s/\.res$//;
424 $file =~ s/\.(ogg|wav|jpg|png)$//; 536 $file =~ s/\.(ogg|wav|jpg|png)$//;
425 537
426 substr $dir, 0, 1 + length $PATH, ""; 538 substr $dir, 0, 1 + length $PATH, "";
427 539
540 if (my $filter = $meta->{cfutil_filter}) {
541 if ($filter eq "yaml2json") {
542 $data = JSON::XS::encode_json YAML::XS::Load $data;
543 } elsif ($filter eq "json2json") {
544 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
545 } elsif ($filter eq "perl2json") {
546 $data = eval $data; die if $@;
547 $data = JSON::XS::encode_json $data;
548 } else {
549 warn "$dir/$file: unknown filter $filter, skipping\n";
550 }
551 }
552
428 $RESOURCE{"$dir/$file"} = { 553 $RESOURCE{"$dir/$file"} = {
429 type => (delete $meta->{type}) || $type, 554 type => (exists $meta->{type} ? delete $meta->{type} : $type),
430 data => $data, 555 data => $data,
431 chksum => (Digest::MD5::md5 $data),
432 %$meta ? (meta => $meta) : (), 556 %$meta ? (meta => $meta) : (),
433 }; 557 };
434 } 558 }
435 } 559 }
436 560
… …
448 my $dir = $path; 572 my $dir = $path;
449 substr $dir, 0, 1 + length $PATH, ""; 573 substr $dir, 0, 1 + length $PATH, "";
450 574
451 for my $file (@$nondirs) { 575 for my $file (@$nondirs) {
452 if ($dir =~ /^music(?:\/|$)/) { 576 if ($dir =~ /^music(?:\/|$)/) {
453 push @res, [$path, $file, 3] # FT_MUSIC 577 $c_res->put ([$path, $file, 3]) # FT_MUSIC
454 if $file =~ /\.(ogg)$/; 578 if $file =~ /\.(ogg)$/;
455 579
456 } elsif ($dir =~ /^sound(?:\/|$)/) { 580 } elsif ($dir =~ /^sound(?:\/|$)/) {
457 push @res, [$path, $file, 5] # FT_SOUND 581 $c_res->put ([$path, $file, 5]) # FT_SOUND
458 if $file =~ /\.(wav|ogg)$/; 582 if $file =~ /\.(wav|ogg)$/;
459 583
460 } elsif ($dir =~ /^res(?:\/|$)/) { 584 } elsif ($dir =~ /^res(?:\/|$)/) {
461 push @res, [$path, $file, 0] # FT_FACE
462 if $file =~ /\.(jpg|png)$/; 585 if ($file =~ /\.(jpg|png)$/) {
463 push @res, [$path, $file, 7] # FT_RSRC 586 $c_res->put ([$path, $file, 0]) # FT_FACE
464 if $file =~ /\.(res)$/; 587 } elsif ($file =~ /\.(res)$/) {
588 $c_res->put ([$path, $file, 6]) # FT_RSRC
589 } else {
590 $c_res->put ([$path, $file, undef]);
591 }
465 592
466 } elsif ($file =~ /\.png$/) { 593 } elsif ($file =~ /\.png$/) {
467 push @png, ["$path/$file", 0]; 594 push @c_png, ["$path/$file", 0];
468 595
469 } elsif ($file =~ /\.trs$/) { 596 } elsif ($file =~ /\.trs$/) {
470 push @trs, [$path, $file]; 597 $c_trs->put ([$path, $file]);
471 598
472 } elsif ($file =~ /\.arc$/) { 599 } elsif ($file =~ /\.arc$/) {
473 push @arc, [$path, $file]; 600 $c_arc->put ([$path, $file]);
474 601
475 } else { 602 } else {
476 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 603 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
477 } 604 }
478 } 605 }
479 }; 606 };
607 }
608
609 sub generate_plurals {
610# use Lingua::EN::Inflect ();
611# Lingua::EN::Inflect::classical;
612# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
613# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
614#
615# for my $a (@ARC) {
616# my $name = $a->{name} || $a->{_name};
617#
618# next unless $a->{name_pl};
619# next if $a->{invisible};
620# next if $a->{is_floor};
621# next if $a->{no_pick};
622#
623# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
624# my $pl = $test =~ /^(?:eq|p:.)$/
625# ? $name
626# : Lingua::EN::Inflect::PL $name;
627#
628# if ($pl ne $a->{name_pl}) {
629# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
630# }
631# }
480 } 632 }
481 633
482 sub inst_arch($) { 634 sub inst_arch($) {
483 my (undef, $path) = @_; 635 my (undef, $path) = @_;
484 636
… …
497 if (!-d "$path/treasures") { 649 if (!-d "$path/treasures") {
498 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 650 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
499 exit 1 unless $FORCE; 651 exit 1 unless $FORCE;
500 } 652 }
501 653
654 print "scanning files...\n" if $VERBOSE;
655
502 find_files $path; 656 find_files $path;
657
658 my @a_arc = map +(async \&process_arc), 1..2;
659 my @a_res = map +(async \&process_res), 1..2;
660 my @a_trs = map +(async \&process_trs), 1..2;
661
503 IO::AIO::flush; 662 IO::AIO::flush;
504 663
505 $_->join for ( 664 $c_res->shutdown;
665 $c_arc->shutdown;
666 $c_trs->shutdown;
667
668 print "start file scan, arc, res processing...\n" if $VERBOSE;
669
670 $_->join for @a_arc; # need to parse all archetypes before png processing
671
672 print "end arc, start png processing...\n" if $VERBOSE;
673
506 # four png crunchers work fine for my 2x smp machine 674 # eight png crunchers work fine for my 4x smp machine
507 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 675 my @a_png = map +(async \&process_png), 1..8;
508 (async \&process_trs), (async \&process_trs),
509 (async \&process_arc), (async \&process_arc),
510 (async \&process_res), (async \&process_res),
511 );
512 676
677 $_->join for (@a_trs, @a_res, @a_png);
678
679 print "scanning done, processing results...\n" if $VERBOSE;
513 { 680 {
514 # remove path prefix from editor_folder 681 # remove path prefix from editor_folder
515 substr $_->{editor_folder}, 0, 1 + length $path, "" 682 substr $_->{editor_folder}, 0, 1 + length $path, ""
516 for values %ARC; 683 for values %ARC;
517 684
685 print "resolving inheritance tree...\n" if $VERBOSE;
518 # resolve inherit 686 # resolve inherit
519 while () { 687 while () {
520 my $progress; 688 my $progress;
521 my $loop; 689 my $loop;
522 690
… …
548 } 716 }
549 717
550 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 718 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
551 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 719 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
552 720
721 print "generating plurals...\n" if $VERBOSE;
722 generate_plurals;
723
724 print "writing archetypes...\n" if $VERBOSE;
553 open my $fh, ">:utf8", "$DATADIR/archetypes~" 725 open my $fh, ">:utf8", "$DATADIR/archetypes~"
554 or die "$DATADIR/archetypes~: $!"; 726 or die "$DATADIR/archetypes~: $!";
555 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 727 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
556 } 728 }
557 729
558 { 730 {
731 print "writing treasures...\n" if $VERBOSE;
559 open my $fh, ">:utf8", "$DATADIR/treasures~" 732 open my $fh, ">:utf8", "$DATADIR/treasures~"
560 or die "$DATADIR/treasures~: $!"; 733 or die "$DATADIR/treasures~: $!";
561 print $fh $TRS; 734 print $fh $TRS;
562 } 735 }
563 736
564 { 737 {
738 print "processing facedata...\n" if $VERBOSE;
565 while (my ($k, $v) = each %FACEINFO) { 739 while (my ($k, $v) = each %FACEINFO) {
566 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 740 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
567 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 741 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
568 742
569 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 743 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
570 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 744 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
571
572 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
573 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
574 745
575 if (my $magicmap = $v->{magicmap}) { 746 if (my $magicmap = $v->{magicmap}) {
576 $magicmap =~ y/A-Z_\-/a-z/d; 747 $magicmap =~ y/A-Z_\-/a-z/d;
577 $v->{magicmap} = $COLOR{$magicmap}; 748 $v->{magicmap} = $COLOR{$magicmap};
578 } 749 }
579 }
580 750
751 delete $v->{arc};
752 }
753
754 print "writing facedata...\n" if $VERBOSE;
581 open my $fh, ">:perlio", "$DATADIR/facedata~" 755 open my $fh, ">:perlio", "$DATADIR/facedata~"
582 or die "$DATADIR/facedata~: $!"; 756 or die "$DATADIR/facedata~: $!";
583 757
584 print $fh freeze { 758 print $fh freeze {
585 version => 2, 759 version => 2,
586 faceinfo => \%FACEINFO, 760 faceinfo => \%FACEINFO,
587 animinfo => \%ANIMINFO, 761 animinfo => \%ANIMINFO,
588 resource => \%RESOURCE, 762 resource => \%RESOURCE,
589 }; 763 };
590 } 764 }
765
766 print "committing files...\n" if $VERBOSE;
591 767
592 for (qw(archetypes facedata treasures)) { 768 for (qw(archetypes facedata treasures)) {
593 chmod 0644, "$DATADIR/$_~"; 769 chmod 0644, "$DATADIR/$_~";
594 rename "$DATADIR/$_~", "$DATADIR/$_" 770 rename "$DATADIR/$_~", "$DATADIR/$_"
595 or die "$DATADIR/$_: $!"; 771 or die "$DATADIR/$_: $!";

Diff Legend

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