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.86 by root, Tue Oct 5 22:33:10 2010 UTC vs.
Revision 1.104 by root, Sat Oct 16 22:12:18 2010 UTC

… …
55 55
56use Deliantra; 56use Deliantra;
57 57
58$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
59 59
60sub WRITE_FACEINFO() { 0 }
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]
64 [--install-maps maps] 66 [--install-maps maps]
… …
77my $TMPDIR = "/tmp/cfutil$$~"; 79my $TMPDIR = "/tmp/cfutil$$~";
78my $TMPFILE = "aaaa0"; 80my $TMPFILE = "aaaa0";
79my @COMMIT; 81my @COMMIT;
80 82
81our %COLOR = ( 83our %COLOR = (
84 # original cf colours
82 black => 0, 85 black => 0,
83 white => 1, 86 white => 1,
84 navy => 2, 87 navy => 2, # "dark blue"
85 red => 3, 88 red => 3,
86 orange => 4, 89 orange => 4,
87 blue => 5, 90 blue => 5, # "light blue"
88 darkorange => 6, 91 darkorange => 6,
89 green => 7, 92 green => 7,
90 lightgreen => 8, 93 lightgreen => 8,
91 grey => 9, 94 grey => 9,
95 brown => 10, # "yellow"
96 gold => 11, # "light yellow"
97 tan => 12, # yellowish gray
98
99 # new for deliantra
92 brown => 10, 100 none => 13,
101
102 # compatibility to existing archetypes
103 lightblue => 5,
93 gold => 11, 104 gray => 9,
105 yellow => 11,
94 tan => 12, 106 khaki => 12,
95); 107);
96 108
97END { system "rm", "-rf", $TMPDIR } 109END { system "rm", "-rf", $TMPDIR }
98 110
99my $s_INT = EV::signal INT => sub { exit 1 }; 111my $s_INT = EV::signal INT => sub { exit 1 };
… …
106 my ($id, $dataref, $hashref, $clen) = @_; 118 my ($id, $dataref, $hashref, $clen) = @_;
107 119
108 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; 120 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
109 121
110 if (exists $hash{$hash}) { 122 if (exists $hash{$hash}) {
111 # hahs collinion, but some files are simply identical 123 # hash collision, but some files are simply identical
112 if (${$hash{$hash}[1]} ne $$dataref) { 124 if (${$hash{$hash}[1]} ne $$dataref) {
113 warn "hash collision $hash{$hash}[0] vs. $id\n"; 125 warn "hash collision $hash{$hash}[0] vs. $id\n";
114 exit 1; 126 exit 1;
115 } else { 127 } else {
116 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;
… …
157 169
158 print "maps installed successfully.\n"; 170 print "maps installed successfully.\n";
159} 171}
160 172
161{ 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{
162 our %ANIMINFO; 231 our %ANIMINFO;
163 our %FACEINFO; 232 our %FACEINFO;
164 our %RESOURCE; 233 our %RESOURCE;
165 our @ARC; 234 our @ARC;
166 our %ARC; 235 our %ARC;
… …
169 our $PATH; 238 our $PATH;
170 239
171 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 240 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
172 241
173 our $c_arc = new Coro::Channel; 242 our $c_arc = new Coro::Channel;
174 our $c_trs = new Coro::Channel; 243 our $c_any = new Coro::Channel;
175 our $c_res = new Coro::Channel;
176 244
177 our @c_png; 245 our @c_png;
178 246
179 sub commit_png($$$$) { 247 sub commit_png($$$$) {
180 my ($stem, $name, $data, $T) = @_; 248 my ($stem, $name, $data, $T) = @_;
… …
416 484
417 aio_unlink $path if $delete; 485 aio_unlink $path if $delete;
418 } 486 }
419 } 487 }
420 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
421 sub process_arc { 518 sub process_arc {
422 while (my $job = $c_arc->get) { 519 while (my ($dir, $file) = @{ $c_arc->get }) {
423 my ($dir, $file) = @$job;
424
425 my $arc; 520 my $arc;
426 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 :/
427 522
428 my $arc = read_arch "$dir/$file"; 523 my $arc = read_arch "$dir/$file";
429 for my $o (values %$arc) { 524 for my $o (values %$arc) {
… …
431 for (my $m = $o; $m; $m = $m->{more}) { 526 for (my $m = $o; $m; $m = $m->{more}) {
432 $ARC{$m->{_name}} = $m; 527 $ARC{$m->{_name}} = $m;
433 } 528 }
434 529
435 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 530 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
436
437 my $visibility = delete $o->{visibility};
438 my $magicmap = delete $o->{magicmap};
439 my $glyph = delete $o->{glyph};
440 531
441 # find upper left corner :/ 532 # find upper left corner :/
442 # omg, this is sooo broken 533 # omg, this is sooo broken
443 my ($dx, $dy); 534 my ($dx, $dy);
444 for (my $o = $o; $o; $o = $o->{more}) { 535 for (my $o = $o; $o; $o = $o->{more}) {
… …
451 my $y = $o->{y} - $dy; 542 my $y = $o->{y} - $dy;
452 543
453 my $ext = $x|$y ? "+$x+$y" : ""; 544 my $ext = $x|$y ? "+$x+$y" : "";
454 545
455 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 546 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
456
457 $visibility = delete $o->{visibility} if exists $o->{visibility};
458 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
459 $glyph = delete $o->{glyph} if exists $o->{glyph};
460 547
461 my $anim = delete $o->{anim}; 548 my $anim = delete $o->{anim};
462 549
463 if ($anim) { 550 if ($anim) {
464 # possibly add $ext to the animation name to avoid 551 # possibly add $ext to the animation name to avoid
… …
492 579
493 my $info = $FACEINFO{$face} ||= { }; 580 my $info = $FACEINFO{$face} ||= { };
494 $info->{arc} = $o; 581 $info->{arc} = $o;
495 582
496 next if $face =~ /^blank.x11$|^empty.x11$/; 583 next if $face =~ /^blank.x11$|^empty.x11$/;
497
498 $info->{visibility} = $visibility if defined $visibility;
499 $info->{magicmap} = $magicmap if defined $magicmap;
500 $info->{glyph} = $glyph if defined $glyph;
501 } 584 }
502 585
503 if (my $smooth = delete $o->{smoothface}) { 586 if (my $smooth = delete $o->{smoothface}) {
504 my %kv = split /\s+/, $smooth; 587 my %kv = split /\s+/, $smooth;
505 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 588 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
514 } 597 }
515 } 598 }
516 } 599 }
517 600
518 sub process_trs { 601 sub process_trs {
519 while (my $job = $c_trs->get) {
520 my ($dir, $file) = @$job; 602 my ($dir, $file) = @_;
521 my $path = "$dir/$file"; 603 my $path = "$dir/$file";
522 604
523 my $trs; 605 my $trs;
524 if (0 > aio_load $path, $trs) { 606 if (0 > aio_load $path, $trs) {
525 warn "$path: $!, skipping.\n"; 607 warn "$path: $!, skipping.\n";
526 next; 608 return;
527 } 609 }
528 610
529 $TRS .= $trs; 611 $TRS .= $trs;
530 }
531 } 612 }
532 613
533 my %FILECACHE; 614 my %FILECACHE;
534 615
535 sub load_cached($;$) { 616 sub load_cached($;$) {
… …
547 628
548 $FILECACHE{$_[0]} 629 $FILECACHE{$_[0]}
549 } 630 }
550 631
551 sub process_res { 632 sub process_res {
552 while (my $job = $c_res->get) {
553 my ($dir, $file, $type) = @$job; 633 my ($dir, $file, $type) = @_;
554 634
555 my $data; 635 my $data;
556 aio_load "$dir/$file", $data; 636 aio_load "$dir/$file", $data;
557 637
558 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) };
559 639
560 utf8::decode $dir; 640 utf8::decode $dir;
561 utf8::decode $file; 641 utf8::decode $file;
562 642
563 # a meta file for resources is now mandatory 643 # a meta file for resources is now mandatory
564 unless (exists $meta->{$file}) { 644 unless (exists $meta->{$file}) {
565 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 645 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
566 next; 646 return;
567 } 647 }
568 648
569 $meta = { 649 $meta = {
570 %{ $meta->{"" } || {} }, 650 %{ $meta->{"" } || {} },
571 %{ $meta->{$file} || {} }, 651 %{ $meta->{$file} || {} },
572 }; 652 };
573 653
574 if ($meta->{license} =~ s/^#//) { 654 if ($meta->{license} =~ s/^#//) {
575 $meta->{license} = ({ 655 $meta->{license} = ({
576 "pd" => "Public Domain", 656 "pd" => "Public Domain",
577 "gpl" => "GNU General Public License, version 3.0 or any later", 657 "gpl" => "GNU General Public License, version 3.0 or any later",
578 "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/",
579 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", 659 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
580 "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/",
581 "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/",
582 })->{$meta->{license}} 662 })->{$meta->{license}}
583 || warn "$dir/$file: license tag '$meta->{license}' not found."; 663 || warn "$dir/$file: license tag '$meta->{license}' not found.";
584 } 664 }
585 665
586 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { 666 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
587 ($meta->{author} = $1) =~ s/_/ /g; 667 ($meta->{author} = $1) =~ s/_/ /g;
588 } 668 }
589 669
590 $file =~ s/\.res$//; 670 $file =~ s/\.res$//;
591 $file =~ s/\.(ogg|wav|jpg|png)$//; 671 $file =~ s/\.(ogg|wav|jpg|png)$//;
592 672
593 substr $dir, 0, 1 + length $PATH, ""; 673 substr $dir, 0, 1 + length $PATH, "";
594 674
595 if (my $filter = $meta->{cfutil_filter}) { 675 if (my $filter = $meta->{cfutil_filter}) {
596 if ($filter eq "yaml2json") { 676 if ($filter eq "yaml2json") {
597 $data = JSON::XS::encode_json YAML::XS::Load $data; 677 $data = JSON::XS::encode_json YAML::XS::Load $data;
598 } elsif ($filter eq "json2json") { 678 } elsif ($filter eq "json2json") {
599 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 679 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
600 } elsif ($filter eq "perl2json") { 680 } elsif ($filter eq "perl2json") {
601 $data = eval $data; die if $@; 681 $data = eval $data; die if $@;
602 $data = JSON::XS::encode_json $data; 682 $data = JSON::XS::encode_json $data;
603 } else { 683 } else {
604 warn "$dir/$file: unknown filter $filter, skipping\n"; 684 warn "$dir/$file: unknown filter $filter, skipping\n";
605 } 685 }
606 } 686 }
607 687
608 $RESOURCE{"$dir/$file"} = { 688 $RESOURCE{"$dir/$file"} = {
609 type => (exists $meta->{type} ? delete $meta->{type} : $type), 689 type => (exists $meta->{type} ? delete $meta->{type} : $type),
610 data => $data, 690 data => $data,
611 %$meta ? (meta => $meta) : (), 691 %$meta ? (meta => $meta) : (),
612 }; 692 };
693 }
694
695 sub process_any {
696 while (my ($func, @args) = @{ $c_any->get }) {
697 $func->(@args);
613 } 698 }
614 } 699 }
615 700
616 sub find_files; 701 sub find_files;
617 sub find_files { 702 sub find_files {
618 my ($path) = @_; 703 my ($path) = @_;
619 704
705 my $grp = IO::AIO::aio_group;
706
707 my $scandir; $scandir = sub {
708 my ($path) = @_;
709
620 IO::AIO::aioreq_pri 4; 710 IO::AIO::aioreq_pri 4;
621 IO::AIO::aio_scandir $path, 4, sub { 711 add $grp IO::AIO::aio_scandir $path, 4, sub {
622 my ($dirs, $nondirs) = @_; 712 my ($dirs, $nondirs) = @_;
623 713
624 find_files "$path/$_" 714 $scandir->("$path/$_")
625 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; 715 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
626 716
627 my $dir = $path; 717 my $dir = $path;
628 substr $dir, 0, 1 + length $PATH, ""; 718 substr $dir, 0, 1 + length $PATH, "";
629 719
630 for my $file (@$nondirs) { 720 for my $file (@$nondirs) {
631 if ($dir =~ /^music(?:\/|$)/) { 721 if ($dir =~ /^music(?:\/|$)/) {
632 $c_res->put ([$path, $file, 3]) # FT_MUSIC 722 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
633 if $file =~ /\.(ogg)$/; 723 if $file =~ /\.(ogg)$/;
634 724
635 } elsif ($dir =~ /^sound(?:\/|$)/) { 725 } elsif ($dir =~ /^sound(?:\/|$)/) {
636 $c_res->put ([$path, $file, 5]) # FT_SOUND 726 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
637 if $file =~ /\.(wav|ogg)$/; 727 if $file =~ /\.(wav|ogg)$/;
638 728
639 } elsif ($dir =~ /^res(?:\/|$)/) { 729 } elsif ($dir =~ /^res(?:\/|$)/) {
640 if ($file =~ /\.(jpg|png)$/) { 730 if ($file =~ /\.(jpg|png)$/) {
641 $c_res->put ([$path, $file, 0]) # FT_FACE 731 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
642 } 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$/) {
643 $c_res->put ([$path, $file, 6]) # FT_RSRC 748 $c_arc->put ([$path, $file]);
749
644 } else { 750 } else {
645 $c_res->put ([$path, $file, undef]); 751 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
646 } 752 }
647
648 } elsif ($file =~ /\.png$/) {
649 push @c_png, ["$path/$file", 0];
650
651 } elsif ($file =~ /\.trs$/) {
652 $c_trs->put ([$path, $file]);
653
654 } elsif ($file =~ /\.arc$/) {
655 $c_arc->put ([$path, $file]);
656
657 } else { 753 }
658 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
659 }
660 } 754 };
661 }; 755 };
756
757 $scandir->($path);
758 aio_wait $grp;
662 } 759 }
663 760
664 sub generate_plurals { 761 sub generate_plurals {
665# use Lingua::EN::Inflect (); 762# use Lingua::EN::Inflect ();
666# Lingua::EN::Inflect::classical; 763# Lingua::EN::Inflect::classical;
… …
704 if (!-d "$path/treasures") { 801 if (!-d "$path/treasures") {
705 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";
706 exit 1 unless $FORCE; 803 exit 1 unless $FORCE;
707 } 804 }
708 805
709 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;
710 810
711 find_files $path; 811 find_files $path;
712 812
713 my @a_arc = map +(async \&process_arc), 1..2;
714 my @a_res = map +(async \&process_res), 1..2;
715 my @a_trs = map +(async \&process_trs), 1..2;
716
717 IO::AIO::flush;
718
719 $c_res->shutdown;
720 $c_arc->shutdown; 813 $c_arc->shutdown;
721 $c_trs->shutdown; 814 $c_any->shutdown;
722
723 print "start file scan, arc, res processing...\n" if $VERBOSE;
724 815
725 $_->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
726 817
727 print "end arc, start png processing...\n" if $VERBOSE; 818 print "end arc, start png processing...\n" if $VERBOSE;
728 819
729 # eight png crunchers work fine for my 4x smp machine 820 # eight png crunchers work fine for my 4x smp machine
730 my @a_png = map +(async \&process_png), 1..8; 821 my @a_png = map +(async \&process_png), 1..8;
731 822
732 $_->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;
733 828
734 print "scanning done, processing results...\n" if $VERBOSE; 829 print "scanning done, processing results...\n" if $VERBOSE;
735 { 830 {
736 # remove path prefix from editor_folder 831 # remove path prefix from editor_folder
737 $_->{editor_folder} =~ /^\x00/ 832 $_->{editor_folder} =~ /^\x00/
… …
755 delete @s{qw(_name more name name_pl)}; 850 delete @s{qw(_name more name name_pl)};
756 %$o = ( %s, %$o ); 851 %$o = ( %s, %$o );
757 ++$progress; 852 ++$progress;
758 } 853 }
759 } else { 854 } else {
760 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";
761 delete $ARC{$o->{_name}}; 856 delete $ARC{$o->{_name}};
762 } 857 }
763 } 858 }
764 } 859 }
765 860
… …
772 } 867 }
773 868
774 # 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
775 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 870 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
776 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
777 print "generating plurals...\n" if $VERBOSE; 883 #print "generating plurals...\n" if $VERBOSE;
778 generate_plurals; 884 #generate_plurals;
779 885
780 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; 886 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
781 open my $fh, ">:utf8", "$DATADIR/archetypes~" 887 open my $fh, ">:utf8", "$DATADIR/archetypes~"
782 or die "$DATADIR/archetypes~: $!"; 888 or die "$DATADIR/archetypes~: $!";
783 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;
784 } 917 }
785 918
786 { 919 {
787 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE; 920 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
788 open my $fh, ">:utf8", "$DATADIR/treasures~" 921 open my $fh, ">:utf8", "$DATADIR/treasures~"
… …
791 } 924 }
792 925
793 { 926 {
794 print "processing facedata...\n" if $VERBOSE; 927 print "processing facedata...\n" if $VERBOSE;
795 while (my ($k, $v) = each %FACEINFO) { 928 while (my ($k, $v) = each %FACEINFO) {
796 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";
797 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";
798 931
799 make_hash $k, $v->{data32}, $v->{hash32}; 932 make_hash $k, $v->{data32}, $v->{hash32};
800 make_hash $k, $v->{data64}, $v->{hash64}; 933 make_hash $k, $v->{data64}, $v->{hash64};
801 934
802 #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";
803 #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";
937
938 exists $v->{visibility}
939 or warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
804 940
805 my $stem = delete $v->{stem}; 941 my $stem = delete $v->{stem};
942 $v->{glyph} // warn "WARNING: face '$k' has glyph, cannot autoglyph at the moment.";
806 $v->{glyph} //= substr $stem, 0, 1; 943 #$v->{glyph} //= autoglyph $stem, $v;
807
808 if (my $magicmap = $v->{magicmap}) {
809 $magicmap =~ y/A-Z_\-/a-z/d;
810 $v->{magicmap} = $COLOR{$magicmap};
811 }
812 944
813 delete $v->{arc}; 945 delete $v->{arc};
814 } 946 }
815 947
816 print "processing resources...\n" if $VERBOSE; 948 print "processing resources...\n" if $VERBOSE;

Diff Legend

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