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.54 by root, Sun Aug 19 10:28:52 2007 UTC vs.
Revision 1.99 by root, Wed Oct 6 03:20:19 2010 UTC

1#!@PERL@ 1#!@PERL@
2 2
3use strict; 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#
24
25use common::sense;
4 26
5my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
6my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
7my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
… …
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; 48use Digest::MD5 ();
21use Crossfire; 49
22use Coro; 50use Coro 5.12;
23use Coro::AIO; 51use Coro::AIO;
24use Coro::Util; 52use Coro::Util;
25use POSIX ();
26use Digest::MD5;
27use Carp;
28use Coro::Channel; 53use Coro::Channel;
29use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
30 57
31$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
32 59
33sub usage { 60sub usage {
34 warn <<EOF; 61 warn <<EOF;
… …
47my $VERBOSE = 1; 74my $VERBOSE = 1;
48my $CACHE = 0; 75my $CACHE = 0;
49my $FORCE; 76my $FORCE;
50my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
51my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
52 80
53our %COLOR = ( 81our %COLOR = (
54 black => 0, 82 black => 0,
55 white => 1, 83 white => 1,
56 navy => 2, 84 navy => 2,
… …
66 tan => 12, 94 tan => 12,
67); 95);
68 96
69END { system "rm", "-rf", $TMPDIR } 97END { system "rm", "-rf", $TMPDIR }
70 98
71Event->signal (signal => "INT", cb => sub { exit 1 }); 99my $s_INT = EV::signal INT => sub { exit 1 };
72Event->signal (signal => "TERM", cb => sub { exit 1 }); 100my $s_TERM = EV::signal TERM => sub { exit 1 };
101
102our %hash;
103
104# here we could try to avoid collisions and reduce chksum size further
105sub make_hash($\$\$;$) {
106 my ($id, $dataref, $hashref, $clen) = @_;
107
108 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
109
110 if (exists $hash{$hash}) {
111 # hash collision, but some files are simply identical
112 if (${$hash{$hash}[1]} ne $$dataref) {
113 warn "hash collision $hash{$hash}[0] vs. $id\n";
114 exit 1;
115 } else {
116 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
117 }
118 }
119 $hash{$hash} = [$id, $dataref, $hashref];
120
121 $$hashref = $hash;
122}
73 123
74mkdir $TMPDIR, 0700 124mkdir $TMPDIR, 0700
75 or die "$TMPDIR: $!"; 125 or die "$TMPDIR: $!";
76 126
77sub fork_sub(&) { 127sub fork_sub(&) {
… …
97 if (!-f "$path/regions") { 147 if (!-f "$path/regions") {
98 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 148 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
99 exit 1 unless $FORCE; 149 exit 1 unless $FORCE;
100 } 150 }
101 151
102 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 152 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
153 "$path/.", "$DATADIR/maps/.",
154 "--exclude", "CVS", "--exclude", "/world-precomposed",
155 "--delete", "--delete-excluded"
103 and die "map installation failed.\n"; 156 and die "map installation failed.\n";
104 157
105 print "maps installed successfully.\n"; 158 print "maps installed successfully.\n";
159}
160
161our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
162
163# used to create crude text glyphs for text-based clients
164sub autoglyph {
165 my ($stem, $face) = @_;
166
167 if ($stem =~ /^wall\/|Nimwall/) {
168 return $WALL_SUFFIX[hex $1]
169 if $stem =~ /(_[0-9A-F]).x11/;
170
171 "█"
172
173 } elsif ($stem =~ /^traps\//) {
174 "☠"
175
176 } elsif ($stem =~ /^armour\//) {
177 "☗"
178
179 } elsif ($stem =~ /^weapon\//) {
180 "†"
181
182 } elsif ($stem =~ /^readable\//) {
183 "✉"
184
185 } elsif ($stem =~ /^river\//) {
186 "~"
187
188 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
189 "."
190
191 } elsif ($stem =~ /^player\//) {
192 "\@"
193
194 } elsif ($stem =~ /^(?:monster|misc|class|connect|gods|indoor|inorganic|mining|music|skills).*\/(.)/) {
195 $1
196
197 } else {
198 substr $stem, 0, 1
199 }
106} 200}
107 201
108{ 202{
109 our %ANIMINFO; 203 our %ANIMINFO;
110 our %FACEINFO; 204 our %FACEINFO;
… …
121 our $c_trs = new Coro::Channel; 215 our $c_trs = new Coro::Channel;
122 our $c_res = new Coro::Channel; 216 our $c_res = new Coro::Channel;
123 217
124 our @c_png; 218 our @c_png;
125 219
126 sub commit_png($$$) { 220 sub commit_png($$$$) {
127 my ($name, $data, $T) = @_; 221 my ($stem, $name, $data, $T) = @_;
128 222
223 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
129 $FACEINFO{$name}{"data$T"} = $data; 224 $FACEINFO{$name}{"data$T"} = $data;
130 } 225 }
131 226
132 sub process_png { 227 sub process_png {
133 while (@c_png) { 228 while (@c_png) {
… …
174 269
175 (my $base = $stem) =~ s/^.*\///; 270 (my $base = $stem) =~ s/^.*\///;
176 271
177 my $fi = $FACEINFO{$base}; 272 my $fi = $FACEINFO{$base};
178 unless ($fi) { 273 unless ($fi) {
179 warn "$path: <$base> not referenced by any archetype, skipping.\n"; 274 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
180 next; 275 #next;
181 } 276 }
182 277
183 my $arc = $FACEINFO{$base}{arc} 278 my $arc = $fi->{arc} || { };
184 or die "FATAL: internal error, cannot continue";
185 279
186 unless ($path =~ /~$/) { 280 unless ($path =~ /~$/) {
187 # possibly enlarge 281 # possibly enlarge
188 if (0 > aio_stat "$stem.64x64.png") { 282 if (0 > aio_stat "$stem.64x64.png") {
189 my $other = "$stem.64x64.png~"; 283 my $other = "$stem.64x64.png~";
… …
199 my ($wall_pfx, $wall_dir, $wall_sfx); 293 my ($wall_pfx, $wall_dir, $wall_sfx);
200 294
201 if ( 295 if (
202 !$is_floor 296 !$is_floor
203 && !$arc->{alive} 297 && !$arc->{alive}
204 && $arc->{no_pass} 298 && $arc->{move_block} eq "all"
205 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/ 299 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
206 ) { 300 ) {
207 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3); 301 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
208 302
209 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) { 303 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
… …
270 fork_sub { 364 fork_sub {
271 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 365 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
272 system $OPTIPNG, "-i0", "-q", "$other~"; 366 system $OPTIPNG, "-i0", "-q", "$other~";
273 367
274 # reduce smoothfaces >10000 bytes 368 # reduce smoothfaces >10000 bytes
369 # obsolete, no longer required
275 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 370 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
276 my $ncolor = 256; 371 my $ncolor = 256;
277 while () { 372 while () {
278 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 373 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
279 system $OPTIPNG, "-i0", "-q", "$other~~"; 374 system $OPTIPNG, "-i0", "-q", "$other~~";
280 last if 10000 > -s "$other~~"; 375 last if 10000 > -s "$other~~";
… …
351 446
352 if (0 > aio_load $file, $tile) { 447 if (0 > aio_load $file, $tile) {
353 die "$path: unable to read tile +$x+$y, aborting.\n"; 448 die "$path: unable to read tile +$x+$y, aborting.\n";
354 } 449 }
355 IO::AIO::aio_unlink $file unless $CACHE; 450 IO::AIO::aio_unlink $file unless $CACHE;
356 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 451 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
357 } 452 }
358 } else { 453 } else {
359 # use as-is (either small, use smooth) 454 # use as-is (either small, use smooth)
360 commit_png $face, $png, $T; 455 commit_png $stem, $face, $png, $T;
361 } 456 }
362 457
363 aio_unlink $path if $delete; 458 aio_unlink $path if $delete;
364 } 459 }
365 } 460 }
… …
376 push @ARC, $o; 471 push @ARC, $o;
377 for (my $m = $o; $m; $m = $m->{more}) { 472 for (my $m = $o; $m; $m = $m->{more}) {
378 $ARC{$m->{_name}} = $m; 473 $ARC{$m->{_name}} = $m;
379 } 474 }
380 475
381 $o->{editor_folder} = $dir; 476 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
382 477
383 my $visibility = delete $o->{visibility}; 478 my $visibility = delete $o->{visibility};
384 my $magicmap = delete $o->{magicmap}; 479 my $magicmap = delete $o->{magicmap};
480 my $glyph = delete $o->{glyph};
385 481
386 # find upper left corner :/ 482 # find upper left corner :/
387 # omg, this is sooo broken 483 # omg, this is sooo broken
388 my ($dx, $dy); 484 my ($dx, $dy);
389 for (my $o = $o; $o; $o = $o->{more}) { 485 for (my $o = $o; $o; $o = $o->{more}) {
… …
399 495
400 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 496 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
401 497
402 $visibility = delete $o->{visibility} if exists $o->{visibility}; 498 $visibility = delete $o->{visibility} if exists $o->{visibility};
403 $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 499 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
500 $glyph = delete $o->{glyph} if exists $o->{glyph};
404 501
405 my $anim = delete $o->{anim}; 502 my $anim = delete $o->{anim};
406 503
407 if ($anim) { 504 if ($anim) {
408 # possibly add $ext to the animation name to avoid 505 # possibly add $ext to the animation name to avoid
… …
426 facings => $facings, 523 facings => $facings,
427 frames => \@frames, 524 frames => \@frames,
428 }; 525 };
429 } 526 }
430 527
431 for my $face ($o->{face} || (), @{$anim || []}) { 528 for ($o->{face} || (), @{$anim || []}) {
432 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 529 next if /^facings\s/;
433 530
531 my $face = $_;
532 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
533
434 my $info = $FACEINFO{$face} ||= {}; 534 my $info = $FACEINFO{$face} ||= { };
435
436 $info->{arc} = $o; 535 $info->{arc} = $o;
536
537 next if $face =~ /^blank.x11$|^empty.x11$/;
538
437 $info->{visibility} = $visibility if defined $visibility; 539 $info->{visibility} = $visibility if defined $visibility;
438 $info->{magicmap} = $magicmap if defined $magicmap; 540 $info->{magicmap} = $magicmap if defined $magicmap;
541 $info->{glyph} = $glyph if defined $glyph;
439 } 542 }
440 543
441 if (my $smooth = delete $o->{smoothface}) { 544 if (my $smooth = delete $o->{smoothface}) {
442 my %kv = split /\s+/, $smooth; 545 my %kv = split /\s+/, $smooth;
443 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 546 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
491 my ($dir, $file, $type) = @$job; 594 my ($dir, $file, $type) = @$job;
492 595
493 my $data; 596 my $data;
494 aio_load "$dir/$file", $data; 597 aio_load "$dir/$file", $data;
495 598
496 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 599 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
497 600
498 next if $meta && !exists $meta->{$file}; 601 utf8::decode $dir;
602 utf8::decode $file;
603
604 # a meta file for resources is now mandatory
605 unless (exists $meta->{$file}) {
606 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
607 next;
608 }
499 609
500 $meta = { 610 $meta = {
501 %{ $meta->{"" } || {} }, 611 %{ $meta->{"" } || {} },
502 %{ $meta->{$file} || {} }, 612 %{ $meta->{$file} || {} },
503 }; 613 };
… …
505 if ($meta->{license} =~ s/^#//) { 615 if ($meta->{license} =~ s/^#//) {
506 $meta->{license} = ({ 616 $meta->{license} = ({
507 "pd" => "Public Domain", 617 "pd" => "Public Domain",
508 "gpl" => "GNU General Public License, version 3.0 or any later", 618 "gpl" => "GNU General Public License, version 3.0 or any later",
509 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 619 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
620 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
510 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 621 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
511 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 622 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
512 })->{$meta->{license}} 623 })->{$meta->{license}}
513 || warn "$dir/$file: license tag '$meta->{license}' not found."; 624 || warn "$dir/$file: license tag '$meta->{license}' not found.";
514 } 625 }
515 626
627 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
628 ($meta->{author} = $1) =~ s/_/ /g;
629 }
630
516 $file =~ s/\.res$//; 631 $file =~ s/\.res$//;
517 $file =~ s/\.(ogg|wav|jpg|png)$//; 632 $file =~ s/\.(ogg|wav|jpg|png)$//;
518 633
519 substr $dir, 0, 1 + length $PATH, ""; 634 substr $dir, 0, 1 + length $PATH, "";
520 635
636 if (my $filter = $meta->{cfutil_filter}) {
637 if ($filter eq "yaml2json") {
638 $data = JSON::XS::encode_json YAML::XS::Load $data;
639 } elsif ($filter eq "json2json") {
640 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
641 } elsif ($filter eq "perl2json") {
642 $data = eval $data; die if $@;
643 $data = JSON::XS::encode_json $data;
644 } else {
645 warn "$dir/$file: unknown filter $filter, skipping\n";
646 }
647 }
648
521 $RESOURCE{"$dir/$file"} = { 649 $RESOURCE{"$dir/$file"} = {
522 type => (delete $meta->{type}) || $type, 650 type => (exists $meta->{type} ? delete $meta->{type} : $type),
523 data => $data, 651 data => $data,
524 chksum => (Digest::MD5::md5 $data),
525 %$meta ? (meta => $meta) : (), 652 %$meta ? (meta => $meta) : (),
526 }; 653 };
527 } 654 }
528 } 655 }
529 656
… …
534 IO::AIO::aioreq_pri 4; 661 IO::AIO::aioreq_pri 4;
535 IO::AIO::aio_scandir $path, 4, sub { 662 IO::AIO::aio_scandir $path, 4, sub {
536 my ($dirs, $nondirs) = @_; 663 my ($dirs, $nondirs) = @_;
537 664
538 find_files "$path/$_" 665 find_files "$path/$_"
539 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 666 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
540 667
541 my $dir = $path; 668 my $dir = $path;
542 substr $dir, 0, 1 + length $PATH, ""; 669 substr $dir, 0, 1 + length $PATH, "";
543 670
544 for my $file (@$nondirs) { 671 for my $file (@$nondirs) {
… …
549 } elsif ($dir =~ /^sound(?:\/|$)/) { 676 } elsif ($dir =~ /^sound(?:\/|$)/) {
550 $c_res->put ([$path, $file, 5]) # FT_SOUND 677 $c_res->put ([$path, $file, 5]) # FT_SOUND
551 if $file =~ /\.(wav|ogg)$/; 678 if $file =~ /\.(wav|ogg)$/;
552 679
553 } elsif ($dir =~ /^res(?:\/|$)/) { 680 } elsif ($dir =~ /^res(?:\/|$)/) {
681 if ($file =~ /\.(jpg|png)$/) {
554 $c_res->put ([$path, $file, 0]) # FT_FACE 682 $c_res->put ([$path, $file, 0]) # FT_FACE
555 if $file =~ /\.(jpg|png)$/; 683 } elsif ($file =~ /\.(res)$/) {
556 $c_res->put ([$path, $file, 7]) # FT_RSRC 684 $c_res->put ([$path, $file, 6]) # FT_RSRC
557 if $file =~ /\.(res)$/; 685 } else {
686 $c_res->put ([$path, $file, undef]);
687 }
558 688
559 } elsif ($file =~ /\.png$/) { 689 } elsif ($file =~ /\.png$/) {
560 push @c_png, ["$path/$file", 0]; 690 push @c_png, ["$path/$file", 0];
561 691
562 } elsif ($file =~ /\.trs$/) { 692 } elsif ($file =~ /\.trs$/) {
… …
568 } else { 698 } else {
569 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 699 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
570 } 700 }
571 } 701 }
572 }; 702 };
703 }
704
705 sub generate_plurals {
706# use Lingua::EN::Inflect ();
707# Lingua::EN::Inflect::classical;
708# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
709# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
710#
711# for my $a (@ARC) {
712# my $name = $a->{name} || $a->{_name};
713#
714# next unless $a->{name_pl};
715# next if $a->{invisible};
716# next if $a->{is_floor};
717# next if $a->{no_pick};
718#
719# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
720# my $pl = $test =~ /^(?:eq|p:.)$/
721# ? $name
722# : Lingua::EN::Inflect::PL $name;
723#
724# if ($pl ne $a->{name_pl}) {
725# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
726# }
727# }
573 } 728 }
574 729
575 sub inst_arch($) { 730 sub inst_arch($) {
576 my (undef, $path) = @_; 731 my (undef, $path) = @_;
577 732
… …
600 my @a_res = map +(async \&process_res), 1..2; 755 my @a_res = map +(async \&process_res), 1..2;
601 my @a_trs = map +(async \&process_trs), 1..2; 756 my @a_trs = map +(async \&process_trs), 1..2;
602 757
603 IO::AIO::flush; 758 IO::AIO::flush;
604 759
605 $c_res->put (undef) for @a_res; 760 $c_res->shutdown;
606 $c_arc->put (undef) for @a_arc; 761 $c_arc->shutdown;
607 $c_trs->put (undef) for @a_trs; 762 $c_trs->shutdown;
608 763
609 print "start file scan, arc, res processing...\n" if $VERBOSE; 764 print "start file scan, arc, res processing...\n" if $VERBOSE;
610 765
611 $_->join for @a_arc; # need to parse all archetypes before png processing 766 $_->join for @a_arc; # need to parse all archetypes before png processing
612 767
613 print "end arc, start png processing...\n" if $VERBOSE; 768 print "end arc, start png processing...\n" if $VERBOSE;
614 769
615 # four png crunchers work fine for my 2x smp machine 770 # eight png crunchers work fine for my 4x smp machine
616 my @a_png = map +(async \&process_png), 1..4; 771 my @a_png = map +(async \&process_png), 1..8;
617 772
618 $_->join for (@a_trs, @a_res, @a_png); 773 $_->join for (@a_trs, @a_res, @a_png);
619 774
620 print "scanning done, processing results...\n" if $VERBOSE; 775 print "scanning done, processing results...\n" if $VERBOSE;
621 { 776 {
622 # remove path prefix from editor_folder 777 # remove path prefix from editor_folder
778 $_->{editor_folder} =~ /^\x00/
623 substr $_->{editor_folder}, 0, 1 + length $path, "" 779 and substr $_->{editor_folder}, 0, 2 + length $path, ""
624 for values %ARC; 780 for values %ARC;
625 781
626 print "resolving inheritance tree...\n" if $VERBOSE; 782 print "resolving inheritance tree...\n" if $VERBOSE;
627 # resolve inherit 783 # resolve inherit
628 while () { 784 while () {
629 my $progress; 785 my $progress;
630 my $loop; 786 my $loop;
631 787
632 for my $o (values %ARC) { 788 for my $o (values %ARC) {
633 if (my $other = $o->{inherit}) { 789 for my $other (split /,/, $o->{inherit}) {
634 if (my $s = $ARC{$other}) { 790 if (my $s = $ARC{$other}) {
635 if ($s->{inherit}) { 791 if ($s->{inherit}) {
636 $loop = $s; 792 $loop = $s;
637 } else { 793 } else {
638 delete $o->{inherit}; 794 delete $o->{inherit};
… …
657 } 813 }
658 814
659 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 815 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
660 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 816 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
661 817
818 print "generating plurals...\n" if $VERBOSE;
819 generate_plurals;
820
662 print "writing archetypes...\n" if $VERBOSE; 821 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
663 open my $fh, ">:utf8", "$DATADIR/archetypes~" 822 open my $fh, ">:utf8", "$DATADIR/archetypes~"
664 or die "$DATADIR/archetypes~: $!"; 823 or die "$DATADIR/archetypes~: $!";
665 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 824 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
666 } 825 }
667 826
668 { 827 {
669 print "writing treasures...\n" if $VERBOSE; 828 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
670 open my $fh, ">:utf8", "$DATADIR/treasures~" 829 open my $fh, ">:utf8", "$DATADIR/treasures~"
671 or die "$DATADIR/treasures~: $!"; 830 or die "$DATADIR/treasures~: $!";
672 print $fh $TRS; 831 print $fh $TRS;
673 } 832 }
674 833
… …
676 print "processing facedata...\n" if $VERBOSE; 835 print "processing facedata...\n" if $VERBOSE;
677 while (my ($k, $v) = each %FACEINFO) { 836 while (my ($k, $v) = each %FACEINFO) {
678 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 837 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
679 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 838 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
680 839
840 make_hash $k, $v->{data32}, $v->{hash32};
841 make_hash $k, $v->{data64}, $v->{hash64};
842
681 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 843 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
682 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 844 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
683
684 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
685 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
686 845
687 if (my $magicmap = $v->{magicmap}) { 846 if (my $magicmap = $v->{magicmap}) {
688 $magicmap =~ y/A-Z_\-/a-z/d; 847 $magicmap =~ y/A-Z_\-/a-z/d;
689 $v->{magicmap} = $COLOR{$magicmap}; 848 $v->{magicmap} = $COLOR{$magicmap};
690 } 849 }
691 850
851 my $stem = delete $v->{stem};
852 $v->{glyph} //= autoglyph $stem, $v;
853 utf8::encode $v->{glyph};
854 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
855
692 delete $v->{arc}; 856 delete $v->{arc};
693 } 857 }
694 858
695 print "writing facedata...\n" if $VERBOSE; 859 print "processing resources...\n" if $VERBOSE;
860 my $enc = JSON::XS->new->utf8->canonical->relaxed;
861 while (my ($k, $v) = each %RESOURCE) {
862
863 if ($v->{meta} && $v->{meta}{datadir}) {
864 delete $RESOURCE{$k};
865
866 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
867
868 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
869 open my $fh, ">:raw", "$DATADIR/$k~"
870 or die "$DATADIR/$k~: $!";
871 syswrite $fh, $v->{data};
872 push @COMMIT, $k;
873
874 } else {
875 if ($v->{type} & 1) {
876 # prepend meta info
877
878 my $meta = $enc->encode ({
879 name => $k,
880 %{ $v->{meta} || {} },
881 });
882
883 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
884 }
885
886 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
887 }
888 }
889
890 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
891 scalar keys %FACEINFO,
892 scalar keys %ANIMINFO,
893 scalar keys %RESOURCE
894 if $VERBOSE;
895
696 open my $fh, ">:perlio", "$DATADIR/facedata~" 896 open my $fh, ">:perlio", "$DATADIR/facedata~"
697 or die "$DATADIR/facedata~: $!"; 897 or die "$DATADIR/facedata~: $!";
698 898
699 print $fh freeze { 899 print $fh nfreeze {
700 version => 2, 900 version => 2,
701 faceinfo => \%FACEINFO, 901 faceinfo => \%FACEINFO,
702 animinfo => \%ANIMINFO, 902 animinfo => \%ANIMINFO,
703 resource => \%RESOURCE, 903 resource => \%RESOURCE,
704 }; 904 };
905
705 } 906 }
706 907
707 print "committing files...\n" if $VERBOSE; 908 print "committing files...\n" if $VERBOSE;
708 909
709 for (qw(archetypes facedata treasures)) { 910 for (qw(archetypes facedata treasures), @COMMIT) {
710 chmod 0644, "$DATADIR/$_~"; 911 chmod 0644, "$DATADIR/$_~";
711 rename "$DATADIR/$_~", "$DATADIR/$_" 912 rename "$DATADIR/$_~", "$DATADIR/$_"
712 or die "$DATADIR/$_: $!"; 913 or die "$DATADIR/$_: $!";
713 } 914 }
714 915

Diff Legend

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