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

Diff Legend

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