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.79 by root, Sun Nov 15 18:04:00 2009 UTC vs.
Revision 1.104 by root, Sat Oct 16 22:12:18 2010 UTC

… …
20# <http://www.gnu.org/licenses/>. 20# <http://www.gnu.org/licenses/>.
21# 21#
22# The authors can be reached via e-mail to <support@deliantra.net> 22# The authors can be reached via e-mail to <support@deliantra.net>
23# 23#
24 24
25use strict; 25use common::sense;
26 26
27my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
28my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
29my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
30my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
… …
54use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55 55
56use Deliantra; 56use Deliantra;
57 57
58$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
59
60sub WRITE_FACEINFO() { 0 }
59 61
60sub usage { 62sub usage {
61 warn <<EOF; 63 warn <<EOF;
62Usage: cfutil [-v] [-q] [--force] [--cache] 64Usage: cfutil [-v] [-q] [--force] [--cache]
63 [--install-arch path] 65 [--install-arch path]
… …
74my $VERBOSE = 1; 76my $VERBOSE = 1;
75my $CACHE = 0; 77my $CACHE = 0;
76my $FORCE; 78my $FORCE;
77my $TMPDIR = "/tmp/cfutil$$~"; 79my $TMPDIR = "/tmp/cfutil$$~";
78my $TMPFILE = "aaaa0"; 80my $TMPFILE = "aaaa0";
81my @COMMIT;
79 82
80our %COLOR = ( 83our %COLOR = (
84 # original cf colours
81 black => 0, 85 black => 0,
82 white => 1, 86 white => 1,
83 navy => 2, 87 navy => 2, # "dark blue"
84 red => 3, 88 red => 3,
85 orange => 4, 89 orange => 4,
86 blue => 5, 90 blue => 5, # "light blue"
87 darkorange => 6, 91 darkorange => 6,
88 green => 7, 92 green => 7,
89 lightgreen => 8, 93 lightgreen => 8,
90 grey => 9, 94 grey => 9,
95 brown => 10, # "yellow"
96 gold => 11, # "light yellow"
97 tan => 12, # yellowish gray
98
99 # new for deliantra
91 brown => 10, 100 none => 13,
101
102 # compatibility to existing archetypes
103 lightblue => 5,
92 gold => 11, 104 gray => 9,
105 yellow => 11,
93 tan => 12, 106 khaki => 12,
94); 107);
95 108
96END { system "rm", "-rf", $TMPDIR } 109END { system "rm", "-rf", $TMPDIR }
97 110
98my $s_INT = EV::signal INT => sub { exit 1 }; 111my $s_INT = EV::signal INT => sub { exit 1 };
… …
105 my ($id, $dataref, $hashref, $clen) = @_; 118 my ($id, $dataref, $hashref, $clen) = @_;
106 119
107 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; 120 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
108 121
109 if (exists $hash{$hash}) { 122 if (exists $hash{$hash}) {
110 # hahs collinion, but some files are simply identical 123 # hash collision, but some files are simply identical
111 if (${$hash{$hash}[1]} ne $$dataref) { 124 if (${$hash{$hash}[1]} ne $$dataref) {
112 warn "hash collision $hash{$hash}[0] vs. $id\n"; 125 warn "hash collision $hash{$hash}[0] vs. $id\n";
113 exit 1; 126 exit 1;
114 } else { 127 } else {
115 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; 128 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
… …
156 169
157 print "maps installed successfully.\n"; 170 print "maps installed successfully.\n";
158} 171}
159 172
160{ 173{
174 no utf8; # == values are utf-8 encoded
175
176 our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
177
178 # used to create crude text glyphs for text-based clients
179 sub autoglyph {
180 my ($stem, $face) = @_;
181
182 if ($stem =~ /^wall\/|Nimwall/) {
183 return $WALL_SUFFIX[hex $1]
184 if $stem =~ /(_[0-9A-F]).x11/;
185
186 "█"
187
188 } elsif ($stem =~ /^traps\//) {
189 "☠"
190
191 } elsif ($stem =~ /^armour\/shield/) {
192 "Ø"
193
194 } elsif ($stem =~ /^armour\//) {
195 "A"
196
197 } elsif ($stem =~ /^weapon\//) {
198 "†"
199
200 } elsif ($stem =~ /^readable\//) {
201 "✉"
202
203 } elsif ($stem =~ /^river\//) {
204 "~"
205
206 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
207 "·"
208
209 } elsif ($stem =~ /^spells\//) {
210 "!"
211
212 } elsif ($stem =~ /^exit\//) {
213 "⎆"
214
215 } elsif ($stem =~ /^construct\//) {
216 "⌂"
217
218 } elsif ($stem =~ /^player\//) {
219 "\@"
220
221 } elsif ($stem =~ /^(?:monster|misc|class|connect|gods|indoor|inorganic|mining|music|skills).*\/(.)/) {
222 $1
223
224 } else {
225 substr $stem, 0, 1
226 }
227 }
228}
229
230{
161 our %ANIMINFO; 231 our %ANIMINFO;
162 our %FACEINFO; 232 our %FACEINFO;
163 our %RESOURCE; 233 our %RESOURCE;
164 our @ARC; 234 our @ARC;
165 our %ARC; 235 our %ARC;
… …
168 our $PATH; 238 our $PATH;
169 239
170 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 240 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
171 241
172 our $c_arc = new Coro::Channel; 242 our $c_arc = new Coro::Channel;
173 our $c_trs = new Coro::Channel; 243 our $c_any = new Coro::Channel;
174 our $c_res = new Coro::Channel;
175 244
176 our @c_png; 245 our @c_png;
177 246
178 sub commit_png($$$) { 247 sub commit_png($$$$) {
179 my ($name, $data, $T) = @_; 248 my ($stem, $name, $data, $T) = @_;
180 249
250 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
181 $FACEINFO{$name}{"data$T"} = $data; 251 $FACEINFO{$name}{"data$T"} = $data;
182 } 252 }
183 253
184 sub process_png { 254 sub process_png {
185 while (@c_png) { 255 while (@c_png) {
… …
403 473
404 if (0 > aio_load $file, $tile) { 474 if (0 > aio_load $file, $tile) {
405 die "$path: unable to read tile +$x+$y, aborting.\n"; 475 die "$path: unable to read tile +$x+$y, aborting.\n";
406 } 476 }
407 IO::AIO::aio_unlink $file unless $CACHE; 477 IO::AIO::aio_unlink $file unless $CACHE;
408 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 478 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
409 } 479 }
410 } else { 480 } else {
411 # use as-is (either small, use smooth) 481 # use as-is (either small, use smooth)
412 commit_png $face, $png, $T; 482 commit_png $stem, $face, $png, $T;
413 } 483 }
414 484
415 aio_unlink $path if $delete; 485 aio_unlink $path if $delete;
416 } 486 }
417 } 487 }
418 488
489 sub process_faceinfo {
490 my ($dir, $file) = @_;
491 my $path = "$dir/$file";
492
493 my $data;
494 if (0 > aio_load $path, $data) {
495 warn "$path: $!, skipping.\n";
496 return;
497 }
498
499 for (split /\n/, $data) {
500 my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/;
501
502 $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag
503
504 (my $fgi = $COLOR{$fg})
505 // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n";
506 (my $bgi = $COLOR{$bg})
507 // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n";
508
509 my $fi = $FACEINFO{$face} ||= { };
510 $fi->{visibility} = $visibility * 1;
511 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap
512 $fi->{glyph} = (chr $fgi) . (chr $bgi) . $glyph;
513 #$fi->{glyph} = (chr $fgi) . $glyph;#d#TOOD remove
514 # bg not used except for text clients
515 }
516 }
517
419 sub process_arc { 518 sub process_arc {
420 while (my $job = $c_arc->get) { 519 while (my ($dir, $file) = @{ $c_arc->get }) {
421 my ($dir, $file) = @$job;
422
423 my $arc; 520 my $arc;
424 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 521 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
425 522
426 my $arc = read_arch "$dir/$file"; 523 my $arc = read_arch "$dir/$file";
427 for my $o (values %$arc) { 524 for my $o (values %$arc) {
… …
429 for (my $m = $o; $m; $m = $m->{more}) { 526 for (my $m = $o; $m; $m = $m->{more}) {
430 $ARC{$m->{_name}} = $m; 527 $ARC{$m->{_name}} = $m;
431 } 528 }
432 529
433 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 530 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
434
435 my $visibility = delete $o->{visibility};
436 my $magicmap = delete $o->{magicmap};
437 531
438 # find upper left corner :/ 532 # find upper left corner :/
439 # omg, this is sooo broken 533 # omg, this is sooo broken
440 my ($dx, $dy); 534 my ($dx, $dy);
441 for (my $o = $o; $o; $o = $o->{more}) { 535 for (my $o = $o; $o; $o = $o->{more}) {
… …
448 my $y = $o->{y} - $dy; 542 my $y = $o->{y} - $dy;
449 543
450 my $ext = $x|$y ? "+$x+$y" : ""; 544 my $ext = $x|$y ? "+$x+$y" : "";
451 545
452 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 546 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
453
454 $visibility = delete $o->{visibility} if exists $o->{visibility};
455 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
456 547
457 my $anim = delete $o->{anim}; 548 my $anim = delete $o->{anim};
458 549
459 if ($anim) { 550 if ($anim) {
460 # possibly add $ext to the animation name to avoid 551 # possibly add $ext to the animation name to avoid
… …
488 579
489 my $info = $FACEINFO{$face} ||= { }; 580 my $info = $FACEINFO{$face} ||= { };
490 $info->{arc} = $o; 581 $info->{arc} = $o;
491 582
492 next if $face =~ /^blank.x11$|^empty.x11$/; 583 next if $face =~ /^blank.x11$|^empty.x11$/;
493
494 $info->{visibility} = $visibility if defined $visibility;
495 $info->{magicmap} = $magicmap if defined $magicmap;
496 } 584 }
497 585
498 if (my $smooth = delete $o->{smoothface}) { 586 if (my $smooth = delete $o->{smoothface}) {
499 my %kv = split /\s+/, $smooth; 587 my %kv = split /\s+/, $smooth;
500 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 588 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
509 } 597 }
510 } 598 }
511 } 599 }
512 600
513 sub process_trs { 601 sub process_trs {
514 while (my $job = $c_trs->get) {
515 my ($dir, $file) = @$job; 602 my ($dir, $file) = @_;
516 my $path = "$dir/$file"; 603 my $path = "$dir/$file";
517 604
518 my $trs; 605 my $trs;
519 if (0 > aio_load $path, $trs) { 606 if (0 > aio_load $path, $trs) {
520 warn "$path: $!, skipping.\n"; 607 warn "$path: $!, skipping.\n";
521 next; 608 return;
522 } 609 }
523 610
524 $TRS .= $trs; 611 $TRS .= $trs;
525 }
526 } 612 }
527 613
528 my %FILECACHE; 614 my %FILECACHE;
529 615
530 sub load_cached($;$) { 616 sub load_cached($;$) {
… …
542 628
543 $FILECACHE{$_[0]} 629 $FILECACHE{$_[0]}
544 } 630 }
545 631
546 sub process_res { 632 sub process_res {
547 while (my $job = $c_res->get) {
548 my ($dir, $file, $type) = @$job; 633 my ($dir, $file, $type) = @_;
549 634
550 my $data; 635 my $data;
551 aio_load "$dir/$file", $data; 636 aio_load "$dir/$file", $data;
552 637
553 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 638 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
554 639
555 utf8::decode $dir; 640 utf8::decode $dir;
556 utf8::decode $file; 641 utf8::decode $file;
557 642
558 # a meta file for resources is now mandatory 643 # a meta file for resources is now mandatory
559 unless (exists $meta->{$file}) { 644 unless (exists $meta->{$file}) {
560 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 645 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
561 next; 646 return;
562 } 647 }
563 648
564 $meta = { 649 $meta = {
565 %{ $meta->{"" } || {} }, 650 %{ $meta->{"" } || {} },
566 %{ $meta->{$file} || {} }, 651 %{ $meta->{$file} || {} },
567 }; 652 };
568 653
569 if ($meta->{license} =~ s/^#//) { 654 if ($meta->{license} =~ s/^#//) {
570 $meta->{license} = ({ 655 $meta->{license} = ({
571 "pd" => "Public Domain", 656 "pd" => "Public Domain",
572 "gpl" => "GNU General Public License, version 3.0 or any later", 657 "gpl" => "GNU General Public License, version 3.0 or any later",
573 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 658 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
659 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
574 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 660 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
575 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 661 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
576 })->{$meta->{license}} 662 })->{$meta->{license}}
577 || warn "$dir/$file: license tag '$meta->{license}' not found."; 663 || warn "$dir/$file: license tag '$meta->{license}' not found.";
578 } 664 }
579 665
666 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
667 ($meta->{author} = $1) =~ s/_/ /g;
668 }
669
580 $file =~ s/\.res$//; 670 $file =~ s/\.res$//;
581 $file =~ s/\.(ogg|wav|jpg|png)$//; 671 $file =~ s/\.(ogg|wav|jpg|png)$//;
582 672
583 substr $dir, 0, 1 + length $PATH, ""; 673 substr $dir, 0, 1 + length $PATH, "";
584 674
585 if (my $filter = $meta->{cfutil_filter}) { 675 if (my $filter = $meta->{cfutil_filter}) {
586 if ($filter eq "yaml2json") { 676 if ($filter eq "yaml2json") {
587 $data = JSON::XS::encode_json YAML::XS::Load $data; 677 $data = JSON::XS::encode_json YAML::XS::Load $data;
588 } elsif ($filter eq "json2json") { 678 } elsif ($filter eq "json2json") {
589 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 679 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
590 } elsif ($filter eq "perl2json") { 680 } elsif ($filter eq "perl2json") {
591 $data = eval $data; die if $@; 681 $data = eval $data; die if $@;
592 $data = JSON::XS::encode_json $data; 682 $data = JSON::XS::encode_json $data;
593 } else { 683 } else {
594 warn "$dir/$file: unknown filter $filter, skipping\n"; 684 warn "$dir/$file: unknown filter $filter, skipping\n";
595 } 685 }
596 } 686 }
597 687
598 $RESOURCE{"$dir/$file"} = { 688 $RESOURCE{"$dir/$file"} = {
599 type => (exists $meta->{type} ? delete $meta->{type} : $type), 689 type => (exists $meta->{type} ? delete $meta->{type} : $type),
600 data => $data, 690 data => $data,
601 %$meta ? (meta => $meta) : (), 691 %$meta ? (meta => $meta) : (),
602 }; 692 };
693 }
694
695 sub process_any {
696 while (my ($func, @args) = @{ $c_any->get }) {
697 $func->(@args);
603 } 698 }
604 } 699 }
605 700
606 sub find_files; 701 sub find_files;
607 sub find_files { 702 sub find_files {
608 my ($path) = @_; 703 my ($path) = @_;
609 704
705 my $grp = IO::AIO::aio_group;
706
707 my $scandir; $scandir = sub {
708 my ($path) = @_;
709
610 IO::AIO::aioreq_pri 4; 710 IO::AIO::aioreq_pri 4;
611 IO::AIO::aio_scandir $path, 4, sub { 711 add $grp IO::AIO::aio_scandir $path, 4, sub {
612 my ($dirs, $nondirs) = @_; 712 my ($dirs, $nondirs) = @_;
613 713
614 find_files "$path/$_" 714 $scandir->("$path/$_")
615 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 715 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
616 716
617 my $dir = $path; 717 my $dir = $path;
618 substr $dir, 0, 1 + length $PATH, ""; 718 substr $dir, 0, 1 + length $PATH, "";
619 719
620 for my $file (@$nondirs) { 720 for my $file (@$nondirs) {
621 if ($dir =~ /^music(?:\/|$)/) { 721 if ($dir =~ /^music(?:\/|$)/) {
622 $c_res->put ([$path, $file, 3]) # FT_MUSIC 722 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
623 if $file =~ /\.(ogg)$/; 723 if $file =~ /\.(ogg)$/;
624 724
625 } elsif ($dir =~ /^sound(?:\/|$)/) { 725 } elsif ($dir =~ /^sound(?:\/|$)/) {
626 $c_res->put ([$path, $file, 5]) # FT_SOUND 726 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
627 if $file =~ /\.(wav|ogg)$/; 727 if $file =~ /\.(wav|ogg)$/;
628 728
629 } elsif ($dir =~ /^res(?:\/|$)/) { 729 } elsif ($dir =~ /^res(?:\/|$)/) {
630 if ($file =~ /\.(jpg|png)$/) { 730 if ($file =~ /\.(jpg|png)$/) {
631 $c_res->put ([$path, $file, 0]) # FT_FACE 731 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
632 } elsif ($file =~ /\.(res)$/) { 732 } elsif ($file =~ /\.(res)$/) {
733 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
734 } else {
735 $c_any->put ([\&process_res, $path, $file, undef]);
736 }
737
738 } elsif ($file =~ /\.png$/) {
739 push @c_png, ["$path/$file", 0];
740
741 } elsif ($file =~ /\.faceinfo$/) {
742 $c_any->put ([\&process_faceinfo, $path, $file]);
743
744 } elsif ($file =~ /\.trs$/) {
745 $c_any->put ([\&process_trs, $path, $file]);
746
747 } elsif ($file =~ /\.arc$/) {
633 $c_res->put ([$path, $file, 6]) # FT_RSRC 748 $c_arc->put ([$path, $file]);
749
634 } else { 750 } else {
635 $c_res->put ([$path, $file, undef]); 751 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
636 } 752 }
637
638 } elsif ($file =~ /\.png$/) {
639 push @c_png, ["$path/$file", 0];
640
641 } elsif ($file =~ /\.trs$/) {
642 $c_trs->put ([$path, $file]);
643
644 } elsif ($file =~ /\.arc$/) {
645 $c_arc->put ([$path, $file]);
646
647 } else { 753 }
648 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
649 }
650 } 754 };
651 }; 755 };
756
757 $scandir->($path);
758 aio_wait $grp;
652 } 759 }
653 760
654 sub generate_plurals { 761 sub generate_plurals {
655# use Lingua::EN::Inflect (); 762# use Lingua::EN::Inflect ();
656# Lingua::EN::Inflect::classical; 763# Lingua::EN::Inflect::classical;
… …
694 if (!-d "$path/treasures") { 801 if (!-d "$path/treasures") {
695 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 802 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
696 exit 1 unless $FORCE; 803 exit 1 unless $FORCE;
697 } 804 }
698 805
699 print "scanning files...\n" if $VERBOSE; 806 print "start file scan, arc, any processing...\n" if $VERBOSE;
807
808 my @a_arc = map +(async \&process_arc), 1..2;
809 my @a_any = map +(async \&process_any), 1..4;
700 810
701 find_files $path; 811 find_files $path;
702 812
703 my @a_arc = map +(async \&process_arc), 1..2;
704 my @a_res = map +(async \&process_res), 1..2;
705 my @a_trs = map +(async \&process_trs), 1..2;
706
707 IO::AIO::flush;
708
709 $c_res->shutdown;
710 $c_arc->shutdown; 813 $c_arc->shutdown;
711 $c_trs->shutdown; 814 $c_any->shutdown;
712
713 print "start file scan, arc, res processing...\n" if $VERBOSE;
714 815
715 $_->join for @a_arc; # need to parse all archetypes before png processing 816 $_->join for @a_arc; # need to parse all archetypes before png processing
716 817
717 print "end arc, start png processing...\n" if $VERBOSE; 818 print "end arc, start png processing...\n" if $VERBOSE;
718 819
719 # eight png crunchers work fine for my 4x smp machine 820 # eight png crunchers work fine for my 4x smp machine
720 my @a_png = map +(async \&process_png), 1..8; 821 my @a_png = map +(async \&process_png), 1..8;
721 822
722 $_->join for (@a_trs, @a_res, @a_png); 823 print "end any processing...\n" if $VERBOSE;
824 $_->join for @a_any;
825
826 print "end png processing...\n" if $VERBOSE;
827 $_->join for @a_png;
723 828
724 print "scanning done, processing results...\n" if $VERBOSE; 829 print "scanning done, processing results...\n" if $VERBOSE;
725 { 830 {
726 # remove path prefix from editor_folder 831 # remove path prefix from editor_folder
727 $_->{editor_folder} =~ /^\x00/ 832 $_->{editor_folder} =~ /^\x00/
… …
733 while () { 838 while () {
734 my $progress; 839 my $progress;
735 my $loop; 840 my $loop;
736 841
737 for my $o (values %ARC) { 842 for my $o (values %ARC) {
738 if (my $other = $o->{inherit}) { 843 for my $other (split /,/, $o->{inherit}) {
739 if (my $s = $ARC{$other}) { 844 if (my $s = $ARC{$other}) {
740 if ($s->{inherit}) { 845 if ($s->{inherit}) {
741 $loop = $s; 846 $loop = $s;
742 } else { 847 } else {
743 delete $o->{inherit}; 848 delete $o->{inherit};
… …
745 delete @s{qw(_name more name name_pl)}; 850 delete @s{qw(_name more name name_pl)};
746 %$o = ( %s, %$o ); 851 %$o = ( %s, %$o );
747 ++$progress; 852 ++$progress;
748 } 853 }
749 } else { 854 } else {
750 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 855 warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
751 delete $ARC{$o->{_name}}; 856 delete $ARC{$o->{_name}};
752 } 857 }
753 } 858 }
754 } 859 }
755 860
… …
762 } 867 }
763 868
764 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 869 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
765 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 870 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
766 871
872 # fix up archetypes without names, where the archanme doesn't work at all
873 for (@ARC) {
874 if (!exists $_->{name} and $_->{_name} =~ /_/) {
875 for ($_->{name} = $_->{_name}) {
876 s/(?:_\d+)+$//;
877 s/_[nesw]+$//;
878 y/_/ /;
879 }
880 }
881 }
882
767 print "generating plurals...\n" if $VERBOSE; 883 #print "generating plurals...\n" if $VERBOSE;
768 generate_plurals; 884 #generate_plurals;
769 885
770 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; 886 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
771 open my $fh, ">:utf8", "$DATADIR/archetypes~" 887 open my $fh, ">:utf8", "$DATADIR/archetypes~"
772 or die "$DATADIR/archetypes~: $!"; 888 or die "$DATADIR/archetypes~: $!";
773 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 889 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
890 }
891
892 if (WRITE_FACEINFO) {
893 my @table;
894 for my $face (sort keys %FACEINFO) {
895 my $v = $FACEINFO{$face};
896 (my $xf = $face) =~ s/\+\d+\+\d+$//;
897
898 $v->{magicmap} //= $FACEINFO{$xf}{magicmap};
899 $v->{glyph} //= $FACEINFO{$xf}{glyph};
900
901 $v->{magicmap} =~ y/A-Z_\-/a-z/d;
902
903 delete $v->{glyph} if $v->{glyph} =~ /^\?./;
904
905 my $stem = $v->{stem};
906 $v->{glyph} = $v->{glyph} // ("?" . (autoglyph $stem, $v));
907
908 push @table, [$face, $v->{visibility} || 0, $v->{magicmap} || "none", "none ", $v->{glyph}];
909 }
910 use Text::Table;
911 my $tb = new Text::Table undef, { align => "num" }, undef, undef, undef;
912 $tb->load (@table);
913 open my $fh, ">:raw", "default.faceinfo"or die;
914 print $fh $tb;
915 print "default.faceinfo written, exiting.\n";
916 exit 77;
774 } 917 }
775 918
776 { 919 {
777 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE; 920 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
778 open my $fh, ">:utf8", "$DATADIR/treasures~" 921 open my $fh, ">:utf8", "$DATADIR/treasures~"
… …
781 } 924 }
782 925
783 { 926 {
784 print "processing facedata...\n" if $VERBOSE; 927 print "processing facedata...\n" if $VERBOSE;
785 while (my ($k, $v) = each %FACEINFO) { 928 while (my ($k, $v) = each %FACEINFO) {
786 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 929 length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n";
787 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 930 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
788 931
789 make_hash $k, $v->{data32}, $v->{hash32}; 932 make_hash $k, $v->{data32}, $v->{hash32};
790 make_hash $k, $v->{data64}, $v->{hash64}; 933 make_hash $k, $v->{data64}, $v->{hash64};
791 934
792 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 935 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
793 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 936 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
794 937
795 if (my $magicmap = $v->{magicmap}) { 938 exists $v->{visibility}
796 $magicmap =~ y/A-Z_\-/a-z/d; 939 or warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
797 $v->{magicmap} = $COLOR{$magicmap}; 940
798 } 941 my $stem = delete $v->{stem};
942 $v->{glyph} // warn "WARNING: face '$k' has glyph, cannot autoglyph at the moment.";
943 #$v->{glyph} //= autoglyph $stem, $v;
799 944
800 delete $v->{arc}; 945 delete $v->{arc};
801 } 946 }
802 947
803 print "processing resources...\n" if $VERBOSE; 948 print "processing resources...\n" if $VERBOSE;
804 my $enc = JSON::XS->new->utf8->canonical->relaxed; 949 my $enc = JSON::XS->new->utf8->canonical->relaxed;
805 while (my ($k, $v) = each %RESOURCE) { 950 while (my ($k, $v) = each %RESOURCE) {
806 951
952 if ($v->{meta} && $v->{meta}{datadir}) {
953 delete $RESOURCE{$k};
954
955 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
956
957 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
958 open my $fh, ">:raw", "$DATADIR/$k~"
959 or die "$DATADIR/$k~: $!";
960 syswrite $fh, $v->{data};
961 push @COMMIT, $k;
962
963 } else {
807 if ($v->{type} & 1) { 964 if ($v->{type} & 1) {
808 # prepend meta info 965 # prepend meta info
809 966
810 my $meta = $enc->encode ({ 967 my $meta = $enc->encode ({
811 name => $k, 968 name => $k,
812 %{ $v->{meta} || {} }, 969 %{ $v->{meta} || {} },
813 }); 970 });
814 971
815 $v->{data} = pack "(w/a*)*", $meta, $v->{data}; 972 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
816 } 973 }
817 974
818 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients 975 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
976 }
819 } 977 }
820 978
821 printf "writing facedata (%d faces, %d anims, %d resources)...\n", 979 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
822 scalar keys %FACEINFO, 980 scalar keys %FACEINFO,
823 scalar keys %ANIMINFO, 981 scalar keys %ANIMINFO,
… …
825 if $VERBOSE; 983 if $VERBOSE;
826 984
827 open my $fh, ">:perlio", "$DATADIR/facedata~" 985 open my $fh, ">:perlio", "$DATADIR/facedata~"
828 or die "$DATADIR/facedata~: $!"; 986 or die "$DATADIR/facedata~: $!";
829 987
830 print $fh freeze { 988 print $fh nfreeze {
831 version => 2, 989 version => 2,
832 faceinfo => \%FACEINFO, 990 faceinfo => \%FACEINFO,
833 animinfo => \%ANIMINFO, 991 animinfo => \%ANIMINFO,
834 resource => \%RESOURCE, 992 resource => \%RESOURCE,
835 }; 993 };
836 994
837 } 995 }
838 996
839 print "committing files...\n" if $VERBOSE; 997 print "committing files...\n" if $VERBOSE;
840 998
841 for (qw(archetypes facedata treasures)) { 999 for (qw(archetypes facedata treasures), @COMMIT) {
842 chmod 0644, "$DATADIR/$_~"; 1000 chmod 0644, "$DATADIR/$_~";
843 rename "$DATADIR/$_~", "$DATADIR/$_" 1001 rename "$DATADIR/$_~", "$DATADIR/$_"
844 or die "$DATADIR/$_: $!"; 1002 or die "$DATADIR/$_: $!";
845 } 1003 }
846 1004

Diff Legend

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