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

Diff Legend

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