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.102 by root, Wed Oct 6 18:23:52 2010 UTC vs.
Revision 1.107 by root, Wed Oct 20 06:36:48 2010 UTC

… …
77my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
78my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT; 79my @COMMIT;
80 80
81our %COLOR = ( 81our %COLOR = (
82 # original cf colours
82 black => 0, 83 black => 0,
83 white => 1, 84 white => 1,
84 navy => 2, 85 navy => 2, # "dark blue"
85 red => 3, 86 red => 3,
86 orange => 4, 87 orange => 4,
87 blue => 5, 88 blue => 5, # "light blue"
88 darkorange => 6, 89 darkorange => 6,
89 green => 7, 90 green => 7,
90 lightgreen => 8, 91 lightgreen => 8,
91 grey => 9, 92 grey => 9,
93 brown => 10, # "yellow"
94 gold => 11, # "light yellow"
95 tan => 12, # yellowish gray
96
97 # new for deliantra
92 brown => 10, 98 none => 13,
99
100 # compatibility to existing archetypes
101 lightblue => 5,
93 gold => 11, 102 gray => 9,
103 yellow => 11,
94 tan => 12, 104 khaki => 12,
95); 105);
96 106
97END { system "rm", "-rf", $TMPDIR } 107END { system "rm", "-rf", $TMPDIR }
98 108
99my $s_INT = EV::signal INT => sub { exit 1 }; 109my $s_INT = EV::signal INT => sub { exit 1 };
… …
156 and die "map installation failed.\n"; 166 and die "map installation failed.\n";
157 167
158 print "maps installed successfully.\n"; 168 print "maps installed successfully.\n";
159} 169}
160 170
161our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
162
163# used to create crude text glyphs for text-based clients
164sub autoglyph {
165 my ($stem, $face) = @_;
166
167 if ($stem =~ /^wall\/|Nimwall/) {
168 return $WALL_SUFFIX[hex $1]
169 if $stem =~ /(_[0-9A-F]).x11/;
170
171 "█"
172
173 } elsif ($stem =~ /^traps\//) {
174 "☠"
175
176 } elsif ($stem =~ /^armour\/shield/) {
177 "Ø"
178
179 } elsif ($stem =~ /^armour\//) {
180 "A"
181
182 } elsif ($stem =~ /^weapon\//) {
183 "†"
184
185 } elsif ($stem =~ /^readable\//) {
186 "✉"
187
188 } elsif ($stem =~ /^river\//) {
189 "~"
190
191 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
192 "·"
193
194 } elsif ($stem =~ /^spells\//) {
195 "!"
196
197 } elsif ($stem =~ /^exit\//) {
198 "⎆"
199
200 } elsif ($stem =~ /^construct\//) {
201 "⌂"
202
203 } elsif ($stem =~ /^player\//) {
204 "\@"
205
206 } elsif ($stem =~ /^(?:monster|misc|class|connect|gods|indoor|inorganic|mining|music|skills).*\/(.)/) {
207 $1
208
209 } else {
210 substr $stem, 0, 1
211 }
212}
213
214{ 171{
215 our %ANIMINFO; 172 our %ANIMINFO;
216 our %FACEINFO; 173 our %FACEINFO;
217 our %RESOURCE; 174 our %RESOURCE;
218 our @ARC; 175 our @ARC;
… …
222 our $PATH; 179 our $PATH;
223 180
224 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 181 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
225 182
226 our $c_arc = new Coro::Channel; 183 our $c_arc = new Coro::Channel;
227 our $c_trs = new Coro::Channel; 184 our $c_any = new Coro::Channel;
228 our $c_res = new Coro::Channel;
229 185
230 our @c_png; 186 our @c_png;
231 187
232 sub commit_png($$$$) { 188 sub commit_png($$$$) {
233 my ($stem, $name, $data, $T) = @_; 189 my ($stem, $name, $data, $T) = @_;
… …
469 425
470 aio_unlink $path if $delete; 426 aio_unlink $path if $delete;
471 } 427 }
472 } 428 }
473 429
430 sub process_faceinfo {
431 my ($dir, $file) = @_;
432 my $path = "$dir/$file";
433
434 my $data;
435 if (0 > aio_load $path, $data) {
436 warn "$path: $!, skipping.\n";
437 return;
438 }
439
440 for (split /\n/, $data) {
441 chomp;
442 my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/;
443 # bg not used except for text clients
444
445 utf8::decode $glyph;
446 $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag
447
448 $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
449
450 (my $fgi = $COLOR{$fg})
451 // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n";
452 (my $bgi = $COLOR{$bg})
453 // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n";
454
455 my $fi = $FACEINFO{$face} ||= { };
456 $fi->{visibility} = $visibility * 1;
457 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap
458
459 $glyph .= " " if 2 > length $glyph; # TODO kanji
460 die "glyph $face too long" if 2 < length $glyph;
461
462 $fi->{glyph} = "";
463 for (split //, $glyph) {
464 utf8::encode $_;
465 $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_;
466 }
467 }
468 }
469
474 sub process_arc { 470 sub process_arc {
475 while (my $job = $c_arc->get) { 471 while (my ($dir, $file) = @{ $c_arc->get }) {
476 my ($dir, $file) = @$job;
477
478 my $arc; 472 my $arc;
479 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 473 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
480 474
481 my $arc = read_arch "$dir/$file"; 475 my $arc = read_arch "$dir/$file";
482 for my $o (values %$arc) { 476 for my $o (values %$arc) {
… …
484 for (my $m = $o; $m; $m = $m->{more}) { 478 for (my $m = $o; $m; $m = $m->{more}) {
485 $ARC{$m->{_name}} = $m; 479 $ARC{$m->{_name}} = $m;
486 } 480 }
487 481
488 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 482 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
489
490 my $visibility = delete $o->{visibility};
491 my $magicmap = delete $o->{magicmap};
492 my $glyph = delete $o->{glyph};
493 483
494 # find upper left corner :/ 484 # find upper left corner :/
495 # omg, this is sooo broken 485 # omg, this is sooo broken
496 my ($dx, $dy); 486 my ($dx, $dy);
497 for (my $o = $o; $o; $o = $o->{more}) { 487 for (my $o = $o; $o; $o = $o->{more}) {
… …
504 my $y = $o->{y} - $dy; 494 my $y = $o->{y} - $dy;
505 495
506 my $ext = $x|$y ? "+$x+$y" : ""; 496 my $ext = $x|$y ? "+$x+$y" : "";
507 497
508 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 498 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
509
510 $visibility = delete $o->{visibility} if exists $o->{visibility};
511 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
512 $glyph = delete $o->{glyph} if exists $o->{glyph};
513 499
514 my $anim = delete $o->{anim}; 500 my $anim = delete $o->{anim};
515 501
516 if ($anim) { 502 if ($anim) {
517 # possibly add $ext to the animation name to avoid 503 # possibly add $ext to the animation name to avoid
… …
545 531
546 my $info = $FACEINFO{$face} ||= { }; 532 my $info = $FACEINFO{$face} ||= { };
547 $info->{arc} = $o; 533 $info->{arc} = $o;
548 534
549 next if $face =~ /^blank.x11$|^empty.x11$/; 535 next if $face =~ /^blank.x11$|^empty.x11$/;
550
551 $info->{visibility} = $visibility if defined $visibility;
552 $info->{magicmap} = $magicmap if defined $magicmap;
553 $info->{glyph} = $glyph if defined $glyph;
554 } 536 }
555 537
556 if (my $smooth = delete $o->{smoothface}) { 538 if (my $smooth = delete $o->{smoothface}) {
557 my %kv = split /\s+/, $smooth; 539 my %kv = split /\s+/, $smooth;
558 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 540 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
567 } 549 }
568 } 550 }
569 } 551 }
570 552
571 sub process_trs { 553 sub process_trs {
572 while (my $job = $c_trs->get) {
573 my ($dir, $file) = @$job; 554 my ($dir, $file) = @_;
574 my $path = "$dir/$file"; 555 my $path = "$dir/$file";
575 556
576 my $trs; 557 my $trs;
577 if (0 > aio_load $path, $trs) { 558 if (0 > aio_load $path, $trs) {
578 warn "$path: $!, skipping.\n"; 559 warn "$path: $!, skipping.\n";
579 next; 560 return;
580 } 561 }
581 562
582 $TRS .= $trs; 563 $TRS .= $trs;
583 }
584 } 564 }
585 565
586 my %FILECACHE; 566 my %FILECACHE;
587 567
588 sub load_cached($;$) { 568 sub load_cached($;$) {
… …
600 580
601 $FILECACHE{$_[0]} 581 $FILECACHE{$_[0]}
602 } 582 }
603 583
604 sub process_res { 584 sub process_res {
605 while (my $job = $c_res->get) {
606 my ($dir, $file, $type) = @$job; 585 my ($dir, $file, $type) = @_;
607 586
608 my $data; 587 my $data;
609 aio_load "$dir/$file", $data; 588 aio_load "$dir/$file", $data;
610 589
611 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 590 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
612 591
613 utf8::decode $dir; 592 utf8::decode $dir;
614 utf8::decode $file; 593 utf8::decode $file;
615 594
616 # a meta file for resources is now mandatory 595 # a meta file for resources is now mandatory
617 unless (exists $meta->{$file}) { 596 unless (exists $meta->{$file}) {
618 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 597 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
619 next; 598 return;
620 } 599 }
621 600
622 $meta = { 601 $meta = {
623 %{ $meta->{"" } || {} }, 602 %{ $meta->{"" } || {} },
624 %{ $meta->{$file} || {} }, 603 %{ $meta->{$file} || {} },
625 }; 604 };
626 605
627 if ($meta->{license} =~ s/^#//) { 606 if ($meta->{license} =~ s/^#//) {
628 $meta->{license} = ({ 607 $meta->{license} = ({
629 "pd" => "Public Domain", 608 "pd" => "Public Domain",
630 "gpl" => "GNU General Public License, version 3.0 or any later", 609 "gpl" => "GNU General Public License, version 3.0 or any later",
631 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 610 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
632 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", 611 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
633 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 612 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
634 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 613 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
635 })->{$meta->{license}} 614 })->{$meta->{license}}
636 || warn "$dir/$file: license tag '$meta->{license}' not found."; 615 || warn "$dir/$file: license tag '$meta->{license}' not found.";
637 } 616 }
638 617
639 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { 618 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
640 ($meta->{author} = $1) =~ s/_/ /g; 619 ($meta->{author} = $1) =~ s/_/ /g;
641 } 620 }
642 621
643 $file =~ s/\.res$//; 622 $file =~ s/\.res$//;
644 $file =~ s/\.(ogg|wav|jpg|png)$//; 623 $file =~ s/\.(ogg|wav|jpg|png)$//;
645 624
646 substr $dir, 0, 1 + length $PATH, ""; 625 substr $dir, 0, 1 + length $PATH, "";
647 626
648 if (my $filter = $meta->{cfutil_filter}) { 627 if (my $filter = $meta->{cfutil_filter}) {
649 if ($filter eq "yaml2json") { 628 if ($filter eq "yaml2json") {
650 $data = JSON::XS::encode_json YAML::XS::Load $data; 629 $data = JSON::XS::encode_json YAML::XS::Load $data;
651 } elsif ($filter eq "json2json") { 630 } elsif ($filter eq "json2json") {
652 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 631 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
653 } elsif ($filter eq "perl2json") { 632 } elsif ($filter eq "perl2json") {
654 $data = eval $data; die if $@; 633 $data = eval $data; die if $@;
655 $data = JSON::XS::encode_json $data; 634 $data = JSON::XS::encode_json $data;
656 } else { 635 } else {
657 warn "$dir/$file: unknown filter $filter, skipping\n"; 636 warn "$dir/$file: unknown filter $filter, skipping\n";
658 } 637 }
659 } 638 }
660 639
661 $RESOURCE{"$dir/$file"} = { 640 $RESOURCE{"$dir/$file"} = {
662 type => (exists $meta->{type} ? delete $meta->{type} : $type), 641 type => (exists $meta->{type} ? delete $meta->{type} : $type),
663 data => $data, 642 data => $data,
664 %$meta ? (meta => $meta) : (), 643 %$meta ? (meta => $meta) : (),
665 }; 644 };
645 }
646
647 sub process_any {
648 while (my ($func, @args) = @{ $c_any->get }) {
649 $func->(@args);
666 } 650 }
667 } 651 }
668 652
669 sub find_files; 653 sub find_files;
670 sub find_files { 654 sub find_files {
671 my ($path) = @_; 655 my ($path) = @_;
672 656
657 my $grp = IO::AIO::aio_group;
658
659 my $scandir; $scandir = sub {
660 my ($path) = @_;
661
673 IO::AIO::aioreq_pri 4; 662 IO::AIO::aioreq_pri 4;
674 IO::AIO::aio_scandir $path, 4, sub { 663 add $grp IO::AIO::aio_scandir $path, 4, sub {
675 my ($dirs, $nondirs) = @_; 664 my ($dirs, $nondirs) = @_;
676 665
677 find_files "$path/$_" 666 $scandir->("$path/$_")
678 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; 667 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
679 668
680 my $dir = $path; 669 my $dir = $path;
681 substr $dir, 0, 1 + length $PATH, ""; 670 substr $dir, 0, 1 + length $PATH, "";
682 671
683 for my $file (@$nondirs) { 672 for my $file (@$nondirs) {
684 if ($dir =~ /^music(?:\/|$)/) { 673 if ($dir =~ /^music(?:\/|$)/) {
685 $c_res->put ([$path, $file, 3]) # FT_MUSIC 674 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
686 if $file =~ /\.(ogg)$/; 675 if $file =~ /\.(ogg)$/;
687 676
688 } elsif ($dir =~ /^sound(?:\/|$)/) { 677 } elsif ($dir =~ /^sound(?:\/|$)/) {
689 $c_res->put ([$path, $file, 5]) # FT_SOUND 678 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
690 if $file =~ /\.(wav|ogg)$/; 679 if $file =~ /\.(wav|ogg)$/;
691 680
692 } elsif ($dir =~ /^res(?:\/|$)/) { 681 } elsif ($dir =~ /^res(?:\/|$)/) {
693 if ($file =~ /\.(jpg|png)$/) { 682 if ($file =~ /\.(jpg|png)$/) {
694 $c_res->put ([$path, $file, 0]) # FT_FACE 683 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
695 } elsif ($file =~ /\.(res)$/) { 684 } elsif ($file =~ /\.(res)$/) {
685 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
686 } else {
687 $c_any->put ([\&process_res, $path, $file, undef]);
688 }
689
690 } elsif ($file =~ /\.png$/) {
691 push @c_png, ["$path/$file", 0];
692
693 } elsif ($file =~ /\.faceinfo$/) {
694 $c_any->put ([\&process_faceinfo, $path, $file]);
695
696 } elsif ($file =~ /\.trs$/) {
697 $c_any->put ([\&process_trs, $path, $file]);
698
699 } elsif ($file =~ /\.arc$/) {
696 $c_res->put ([$path, $file, 6]) # FT_RSRC 700 $c_arc->put ([$path, $file]);
701
697 } else { 702 } else {
698 $c_res->put ([$path, $file, undef]);
699 }
700
701 } elsif ($file =~ /\.png$/) {
702 push @c_png, ["$path/$file", 0];
703
704 } elsif ($file =~ /\.trs$/) {
705 $c_trs->put ([$path, $file]);
706
707 } elsif ($file =~ /\.arc$/) {
708 $c_arc->put ([$path, $file]);
709
710 } else {
711 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 703 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
712 } 704 }
705 }
713 } 706 };
714 }; 707 };
708
709 $scandir->($path);
710 aio_wait $grp;
715 } 711 }
716 712
717 sub generate_plurals { 713 sub generate_plurals {
718# use Lingua::EN::Inflect (); 714# use Lingua::EN::Inflect ();
719# Lingua::EN::Inflect::classical; 715# Lingua::EN::Inflect::classical;
… …
757 if (!-d "$path/treasures") { 753 if (!-d "$path/treasures") {
758 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 754 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
759 exit 1 unless $FORCE; 755 exit 1 unless $FORCE;
760 } 756 }
761 757
762 print "scanning files...\n" if $VERBOSE; 758 print "start file scan, arc, any processing...\n" if $VERBOSE;
759
760 my @a_arc = map +(async \&process_arc), 1..2;
761 my @a_any = map +(async \&process_any), 1..4;
763 762
764 find_files $path; 763 find_files $path;
765 764
766 my @a_arc = map +(async \&process_arc), 1..2;
767 my @a_res = map +(async \&process_res), 1..2;
768 my @a_trs = map +(async \&process_trs), 1..2;
769
770 IO::AIO::flush;
771
772 $c_res->shutdown;
773 $c_arc->shutdown; 765 $c_arc->shutdown;
774 $c_trs->shutdown; 766 $c_any->shutdown;
775
776 print "start file scan, arc, res processing...\n" if $VERBOSE;
777 767
778 $_->join for @a_arc; # need to parse all archetypes before png processing 768 $_->join for @a_arc; # need to parse all archetypes before png processing
779 769
780 print "end arc, start png processing...\n" if $VERBOSE; 770 print "end arc, start png processing...\n" if $VERBOSE;
781 771
782 # eight png crunchers work fine for my 4x smp machine 772 # eight png crunchers work fine for my 4x smp machine
783 my @a_png = map +(async \&process_png), 1..8; 773 my @a_png = map +(async \&process_png), 1..8;
784 774
785 $_->join for (@a_trs, @a_res, @a_png); 775 print "end any processing...\n" if $VERBOSE;
776 $_->join for @a_any;
777
778 print "end png processing...\n" if $VERBOSE;
779 $_->join for @a_png;
786 780
787 print "scanning done, processing results...\n" if $VERBOSE; 781 print "scanning done, processing results...\n" if $VERBOSE;
788 { 782 {
789 # remove path prefix from editor_folder 783 # remove path prefix from editor_folder
790 $_->{editor_folder} =~ /^\x00/ 784 $_->{editor_folder} =~ /^\x00/
… …
808 delete @s{qw(_name more name name_pl)}; 802 delete @s{qw(_name more name name_pl)};
809 %$o = ( %s, %$o ); 803 %$o = ( %s, %$o );
810 ++$progress; 804 ++$progress;
811 } 805 }
812 } else { 806 } else {
813 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 807 warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
814 delete $ARC{$o->{_name}}; 808 delete $ARC{$o->{_name}};
815 } 809 }
816 } 810 }
817 } 811 }
818 812
… …
825 } 819 }
826 820
827 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 821 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
828 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 822 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
829 823
824 # fix up archetypes without names, where the archanme doesn't work at all
825 for (@ARC) {
826 if (!exists $_->{name} and $_->{_name} =~ /_/) {
827 for ($_->{name} = $_->{_name}) {
828 s/(?:_\d+)+$//;
829 s/_[nesw]+$//;
830 y/_/ /;
831 }
832 }
833 }
834
830 print "generating plurals...\n" if $VERBOSE; 835 #print "generating plurals...\n" if $VERBOSE;
831 generate_plurals; 836 #generate_plurals;
832 837
833 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; 838 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
834 open my $fh, ">:utf8", "$DATADIR/archetypes~" 839 open my $fh, ">:utf8", "$DATADIR/archetypes~"
835 or die "$DATADIR/archetypes~: $!"; 840 or die "$DATADIR/archetypes~: $!";
836 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 841 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
… …
844 } 849 }
845 850
846 { 851 {
847 print "processing facedata...\n" if $VERBOSE; 852 print "processing facedata...\n" if $VERBOSE;
848 while (my ($k, $v) = each %FACEINFO) { 853 while (my ($k, $v) = each %FACEINFO) {
849 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 854 length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n";
850 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 855 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
851 856
852 make_hash $k, $v->{data32}, $v->{hash32}; 857 make_hash $k, $v->{data32}, $v->{hash32};
853 make_hash $k, $v->{data64}, $v->{hash64}; 858 make_hash $k, $v->{data64}, $v->{hash64};
854 859
855 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 860 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
856 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 861 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
857 862
858 if (my $magicmap = $v->{magicmap}) { 863 $v->{glyph} // warn "WARNING: face '$k' has glyph.";
859 $magicmap =~ y/A-Z_\-/a-z/d; 864 $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
860 $v->{magicmap} = $COLOR{$magicmap}; 865 $v->{magicmap} // warn "WARNING: face '$k' has foreground colour.";
861 }
862 866
863 my $stem = delete $v->{stem}; 867 delete @$v{qw(arc stem)}; # not used by the server
864 $v->{glyph} //= autoglyph $stem, $v;
865 utf8::encode $v->{glyph};
866 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
867
868 delete $v->{arc};
869 } 868 }
870 869
871 print "processing resources...\n" if $VERBOSE; 870 print "processing resources...\n" if $VERBOSE;
872 my $enc = JSON::XS->new->utf8->canonical->relaxed; 871 my $enc = JSON::XS->new->utf8->canonical->relaxed;
873 while (my ($k, $v) = each %RESOURCE) { 872 while (my ($k, $v) = each %RESOURCE) {

Diff Legend

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