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.99 by root, Wed Oct 6 03:20:19 2010 UTC vs.
Revision 1.103 by root, Sat Oct 16 09:20:58 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 };
… …
156 and die "map installation failed.\n"; 168 and die "map installation failed.\n";
157 169
158 print "maps installed successfully.\n"; 170 print "maps installed successfully.\n";
159} 171}
160 172
173{
174 no utf8; # == values are utf-8 encoded
175
161our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋); 176 our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
162 177
163# used to create crude text glyphs for text-based clients 178 # used to create crude text glyphs for text-based clients
164sub autoglyph { 179 sub autoglyph {
165 my ($stem, $face) = @_; 180 my ($stem, $face) = @_;
166 181
167 if ($stem =~ /^wall\/|Nimwall/) { 182 if ($stem =~ /^wall\/|Nimwall/) {
168 return $WALL_SUFFIX[hex $1] 183 return $WALL_SUFFIX[hex $1]
169 if $stem =~ /(_[0-9A-F]).x11/; 184 if $stem =~ /(_[0-9A-F]).x11/;
170 185
171 "█" 186 "█"
172 187
173 } elsif ($stem =~ /^traps\//) { 188 } elsif ($stem =~ /^traps\//) {
174 "☠" 189 "☠"
175 190
191 } elsif ($stem =~ /^armour\/shield/) {
192 "Ø"
193
176 } elsif ($stem =~ /^armour\//) { 194 } elsif ($stem =~ /^armour\//) {
177 "☗" 195 "A"
178 196
179 } elsif ($stem =~ /^weapon\//) { 197 } elsif ($stem =~ /^weapon\//) {
180 "†" 198 "†"
181 199
182 } elsif ($stem =~ /^readable\//) { 200 } elsif ($stem =~ /^readable\//) {
183 "✉" 201 "✉"
184 202
185 } elsif ($stem =~ /^river\//) { 203 } elsif ($stem =~ /^river\//) {
186 "~" 204 "~"
187 205
188 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) { 206 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
207 "·"
208
209 } elsif ($stem =~ /^spells\//) {
189 "." 210 "!"
190 211
212 } elsif ($stem =~ /^exit\//) {
213 "⎆"
214
215 } elsif ($stem =~ /^construct\//) {
216 "⌂"
217
191 } elsif ($stem =~ /^player\//) { 218 } elsif ($stem =~ /^player\//) {
192 "\@" 219 "\@"
193 220
194 } elsif ($stem =~ /^(?:monster|misc|class|connect|gods|indoor|inorganic|mining|music|skills).*\/(.)/) { 221 } elsif ($stem =~ /^(?:monster|misc|class|connect|gods|indoor|inorganic|mining|music|skills).*\/(.)/) {
195 $1 222 $1
196 223
197 } else { 224 } else {
198 substr $stem, 0, 1 225 substr $stem, 0, 1
226 }
199 } 227 }
200} 228}
201 229
202{ 230{
203 our %ANIMINFO; 231 our %ANIMINFO;
… …
210 our $PATH; 238 our $PATH;
211 239
212 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 240 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
213 241
214 our $c_arc = new Coro::Channel; 242 our $c_arc = new Coro::Channel;
215 our $c_trs = new Coro::Channel; 243 our $c_any = new Coro::Channel;
216 our $c_res = new Coro::Channel;
217 244
218 our @c_png; 245 our @c_png;
219 246
220 sub commit_png($$$$) { 247 sub commit_png($$$$) {
221 my ($stem, $name, $data, $T) = @_; 248 my ($stem, $name, $data, $T) = @_;
… …
457 484
458 aio_unlink $path if $delete; 485 aio_unlink $path if $delete;
459 } 486 }
460 } 487 }
461 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 # bg not used except for text clients
514 }
515 }
516
462 sub process_arc { 517 sub process_arc {
463 while (my $job = $c_arc->get) { 518 while (my ($dir, $file) = @{ $c_arc->get }) {
464 my ($dir, $file) = @$job;
465
466 my $arc; 519 my $arc;
467 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 520 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
468 521
469 my $arc = read_arch "$dir/$file"; 522 my $arc = read_arch "$dir/$file";
470 for my $o (values %$arc) { 523 for my $o (values %$arc) {
… …
472 for (my $m = $o; $m; $m = $m->{more}) { 525 for (my $m = $o; $m; $m = $m->{more}) {
473 $ARC{$m->{_name}} = $m; 526 $ARC{$m->{_name}} = $m;
474 } 527 }
475 528
476 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 529 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
477
478 my $visibility = delete $o->{visibility};
479 my $magicmap = delete $o->{magicmap};
480 my $glyph = delete $o->{glyph};
481 530
482 # find upper left corner :/ 531 # find upper left corner :/
483 # omg, this is sooo broken 532 # omg, this is sooo broken
484 my ($dx, $dy); 533 my ($dx, $dy);
485 for (my $o = $o; $o; $o = $o->{more}) { 534 for (my $o = $o; $o; $o = $o->{more}) {
… …
492 my $y = $o->{y} - $dy; 541 my $y = $o->{y} - $dy;
493 542
494 my $ext = $x|$y ? "+$x+$y" : ""; 543 my $ext = $x|$y ? "+$x+$y" : "";
495 544
496 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 545 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
497
498 $visibility = delete $o->{visibility} if exists $o->{visibility};
499 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
500 $glyph = delete $o->{glyph} if exists $o->{glyph};
501 546
502 my $anim = delete $o->{anim}; 547 my $anim = delete $o->{anim};
503 548
504 if ($anim) { 549 if ($anim) {
505 # possibly add $ext to the animation name to avoid 550 # possibly add $ext to the animation name to avoid
… …
533 578
534 my $info = $FACEINFO{$face} ||= { }; 579 my $info = $FACEINFO{$face} ||= { };
535 $info->{arc} = $o; 580 $info->{arc} = $o;
536 581
537 next if $face =~ /^blank.x11$|^empty.x11$/; 582 next if $face =~ /^blank.x11$|^empty.x11$/;
538
539 $info->{visibility} = $visibility if defined $visibility;
540 $info->{magicmap} = $magicmap if defined $magicmap;
541 $info->{glyph} = $glyph if defined $glyph;
542 } 583 }
543 584
544 if (my $smooth = delete $o->{smoothface}) { 585 if (my $smooth = delete $o->{smoothface}) {
545 my %kv = split /\s+/, $smooth; 586 my %kv = split /\s+/, $smooth;
546 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 587 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
555 } 596 }
556 } 597 }
557 } 598 }
558 599
559 sub process_trs { 600 sub process_trs {
560 while (my $job = $c_trs->get) {
561 my ($dir, $file) = @$job; 601 my ($dir, $file) = @_;
562 my $path = "$dir/$file"; 602 my $path = "$dir/$file";
563 603
564 my $trs; 604 my $trs;
565 if (0 > aio_load $path, $trs) { 605 if (0 > aio_load $path, $trs) {
566 warn "$path: $!, skipping.\n"; 606 warn "$path: $!, skipping.\n";
567 next; 607 return;
568 } 608 }
569 609
570 $TRS .= $trs; 610 $TRS .= $trs;
571 }
572 } 611 }
573 612
574 my %FILECACHE; 613 my %FILECACHE;
575 614
576 sub load_cached($;$) { 615 sub load_cached($;$) {
… …
588 627
589 $FILECACHE{$_[0]} 628 $FILECACHE{$_[0]}
590 } 629 }
591 630
592 sub process_res { 631 sub process_res {
593 while (my $job = $c_res->get) {
594 my ($dir, $file, $type) = @$job; 632 my ($dir, $file, $type) = @_;
595 633
596 my $data; 634 my $data;
597 aio_load "$dir/$file", $data; 635 aio_load "$dir/$file", $data;
598 636
599 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 637 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
600 638
601 utf8::decode $dir; 639 utf8::decode $dir;
602 utf8::decode $file; 640 utf8::decode $file;
603 641
604 # a meta file for resources is now mandatory 642 # a meta file for resources is now mandatory
605 unless (exists $meta->{$file}) { 643 unless (exists $meta->{$file}) {
606 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 644 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
607 next; 645 return;
608 } 646 }
609 647
610 $meta = { 648 $meta = {
611 %{ $meta->{"" } || {} }, 649 %{ $meta->{"" } || {} },
612 %{ $meta->{$file} || {} }, 650 %{ $meta->{$file} || {} },
613 }; 651 };
614 652
615 if ($meta->{license} =~ s/^#//) { 653 if ($meta->{license} =~ s/^#//) {
616 $meta->{license} = ({ 654 $meta->{license} = ({
617 "pd" => "Public Domain", 655 "pd" => "Public Domain",
618 "gpl" => "GNU General Public License, version 3.0 or any later", 656 "gpl" => "GNU General Public License, version 3.0 or any later",
619 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 657 "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/", 658 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
621 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 659 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
622 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 660 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
623 })->{$meta->{license}} 661 })->{$meta->{license}}
624 || warn "$dir/$file: license tag '$meta->{license}' not found."; 662 || warn "$dir/$file: license tag '$meta->{license}' not found.";
625 } 663 }
626 664
627 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { 665 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
628 ($meta->{author} = $1) =~ s/_/ /g; 666 ($meta->{author} = $1) =~ s/_/ /g;
629 } 667 }
630 668
631 $file =~ s/\.res$//; 669 $file =~ s/\.res$//;
632 $file =~ s/\.(ogg|wav|jpg|png)$//; 670 $file =~ s/\.(ogg|wav|jpg|png)$//;
633 671
634 substr $dir, 0, 1 + length $PATH, ""; 672 substr $dir, 0, 1 + length $PATH, "";
635 673
636 if (my $filter = $meta->{cfutil_filter}) { 674 if (my $filter = $meta->{cfutil_filter}) {
637 if ($filter eq "yaml2json") { 675 if ($filter eq "yaml2json") {
638 $data = JSON::XS::encode_json YAML::XS::Load $data; 676 $data = JSON::XS::encode_json YAML::XS::Load $data;
639 } elsif ($filter eq "json2json") { 677 } elsif ($filter eq "json2json") {
640 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 678 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
641 } elsif ($filter eq "perl2json") { 679 } elsif ($filter eq "perl2json") {
642 $data = eval $data; die if $@; 680 $data = eval $data; die if $@;
643 $data = JSON::XS::encode_json $data; 681 $data = JSON::XS::encode_json $data;
644 } else { 682 } else {
645 warn "$dir/$file: unknown filter $filter, skipping\n"; 683 warn "$dir/$file: unknown filter $filter, skipping\n";
646 } 684 }
647 } 685 }
648 686
649 $RESOURCE{"$dir/$file"} = { 687 $RESOURCE{"$dir/$file"} = {
650 type => (exists $meta->{type} ? delete $meta->{type} : $type), 688 type => (exists $meta->{type} ? delete $meta->{type} : $type),
651 data => $data, 689 data => $data,
652 %$meta ? (meta => $meta) : (), 690 %$meta ? (meta => $meta) : (),
653 }; 691 };
692 }
693
694 sub process_any {
695 while (my ($func, @args) = @{ $c_any->get }) {
696 $func->(@args);
654 } 697 }
655 } 698 }
656 699
657 sub find_files; 700 sub find_files;
658 sub find_files { 701 sub find_files {
659 my ($path) = @_; 702 my ($path) = @_;
660 703
704 my $grp = IO::AIO::aio_group;
705
706 my $scandir; $scandir = sub {
707 my ($path) = @_;
708
661 IO::AIO::aioreq_pri 4; 709 IO::AIO::aioreq_pri 4;
662 IO::AIO::aio_scandir $path, 4, sub { 710 add $grp IO::AIO::aio_scandir $path, 4, sub {
663 my ($dirs, $nondirs) = @_; 711 my ($dirs, $nondirs) = @_;
664 712
665 find_files "$path/$_" 713 $scandir->("$path/$_")
666 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; 714 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
667 715
668 my $dir = $path; 716 my $dir = $path;
669 substr $dir, 0, 1 + length $PATH, ""; 717 substr $dir, 0, 1 + length $PATH, "";
670 718
671 for my $file (@$nondirs) { 719 for my $file (@$nondirs) {
672 if ($dir =~ /^music(?:\/|$)/) { 720 if ($dir =~ /^music(?:\/|$)/) {
673 $c_res->put ([$path, $file, 3]) # FT_MUSIC 721 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
674 if $file =~ /\.(ogg)$/; 722 if $file =~ /\.(ogg)$/;
675 723
676 } elsif ($dir =~ /^sound(?:\/|$)/) { 724 } elsif ($dir =~ /^sound(?:\/|$)/) {
677 $c_res->put ([$path, $file, 5]) # FT_SOUND 725 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
678 if $file =~ /\.(wav|ogg)$/; 726 if $file =~ /\.(wav|ogg)$/;
679 727
680 } elsif ($dir =~ /^res(?:\/|$)/) { 728 } elsif ($dir =~ /^res(?:\/|$)/) {
681 if ($file =~ /\.(jpg|png)$/) { 729 if ($file =~ /\.(jpg|png)$/) {
682 $c_res->put ([$path, $file, 0]) # FT_FACE 730 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
683 } elsif ($file =~ /\.(res)$/) { 731 } elsif ($file =~ /\.(res)$/) {
732 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
733 } else {
734 $c_any->put ([\&process_res, $path, $file, undef]);
735 }
736
737 } elsif ($file =~ /\.png$/) {
738 push @c_png, ["$path/$file", 0];
739
740 } elsif ($file =~ /\.faceinfo$/) {
741 $c_any->put ([\&process_faceinfo, $path, $file]);
742
743 } elsif ($file =~ /\.trs$/) {
744 $c_any->put ([\&process_trs, $path, $file]);
745
746 } elsif ($file =~ /\.arc$/) {
684 $c_res->put ([$path, $file, 6]) # FT_RSRC 747 $c_arc->put ([$path, $file]);
748
685 } else { 749 } else {
686 $c_res->put ([$path, $file, undef]); 750 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
687 } 751 }
688
689 } elsif ($file =~ /\.png$/) {
690 push @c_png, ["$path/$file", 0];
691
692 } elsif ($file =~ /\.trs$/) {
693 $c_trs->put ([$path, $file]);
694
695 } elsif ($file =~ /\.arc$/) {
696 $c_arc->put ([$path, $file]);
697
698 } else { 752 }
699 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
700 }
701 } 753 };
702 }; 754 };
755
756 $scandir->($path);
757 aio_wait $grp;
703 } 758 }
704 759
705 sub generate_plurals { 760 sub generate_plurals {
706# use Lingua::EN::Inflect (); 761# use Lingua::EN::Inflect ();
707# Lingua::EN::Inflect::classical; 762# Lingua::EN::Inflect::classical;
… …
745 if (!-d "$path/treasures") { 800 if (!-d "$path/treasures") {
746 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 801 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
747 exit 1 unless $FORCE; 802 exit 1 unless $FORCE;
748 } 803 }
749 804
750 print "scanning files...\n" if $VERBOSE; 805 print "start file scan, arc, any processing...\n" if $VERBOSE;
806
807 my @a_arc = map +(async \&process_arc), 1..2;
808 my @a_any = map +(async \&process_any), 1..4;
751 809
752 find_files $path; 810 find_files $path;
753 811
754 my @a_arc = map +(async \&process_arc), 1..2;
755 my @a_res = map +(async \&process_res), 1..2;
756 my @a_trs = map +(async \&process_trs), 1..2;
757
758 IO::AIO::flush;
759
760 $c_res->shutdown;
761 $c_arc->shutdown; 812 $c_arc->shutdown;
762 $c_trs->shutdown; 813 $c_any->shutdown;
763
764 print "start file scan, arc, res processing...\n" if $VERBOSE;
765 814
766 $_->join for @a_arc; # need to parse all archetypes before png processing 815 $_->join for @a_arc; # need to parse all archetypes before png processing
767 816
768 print "end arc, start png processing...\n" if $VERBOSE; 817 print "end arc, start png processing...\n" if $VERBOSE;
769 818
770 # eight png crunchers work fine for my 4x smp machine 819 # eight png crunchers work fine for my 4x smp machine
771 my @a_png = map +(async \&process_png), 1..8; 820 my @a_png = map +(async \&process_png), 1..8;
772 821
773 $_->join for (@a_trs, @a_res, @a_png); 822 print "end any processing...\n" if $VERBOSE;
823 $_->join for @a_any;
824
825 print "end png processing...\n" if $VERBOSE;
826 $_->join for @a_png;
774 827
775 print "scanning done, processing results...\n" if $VERBOSE; 828 print "scanning done, processing results...\n" if $VERBOSE;
776 { 829 {
777 # remove path prefix from editor_folder 830 # remove path prefix from editor_folder
778 $_->{editor_folder} =~ /^\x00/ 831 $_->{editor_folder} =~ /^\x00/
… …
796 delete @s{qw(_name more name name_pl)}; 849 delete @s{qw(_name more name name_pl)};
797 %$o = ( %s, %$o ); 850 %$o = ( %s, %$o );
798 ++$progress; 851 ++$progress;
799 } 852 }
800 } else { 853 } else {
801 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 854 warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
802 delete $ARC{$o->{_name}}; 855 delete $ARC{$o->{_name}};
803 } 856 }
804 } 857 }
805 } 858 }
806 859
… …
820 873
821 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; 874 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
822 open my $fh, ">:utf8", "$DATADIR/archetypes~" 875 open my $fh, ">:utf8", "$DATADIR/archetypes~"
823 or die "$DATADIR/archetypes~: $!"; 876 or die "$DATADIR/archetypes~: $!";
824 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 877 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
878 }
879
880 if (WRITE_FACEINFO) {
881 my @table;
882 for my $face (sort keys %FACEINFO) {
883 my $v = $FACEINFO{$face};
884 (my $xf = $face) =~ s/\+\d+\+\d+$//;
885
886 $v->{magicmap} //= $FACEINFO{$xf}{magicmap};
887 $v->{glyph} //= $FACEINFO{$xf}{glyph};
888
889 $v->{magicmap} =~ y/A-Z_\-/a-z/d;
890
891 delete $v->{glyph} if $v->{glyph} =~ /^\?./;
892
893 my $stem = $v->{stem};
894 $v->{glyph} = $v->{glyph} // ("?" . (autoglyph $stem, $v));
895
896 push @table, [$face, $v->{visibility} || 0, $v->{magicmap} || "none", "none ", $v->{glyph}];
897 }
898 use Text::Table;
899 my $tb = new Text::Table undef, { align => "num" }, undef, undef, undef;
900 $tb->load (@table);
901 open my $fh, ">:raw", "default.faceinfo"or die;
902 print $fh $tb;
903 print "default.faceinfo written, exiting.\n";
904 exit 77;
825 } 905 }
826 906
827 { 907 {
828 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE; 908 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
829 open my $fh, ">:utf8", "$DATADIR/treasures~" 909 open my $fh, ">:utf8", "$DATADIR/treasures~"
… …
832 } 912 }
833 913
834 { 914 {
835 print "processing facedata...\n" if $VERBOSE; 915 print "processing facedata...\n" if $VERBOSE;
836 while (my ($k, $v) = each %FACEINFO) { 916 while (my ($k, $v) = each %FACEINFO) {
837 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 917 length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n";
838 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 918 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
839 919
840 make_hash $k, $v->{data32}, $v->{hash32}; 920 make_hash $k, $v->{data32}, $v->{hash32};
841 make_hash $k, $v->{data64}, $v->{hash64}; 921 make_hash $k, $v->{data64}, $v->{hash64};
842 922
843 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 923 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
844 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 924 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
845 925
846 if (my $magicmap = $v->{magicmap}) { 926 exists $v->{visibility}
847 $magicmap =~ y/A-Z_\-/a-z/d; 927 or warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
848 $v->{magicmap} = $COLOR{$magicmap};
849 }
850 928
851 my $stem = delete $v->{stem}; 929 my $stem = delete $v->{stem};
930 $v->{glyph} // warn "WARNING: face '$k' has glyph, cannot autoglyph at the moment.";
852 $v->{glyph} //= autoglyph $stem, $v; 931 #$v->{glyph} //= autoglyph $stem, $v;
853 utf8::encode $v->{glyph};
854 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
855 932
856 delete $v->{arc}; 933 delete $v->{arc};
857 } 934 }
858 935
859 print "processing resources...\n" if $VERBOSE; 936 print "processing resources...\n" if $VERBOSE;

Diff Legend

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