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.40 by root, Mon Jul 16 19:43:33 2007 UTC vs.
Revision 1.78 by root, Wed Nov 4 13:46:37 2009 UTC

1#!@PERL@ 1#!@PERL@
2
3#
4# This file is part of Deliantra, the Roguelike Realtime MMORPG.
5#
6# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
7#
8# Deliantra is free software: you can redistribute it and/or modify it under
9# the terms of the Affero GNU General Public License as published by the
10# Free Software Foundation, either version 3 of the License, or (at your
11# option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU General Public License for more details.
17#
18# You should have received a copy of the Affero GNU General Public License
19# and the GNU General Public License along with this program. If not, see
20# <http://www.gnu.org/licenses/>.
21#
22# The authors can be reached via e-mail to <support@deliantra.net>
23#
2 24
3use strict; 25use strict;
4 26
5my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
6my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
12my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@"; 36my $PNGNQ = "@PNGNQ@";
15 37
16use Getopt::Long; 38use Getopt::Long;
39use File::Temp;
40use POSIX ();
41use Carp;
42
17use Coro::Event; 43use Coro::EV;
18use AnyEvent; 44use AnyEvent;
45use YAML::XS ();
46use JSON::XS ();
19use IO::AIO (); 47use IO::AIO ();
20use File::Temp; 48
21use Crossfire;
22use Coro; 49use Coro 5.12;
23use Coro::AIO; 50use Coro::AIO;
24use POSIX (); 51use Coro::Util;
25use Digest::MD5; 52use Coro::Channel;
26use Coro::Storable; $Storable::canonical = 1; 53use Coro::Storable; $Storable::canonical = 1;
54
55use Deliantra;
56
57$SIG{QUIT} = sub { Carp::cluck "QUIT" };
27 58
28sub usage { 59sub usage {
29 warn <<EOF; 60 warn <<EOF;
30Usage: cfutil [-v] [-q] [--force] [--cache] 61Usage: cfutil [-v] [-q] [--force] [--cache]
31 [--install-arch path] 62 [--install-arch path]
61 tan => 12, 92 tan => 12,
62); 93);
63 94
64END { system "rm", "-rf", $TMPDIR } 95END { system "rm", "-rf", $TMPDIR }
65 96
66Event->signal (signal => "INT", cb => sub { exit 1 }); 97my $s_INT = EV::signal INT => sub { exit 1 };
67Event->signal (signal => "TERM", cb => sub { exit 1 }); 98my $s_TERM = EV::signal TERM => sub { exit 1 };
68 99
69mkdir $TMPDIR, 0700 100mkdir $TMPDIR, 0700
70 or die "$TMPDIR: $!"; 101 or die "$TMPDIR: $!";
71 102
72sub fork_sub(&) { 103sub fork_sub(&) {
92 if (!-f "$path/regions") { 123 if (!-f "$path/regions") {
93 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 124 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
94 exit 1 unless $FORCE; 125 exit 1 unless $FORCE;
95 } 126 }
96 127
97 system $RSYNC, "-av", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 128 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
129 "$path/.", "$DATADIR/maps/.",
130 "--exclude", "CVS", "--exclude", "/world-precomposed",
131 "--delete", "--delete-excluded"
98 and die "map installation failed.\n"; 132 and die "map installation failed.\n";
99 133
100 print "maps installed successfully.\n"; 134 print "maps installed successfully.\n";
101} 135}
102 136
110 our $NFILE; 144 our $NFILE;
111 our $PATH; 145 our $PATH;
112 146
113 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 147 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
114 148
115 our (@png, @trs, @arc, @res); # files we are interested in 149 our $c_arc = new Coro::Channel;
150 our $c_trs = new Coro::Channel;
151 our $c_res = new Coro::Channel;
152
153 our @c_png;
116 154
117 sub commit_png($$$) { 155 sub commit_png($$$) {
118 my ($name, $data, $T) = @_; 156 my ($name, $data, $T) = @_;
119 157
120 $FACEINFO{$name}{"data$T"} = $data; 158 $FACEINFO{$name}{"data$T"} = $data;
121 } 159 }
122 160
123 sub process_png { 161 sub process_png {
124 while (@png) { 162 while (@c_png) {
125 my ($path, $delete) = @{pop @png}; 163 my ($path, $delete) = @{pop @c_png};
126 164
127 my $png; 165 my $png;
128 aio_lstat $path; 166 aio_lstat $path;
129 my ($size, $mtime) = (stat _)[7,9]; 167 my ($size, $mtime) = (stat _)[7,9];
130 168
161 if ($w % $T || $h % $T) { 199 if ($w % $T || $h % $T) {
162 warn "$path: weird png size ($w $h), skipping.\n"; 200 warn "$path: weird png size ($w $h), skipping.\n";
163 next; 201 next;
164 } 202 }
165 203
204 (my $base = $stem) =~ s/^.*\///;
205
206 my $fi = $FACEINFO{$base};
207 unless ($fi) {
208 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
209 #next;
210 }
211
212 my $arc = $fi->{arc} || { };
213
166 unless ($path =~ /~$/) { 214 unless ($path =~ /~$/) {
167 # possibly enlarge 215 # possibly enlarge
168 if (0 > aio_stat "$stem.64x64.png") { 216 if (0 > aio_stat "$stem.64x64.png") {
169 my $other = "$stem.64x64.png~"; 217 my $other = "$stem.64x64.png~";
170 218
171 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 219 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
172 my $wrap = 0; # for the time being
173 fork_sub { 220 fork_sub {
221 my $CROP;
222 my $SRC = "png:\Q$path\E";
223
224 my $is_floor = $arc->{is_floor};
225 my $is_wall = 0;
226
227 my ($wall_pfx, $wall_dir, $wall_sfx);
228
229 if (
230 !$is_floor
231 && !$arc->{alive}
232 && $arc->{move_block} eq "all"
233 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
234 ) {
235 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
236
237 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
238 $is_wall = 1;
239 }
240 }
241
242 if ($is_wall || $is_floor) {
243 # add a 4px border and add other images around it
244 $CROP = "-shave 8x8 +repage";
245
246 $w += 8;
247 $h += 8;
248
249 $SRC = "-size ${w}x${h} xc:transparent";
250 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
251
252 # 8 surrounding images
253 for (
254 # x y b r0 r1
255 [-1, -1, 0, 6],
256 [ 0, -1, 1, 10, 14],
257 [+1, -1, 0, 12],
258
259 [-1, 0, 8, 5, 7],
260 #
261 [+1, 0, 2, 5, 13],
262
263 [-1, +1, 0, 3],
264 [ 0, +1, 4, 10, 11],
265 [+1, +1, 0, 9],
266 ) {
267 my ($x, $y, $d, $r0, $r1) = @$_;
268
269 my $tile = $is_floor ? $path
270 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
271 : die;
272
273 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
274 "\Q$tile",
275 $x * ($w - 8) + 4,
276 $y * ($h - 8) + 4;
277 }
278 }
279
174 system "convert png:\Q$path\E -depth 8 rgba:-" 280 system "convert -depth 8 $SRC rgba:-"
175 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 281 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
176 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" 282 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
177 and die "convert/hq2xa pipeline error: status $? ($!)"; 283 and die "convert/cfhq2xa pipeline error: status $? ($!)";
178 system $OPTIPNG, "-i0", "-q", "$other~"; 284 system $OPTIPNG, "-i0", "-q", "$other~";
179 die "$other~ has zero size, aborting." unless -s "$other~"; 285 die "$other~ has zero size, aborting." unless -s "$other~";
180 rename "$other~", $other; 286 rename "$other~", $other;
181 }; 287 };
182 } 288 }
183 289
184 push @png, [$other, !$CACHE]; 290 push @c_png, [$other, !$CACHE];
185 } 291 }
186 292
187 # possibly scale down 293 # possibly scale down
188 if (0 > aio_stat "$stem.32x32.png") { 294 if (0 > aio_stat "$stem.32x32.png") {
189 my $other = "$stem.32x32.png~"; 295 my $other = "$stem.32x32.png~";
192 fork_sub { 298 fork_sub {
193 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 299 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
194 system $OPTIPNG, "-i0", "-q", "$other~"; 300 system $OPTIPNG, "-i0", "-q", "$other~";
195 301
196 # reduce smoothfaces >10000 bytes 302 # reduce smoothfaces >10000 bytes
303 # obsolete, no longer required
197 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 304 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
198 my $ncolor = 256; 305 my $ncolor = 256;
199 while () { 306 while () {
200 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 307 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
201 system $OPTIPNG, "-i0", "-q", "$other~~"; 308 system $OPTIPNG, "-i0", "-q", "$other~~";
202 last if 10000 > -s "$other~~"; 309 last if 10000 > -s "$other~~";
214 rename "$other~", $other; 321 rename "$other~", $other;
215 }; 322 };
216 } 323 }
217 324
218 #warn "scaled down $path to $other\n";#d# 325 #warn "scaled down $path to $other\n";#d#
219 push @png, [$other, !$CACHE]; 326 push @c_png, [$other, !$CACHE];
220 } 327 }
221 } 328 }
222 329
223 (my $face = $stem) =~ s/^.*\///; 330 (my $face = $stem) =~ s/^.*\///;
224 331
285 aio_unlink $path if $delete; 392 aio_unlink $path if $delete;
286 } 393 }
287 } 394 }
288 395
289 sub process_arc { 396 sub process_arc {
290 while (@arc) { 397 while (my $job = $c_arc->get) {
291 my ($dir, $file) = @{pop @arc}; 398 my ($dir, $file) = @$job;
292 399
293 my $arc; 400 my $arc;
294 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 401 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
295 402
296 my $arc = read_arch "$dir/$file"; 403 my $arc = read_arch "$dir/$file";
298 push @ARC, $o; 405 push @ARC, $o;
299 for (my $m = $o; $m; $m = $m->{more}) { 406 for (my $m = $o; $m; $m = $m->{more}) {
300 $ARC{$m->{_name}} = $m; 407 $ARC{$m->{_name}} = $m;
301 } 408 }
302 409
303 $o->{editor_folder} = $dir; 410 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
304 411
305 my $visibility = delete $o->{visibility}; 412 my $visibility = delete $o->{visibility};
306 my $magicmap = delete $o->{magicmap}; 413 my $magicmap = delete $o->{magicmap};
307 414
308 # find upper left corner :/ 415 # find upper left corner :/
348 facings => $facings, 455 facings => $facings,
349 frames => \@frames, 456 frames => \@frames,
350 }; 457 };
351 } 458 }
352 459
353 for my $face ($o->{face} || (), @{$anim || []}) { 460 for ($o->{face} || (), @{$anim || []}) {
354 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 461 next if /^facings\s/;
355 462
463 my $face = $_;
464 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
465
356 my $info = $FACEINFO{$face} ||= {}; 466 my $info = $FACEINFO{$face} ||= { };
467 $info->{arc} = $o;
468
469 next if $face =~ /^blank.x11$|^empty.x11$/;
357 470
358 $info->{visibility} = $visibility if defined $visibility; 471 $info->{visibility} = $visibility if defined $visibility;
359 $info->{magicmap} = $magicmap if defined $magicmap; 472 $info->{magicmap} = $magicmap if defined $magicmap;
360 } 473 }
361 474
362 if (my $smooth = delete $o->{smoothface}) { 475 if (my $smooth = delete $o->{smoothface}) {
363 my %kv =split /\s+/, $smooth; 476 my %kv = split /\s+/, $smooth;
364 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 477 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
365 while (my ($face, $smooth) = each %kv) { 478 while (my ($face, $smooth) = each %kv) {
479 $FACEINFO{$smooth}{arc} = $o;
480
366 $FACEINFO{$face}{smooth} = $smooth; 481 $FACEINFO{$face}{smooth} = $smooth;
367 $FACEINFO{$face}{smoothlevel} = $level; 482 $FACEINFO{$face}{smoothlevel} = $level;
368 } 483 }
369 } 484 }
370 } 485 }
371 } 486 }
372 } 487 }
373 } 488 }
374 489
375 sub process_trs { 490 sub process_trs {
376 while (@trs) { 491 while (my $job = $c_trs->get) {
377 my ($dir, $file) = @{pop @trs}; 492 my ($dir, $file) = @$job;
378 my $path = "$dir/$file"; 493 my $path = "$dir/$file";
379 494
380 my $trs; 495 my $trs;
381 if (0 > aio_load $path, $trs) { 496 if (0 > aio_load $path, $trs) {
382 warn "$path: $!, skipping.\n"; 497 warn "$path: $!, skipping.\n";
385 500
386 $TRS .= $trs; 501 $TRS .= $trs;
387 } 502 }
388 } 503 }
389 504
505 my %FILECACHE;
506
507 sub load_cached($;$) {
508 unless (exists $FILECACHE{$_[0]}) {
509 my $data;
510 if (0 < aio_load $_[0], $data) {
511 if ($_[1]) {
512 $data = eval { $_[1]->($data) };
513 warn "$_[0]: $@" if $@;
514 }
515 }
516
517 $FILECACHE{$_[0]} = $data;
518 }
519
520 $FILECACHE{$_[0]}
521 }
522
390 sub process_res { 523 sub process_res {
391 while (@res) { 524 while (my $job = $c_res->get) {
392 my ($dir, $file) = @{pop @res}; 525 my ($dir, $file, $type) = @$job;
393 526
394 my $data; 527 my $data;
395 aio_load "$dir/$file", $data; 528 aio_load "$dir/$file", $data;
396 529
397 my $copyright; 530 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
398 aio_load "$dir/copyright", $copyright; 531
532 utf8::decode $dir;
533 utf8::decode $file;
534
535 # a meta file for resources is now mandatory
536 unless (exists $meta->{$file}) {
537 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
538 next;
539 }
540
541 $meta = {
542 %{ $meta->{"" } || {} },
543 %{ $meta->{$file} || {} },
544 };
545
546 if ($meta->{license} =~ s/^#//) {
547 $meta->{license} = ({
548 "pd" => "Public Domain",
549 "gpl" => "GNU General Public License, version 3.0 or any later",
550 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
551 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
552 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
553 })->{$meta->{license}}
554 || warn "$dir/$file: license tag '$meta->{license}' not found.";
555 }
399 556
400 $file =~ s/\.res$//; 557 $file =~ s/\.res$//;
401 $file =~ /\.([^.]+)$/ 558 $file =~ s/\.(ogg|wav|jpg|png)$//;
402 or next;
403
404 my $type = $1;
405 559
406 substr $dir, 0, 1 + length $PATH, ""; 560 substr $dir, 0, 1 + length $PATH, "";
407 561
562 if (my $filter = $meta->{cfutil_filter}) {
563 if ($filter eq "yaml2json") {
564 $data = JSON::XS::encode_json YAML::XS::Load $data;
565 } elsif ($filter eq "json2json") {
566 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
567 } elsif ($filter eq "perl2json") {
568 $data = eval $data; die if $@;
569 $data = JSON::XS::encode_json $data;
570 } else {
571 warn "$dir/$file: unknown filter $filter, skipping\n";
572 }
573 }
574
408 $RESOURCE{"$dir/$file"} = { 575 $RESOURCE{"$dir/$file"} = {
409 type => $1, 576 type => (exists $meta->{type} ? delete $meta->{type} : $type),
410 copyright => $copyright,
411 data => $data, 577 data => $data,
412 chksum => Digest::MD5::md5 $data, 578 %$meta ? (meta => $meta) : (),
413 }; 579 };
414 } 580 }
415 } 581 }
416 582
417 sub find_files; 583 sub find_files;
423 my ($dirs, $nondirs) = @_; 589 my ($dirs, $nondirs) = @_;
424 590
425 find_files "$path/$_" 591 find_files "$path/$_"
426 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 592 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
427 593
594 my $dir = $path;
595 substr $dir, 0, 1 + length $PATH, "";
596
428 for my $file (@$nondirs) { 597 for my $file (@$nondirs) {
598 if ($dir =~ /^music(?:\/|$)/) {
599 $c_res->put ([$path, $file, 3]) # FT_MUSIC
600 if $file =~ /\.(ogg)$/;
601
602 } elsif ($dir =~ /^sound(?:\/|$)/) {
603 $c_res->put ([$path, $file, 5]) # FT_SOUND
604 if $file =~ /\.(wav|ogg)$/;
605
606 } elsif ($dir =~ /^res(?:\/|$)/) {
607 if ($file =~ /\.(jpg|png)$/) {
608 $c_res->put ([$path, $file, 0]) # FT_FACE
609 } elsif ($file =~ /\.(res)$/) {
610 $c_res->put ([$path, $file, 6]) # FT_RSRC
611 } else {
612 $c_res->put ([$path, $file, undef]);
613 }
614
429 if ($file =~ /\.png$/) { 615 } elsif ($file =~ /\.png$/) {
430 push @png, ["$path/$file", 0]; 616 push @c_png, ["$path/$file", 0];
617
431 } elsif ($file =~ /\.trs$/) { 618 } elsif ($file =~ /\.trs$/) {
432 push @trs, [$path, $file]; 619 $c_trs->put ([$path, $file]);
620
433 } elsif ($file =~ /\.arc$/) { 621 } elsif ($file =~ /\.arc$/) {
434 push @arc, [$path, $file]; 622 $c_arc->put ([$path, $file]);
435 } elsif ($file =~ /\.(ogg|jpg|res)$/) { 623
436 push @res, [$path, $file];
437 } else { 624 } else {
438 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 625 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
439 } 626 }
440 } 627 }
441 }; 628 };
629 }
630
631 sub generate_plurals {
632# use Lingua::EN::Inflect ();
633# Lingua::EN::Inflect::classical;
634# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
635# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
636#
637# for my $a (@ARC) {
638# my $name = $a->{name} || $a->{_name};
639#
640# next unless $a->{name_pl};
641# next if $a->{invisible};
642# next if $a->{is_floor};
643# next if $a->{no_pick};
644#
645# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
646# my $pl = $test =~ /^(?:eq|p:.)$/
647# ? $name
648# : Lingua::EN::Inflect::PL $name;
649#
650# if ($pl ne $a->{name_pl}) {
651# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
652# }
653# }
442 } 654 }
443 655
444 sub inst_arch($) { 656 sub inst_arch($) {
445 my (undef, $path) = @_; 657 my (undef, $path) = @_;
446 658
459 if (!-d "$path/treasures") { 671 if (!-d "$path/treasures") {
460 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 672 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
461 exit 1 unless $FORCE; 673 exit 1 unless $FORCE;
462 } 674 }
463 675
676 print "scanning files...\n" if $VERBOSE;
677
464 find_files $path; 678 find_files $path;
679
680 my @a_arc = map +(async \&process_arc), 1..2;
681 my @a_res = map +(async \&process_res), 1..2;
682 my @a_trs = map +(async \&process_trs), 1..2;
683
465 IO::AIO::flush; 684 IO::AIO::flush;
466 685
467 $_->join for ( 686 $c_res->shutdown;
687 $c_arc->shutdown;
688 $c_trs->shutdown;
689
690 print "start file scan, arc, res processing...\n" if $VERBOSE;
691
692 $_->join for @a_arc; # need to parse all archetypes before png processing
693
694 print "end arc, start png processing...\n" if $VERBOSE;
695
468 # four png crunchers work fine for my 2x smp machine 696 # eight png crunchers work fine for my 4x smp machine
469 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 697 my @a_png = map +(async \&process_png), 1..8;
470 (async \&process_trs), (async \&process_trs),
471 (async \&process_arc), (async \&process_arc),
472 (async \&process_res), (async \&process_res),
473 );
474 698
699 $_->join for (@a_trs, @a_res, @a_png);
700
701 print "scanning done, processing results...\n" if $VERBOSE;
475 { 702 {
476 # remove path prefix from editor_folder 703 # remove path prefix from editor_folder
704 $_->{editor_folder} =~ /^\x00/
477 substr $_->{editor_folder}, 0, 1 + length $path, "" 705 and substr $_->{editor_folder}, 0, 2 + length $path, ""
478 for values %ARC; 706 for values %ARC;
479 707
708 print "resolving inheritance tree...\n" if $VERBOSE;
480 # resolve inherit 709 # resolve inherit
481 while () { 710 while () {
482 my $progress; 711 my $progress;
483 my $loop; 712 my $loop;
484 713
510 } 739 }
511 740
512 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 741 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
513 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 742 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
514 743
744 print "generating plurals...\n" if $VERBOSE;
745 generate_plurals;
746
747 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
515 open my $fh, ">:utf8", "$DATADIR/archetypes~" 748 open my $fh, ">:utf8", "$DATADIR/archetypes~"
516 or die "$DATADIR/archetypes~: $!"; 749 or die "$DATADIR/archetypes~: $!";
517 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 750 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
518 } 751 }
519 752
520 { 753 {
754 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
521 open my $fh, ">:utf8", "$DATADIR/treasures~" 755 open my $fh, ">:utf8", "$DATADIR/treasures~"
522 or die "$DATADIR/treasures~: $!"; 756 or die "$DATADIR/treasures~: $!";
523 print $fh $TRS; 757 print $fh $TRS;
524 } 758 }
525 759
526 { 760 {
761 print "processing facedata...\n" if $VERBOSE;
527 while (my ($k, $v) = each %FACEINFO) { 762 while (my ($k, $v) = each %FACEINFO) {
528 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 763 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
529 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 764 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
530 765
531 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 766 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
532 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 767 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
533
534 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
535 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
536 768
537 if (my $magicmap = $v->{magicmap}) { 769 if (my $magicmap = $v->{magicmap}) {
538 $magicmap =~ y/A-Z_\-/a-z/d; 770 $magicmap =~ y/A-Z_\-/a-z/d;
539 $v->{magicmap} = $COLOR{$magicmap}; 771 $v->{magicmap} = $COLOR{$magicmap};
540 } 772 }
773
774 delete $v->{arc};
541 } 775 }
776
777 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
778 scalar keys %FACEINFO,
779 scalar keys %ANIMINFO,
780 scalar keys %RESOURCE
781 if $VERBOSE;
542 782
543 open my $fh, ">:perlio", "$DATADIR/facedata~" 783 open my $fh, ">:perlio", "$DATADIR/facedata~"
544 or die "$DATADIR/facedata~: $!"; 784 or die "$DATADIR/facedata~: $!";
545 785
546 print $fh freeze { 786 print $fh freeze {
547 version => 2, 787 version => 2,
548 faceinfo => \%FACEINFO, 788 faceinfo => \%FACEINFO,
549 animinfo => \%ANIMINFO, 789 animinfo => \%ANIMINFO,
550 resource => \%RESOURCE, 790 resource => \%RESOURCE,
551 }; 791 };
792
552 } 793 }
794
795 print "committing files...\n" if $VERBOSE;
553 796
554 for (qw(archetypes facedata treasures)) { 797 for (qw(archetypes facedata treasures)) {
555 chmod 0644, "$DATADIR/$_~"; 798 chmod 0644, "$DATADIR/$_~";
556 rename "$DATADIR/$_~", "$DATADIR/$_" 799 rename "$DATADIR/$_~", "$DATADIR/$_"
557 or die "$DATADIR/$_: $!"; 800 or die "$DATADIR/$_: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines