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.91 by root, Tue Oct 5 23:52:52 2010 UTC vs.
Revision 1.105 by root, Sun Oct 17 08:00:09 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 $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
505
506 (my $fgi = $COLOR{$fg})
507 // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n";
508 (my $bgi = $COLOR{$bg})
509 // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n";
510
511 my $fi = $FACEINFO{$face} ||= { };
512 $fi->{visibility} = $visibility * 1;
513 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap
514 $fi->{glyph} = (chr $fgi) . (chr $bgi) . $glyph;
515 #$fi->{glyph} = (chr $fgi) . $glyph;#d#TOOD remove
516 # bg not used except for text clients
517 }
518 }
519
464 sub process_arc { 520 sub process_arc {
465 while (my $job = $c_arc->get) { 521 while (my ($dir, $file) = @{ $c_arc->get }) {
466 my ($dir, $file) = @$job;
467
468 my $arc; 522 my $arc;
469 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 523 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
470 524
471 my $arc = read_arch "$dir/$file"; 525 my $arc = read_arch "$dir/$file";
472 for my $o (values %$arc) { 526 for my $o (values %$arc) {
… …
474 for (my $m = $o; $m; $m = $m->{more}) { 528 for (my $m = $o; $m; $m = $m->{more}) {
475 $ARC{$m->{_name}} = $m; 529 $ARC{$m->{_name}} = $m;
476 } 530 }
477 531
478 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 532 $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 533
484 # find upper left corner :/ 534 # find upper left corner :/
485 # omg, this is sooo broken 535 # omg, this is sooo broken
486 my ($dx, $dy); 536 my ($dx, $dy);
487 for (my $o = $o; $o; $o = $o->{more}) { 537 for (my $o = $o; $o; $o = $o->{more}) {
… …
494 my $y = $o->{y} - $dy; 544 my $y = $o->{y} - $dy;
495 545
496 my $ext = $x|$y ? "+$x+$y" : ""; 546 my $ext = $x|$y ? "+$x+$y" : "";
497 547
498 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 548 $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 549
504 my $anim = delete $o->{anim}; 550 my $anim = delete $o->{anim};
505 551
506 if ($anim) { 552 if ($anim) {
507 # possibly add $ext to the animation name to avoid 553 # possibly add $ext to the animation name to avoid
… …
535 581
536 my $info = $FACEINFO{$face} ||= { }; 582 my $info = $FACEINFO{$face} ||= { };
537 $info->{arc} = $o; 583 $info->{arc} = $o;
538 584
539 next if $face =~ /^blank.x11$|^empty.x11$/; 585 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 } 586 }
545 587
546 if (my $smooth = delete $o->{smoothface}) { 588 if (my $smooth = delete $o->{smoothface}) {
547 my %kv = split /\s+/, $smooth; 589 my %kv = split /\s+/, $smooth;
548 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 590 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
557 } 599 }
558 } 600 }
559 } 601 }
560 602
561 sub process_trs { 603 sub process_trs {
562 while (my $job = $c_trs->get) {
563 my ($dir, $file) = @$job; 604 my ($dir, $file) = @_;
564 my $path = "$dir/$file"; 605 my $path = "$dir/$file";
565 606
566 my $trs; 607 my $trs;
567 if (0 > aio_load $path, $trs) { 608 if (0 > aio_load $path, $trs) {
568 warn "$path: $!, skipping.\n"; 609 warn "$path: $!, skipping.\n";
569 next; 610 return;
570 } 611 }
571 612
572 $TRS .= $trs; 613 $TRS .= $trs;
573 }
574 } 614 }
575 615
576 my %FILECACHE; 616 my %FILECACHE;
577 617
578 sub load_cached($;$) { 618 sub load_cached($;$) {
… …
590 630
591 $FILECACHE{$_[0]} 631 $FILECACHE{$_[0]}
592 } 632 }
593 633
594 sub process_res { 634 sub process_res {
595 while (my $job = $c_res->get) {
596 my ($dir, $file, $type) = @$job; 635 my ($dir, $file, $type) = @_;
597 636
598 my $data; 637 my $data;
599 aio_load "$dir/$file", $data; 638 aio_load "$dir/$file", $data;
600 639
601 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 640 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
602 641
603 utf8::decode $dir; 642 utf8::decode $dir;
604 utf8::decode $file; 643 utf8::decode $file;
605 644
606 # a meta file for resources is now mandatory 645 # a meta file for resources is now mandatory
607 unless (exists $meta->{$file}) { 646 unless (exists $meta->{$file}) {
608 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 647 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
609 next; 648 return;
610 } 649 }
611 650
612 $meta = { 651 $meta = {
613 %{ $meta->{"" } || {} }, 652 %{ $meta->{"" } || {} },
614 %{ $meta->{$file} || {} }, 653 %{ $meta->{$file} || {} },
615 }; 654 };
616 655
617 if ($meta->{license} =~ s/^#//) { 656 if ($meta->{license} =~ s/^#//) {
618 $meta->{license} = ({ 657 $meta->{license} = ({
619 "pd" => "Public Domain", 658 "pd" => "Public Domain",
620 "gpl" => "GNU General Public License, version 3.0 or any later", 659 "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/", 660 "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/", 661 "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/", 662 "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/", 663 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
625 })->{$meta->{license}} 664 })->{$meta->{license}}
626 || warn "$dir/$file: license tag '$meta->{license}' not found."; 665 || warn "$dir/$file: license tag '$meta->{license}' not found.";
627 } 666 }
628 667
629 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { 668 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
630 ($meta->{author} = $1) =~ s/_/ /g; 669 ($meta->{author} = $1) =~ s/_/ /g;
631 } 670 }
632 671
633 $file =~ s/\.res$//; 672 $file =~ s/\.res$//;
634 $file =~ s/\.(ogg|wav|jpg|png)$//; 673 $file =~ s/\.(ogg|wav|jpg|png)$//;
635 674
636 substr $dir, 0, 1 + length $PATH, ""; 675 substr $dir, 0, 1 + length $PATH, "";
637 676
638 if (my $filter = $meta->{cfutil_filter}) { 677 if (my $filter = $meta->{cfutil_filter}) {
639 if ($filter eq "yaml2json") { 678 if ($filter eq "yaml2json") {
640 $data = JSON::XS::encode_json YAML::XS::Load $data; 679 $data = JSON::XS::encode_json YAML::XS::Load $data;
641 } elsif ($filter eq "json2json") { 680 } elsif ($filter eq "json2json") {
642 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 681 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
643 } elsif ($filter eq "perl2json") { 682 } elsif ($filter eq "perl2json") {
644 $data = eval $data; die if $@; 683 $data = eval $data; die if $@;
645 $data = JSON::XS::encode_json $data; 684 $data = JSON::XS::encode_json $data;
646 } else { 685 } else {
647 warn "$dir/$file: unknown filter $filter, skipping\n"; 686 warn "$dir/$file: unknown filter $filter, skipping\n";
648 } 687 }
649 } 688 }
650 689
651 $RESOURCE{"$dir/$file"} = { 690 $RESOURCE{"$dir/$file"} = {
652 type => (exists $meta->{type} ? delete $meta->{type} : $type), 691 type => (exists $meta->{type} ? delete $meta->{type} : $type),
653 data => $data, 692 data => $data,
654 %$meta ? (meta => $meta) : (), 693 %$meta ? (meta => $meta) : (),
655 }; 694 };
695 }
696
697 sub process_any {
698 while (my ($func, @args) = @{ $c_any->get }) {
699 $func->(@args);
656 } 700 }
657 } 701 }
658 702
659 sub find_files; 703 sub find_files;
660 sub find_files { 704 sub find_files {
661 my ($path) = @_; 705 my ($path) = @_;
662 706
707 my $grp = IO::AIO::aio_group;
708
709 my $scandir; $scandir = sub {
710 my ($path) = @_;
711
663 IO::AIO::aioreq_pri 4; 712 IO::AIO::aioreq_pri 4;
664 IO::AIO::aio_scandir $path, 4, sub { 713 add $grp IO::AIO::aio_scandir $path, 4, sub {
665 my ($dirs, $nondirs) = @_; 714 my ($dirs, $nondirs) = @_;
666 715
667 find_files "$path/$_" 716 $scandir->("$path/$_")
668 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; 717 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
669 718
670 my $dir = $path; 719 my $dir = $path;
671 substr $dir, 0, 1 + length $PATH, ""; 720 substr $dir, 0, 1 + length $PATH, "";
672 721
673 for my $file (@$nondirs) { 722 for my $file (@$nondirs) {
674 if ($dir =~ /^music(?:\/|$)/) { 723 if ($dir =~ /^music(?:\/|$)/) {
675 $c_res->put ([$path, $file, 3]) # FT_MUSIC 724 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
676 if $file =~ /\.(ogg)$/; 725 if $file =~ /\.(ogg)$/;
677 726
678 } elsif ($dir =~ /^sound(?:\/|$)/) { 727 } elsif ($dir =~ /^sound(?:\/|$)/) {
679 $c_res->put ([$path, $file, 5]) # FT_SOUND 728 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
680 if $file =~ /\.(wav|ogg)$/; 729 if $file =~ /\.(wav|ogg)$/;
681 730
682 } elsif ($dir =~ /^res(?:\/|$)/) { 731 } elsif ($dir =~ /^res(?:\/|$)/) {
683 if ($file =~ /\.(jpg|png)$/) { 732 if ($file =~ /\.(jpg|png)$/) {
684 $c_res->put ([$path, $file, 0]) # FT_FACE 733 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
685 } elsif ($file =~ /\.(res)$/) { 734 } elsif ($file =~ /\.(res)$/) {
735 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
736 } else {
737 $c_any->put ([\&process_res, $path, $file, undef]);
738 }
739
740 } elsif ($file =~ /\.png$/) {
741 push @c_png, ["$path/$file", 0];
742
743 } elsif ($file =~ /\.faceinfo$/) {
744 $c_any->put ([\&process_faceinfo, $path, $file]);
745
746 } elsif ($file =~ /\.trs$/) {
747 $c_any->put ([\&process_trs, $path, $file]);
748
749 } elsif ($file =~ /\.arc$/) {
686 $c_res->put ([$path, $file, 6]) # FT_RSRC 750 $c_arc->put ([$path, $file]);
751
687 } else { 752 } else {
688 $c_res->put ([$path, $file, undef]); 753 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
689 } 754 }
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 { 755 }
701 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
702 }
703 } 756 };
704 }; 757 };
758
759 $scandir->($path);
760 aio_wait $grp;
705 } 761 }
706 762
707 sub generate_plurals { 763 sub generate_plurals {
708# use Lingua::EN::Inflect (); 764# use Lingua::EN::Inflect ();
709# Lingua::EN::Inflect::classical; 765# Lingua::EN::Inflect::classical;
… …
747 if (!-d "$path/treasures") { 803 if (!-d "$path/treasures") {
748 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 804 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
749 exit 1 unless $FORCE; 805 exit 1 unless $FORCE;
750 } 806 }
751 807
752 print "scanning files...\n" if $VERBOSE; 808 print "start file scan, arc, any processing...\n" if $VERBOSE;
809
810 my @a_arc = map +(async \&process_arc), 1..2;
811 my @a_any = map +(async \&process_any), 1..4;
753 812
754 find_files $path; 813 find_files $path;
755 814
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; 815 $c_arc->shutdown;
764 $c_trs->shutdown; 816 $c_any->shutdown;
765
766 print "start file scan, arc, res processing...\n" if $VERBOSE;
767 817
768 $_->join for @a_arc; # need to parse all archetypes before png processing 818 $_->join for @a_arc; # need to parse all archetypes before png processing
769 819
770 print "end arc, start png processing...\n" if $VERBOSE; 820 print "end arc, start png processing...\n" if $VERBOSE;
771 821
772 # eight png crunchers work fine for my 4x smp machine 822 # eight png crunchers work fine for my 4x smp machine
773 my @a_png = map +(async \&process_png), 1..8; 823 my @a_png = map +(async \&process_png), 1..8;
774 824
775 $_->join for (@a_trs, @a_res, @a_png); 825 print "end any processing...\n" if $VERBOSE;
826 $_->join for @a_any;
827
828 print "end png processing...\n" if $VERBOSE;
829 $_->join for @a_png;
776 830
777 print "scanning done, processing results...\n" if $VERBOSE; 831 print "scanning done, processing results...\n" if $VERBOSE;
778 { 832 {
779 # remove path prefix from editor_folder 833 # remove path prefix from editor_folder
780 $_->{editor_folder} =~ /^\x00/ 834 $_->{editor_folder} =~ /^\x00/
… …
798 delete @s{qw(_name more name name_pl)}; 852 delete @s{qw(_name more name name_pl)};
799 %$o = ( %s, %$o ); 853 %$o = ( %s, %$o );
800 ++$progress; 854 ++$progress;
801 } 855 }
802 } else { 856 } else {
803 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 857 warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
804 delete $ARC{$o->{_name}}; 858 delete $ARC{$o->{_name}};
805 } 859 }
806 } 860 }
807 } 861 }
808 862
… …
815 } 869 }
816 870
817 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 871 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
818 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 872 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
819 873
874 # fix up archetypes without names, where the archanme doesn't work at all
875 for (@ARC) {
876 if (!exists $_->{name} and $_->{_name} =~ /_/) {
877 for ($_->{name} = $_->{_name}) {
878 s/(?:_\d+)+$//;
879 s/_[nesw]+$//;
880 y/_/ /;
881 }
882 }
883 }
884
820 print "generating plurals...\n" if $VERBOSE; 885 #print "generating plurals...\n" if $VERBOSE;
821 generate_plurals; 886 #generate_plurals;
822 887
823 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; 888 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
824 open my $fh, ">:utf8", "$DATADIR/archetypes~" 889 open my $fh, ">:utf8", "$DATADIR/archetypes~"
825 or die "$DATADIR/archetypes~: $!"; 890 or die "$DATADIR/archetypes~: $!";
826 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 891 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
892 }
893
894 if (WRITE_FACEINFO) {
895 my @table;
896 for my $face (sort keys %FACEINFO) {
897 my $v = $FACEINFO{$face};
898 (my $xf = $face) =~ s/\+\d+\+\d+$//;
899
900 $v->{magicmap} //= $FACEINFO{$xf}{magicmap};
901 $v->{glyph} //= $FACEINFO{$xf}{glyph};
902
903 $v->{magicmap} =~ y/A-Z_\-/a-z/d;
904
905 delete $v->{glyph} if $v->{glyph} =~ /^\?./;
906
907 my $stem = $v->{stem};
908 $v->{glyph} = $v->{glyph} // ("?" . (autoglyph $stem, $v));
909
910 push @table, [$face, $v->{visibility} || 0, $v->{magicmap} || "none", "none ", $v->{glyph}];
911 }
912 use Text::Table;
913 my $tb = new Text::Table undef, { align => "num" }, undef, undef, undef;
914 $tb->load (@table);
915 open my $fh, ">:raw", "default.faceinfo"or die;
916 print $fh $tb;
917 print "default.faceinfo written, exiting.\n";
918 exit 77;
827 } 919 }
828 920
829 { 921 {
830 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE; 922 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
831 open my $fh, ">:utf8", "$DATADIR/treasures~" 923 open my $fh, ">:utf8", "$DATADIR/treasures~"
… …
834 } 926 }
835 927
836 { 928 {
837 print "processing facedata...\n" if $VERBOSE; 929 print "processing facedata...\n" if $VERBOSE;
838 while (my ($k, $v) = each %FACEINFO) { 930 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"; 931 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"; 932 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
841 933
842 make_hash $k, $v->{data32}, $v->{hash32}; 934 make_hash $k, $v->{data32}, $v->{hash32};
843 make_hash $k, $v->{data64}, $v->{hash64}; 935 make_hash $k, $v->{data64}, $v->{hash64};
844 936
845 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 937 #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"; 938 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
847 939
848 if (my $magicmap = $v->{magicmap}) { 940 exists $v->{visibility}
849 $magicmap =~ y/A-Z_\-/a-z/d; 941 or warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
850 $v->{magicmap} = $COLOR{$magicmap};
851 }
852 942
853 my $stem = delete $v->{stem}; 943 my $stem = delete $v->{stem};
944 $v->{glyph} // warn "WARNING: face '$k' has glyph, cannot autoglyph at the moment.";
854 $v->{glyph} //= autoglyph $stem, $v; 945 #$v->{glyph} //= autoglyph $stem, $v;
855 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
856 946
857 delete $v->{arc}; 947 delete $v->{arc};
858 } 948 }
859 949
860 print "processing resources...\n" if $VERBOSE; 950 print "processing resources...\n" if $VERBOSE;

Diff Legend

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