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.31 by root, Thu Apr 26 00:39:18 2007 UTC vs.
Revision 1.56 by root, Sun Aug 19 15:47:56 2007 UTC

… …
6my $exec_prefix = "@exec_prefix@"; 6my $exec_prefix = "@exec_prefix@";
7my $datarootdir = "@datarootdir@"; 7my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 8my $DATADIR = "@datadir@/@PACKAGE@";
9 9
10my $CONVERT = "@CONVERT@"; 10my $CONVERT = "@CONVERT@";
11my $IDENTIFY = "@IDENTIFY@"; 11#my $IDENTIFY = "@IDENTIFY@";
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;
… …
19use IO::AIO (); 19use IO::AIO ();
20use File::Temp; 20use File::Temp;
21use Crossfire; 21use Crossfire;
22use Coro; 22use Coro;
23use Coro::AIO; 23use Coro::AIO;
24use Coro::Util;
24use POSIX (); 25use POSIX ();
25use Digest::MD5; 26use Digest::MD5;
27use Carp;
28use Coro::Channel;
26use Coro::Storable; $Storable::canonical = 1; 29use Coro::Storable; $Storable::canonical = 1;
30
31$SIG{QUIT} = sub { Carp::cluck "QUIT" };
27 32
28sub usage { 33sub usage {
29 warn <<EOF; 34 warn <<EOF;
30Usage: cfutil [-v] [-q] [--force] [--cache] 35Usage: cfutil [-v] [-q] [--force] [--cache]
31 [--install-arch path] 36 [--install-arch path]
… …
43my $CACHE = 0; 48my $CACHE = 0;
44my $FORCE; 49my $FORCE;
45my $TMPDIR = "/tmp/cfutil$$~"; 50my $TMPDIR = "/tmp/cfutil$$~";
46my $TMPFILE = "aaaa0"; 51my $TMPFILE = "aaaa0";
47 52
53our %COLOR = (
54 black => 0,
55 white => 1,
56 navy => 2,
57 red => 3,
58 orange => 4,
59 blue => 5,
60 darkorange => 6,
61 green => 7,
62 lightgreen => 8,
63 grey => 9,
64 brown => 10,
65 gold => 11,
66 tan => 12,
67);
68
48END { system "rm", "-rf", $TMPDIR } 69END { system "rm", "-rf", $TMPDIR }
49 70
50Event->signal (signal => "INT", cb => sub { exit 1 }); 71Event->signal (signal => "INT", cb => sub { exit 1 });
51Event->signal (signal => "TERM", cb => sub { exit 1 }); 72Event->signal (signal => "TERM", cb => sub { exit 1 });
52 73
… …
76 if (!-f "$path/regions") { 97 if (!-f "$path/regions") {
77 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 98 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
78 exit 1 unless $FORCE; 99 exit 1 unless $FORCE;
79 } 100 }
80 101
81 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 102 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
82 and die "map installation failed.\n"; 103 and die "map installation failed.\n";
83 104
84 print "maps installed successfully.\n"; 105 print "maps installed successfully.\n";
85} 106}
86 107
87{ 108{
88 our %ANIMINFO; 109 our %ANIMINFO;
89 our %FACEINFO; 110 our %FACEINFO;
111 our %RESOURCE;
90 our @ARC; 112 our @ARC;
91 our %ARC; 113 our %ARC;
92 our $TRS; 114 our $TRS;
93 our $NFILE; 115 our $NFILE;
116 our $PATH;
94 117
95 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 118 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
96 119
97 our (@png, @trs, @arc); # files we are interested in 120 our $c_arc = new Coro::Channel;
121 our $c_trs = new Coro::Channel;
122 our $c_res = new Coro::Channel;
123
124 our @c_png;
98 125
99 sub commit_png($$$) { 126 sub commit_png($$$) {
100 my ($name, $data, $T) = @_; 127 my ($name, $data, $T) = @_;
101 128
102 $FACEINFO{$name}{"data$T"} = $data; 129 $FACEINFO{$name}{"data$T"} = $data;
103 } 130 }
104 131
105 sub process_png { 132 sub process_png {
106 while (@png) { 133 while (@c_png) {
107 my ($path, $delete) = @{pop @png}; 134 my ($path, $delete) = @{pop @c_png};
108 135
109 my $png; 136 my $png;
110 aio_lstat $path; 137 aio_lstat $path;
111 my ($size, $mtime) = (stat _)[7,9]; 138 my ($size, $mtime) = (stat _)[7,9];
112 139
… …
143 if ($w % $T || $h % $T) { 170 if ($w % $T || $h % $T) {
144 warn "$path: weird png size ($w $h), skipping.\n"; 171 warn "$path: weird png size ($w $h), skipping.\n";
145 next; 172 next;
146 } 173 }
147 174
175 (my $base = $stem) =~ s/^.*\///;
176
177 my $fi = $FACEINFO{$base};
178 unless ($fi) {
179 warn "$path: <$base> not referenced by any archetype, skipping.\n";
180 next;
181 }
182
183 my $arc = $FACEINFO{$base}{arc}
184 or die "FATAL: internal error <$base>, cannot continue";
185
148 unless ($path =~ /~$/) { 186 unless ($path =~ /~$/) {
149 # possibly enlarge 187 # possibly enlarge
150 if (0 > aio_stat "$stem.64x64.png") { 188 if (0 > aio_stat "$stem.64x64.png") {
151 my $other = "$stem.64x64.png~"; 189 my $other = "$stem.64x64.png~";
152 190
153 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 191 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
154 my $wrap = 0; # for the time being
155 fork_sub { 192 fork_sub {
193 my $CROP;
194 my $SRC = "png:\Q$path\E";
195
196 my $is_floor = $arc->{is_floor};
197 my $is_wall = 0;
198
199 my ($wall_pfx, $wall_dir, $wall_sfx);
200
201 if (
202 !$is_floor
203 && !$arc->{alive}
204 && $arc->{move_block} eq "all"
205 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
206 ) {
207 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
208
209 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
210 $is_wall = 1;
211 }
212 }
213
214 if ($is_wall || $is_floor) {
215 # add a 4px border and add other images around it
216 $CROP = "-shave 8x8 +repage";
217
218 $w += 8;
219 $h += 8;
220
221 $SRC = "-size ${w}x${h} xc:transparent";
222 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
223
224 # 8 surrounding images
225 for (
226 # x y b r0 r1
227 [-1, -1, 0, 6],
228 [ 0, -1, 1, 10, 14],
229 [+1, -1, 0, 12],
230
231 [-1, 0, 8, 5, 7],
232 #
233 [+1, 0, 2, 5, 13],
234
235 [-1, +1, 0, 3],
236 [ 0, +1, 4, 10, 11],
237 [+1, +1, 0, 9],
238 ) {
239 my ($x, $y, $d, $r0, $r1) = @$_;
240
241 my $tile = $is_floor ? $path
242 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
243 : die;
244
245 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
246 "\Q$tile",
247 $x * ($w - 8) + 4,
248 $y * ($h - 8) + 4;
249 }
250 }
251
156 system "convert png:\Q$path\E -depth 8 rgba:-" 252 system "convert -depth 8 $SRC rgba:-"
157 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 253 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
158 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" 254 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
159 and die "convert/hq2xa pipeline error: status $? ($!)"; 255 and die "convert/cfhq2xa pipeline error: status $? ($!)";
160 system $OPTIPNG, "-i0", "-q", "$other~"; 256 system $OPTIPNG, "-i0", "-q", "$other~";
161 die "$other~ has zero size, aborting." unless -s "$other~"; 257 die "$other~ has zero size, aborting." unless -s "$other~";
162 rename "$other~", $other; 258 rename "$other~", $other;
163 }; 259 };
164 } 260 }
165 261
166 push @png, [$other, !$CACHE]; 262 push @c_png, [$other, !$CACHE];
167 } 263 }
168 264
169 # possibly scale down 265 # possibly scale down
170 if (0 > aio_stat "$stem.32x32.png") { 266 if (0 > aio_stat "$stem.32x32.png") {
171 my $other = "$stem.32x32.png~"; 267 my $other = "$stem.32x32.png~";
… …
177 273
178 # reduce smoothfaces >10000 bytes 274 # reduce smoothfaces >10000 bytes
179 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 275 if ($stem =~ /_S\./ && (-s "$other~") > 10000) {
180 my $ncolor = 256; 276 my $ncolor = 256;
181 while () { 277 while () {
182 system "<\Q$other~\E $PNGNQ -n$ncolor >\Q$other~~\E"; 278 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
183 system $OPTIPNG, "-i0", "-q", "$other~~"; 279 system $OPTIPNG, "-i0", "-q", "$other~~";
184 last if 10000 > -s "$other~~"; 280 last if 10000 > -s "$other~~";
185 $ncolor = int $ncolor * 0.9; 281 $ncolor = int $ncolor * 0.9;
186 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; 282 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
187 } 283 }
188 284
189 printf "reduced %s from %d to %d bytes using %d colours.\n", 285 printf "reduced %s from %d to %d bytes using %d colours.\n",
190 $other, -s "$other~", -s "$other~~", $ncolor 286 $other, -s "$other~", -s "$other~~", $ncolor
191 if $VERBOSE > 0; 287 if $VERBOSE >= 2;
192 rename "$other~~", "$other~"; 288 rename "$other~~", "$other~";
193 } 289 }
194 290
195 die "$other~ has zero size, aborting." unless -s "$other~"; 291 die "$other~ has zero size, aborting." unless -s "$other~";
196 rename "$other~", $other; 292 rename "$other~", $other;
197 }; 293 };
198 } 294 }
199 295
200 #warn "scaled down $path to $other\n";#d# 296 #warn "scaled down $path to $other\n";#d#
201 push @png, [$other, !$CACHE]; 297 push @c_png, [$other, !$CACHE];
202 } 298 }
203 } 299 }
204 300
205 (my $face = $stem) =~ s/^.*\///; 301 (my $face = $stem) =~ s/^.*\///;
206 302
… …
267 aio_unlink $path if $delete; 363 aio_unlink $path if $delete;
268 } 364 }
269 } 365 }
270 366
271 sub process_arc { 367 sub process_arc {
272 while (@arc) { 368 while (my $job = $c_arc->get) {
273 my ($dir, $file) = @{pop @arc}; 369 my ($dir, $file) = @$job;
274 370
275 my $arc; 371 my $arc;
276 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 372 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
277 373
278 my $arc = read_arch "$dir/$file"; 374 my $arc = read_arch "$dir/$file";
… …
301 397
302 my $ext = $x|$y ? "+$x+$y" : ""; 398 my $ext = $x|$y ? "+$x+$y" : "";
303 399
304 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 400 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
305 401
306 my $visibility = delete $o->{visibility} if exists $o->{visibility}; 402 $visibility = delete $o->{visibility} if exists $o->{visibility};
307 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 403 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
308 404
309 my $anim = delete $o->{anim}; 405 my $anim = delete $o->{anim};
310 406
311 if ($anim) { 407 if ($anim) {
312 # possibly add $ext to the animation name to avoid 408 # possibly add $ext to the animation name to avoid
… …
331 frames => \@frames, 427 frames => \@frames,
332 }; 428 };
333 } 429 }
334 430
335 for my $face ($o->{face} || (), @{$anim || []}) { 431 for my $face ($o->{face} || (), @{$anim || []}) {
336 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 432 next if $face =~ /^facings\s/;
337 433
338 my $info = $FACEINFO{$face} ||= {}; 434 my $info = $FACEINFO{$face} ||= { };
435 $info->{arc} = $o;
436
437 next if $face =~ /^blank.x11$|^empty.x11$/;
339 438
340 $info->{visibility} = $visibility if defined $visibility; 439 $info->{visibility} = $visibility if defined $visibility;
341 $info->{magicmap} = $magicmap if defined $magicmap; 440 $info->{magicmap} = $magicmap if defined $magicmap;
342 } 441 }
343 442
344 if (my $smooth = delete $o->{smoothface}) { 443 if (my $smooth = delete $o->{smoothface}) {
345 my %kv =split /\s+/, $smooth; 444 my %kv = split /\s+/, $smooth;
346 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 445 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
347 while (my ($face, $smooth) = each %kv) { 446 while (my ($face, $smooth) = each %kv) {
447 $FACEINFO{$smooth}{arc} = $o;
448
348 $FACEINFO{$face}{smooth} = $smooth; 449 $FACEINFO{$face}{smooth} = $smooth;
349 $FACEINFO{$face}{smoothlevel} = $level; 450 $FACEINFO{$face}{smoothlevel} = $level;
350 } 451 }
351 } 452 }
352 } 453 }
353 } 454 }
354 } 455 }
355 } 456 }
356 457
357 sub process_trs { 458 sub process_trs {
358 while (@trs) { 459 while (my $job = $c_trs->get) {
359 my ($dir, $file) = @{pop @trs}; 460 my ($dir, $file) = @$job;
360 my $path = "$dir/$file"; 461 my $path = "$dir/$file";
361 462
362 my $trs; 463 my $trs;
363 if (0 > aio_load $path, $trs) { 464 if (0 > aio_load $path, $trs) {
364 warn "$path: $!, skipping.\n"; 465 warn "$path: $!, skipping.\n";
… …
367 468
368 $TRS .= $trs; 469 $TRS .= $trs;
369 } 470 }
370 } 471 }
371 472
473 my %FILECACHE;
474
475 sub load_cached($;$) {
476 unless (exists $FILECACHE{$_[0]}) {
477 my $data;
478 if (0 < aio_load $_[0], $data) {
479 if ($_[1]) {
480 $data = eval { $_[1]->($data) };
481 warn "$_[0]: $@" if $@;
482 }
483 }
484
485 $FILECACHE{$_[0]} = $data;
486 }
487
488 $FILECACHE{$_[0]}
489 }
490
491 sub process_res {
492 while (my $job = $c_res->get) {
493 my ($dir, $file, $type) = @$job;
494
495 my $data;
496 aio_load "$dir/$file", $data;
497
498 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
499
500 next if $meta && !exists $meta->{$file};
501
502 $meta = {
503 %{ $meta->{"" } || {} },
504 %{ $meta->{$file} || {} },
505 };
506
507 if ($meta->{license} =~ s/^#//) {
508 $meta->{license} = ({
509 "pd" => "Public Domain",
510 "gpl" => "GNU General Public License, version 3.0 or any later",
511 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
512 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
513 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
514 })->{$meta->{license}}
515 || warn "$dir/$file: license tag '$meta->{license}' not found.";
516 }
517
518 $file =~ s/\.res$//;
519 $file =~ s/\.(ogg|wav|jpg|png)$//;
520
521 substr $dir, 0, 1 + length $PATH, "";
522
523 $RESOURCE{"$dir/$file"} = {
524 type => (delete $meta->{type}) || $type,
525 data => $data,
526 chksum => (Digest::MD5::md5 $data),
527 %$meta ? (meta => $meta) : (),
528 };
529 }
530 }
531
372 sub find_files; 532 sub find_files;
373 sub find_files { 533 sub find_files {
374 my ($path) = @_; 534 my ($path) = @_;
375 535
376 IO::AIO::aioreq_pri 4; 536 IO::AIO::aioreq_pri 4;
… …
378 my ($dirs, $nondirs) = @_; 538 my ($dirs, $nondirs) = @_;
379 539
380 find_files "$path/$_" 540 find_files "$path/$_"
381 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 541 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
382 542
543 my $dir = $path;
544 substr $dir, 0, 1 + length $PATH, "";
545
383 for my $file (@$nondirs) { 546 for my $file (@$nondirs) {
547 if ($dir =~ /^music(?:\/|$)/) {
548 $c_res->put ([$path, $file, 3]) # FT_MUSIC
549 if $file =~ /\.(ogg)$/;
550
551 } elsif ($dir =~ /^sound(?:\/|$)/) {
552 $c_res->put ([$path, $file, 5]) # FT_SOUND
553 if $file =~ /\.(wav|ogg)$/;
554
555 } elsif ($dir =~ /^res(?:\/|$)/) {
556 $c_res->put ([$path, $file, 0]) # FT_FACE
557 if $file =~ /\.(jpg|png)$/;
558 $c_res->put ([$path, $file, 7]) # FT_RSRC
559 if $file =~ /\.(res)$/;
560
384 if ($file =~ /\.png$/) { 561 } elsif ($file =~ /\.png$/) {
385 push @png, ["$path/$file", 0]; 562 push @c_png, ["$path/$file", 0];
563
386 } elsif ($file =~ /\.trs$/) { 564 } elsif ($file =~ /\.trs$/) {
387 push @trs, [$path, $file]; 565 $c_trs->put ([$path, $file]);
566
388 } elsif ($file =~ /\.arc$/) { 567 } elsif ($file =~ /\.arc$/) {
389 push @arc, [$path, $file]; 568 $c_arc->put ([$path, $file]);
569
390 } else { 570 } else {
391 warn "ignoring $path/$file\n" if $VERBOSE >= 2; 571 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
392 } 572 }
393 } 573 }
394 }; 574 };
395 } 575 }
396 576
397 sub inst_arch($) { 577 sub inst_arch($) {
398 my (undef, $path) = @_; 578 my (undef, $path) = @_;
579
580 $PATH = $path;
399 581
400 print "\n", 582 print "\n",
401 "Installing '$path' to '$DATADIR'\n", 583 "Installing '$path' to '$DATADIR'\n",
402 "\n", 584 "\n",
403 "This can take a long time if you run this\n", 585 "This can take a long time if you run this\n",
… …
410 if (!-d "$path/treasures") { 592 if (!-d "$path/treasures") {
411 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 593 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
412 exit 1 unless $FORCE; 594 exit 1 unless $FORCE;
413 } 595 }
414 596
597 print "scanning files...\n" if $VERBOSE;
598
415 find_files $path; 599 find_files $path;
600
601 my @a_arc = map +(async \&process_arc), 1..2;
602 my @a_res = map +(async \&process_res), 1..2;
603 my @a_trs = map +(async \&process_trs), 1..2;
604
416 IO::AIO::flush; 605 IO::AIO::flush;
417 606
418 $_->join for ( 607 $c_res->put (undef) for @a_res;
608 $c_arc->put (undef) for @a_arc;
609 $c_trs->put (undef) for @a_trs;
610
611 print "start file scan, arc, res processing...\n" if $VERBOSE;
612
613 $_->join for @a_arc; # need to parse all archetypes before png processing
614
615 print "end arc, start png processing...\n" if $VERBOSE;
616
419 # four png crunchers work fine for my 2x smp machine 617 # four png crunchers work fine for my 2x smp machine
420 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 618 my @a_png = map +(async \&process_png), 1..4;
421 (async \&process_trs), (async \&process_trs),
422 (async \&process_arc), (async \&process_arc),
423 );
424 619
620 $_->join for (@a_trs, @a_res, @a_png);
621
622 print "scanning done, processing results...\n" if $VERBOSE;
425 { 623 {
426 # remove path prefix from editor_folder 624 # remove path prefix from editor_folder
427 substr $_->{editor_folder}, 0, 1 + length $path, "" 625 substr $_->{editor_folder}, 0, 1 + length $path, ""
428 for values %ARC; 626 for values %ARC;
429 627
628 print "resolving inheritance tree...\n" if $VERBOSE;
430 # resolve inherit 629 # resolve inherit
431 while () { 630 while () {
432 my $progress; 631 my $progress;
433 my $loop; 632 my $loop;
434 633
… …
457 656
458 last; 657 last;
459 } 658 }
460 } 659 }
461 660
661 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
662 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
663
664 print "writing archetypes...\n" if $VERBOSE;
462 open my $fh, ">:utf8", "$DATADIR/archetypes~" 665 open my $fh, ">:utf8", "$DATADIR/archetypes~"
463 or die "$DATADIR/archetypes~: $!"; 666 or die "$DATADIR/archetypes~: $!";
464 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 667 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
465 } 668 }
466 669
467 { 670 {
671 print "writing treasures...\n" if $VERBOSE;
468 open my $fh, ">:utf8", "$DATADIR/treasures~" 672 open my $fh, ">:utf8", "$DATADIR/treasures~"
469 or die "$DATADIR/treasures~: $!"; 673 or die "$DATADIR/treasures~: $!";
470 print $fh $TRS; 674 print $fh $TRS;
471 } 675 }
472 676
473 { 677 {
678 print "processing facedata...\n" if $VERBOSE;
474 while (my ($k, $v) = each %FACEINFO) { 679 while (my ($k, $v) = each %FACEINFO) {
475 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 680 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
476 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 681 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
477 682
478 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 683 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
479 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 684 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
480 685
481 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 686 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
482 $v->{chksum64} = Digest::MD5::md5 $v->{data64}; 687 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
688
689 if (my $magicmap = $v->{magicmap}) {
690 $magicmap =~ y/A-Z_\-/a-z/d;
691 $v->{magicmap} = $COLOR{$magicmap};
483 } 692 }
484 693
694 delete $v->{arc};
695 }
696
697 print "writing facedata...\n" if $VERBOSE;
485 open my $fh, ">:perlio", "$DATADIR/facedata~" 698 open my $fh, ">:perlio", "$DATADIR/facedata~"
486 or die "$DATADIR/facedata~: $!"; 699 or die "$DATADIR/facedata~: $!";
487 700
488 print $fh freeze { 701 print $fh freeze {
489 version => 2, 702 version => 2,
490 faceinfo => \%FACEINFO, 703 faceinfo => \%FACEINFO,
491 animinfo => \%ANIMINFO, 704 animinfo => \%ANIMINFO,
705 resource => \%RESOURCE,
492 }; 706 };
493 } 707 }
708
709 print "committing files...\n" if $VERBOSE;
494 710
495 for (qw(archetypes facedata treasures)) { 711 for (qw(archetypes facedata treasures)) {
496 chmod 0644, "$DATADIR/$_~"; 712 chmod 0644, "$DATADIR/$_~";
497 rename "$DATADIR/$_~", "$DATADIR/$_" 713 rename "$DATADIR/$_~", "$DATADIR/$_"
498 or die "$DATADIR/$_: $!"; 714 or die "$DATADIR/$_: $!";

Diff Legend

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