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.100 by root, Wed Oct 6 03:44:55 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 };
… …
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
176 } elsif ($stem =~ /^armour\/shield/) { 191 } elsif ($stem =~ /^armour\/shield/) {
177 "Ø" 192 "Ø"
178 193
179 } elsif ($stem =~ /^armour\//) { 194 } elsif ($stem =~ /^armour\//) {
180 "A" 195 "A"
181 196
182 } elsif ($stem =~ /^weapon\//) { 197 } elsif ($stem =~ /^weapon\//) {
183 "†" 198 "†"
184 199
185 } elsif ($stem =~ /^readable\//) { 200 } elsif ($stem =~ /^readable\//) {
186 "✉" 201 "✉"
187 202
188 } elsif ($stem =~ /^river\//) { 203 } elsif ($stem =~ /^river\//) {
189 "~" 204 "~"
190 205
191 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) { 206 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
192 "·" 207 "·"
193 208
194 } elsif ($stem =~ /^spells\//) { 209 } elsif ($stem =~ /^spells\//) {
195 "!" 210 "!"
196 211
212 } elsif ($stem =~ /^exit\//) {
213 "⎆"
214
215 } elsif ($stem =~ /^construct\//) {
216 "⌂"
217
197 } elsif ($stem =~ /^player\//) { 218 } elsif ($stem =~ /^player\//) {
198 "\@" 219 "\@"
199 220
200 } 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).*\/(.)/) {
201 $1 222 $1
202 223
203 } else { 224 } else {
204 substr $stem, 0, 1 225 substr $stem, 0, 1
226 }
205 } 227 }
206} 228}
207 229
208{ 230{
209 our %ANIMINFO; 231 our %ANIMINFO;
… …
216 our $PATH; 238 our $PATH;
217 239
218 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 240 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
219 241
220 our $c_arc = new Coro::Channel; 242 our $c_arc = new Coro::Channel;
221 our $c_trs = new Coro::Channel; 243 our $c_any = new Coro::Channel;
222 our $c_res = new Coro::Channel;
223 244
224 our @c_png; 245 our @c_png;
225 246
226 sub commit_png($$$$) { 247 sub commit_png($$$$) {
227 my ($stem, $name, $data, $T) = @_; 248 my ($stem, $name, $data, $T) = @_;
… …
463 484
464 aio_unlink $path if $delete; 485 aio_unlink $path if $delete;
465 } 486 }
466 } 487 }
467 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
468 sub process_arc { 518 sub process_arc {
469 while (my $job = $c_arc->get) { 519 while (my ($dir, $file) = @{ $c_arc->get }) {
470 my ($dir, $file) = @$job;
471
472 my $arc; 520 my $arc;
473 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 :/
474 522
475 my $arc = read_arch "$dir/$file"; 523 my $arc = read_arch "$dir/$file";
476 for my $o (values %$arc) { 524 for my $o (values %$arc) {
… …
478 for (my $m = $o; $m; $m = $m->{more}) { 526 for (my $m = $o; $m; $m = $m->{more}) {
479 $ARC{$m->{_name}} = $m; 527 $ARC{$m->{_name}} = $m;
480 } 528 }
481 529
482 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 530 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
483
484 my $visibility = delete $o->{visibility};
485 my $magicmap = delete $o->{magicmap};
486 my $glyph = delete $o->{glyph};
487 531
488 # find upper left corner :/ 532 # find upper left corner :/
489 # omg, this is sooo broken 533 # omg, this is sooo broken
490 my ($dx, $dy); 534 my ($dx, $dy);
491 for (my $o = $o; $o; $o = $o->{more}) { 535 for (my $o = $o; $o; $o = $o->{more}) {
… …
498 my $y = $o->{y} - $dy; 542 my $y = $o->{y} - $dy;
499 543
500 my $ext = $x|$y ? "+$x+$y" : ""; 544 my $ext = $x|$y ? "+$x+$y" : "";
501 545
502 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 546 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
503
504 $visibility = delete $o->{visibility} if exists $o->{visibility};
505 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
506 $glyph = delete $o->{glyph} if exists $o->{glyph};
507 547
508 my $anim = delete $o->{anim}; 548 my $anim = delete $o->{anim};
509 549
510 if ($anim) { 550 if ($anim) {
511 # possibly add $ext to the animation name to avoid 551 # possibly add $ext to the animation name to avoid
… …
539 579
540 my $info = $FACEINFO{$face} ||= { }; 580 my $info = $FACEINFO{$face} ||= { };
541 $info->{arc} = $o; 581 $info->{arc} = $o;
542 582
543 next if $face =~ /^blank.x11$|^empty.x11$/; 583 next if $face =~ /^blank.x11$|^empty.x11$/;
544
545 $info->{visibility} = $visibility if defined $visibility;
546 $info->{magicmap} = $magicmap if defined $magicmap;
547 $info->{glyph} = $glyph if defined $glyph;
548 } 584 }
549 585
550 if (my $smooth = delete $o->{smoothface}) { 586 if (my $smooth = delete $o->{smoothface}) {
551 my %kv = split /\s+/, $smooth; 587 my %kv = split /\s+/, $smooth;
552 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 588 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
561 } 597 }
562 } 598 }
563 } 599 }
564 600
565 sub process_trs { 601 sub process_trs {
566 while (my $job = $c_trs->get) {
567 my ($dir, $file) = @$job; 602 my ($dir, $file) = @_;
568 my $path = "$dir/$file"; 603 my $path = "$dir/$file";
569 604
570 my $trs; 605 my $trs;
571 if (0 > aio_load $path, $trs) { 606 if (0 > aio_load $path, $trs) {
572 warn "$path: $!, skipping.\n"; 607 warn "$path: $!, skipping.\n";
573 next; 608 return;
574 } 609 }
575 610
576 $TRS .= $trs; 611 $TRS .= $trs;
577 }
578 } 612 }
579 613
580 my %FILECACHE; 614 my %FILECACHE;
581 615
582 sub load_cached($;$) { 616 sub load_cached($;$) {
… …
594 628
595 $FILECACHE{$_[0]} 629 $FILECACHE{$_[0]}
596 } 630 }
597 631
598 sub process_res { 632 sub process_res {
599 while (my $job = $c_res->get) {
600 my ($dir, $file, $type) = @$job; 633 my ($dir, $file, $type) = @_;
601 634
602 my $data; 635 my $data;
603 aio_load "$dir/$file", $data; 636 aio_load "$dir/$file", $data;
604 637
605 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) };
606 639
607 utf8::decode $dir; 640 utf8::decode $dir;
608 utf8::decode $file; 641 utf8::decode $file;
609 642
610 # a meta file for resources is now mandatory 643 # a meta file for resources is now mandatory
611 unless (exists $meta->{$file}) { 644 unless (exists $meta->{$file}) {
612 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 645 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
613 next; 646 return;
614 } 647 }
615 648
616 $meta = { 649 $meta = {
617 %{ $meta->{"" } || {} }, 650 %{ $meta->{"" } || {} },
618 %{ $meta->{$file} || {} }, 651 %{ $meta->{$file} || {} },
619 }; 652 };
620 653
621 if ($meta->{license} =~ s/^#//) { 654 if ($meta->{license} =~ s/^#//) {
622 $meta->{license} = ({ 655 $meta->{license} = ({
623 "pd" => "Public Domain", 656 "pd" => "Public Domain",
624 "gpl" => "GNU General Public License, version 3.0 or any later", 657 "gpl" => "GNU General Public License, version 3.0 or any later",
625 "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/",
626 "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/",
627 "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/",
628 "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/",
629 })->{$meta->{license}} 662 })->{$meta->{license}}
630 || warn "$dir/$file: license tag '$meta->{license}' not found."; 663 || warn "$dir/$file: license tag '$meta->{license}' not found.";
631 } 664 }
632 665
633 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/(.*)$%) {
634 ($meta->{author} = $1) =~ s/_/ /g; 667 ($meta->{author} = $1) =~ s/_/ /g;
635 } 668 }
636 669
637 $file =~ s/\.res$//; 670 $file =~ s/\.res$//;
638 $file =~ s/\.(ogg|wav|jpg|png)$//; 671 $file =~ s/\.(ogg|wav|jpg|png)$//;
639 672
640 substr $dir, 0, 1 + length $PATH, ""; 673 substr $dir, 0, 1 + length $PATH, "";
641 674
642 if (my $filter = $meta->{cfutil_filter}) { 675 if (my $filter = $meta->{cfutil_filter}) {
643 if ($filter eq "yaml2json") { 676 if ($filter eq "yaml2json") {
644 $data = JSON::XS::encode_json YAML::XS::Load $data; 677 $data = JSON::XS::encode_json YAML::XS::Load $data;
645 } elsif ($filter eq "json2json") { 678 } elsif ($filter eq "json2json") {
646 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 679 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
647 } elsif ($filter eq "perl2json") { 680 } elsif ($filter eq "perl2json") {
648 $data = eval $data; die if $@; 681 $data = eval $data; die if $@;
649 $data = JSON::XS::encode_json $data; 682 $data = JSON::XS::encode_json $data;
650 } else { 683 } else {
651 warn "$dir/$file: unknown filter $filter, skipping\n"; 684 warn "$dir/$file: unknown filter $filter, skipping\n";
652 } 685 }
653 } 686 }
654 687
655 $RESOURCE{"$dir/$file"} = { 688 $RESOURCE{"$dir/$file"} = {
656 type => (exists $meta->{type} ? delete $meta->{type} : $type), 689 type => (exists $meta->{type} ? delete $meta->{type} : $type),
657 data => $data, 690 data => $data,
658 %$meta ? (meta => $meta) : (), 691 %$meta ? (meta => $meta) : (),
659 }; 692 };
693 }
694
695 sub process_any {
696 while (my ($func, @args) = @{ $c_any->get }) {
697 $func->(@args);
660 } 698 }
661 } 699 }
662 700
663 sub find_files; 701 sub find_files;
664 sub find_files { 702 sub find_files {
665 my ($path) = @_; 703 my ($path) = @_;
666 704
705 my $grp = IO::AIO::aio_group;
706
707 my $scandir; $scandir = sub {
708 my ($path) = @_;
709
667 IO::AIO::aioreq_pri 4; 710 IO::AIO::aioreq_pri 4;
668 IO::AIO::aio_scandir $path, 4, sub { 711 add $grp IO::AIO::aio_scandir $path, 4, sub {
669 my ($dirs, $nondirs) = @_; 712 my ($dirs, $nondirs) = @_;
670 713
671 find_files "$path/$_" 714 $scandir->("$path/$_")
672 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; 715 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
673 716
674 my $dir = $path; 717 my $dir = $path;
675 substr $dir, 0, 1 + length $PATH, ""; 718 substr $dir, 0, 1 + length $PATH, "";
676 719
677 for my $file (@$nondirs) { 720 for my $file (@$nondirs) {
678 if ($dir =~ /^music(?:\/|$)/) { 721 if ($dir =~ /^music(?:\/|$)/) {
679 $c_res->put ([$path, $file, 3]) # FT_MUSIC 722 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
680 if $file =~ /\.(ogg)$/; 723 if $file =~ /\.(ogg)$/;
681 724
682 } elsif ($dir =~ /^sound(?:\/|$)/) { 725 } elsif ($dir =~ /^sound(?:\/|$)/) {
683 $c_res->put ([$path, $file, 5]) # FT_SOUND 726 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
684 if $file =~ /\.(wav|ogg)$/; 727 if $file =~ /\.(wav|ogg)$/;
685 728
686 } elsif ($dir =~ /^res(?:\/|$)/) { 729 } elsif ($dir =~ /^res(?:\/|$)/) {
687 if ($file =~ /\.(jpg|png)$/) { 730 if ($file =~ /\.(jpg|png)$/) {
688 $c_res->put ([$path, $file, 0]) # FT_FACE 731 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
689 } 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$/) {
690 $c_res->put ([$path, $file, 6]) # FT_RSRC 748 $c_arc->put ([$path, $file]);
749
691 } else { 750 } else {
692 $c_res->put ([$path, $file, undef]); 751 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
693 } 752 }
694
695 } elsif ($file =~ /\.png$/) {
696 push @c_png, ["$path/$file", 0];
697
698 } elsif ($file =~ /\.trs$/) {
699 $c_trs->put ([$path, $file]);
700
701 } elsif ($file =~ /\.arc$/) {
702 $c_arc->put ([$path, $file]);
703
704 } else { 753 }
705 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
706 }
707 } 754 };
708 }; 755 };
756
757 $scandir->($path);
758 aio_wait $grp;
709 } 759 }
710 760
711 sub generate_plurals { 761 sub generate_plurals {
712# use Lingua::EN::Inflect (); 762# use Lingua::EN::Inflect ();
713# Lingua::EN::Inflect::classical; 763# Lingua::EN::Inflect::classical;
… …
751 if (!-d "$path/treasures") { 801 if (!-d "$path/treasures") {
752 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";
753 exit 1 unless $FORCE; 803 exit 1 unless $FORCE;
754 } 804 }
755 805
756 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;
757 810
758 find_files $path; 811 find_files $path;
759 812
760 my @a_arc = map +(async \&process_arc), 1..2;
761 my @a_res = map +(async \&process_res), 1..2;
762 my @a_trs = map +(async \&process_trs), 1..2;
763
764 IO::AIO::flush;
765
766 $c_res->shutdown;
767 $c_arc->shutdown; 813 $c_arc->shutdown;
768 $c_trs->shutdown; 814 $c_any->shutdown;
769
770 print "start file scan, arc, res processing...\n" if $VERBOSE;
771 815
772 $_->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
773 817
774 print "end arc, start png processing...\n" if $VERBOSE; 818 print "end arc, start png processing...\n" if $VERBOSE;
775 819
776 # eight png crunchers work fine for my 4x smp machine 820 # eight png crunchers work fine for my 4x smp machine
777 my @a_png = map +(async \&process_png), 1..8; 821 my @a_png = map +(async \&process_png), 1..8;
778 822
779 $_->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;
780 828
781 print "scanning done, processing results...\n" if $VERBOSE; 829 print "scanning done, processing results...\n" if $VERBOSE;
782 { 830 {
783 # remove path prefix from editor_folder 831 # remove path prefix from editor_folder
784 $_->{editor_folder} =~ /^\x00/ 832 $_->{editor_folder} =~ /^\x00/
… …
802 delete @s{qw(_name more name name_pl)}; 850 delete @s{qw(_name more name name_pl)};
803 %$o = ( %s, %$o ); 851 %$o = ( %s, %$o );
804 ++$progress; 852 ++$progress;
805 } 853 }
806 } else { 854 } else {
807 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";
808 delete $ARC{$o->{_name}}; 856 delete $ARC{$o->{_name}};
809 } 857 }
810 } 858 }
811 } 859 }
812 860
… …
819 } 867 }
820 868
821 # 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
822 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 870 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
823 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
824 print "generating plurals...\n" if $VERBOSE; 883 #print "generating plurals...\n" if $VERBOSE;
825 generate_plurals; 884 #generate_plurals;
826 885
827 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; 886 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
828 open my $fh, ">:utf8", "$DATADIR/archetypes~" 887 open my $fh, ">:utf8", "$DATADIR/archetypes~"
829 or die "$DATADIR/archetypes~: $!"; 888 or die "$DATADIR/archetypes~: $!";
830 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;
831 } 917 }
832 918
833 { 919 {
834 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE; 920 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
835 open my $fh, ">:utf8", "$DATADIR/treasures~" 921 open my $fh, ">:utf8", "$DATADIR/treasures~"
… …
838 } 924 }
839 925
840 { 926 {
841 print "processing facedata...\n" if $VERBOSE; 927 print "processing facedata...\n" if $VERBOSE;
842 while (my ($k, $v) = each %FACEINFO) { 928 while (my ($k, $v) = each %FACEINFO) {
843 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";
844 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";
845 931
846 make_hash $k, $v->{data32}, $v->{hash32}; 932 make_hash $k, $v->{data32}, $v->{hash32};
847 make_hash $k, $v->{data64}, $v->{hash64}; 933 make_hash $k, $v->{data64}, $v->{hash64};
848 934
849 #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";
850 #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";
851 937
852 if (my $magicmap = $v->{magicmap}) { 938 exists $v->{visibility}
853 $magicmap =~ y/A-Z_\-/a-z/d; 939 or warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
854 $v->{magicmap} = $COLOR{$magicmap};
855 }
856 940
857 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.";
858 $v->{glyph} //= autoglyph $stem, $v; 943 #$v->{glyph} //= autoglyph $stem, $v;
859 utf8::encode $v->{glyph};
860 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
861 944
862 delete $v->{arc}; 945 delete $v->{arc};
863 } 946 }
864 947
865 print "processing resources...\n" if $VERBOSE; 948 print "processing resources...\n" if $VERBOSE;

Diff Legend

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