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.36 by root, Sun Jun 10 02:51:46 2007 UTC vs.
Revision 1.75 by root, Mon Nov 2 11:50:20 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 Coro::Storable; $Storable::canonical = 1; 31use Coro::Storable; $Storable::canonical = 1;
32
33use Deliantra;
34
35$SIG{QUIT} = sub { Carp::cluck "QUIT" };
27 36
28sub usage { 37sub usage {
29 warn <<EOF; 38 warn <<EOF;
30Usage: cfutil [-v] [-q] [--force] [--cache] 39Usage: cfutil [-v] [-q] [--force] [--cache]
31 [--install-arch path] 40 [--install-arch path]
… …
61 tan => 12, 70 tan => 12,
62); 71);
63 72
64END { system "rm", "-rf", $TMPDIR } 73END { system "rm", "-rf", $TMPDIR }
65 74
66Event->signal (signal => "INT", cb => sub { exit 1 }); 75my $s_INT = EV::signal INT => sub { exit 1 };
67Event->signal (signal => "TERM", cb => sub { exit 1 }); 76my $s_TERM = EV::signal TERM => sub { exit 1 };
68 77
69mkdir $TMPDIR, 0700 78mkdir $TMPDIR, 0700
70 or die "$TMPDIR: $!"; 79 or die "$TMPDIR: $!";
71 80
72sub fork_sub(&) { 81sub fork_sub(&) {
… …
92 if (!-f "$path/regions") { 101 if (!-f "$path/regions") {
93 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";
94 exit 1 unless $FORCE; 103 exit 1 unless $FORCE;
95 } 104 }
96 105
97 system $RSYNC, "-av", "$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"
98 and die "map installation failed.\n"; 110 and die "map installation failed.\n";
99 111
100 print "maps installed successfully.\n"; 112 print "maps installed successfully.\n";
101} 113}
102 114
103{ 115{
104 our %ANIMINFO; 116 our %ANIMINFO;
105 our %FACEINFO; 117 our %FACEINFO;
118 our %RESOURCE;
106 our @ARC; 119 our @ARC;
107 our %ARC; 120 our %ARC;
108 our $TRS; 121 our $TRS;
109 our $NFILE; 122 our $NFILE;
123 our $PATH;
110 124
111 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 125 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
112 126
113 our (@png, @trs, @arc); # 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;
114 132
115 sub commit_png($$$) { 133 sub commit_png($$$) {
116 my ($name, $data, $T) = @_; 134 my ($name, $data, $T) = @_;
117 135
118 $FACEINFO{$name}{"data$T"} = $data; 136 $FACEINFO{$name}{"data$T"} = $data;
119 } 137 }
120 138
121 sub process_png { 139 sub process_png {
122 while (@png) { 140 while (@c_png) {
123 my ($path, $delete) = @{pop @png}; 141 my ($path, $delete) = @{pop @c_png};
124 142
125 my $png; 143 my $png;
126 aio_lstat $path; 144 aio_lstat $path;
127 my ($size, $mtime) = (stat _)[7,9]; 145 my ($size, $mtime) = (stat _)[7,9];
128 146
… …
159 if ($w % $T || $h % $T) { 177 if ($w % $T || $h % $T) {
160 warn "$path: weird png size ($w $h), skipping.\n"; 178 warn "$path: weird png size ($w $h), skipping.\n";
161 next; 179 next;
162 } 180 }
163 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
164 unless ($path =~ /~$/) { 192 unless ($path =~ /~$/) {
165 # possibly enlarge 193 # possibly enlarge
166 if (0 > aio_stat "$stem.64x64.png") { 194 if (0 > aio_stat "$stem.64x64.png") {
167 my $other = "$stem.64x64.png~"; 195 my $other = "$stem.64x64.png~";
168 196
169 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 197 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
170 my $wrap = 0; # for the time being
171 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
172 system "convert png:\Q$path\E -depth 8 rgba:-" 258 system "convert -depth 8 $SRC rgba:-"
173 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 259 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
174 . "| 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~"
175 and die "convert/hq2xa pipeline error: status $? ($!)"; 261 and die "convert/cfhq2xa pipeline error: status $? ($!)";
176 system $OPTIPNG, "-i0", "-q", "$other~"; 262 system $OPTIPNG, "-i0", "-q", "$other~";
177 die "$other~ has zero size, aborting." unless -s "$other~"; 263 die "$other~ has zero size, aborting." unless -s "$other~";
178 rename "$other~", $other; 264 rename "$other~", $other;
179 }; 265 };
180 } 266 }
181 267
182 push @png, [$other, !$CACHE]; 268 push @c_png, [$other, !$CACHE];
183 } 269 }
184 270
185 # possibly scale down 271 # possibly scale down
186 if (0 > aio_stat "$stem.32x32.png") { 272 if (0 > aio_stat "$stem.32x32.png") {
187 my $other = "$stem.32x32.png~"; 273 my $other = "$stem.32x32.png~";
… …
190 fork_sub { 276 fork_sub {
191 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~";
192 system $OPTIPNG, "-i0", "-q", "$other~"; 278 system $OPTIPNG, "-i0", "-q", "$other~";
193 279
194 # reduce smoothfaces >10000 bytes 280 # reduce smoothfaces >10000 bytes
281 # obsolete, no longer required
195 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 282 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
196 my $ncolor = 256; 283 my $ncolor = 256;
197 while () { 284 while () {
198 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 285 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
199 system $OPTIPNG, "-i0", "-q", "$other~~"; 286 system $OPTIPNG, "-i0", "-q", "$other~~";
200 last if 10000 > -s "$other~~"; 287 last if 10000 > -s "$other~~";
… …
212 rename "$other~", $other; 299 rename "$other~", $other;
213 }; 300 };
214 } 301 }
215 302
216 #warn "scaled down $path to $other\n";#d# 303 #warn "scaled down $path to $other\n";#d#
217 push @png, [$other, !$CACHE]; 304 push @c_png, [$other, !$CACHE];
218 } 305 }
219 } 306 }
220 307
221 (my $face = $stem) =~ s/^.*\///; 308 (my $face = $stem) =~ s/^.*\///;
222 309
… …
283 aio_unlink $path if $delete; 370 aio_unlink $path if $delete;
284 } 371 }
285 } 372 }
286 373
287 sub process_arc { 374 sub process_arc {
288 while (@arc) { 375 while (my $job = $c_arc->get) {
289 my ($dir, $file) = @{pop @arc}; 376 my ($dir, $file) = @$job;
290 377
291 my $arc; 378 my $arc;
292 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 :/
293 380
294 my $arc = read_arch "$dir/$file"; 381 my $arc = read_arch "$dir/$file";
… …
296 push @ARC, $o; 383 push @ARC, $o;
297 for (my $m = $o; $m; $m = $m->{more}) { 384 for (my $m = $o; $m; $m = $m->{more}) {
298 $ARC{$m->{_name}} = $m; 385 $ARC{$m->{_name}} = $m;
299 } 386 }
300 387
301 $o->{editor_folder} = $dir; 388 $o->{editor_folder} ||= $dir;
302 389
303 my $visibility = delete $o->{visibility}; 390 my $visibility = delete $o->{visibility};
304 my $magicmap = delete $o->{magicmap}; 391 my $magicmap = delete $o->{magicmap};
305 392
306 # find upper left corner :/ 393 # find upper left corner :/
… …
346 facings => $facings, 433 facings => $facings,
347 frames => \@frames, 434 frames => \@frames,
348 }; 435 };
349 } 436 }
350 437
351 for my $face ($o->{face} || (), @{$anim || []}) { 438 for ($o->{face} || (), @{$anim || []}) {
352 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 439 next if /^facings\s/;
353 440
441 my $face = $_;
442 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
443
354 my $info = $FACEINFO{$face} ||= {}; 444 my $info = $FACEINFO{$face} ||= { };
445 $info->{arc} = $o;
446
447 next if $face =~ /^blank.x11$|^empty.x11$/;
355 448
356 $info->{visibility} = $visibility if defined $visibility; 449 $info->{visibility} = $visibility if defined $visibility;
357 $info->{magicmap} = $magicmap if defined $magicmap; 450 $info->{magicmap} = $magicmap if defined $magicmap;
358 } 451 }
359 452
360 if (my $smooth = delete $o->{smoothface}) { 453 if (my $smooth = delete $o->{smoothface}) {
361 my %kv =split /\s+/, $smooth; 454 my %kv = split /\s+/, $smooth;
362 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 455 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
363 while (my ($face, $smooth) = each %kv) { 456 while (my ($face, $smooth) = each %kv) {
457 $FACEINFO{$smooth}{arc} = $o;
458
364 $FACEINFO{$face}{smooth} = $smooth; 459 $FACEINFO{$face}{smooth} = $smooth;
365 $FACEINFO{$face}{smoothlevel} = $level; 460 $FACEINFO{$face}{smoothlevel} = $level;
366 } 461 }
367 } 462 }
368 } 463 }
369 } 464 }
370 } 465 }
371 } 466 }
372 467
373 sub process_trs { 468 sub process_trs {
374 while (@trs) { 469 while (my $job = $c_trs->get) {
375 my ($dir, $file) = @{pop @trs}; 470 my ($dir, $file) = @$job;
376 my $path = "$dir/$file"; 471 my $path = "$dir/$file";
377 472
378 my $trs; 473 my $trs;
379 if (0 > aio_load $path, $trs) { 474 if (0 > aio_load $path, $trs) {
380 warn "$path: $!, skipping.\n"; 475 warn "$path: $!, skipping.\n";
… …
383 478
384 $TRS .= $trs; 479 $TRS .= $trs;
385 } 480 }
386 } 481 }
387 482
483 my %FILECACHE;
484
485 sub load_cached($;$) {
486 unless (exists $FILECACHE{$_[0]}) {
487 my $data;
488 if (0 < aio_load $_[0], $data) {
489 if ($_[1]) {
490 $data = eval { $_[1]->($data) };
491 warn "$_[0]: $@" if $@;
492 }
493 }
494
495 $FILECACHE{$_[0]} = $data;
496 }
497
498 $FILECACHE{$_[0]}
499 }
500
501 sub process_res {
502 while (my $job = $c_res->get) {
503 my ($dir, $file, $type) = @$job;
504
505 my $data;
506 aio_load "$dir/$file", $data;
507
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 }
518
519 $meta = {
520 %{ $meta->{"" } || {} },
521 %{ $meta->{$file} || {} },
522 };
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
535 $file =~ s/\.res$//;
536 $file =~ s/\.(ogg|wav|jpg|png)$//;
537
538 substr $dir, 0, 1 + length $PATH, "";
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
553 $RESOURCE{"$dir/$file"} = {
554 type => (exists $meta->{type} ? delete $meta->{type} : $type),
555 data => $data,
556 %$meta ? (meta => $meta) : (),
557 };
558 }
559 }
560
388 sub find_files; 561 sub find_files;
389 sub find_files { 562 sub find_files {
390 my ($path) = @_; 563 my ($path) = @_;
391 564
392 IO::AIO::aioreq_pri 4; 565 IO::AIO::aioreq_pri 4;
… …
394 my ($dirs, $nondirs) = @_; 567 my ($dirs, $nondirs) = @_;
395 568
396 find_files "$path/$_" 569 find_files "$path/$_"
397 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 570 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
398 571
572 my $dir = $path;
573 substr $dir, 0, 1 + length $PATH, "";
574
399 for my $file (@$nondirs) { 575 for my $file (@$nondirs) {
576 if ($dir =~ /^music(?:\/|$)/) {
577 $c_res->put ([$path, $file, 3]) # FT_MUSIC
578 if $file =~ /\.(ogg)$/;
579
580 } elsif ($dir =~ /^sound(?:\/|$)/) {
581 $c_res->put ([$path, $file, 5]) # FT_SOUND
582 if $file =~ /\.(wav|ogg)$/;
583
584 } elsif ($dir =~ /^res(?:\/|$)/) {
585 if ($file =~ /\.(jpg|png)$/) {
586 $c_res->put ([$path, $file, 0]) # FT_FACE
587 } elsif ($file =~ /\.(res)$/) {
588 $c_res->put ([$path, $file, 6]) # FT_RSRC
589 } else {
590 $c_res->put ([$path, $file, undef]);
591 }
592
400 if ($file =~ /\.png$/) { 593 } elsif ($file =~ /\.png$/) {
401 push @png, ["$path/$file", 0]; 594 push @c_png, ["$path/$file", 0];
595
402 } elsif ($file =~ /\.trs$/) { 596 } elsif ($file =~ /\.trs$/) {
403 push @trs, [$path, $file]; 597 $c_trs->put ([$path, $file]);
598
404 } elsif ($file =~ /\.arc$/) { 599 } elsif ($file =~ /\.arc$/) {
405 push @arc, [$path, $file]; 600 $c_arc->put ([$path, $file]);
601
406 } else { 602 } else {
407 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 603 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
408 } 604 }
409 } 605 }
410 }; 606 };
411 } 607 }
412 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# }
632 }
633
413 sub inst_arch($) { 634 sub inst_arch($) {
414 my (undef, $path) = @_; 635 my (undef, $path) = @_;
636
637 $PATH = $path;
415 638
416 print "\n", 639 print "\n",
417 "Installing '$path' to '$DATADIR'\n", 640 "Installing '$path' to '$DATADIR'\n",
418 "\n", 641 "\n",
419 "This can take a long time if you run this\n", 642 "This can take a long time if you run this\n",
… …
426 if (!-d "$path/treasures") { 649 if (!-d "$path/treasures") {
427 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";
428 exit 1 unless $FORCE; 651 exit 1 unless $FORCE;
429 } 652 }
430 653
654 print "scanning files...\n" if $VERBOSE;
655
431 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
432 IO::AIO::flush; 662 IO::AIO::flush;
433 663
434 $_->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
435 # four png crunchers work fine for my 2x smp machine 674 # eight png crunchers work fine for my 4x smp machine
436 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 675 my @a_png = map +(async \&process_png), 1..8;
437 (async \&process_trs), (async \&process_trs),
438 (async \&process_arc), (async \&process_arc),
439 );
440 676
677 $_->join for (@a_trs, @a_res, @a_png);
678
679 print "scanning done, processing results...\n" if $VERBOSE;
441 { 680 {
442 # remove path prefix from editor_folder 681 # remove path prefix from editor_folder
443 substr $_->{editor_folder}, 0, 1 + length $path, "" 682 substr $_->{editor_folder}, 0, 1 + length $path, ""
444 for values %ARC; 683 for values %ARC;
445 684
685 print "resolving inheritance tree...\n" if $VERBOSE;
446 # resolve inherit 686 # resolve inherit
447 while () { 687 while () {
448 my $progress; 688 my $progress;
449 my $loop; 689 my $loop;
450 690
… …
476 } 716 }
477 717
478 # 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
479 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 719 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
480 720
721 print "generating plurals...\n" if $VERBOSE;
722 generate_plurals;
723
724 print "writing archetypes...\n" if $VERBOSE;
481 open my $fh, ">:utf8", "$DATADIR/archetypes~" 725 open my $fh, ">:utf8", "$DATADIR/archetypes~"
482 or die "$DATADIR/archetypes~: $!"; 726 or die "$DATADIR/archetypes~: $!";
483 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];
484 } 728 }
485 729
486 { 730 {
731 print "writing treasures...\n" if $VERBOSE;
487 open my $fh, ">:utf8", "$DATADIR/treasures~" 732 open my $fh, ">:utf8", "$DATADIR/treasures~"
488 or die "$DATADIR/treasures~: $!"; 733 or die "$DATADIR/treasures~: $!";
489 print $fh $TRS; 734 print $fh $TRS;
490 } 735 }
491 736
492 { 737 {
738 print "processing facedata...\n" if $VERBOSE;
493 while (my ($k, $v) = each %FACEINFO) { 739 while (my ($k, $v) = each %FACEINFO) {
494 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";
495 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";
496 742
497 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";
498 #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";
499
500 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
501 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
502 745
503 if (my $magicmap = $v->{magicmap}) { 746 if (my $magicmap = $v->{magicmap}) {
504 $magicmap =~ y/A-Z_\-/a-z/d; 747 $magicmap =~ y/A-Z_\-/a-z/d;
505 $v->{magicmap} = $COLOR{$magicmap}; 748 $v->{magicmap} = $COLOR{$magicmap};
506 } 749 }
507 }
508 750
751 delete $v->{arc};
752 }
753
754 print "writing facedata...\n" if $VERBOSE;
509 open my $fh, ">:perlio", "$DATADIR/facedata~" 755 open my $fh, ">:perlio", "$DATADIR/facedata~"
510 or die "$DATADIR/facedata~: $!"; 756 or die "$DATADIR/facedata~: $!";
511 757
512 print $fh freeze { 758 print $fh freeze {
513 version => 2, 759 version => 2,
514 faceinfo => \%FACEINFO, 760 faceinfo => \%FACEINFO,
515 animinfo => \%ANIMINFO, 761 animinfo => \%ANIMINFO,
762 resource => \%RESOURCE,
516 }; 763 };
517 } 764 }
765
766 print "committing files...\n" if $VERBOSE;
518 767
519 for (qw(archetypes facedata treasures)) { 768 for (qw(archetypes facedata treasures)) {
520 chmod 0644, "$DATADIR/$_~"; 769 chmod 0644, "$DATADIR/$_~";
521 rename "$DATADIR/$_~", "$DATADIR/$_" 770 rename "$DATADIR/$_~", "$DATADIR/$_"
522 or die "$DATADIR/$_: $!"; 771 or die "$DATADIR/$_: $!";

Diff Legend

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