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.34 by root, Mon May 7 06:01:48 2007 UTC vs.
Revision 1.73 by root, Mon Oct 26 11:31:39 2009 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;
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]
… …
43my $CACHE = 0; 52my $CACHE = 0;
44my $FORCE; 53my $FORCE;
45my $TMPDIR = "/tmp/cfutil$$~"; 54my $TMPDIR = "/tmp/cfutil$$~";
46my $TMPFILE = "aaaa0"; 55my $TMPFILE = "aaaa0";
47 56
57our %COLOR = (
58 black => 0,
59 white => 1,
60 navy => 2,
61 red => 3,
62 orange => 4,
63 blue => 5,
64 darkorange => 6,
65 green => 7,
66 lightgreen => 8,
67 grey => 9,
68 brown => 10,
69 gold => 11,
70 tan => 12,
71);
72
48END { system "rm", "-rf", $TMPDIR } 73END { system "rm", "-rf", $TMPDIR }
49 74
50Event->signal (signal => "INT", cb => sub { exit 1 }); 75my $s_INT = EV::signal INT => sub { exit 1 };
51Event->signal (signal => "TERM", cb => sub { exit 1 }); 76my $s_TERM = EV::signal TERM => sub { exit 1 };
52 77
53mkdir $TMPDIR, 0700 78mkdir $TMPDIR, 0700
54 or die "$TMPDIR: $!"; 79 or die "$TMPDIR: $!";
55 80
56sub fork_sub(&) { 81sub fork_sub(&) {
… …
76 if (!-f "$path/regions") { 101 if (!-f "$path/regions") {
77 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";
78 exit 1 unless $FORCE; 103 exit 1 unless $FORCE;
79 } 104 }
80 105
81 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"
82 and die "map installation failed.\n"; 110 and die "map installation failed.\n";
83 111
84 print "maps installed successfully.\n"; 112 print "maps installed successfully.\n";
85} 113}
86 114
87{ 115{
88 our %ANIMINFO; 116 our %ANIMINFO;
89 our %FACEINFO; 117 our %FACEINFO;
118 our %RESOURCE;
90 our @ARC; 119 our @ARC;
91 our %ARC; 120 our %ARC;
92 our $TRS; 121 our $TRS;
93 our $NFILE; 122 our $NFILE;
123 our $PATH;
94 124
95 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 125 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
96 126
97 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;
98 132
99 sub commit_png($$$) { 133 sub commit_png($$$) {
100 my ($name, $data, $T) = @_; 134 my ($name, $data, $T) = @_;
101 135
102 $FACEINFO{$name}{"data$T"} = $data; 136 $FACEINFO{$name}{"data$T"} = $data;
103 } 137 }
104 138
105 sub process_png { 139 sub process_png {
106 while (@png) { 140 while (@c_png) {
107 my ($path, $delete) = @{pop @png}; 141 my ($path, $delete) = @{pop @c_png};
108 142
109 my $png; 143 my $png;
110 aio_lstat $path; 144 aio_lstat $path;
111 my ($size, $mtime) = (stat _)[7,9]; 145 my ($size, $mtime) = (stat _)[7,9];
112 146
… …
143 if ($w % $T || $h % $T) { 177 if ($w % $T || $h % $T) {
144 warn "$path: weird png size ($w $h), skipping.\n"; 178 warn "$path: weird png size ($w $h), skipping.\n";
145 next; 179 next;
146 } 180 }
147 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
148 unless ($path =~ /~$/) { 192 unless ($path =~ /~$/) {
149 # possibly enlarge 193 # possibly enlarge
150 if (0 > aio_stat "$stem.64x64.png") { 194 if (0 > aio_stat "$stem.64x64.png") {
151 my $other = "$stem.64x64.png~"; 195 my $other = "$stem.64x64.png~";
152 196
153 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 197 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
154 my $wrap = 0; # for the time being
155 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
156 system "convert png:\Q$path\E -depth 8 rgba:-" 258 system "convert -depth 8 $SRC rgba:-"
157 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 259 . "| $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~" 260 . "| 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 $? ($!)"; 261 and die "convert/cfhq2xa pipeline error: status $? ($!)";
160 system $OPTIPNG, "-i0", "-q", "$other~"; 262 system $OPTIPNG, "-i0", "-q", "$other~";
161 die "$other~ has zero size, aborting." unless -s "$other~"; 263 die "$other~ has zero size, aborting." unless -s "$other~";
162 rename "$other~", $other; 264 rename "$other~", $other;
163 }; 265 };
164 } 266 }
165 267
166 push @png, [$other, !$CACHE]; 268 push @c_png, [$other, !$CACHE];
167 } 269 }
168 270
169 # possibly scale down 271 # possibly scale down
170 if (0 > aio_stat "$stem.32x32.png") { 272 if (0 > aio_stat "$stem.32x32.png") {
171 my $other = "$stem.32x32.png~"; 273 my $other = "$stem.32x32.png~";
… …
174 fork_sub { 276 fork_sub {
175 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~";
176 system $OPTIPNG, "-i0", "-q", "$other~"; 278 system $OPTIPNG, "-i0", "-q", "$other~";
177 279
178 # reduce smoothfaces >10000 bytes 280 # reduce smoothfaces >10000 bytes
281 # obsolete, no longer required
179 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 282 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
180 my $ncolor = 256; 283 my $ncolor = 256;
181 while () { 284 while () {
182 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 285 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
183 system $OPTIPNG, "-i0", "-q", "$other~~"; 286 system $OPTIPNG, "-i0", "-q", "$other~~";
184 last if 10000 > -s "$other~~"; 287 last if 10000 > -s "$other~~";
… …
196 rename "$other~", $other; 299 rename "$other~", $other;
197 }; 300 };
198 } 301 }
199 302
200 #warn "scaled down $path to $other\n";#d# 303 #warn "scaled down $path to $other\n";#d#
201 push @png, [$other, !$CACHE]; 304 push @c_png, [$other, !$CACHE];
202 } 305 }
203 } 306 }
204 307
205 (my $face = $stem) =~ s/^.*\///; 308 (my $face = $stem) =~ s/^.*\///;
206 309
… …
267 aio_unlink $path if $delete; 370 aio_unlink $path if $delete;
268 } 371 }
269 } 372 }
270 373
271 sub process_arc { 374 sub process_arc {
272 while (@arc) { 375 while (my $job = $c_arc->get) {
273 my ($dir, $file) = @{pop @arc}; 376 my ($dir, $file) = @$job;
274 377
275 my $arc; 378 my $arc;
276 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 :/
277 380
278 my $arc = read_arch "$dir/$file"; 381 my $arc = read_arch "$dir/$file";
… …
301 404
302 my $ext = $x|$y ? "+$x+$y" : ""; 405 my $ext = $x|$y ? "+$x+$y" : "";
303 406
304 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 407 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
305 408
306 my $visibility = delete $o->{visibility} if exists $o->{visibility}; 409 $visibility = delete $o->{visibility} if exists $o->{visibility};
307 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 410 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
308 411
309 my $anim = delete $o->{anim}; 412 my $anim = delete $o->{anim};
310 413
311 if ($anim) { 414 if ($anim) {
312 # possibly add $ext to the animation name to avoid 415 # possibly add $ext to the animation name to avoid
… …
330 facings => $facings, 433 facings => $facings,
331 frames => \@frames, 434 frames => \@frames,
332 }; 435 };
333 } 436 }
334 437
335 for my $face ($o->{face} || (), @{$anim || []}) { 438 for ($o->{face} || (), @{$anim || []}) {
336 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 439 next if /^facings\s/;
337 440
441 my $face = $_;
442 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
443
338 my $info = $FACEINFO{$face} ||= {}; 444 my $info = $FACEINFO{$face} ||= { };
445 $info->{arc} = $o;
446
447 next if $face =~ /^blank.x11$|^empty.x11$/;
339 448
340 $info->{visibility} = $visibility if defined $visibility; 449 $info->{visibility} = $visibility if defined $visibility;
341 $info->{magicmap} = $magicmap if defined $magicmap; 450 $info->{magicmap} = $magicmap if defined $magicmap;
342 } 451 }
343 452
344 if (my $smooth = delete $o->{smoothface}) { 453 if (my $smooth = delete $o->{smoothface}) {
345 my %kv =split /\s+/, $smooth; 454 my %kv = split /\s+/, $smooth;
346 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 455 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
347 while (my ($face, $smooth) = each %kv) { 456 while (my ($face, $smooth) = each %kv) {
457 $FACEINFO{$smooth}{arc} = $o;
458
348 $FACEINFO{$face}{smooth} = $smooth; 459 $FACEINFO{$face}{smooth} = $smooth;
349 $FACEINFO{$face}{smoothlevel} = $level; 460 $FACEINFO{$face}{smoothlevel} = $level;
350 } 461 }
351 } 462 }
352 } 463 }
353 } 464 }
354 } 465 }
355 } 466 }
356 467
357 sub process_trs { 468 sub process_trs {
358 while (@trs) { 469 while (my $job = $c_trs->get) {
359 my ($dir, $file) = @{pop @trs}; 470 my ($dir, $file) = @$job;
360 my $path = "$dir/$file"; 471 my $path = "$dir/$file";
361 472
362 my $trs; 473 my $trs;
363 if (0 > aio_load $path, $trs) { 474 if (0 > aio_load $path, $trs) {
364 warn "$path: $!, skipping.\n"; 475 warn "$path: $!, skipping.\n";
… …
367 478
368 $TRS .= $trs; 479 $TRS .= $trs;
369 } 480 }
370 } 481 }
371 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
372 sub find_files; 561 sub find_files;
373 sub find_files { 562 sub find_files {
374 my ($path) = @_; 563 my ($path) = @_;
375 564
376 IO::AIO::aioreq_pri 4; 565 IO::AIO::aioreq_pri 4;
… …
378 my ($dirs, $nondirs) = @_; 567 my ($dirs, $nondirs) = @_;
379 568
380 find_files "$path/$_" 569 find_files "$path/$_"
381 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 570 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
382 571
572 my $dir = $path;
573 substr $dir, 0, 1 + length $PATH, "";
574
383 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
384 if ($file =~ /\.png$/) { 593 } elsif ($file =~ /\.png$/) {
385 push @png, ["$path/$file", 0]; 594 push @c_png, ["$path/$file", 0];
595
386 } elsif ($file =~ /\.trs$/) { 596 } elsif ($file =~ /\.trs$/) {
387 push @trs, [$path, $file]; 597 $c_trs->put ([$path, $file]);
598
388 } elsif ($file =~ /\.arc$/) { 599 } elsif ($file =~ /\.arc$/) {
389 push @arc, [$path, $file]; 600 $c_arc->put ([$path, $file]);
601
390 } else { 602 } else {
391 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 603 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
392 } 604 }
393 } 605 }
394 }; 606 };
395 } 607 }
396 608
609 sub generate_plurals {
610# use Lingua::EN::Inflect ();
611# Lingua::EN::Inflect::classical;
612# Lingua::EN::Inflect::def_noun 'talisman' => 'talismans';
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#
620#
621# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
622# my $pl = $test =~ /^(?:eq|p:.)$/
623# ? $name
624# : Lingua::EN::Inflect::PL $name;
625# die "$test $pl" if $pl =~ /bootss/;#d#
626#
627# if ($pl ne $a->{name_pl}) {
628# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
629# }
630# }
631 }
632
397 sub inst_arch($) { 633 sub inst_arch($) {
398 my (undef, $path) = @_; 634 my (undef, $path) = @_;
635
636 $PATH = $path;
399 637
400 print "\n", 638 print "\n",
401 "Installing '$path' to '$DATADIR'\n", 639 "Installing '$path' to '$DATADIR'\n",
402 "\n", 640 "\n",
403 "This can take a long time if you run this\n", 641 "This can take a long time if you run this\n",
… …
410 if (!-d "$path/treasures") { 648 if (!-d "$path/treasures") {
411 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 649 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
412 exit 1 unless $FORCE; 650 exit 1 unless $FORCE;
413 } 651 }
414 652
653 print "scanning files...\n" if $VERBOSE;
654
415 find_files $path; 655 find_files $path;
656
657 my @a_arc = map +(async \&process_arc), 1..2;
658 my @a_res = map +(async \&process_res), 1..2;
659 my @a_trs = map +(async \&process_trs), 1..2;
660
416 IO::AIO::flush; 661 IO::AIO::flush;
417 662
418 $_->join for ( 663 $c_res->shutdown;
664 $c_arc->shutdown;
665 $c_trs->shutdown;
666
667 print "start file scan, arc, res processing...\n" if $VERBOSE;
668
669 $_->join for @a_arc; # need to parse all archetypes before png processing
670
671 print "end arc, start png processing...\n" if $VERBOSE;
672
419 # four png crunchers work fine for my 2x smp machine 673 # eight png crunchers work fine for my 4x smp machine
420 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 674 my @a_png = map +(async \&process_png), 1..8;
421 (async \&process_trs), (async \&process_trs),
422 (async \&process_arc), (async \&process_arc),
423 );
424 675
676 $_->join for (@a_trs, @a_res, @a_png);
677
678 print "scanning done, processing results...\n" if $VERBOSE;
425 { 679 {
426 # remove path prefix from editor_folder 680 # remove path prefix from editor_folder
427 substr $_->{editor_folder}, 0, 1 + length $path, "" 681 substr $_->{editor_folder}, 0, 1 + length $path, ""
428 for values %ARC; 682 for values %ARC;
429 683
684 print "resolving inheritance tree...\n" if $VERBOSE;
430 # resolve inherit 685 # resolve inherit
431 while () { 686 while () {
432 my $progress; 687 my $progress;
433 my $loop; 688 my $loop;
434 689
… …
460 } 715 }
461 716
462 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 717 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
463 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 718 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
464 719
720 print "generating plurals...\n" if $VERBOSE;
721 generate_plurals;
722
723 print "writing archetypes...\n" if $VERBOSE;
465 open my $fh, ">:utf8", "$DATADIR/archetypes~" 724 open my $fh, ">:utf8", "$DATADIR/archetypes~"
466 or die "$DATADIR/archetypes~: $!"; 725 or die "$DATADIR/archetypes~: $!";
467 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 726 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
468 } 727 }
469 728
470 { 729 {
730 print "writing treasures...\n" if $VERBOSE;
471 open my $fh, ">:utf8", "$DATADIR/treasures~" 731 open my $fh, ">:utf8", "$DATADIR/treasures~"
472 or die "$DATADIR/treasures~: $!"; 732 or die "$DATADIR/treasures~: $!";
473 print $fh $TRS; 733 print $fh $TRS;
474 } 734 }
475 735
476 { 736 {
737 print "processing facedata...\n" if $VERBOSE;
477 while (my ($k, $v) = each %FACEINFO) { 738 while (my ($k, $v) = each %FACEINFO) {
478 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 739 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
479 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 740 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
480 741
481 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 742 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
482 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 743 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
483 744
484 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 745 if (my $magicmap = $v->{magicmap}) {
485 $v->{chksum64} = Digest::MD5::md5 $v->{data64}; 746 $magicmap =~ y/A-Z_\-/a-z/d;
747 $v->{magicmap} = $COLOR{$magicmap};
486 } 748 }
487 749
750 delete $v->{arc};
751 }
752
753 print "writing facedata...\n" if $VERBOSE;
488 open my $fh, ">:perlio", "$DATADIR/facedata~" 754 open my $fh, ">:perlio", "$DATADIR/facedata~"
489 or die "$DATADIR/facedata~: $!"; 755 or die "$DATADIR/facedata~: $!";
490 756
491 print $fh freeze { 757 print $fh freeze {
492 version => 2, 758 version => 2,
493 faceinfo => \%FACEINFO, 759 faceinfo => \%FACEINFO,
494 animinfo => \%ANIMINFO, 760 animinfo => \%ANIMINFO,
761 resource => \%RESOURCE,
495 }; 762 };
496 } 763 }
764
765 print "committing files...\n" if $VERBOSE;
497 766
498 for (qw(archetypes facedata treasures)) { 767 for (qw(archetypes facedata treasures)) {
499 chmod 0644, "$DATADIR/$_~"; 768 chmod 0644, "$DATADIR/$_~";
500 rename "$DATADIR/$_~", "$DATADIR/$_" 769 rename "$DATADIR/$_~", "$DATADIR/$_"
501 or die "$DATADIR/$_: $!"; 770 or die "$DATADIR/$_: $!";

Diff Legend

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