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.96 by root, Wed Oct 6 00:28:15 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
163sub autoglyph {
164 my ($stem, $face) = @_;
165
166 if ($stem =~ /^wall\/|Nimwall/) {
167 return $WALL_SUFFIX[hex $1]
168 if $stem =~ /(_[0-9A-F]).x11/;
169
170 "+"
171
172 } elsif ($stem =~ /^monster.*\/(.)/) {
173 $1
174
175 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
176 "."
177
178 } elsif ($stem =~ /^player\//) {
179 "\@"
180
181 } else {
182 substr $stem, 0, 1
183 }
184}
185
186{ 171{
187 our %ANIMINFO; 172 our %ANIMINFO;
188 our %FACEINFO; 173 our %FACEINFO;
189 our %RESOURCE; 174 our %RESOURCE;
190 our @ARC; 175 our @ARC;
… …
194 our $PATH; 179 our $PATH;
195 180
196 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 181 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
197 182
198 our $c_arc = new Coro::Channel; 183 our $c_arc = new Coro::Channel;
199 our $c_trs = new Coro::Channel; 184 our $c_any = new Coro::Channel;
200 our $c_res = new Coro::Channel;
201 185
202 our @c_png; 186 our @c_png;
203 187
204 sub commit_png($$$$) { 188 sub commit_png($$$$) {
205 my ($stem, $name, $data, $T) = @_; 189 my ($stem, $name, $data, $T) = @_;
… …
441 425
442 aio_unlink $path if $delete; 426 aio_unlink $path if $delete;
443 } 427 }
444 } 428 }
445 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
446 sub process_arc { 470 sub process_arc {
447 while (my $job = $c_arc->get) { 471 while (my ($dir, $file) = @{ $c_arc->get }) {
448 my ($dir, $file) = @$job;
449
450 my $arc; 472 my $arc;
451 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 :/
452 474
453 my $arc = read_arch "$dir/$file"; 475 my $arc = read_arch "$dir/$file";
454 for my $o (values %$arc) { 476 for my $o (values %$arc) {
… …
456 for (my $m = $o; $m; $m = $m->{more}) { 478 for (my $m = $o; $m; $m = $m->{more}) {
457 $ARC{$m->{_name}} = $m; 479 $ARC{$m->{_name}} = $m;
458 } 480 }
459 481
460 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 482 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
461
462 my $visibility = delete $o->{visibility};
463 my $magicmap = delete $o->{magicmap};
464 my $glyph = delete $o->{glyph};
465 483
466 # find upper left corner :/ 484 # find upper left corner :/
467 # omg, this is sooo broken 485 # omg, this is sooo broken
468 my ($dx, $dy); 486 my ($dx, $dy);
469 for (my $o = $o; $o; $o = $o->{more}) { 487 for (my $o = $o; $o; $o = $o->{more}) {
… …
476 my $y = $o->{y} - $dy; 494 my $y = $o->{y} - $dy;
477 495
478 my $ext = $x|$y ? "+$x+$y" : ""; 496 my $ext = $x|$y ? "+$x+$y" : "";
479 497
480 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 498 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
481
482 $visibility = delete $o->{visibility} if exists $o->{visibility};
483 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
484 $glyph = delete $o->{glyph} if exists $o->{glyph};
485 499
486 my $anim = delete $o->{anim}; 500 my $anim = delete $o->{anim};
487 501
488 if ($anim) { 502 if ($anim) {
489 # possibly add $ext to the animation name to avoid 503 # possibly add $ext to the animation name to avoid
… …
517 531
518 my $info = $FACEINFO{$face} ||= { }; 532 my $info = $FACEINFO{$face} ||= { };
519 $info->{arc} = $o; 533 $info->{arc} = $o;
520 534
521 next if $face =~ /^blank.x11$|^empty.x11$/; 535 next if $face =~ /^blank.x11$|^empty.x11$/;
522
523 $info->{visibility} = $visibility if defined $visibility;
524 $info->{magicmap} = $magicmap if defined $magicmap;
525 $info->{glyph} = $glyph if defined $glyph;
526 } 536 }
527 537
528 if (my $smooth = delete $o->{smoothface}) { 538 if (my $smooth = delete $o->{smoothface}) {
529 my %kv = split /\s+/, $smooth; 539 my %kv = split /\s+/, $smooth;
530 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 540 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
539 } 549 }
540 } 550 }
541 } 551 }
542 552
543 sub process_trs { 553 sub process_trs {
544 while (my $job = $c_trs->get) {
545 my ($dir, $file) = @$job; 554 my ($dir, $file) = @_;
546 my $path = "$dir/$file"; 555 my $path = "$dir/$file";
547 556
548 my $trs; 557 my $trs;
549 if (0 > aio_load $path, $trs) { 558 if (0 > aio_load $path, $trs) {
550 warn "$path: $!, skipping.\n"; 559 warn "$path: $!, skipping.\n";
551 next; 560 return;
552 } 561 }
553 562
554 $TRS .= $trs; 563 $TRS .= $trs;
555 }
556 } 564 }
557 565
558 my %FILECACHE; 566 my %FILECACHE;
559 567
560 sub load_cached($;$) { 568 sub load_cached($;$) {
… …
572 580
573 $FILECACHE{$_[0]} 581 $FILECACHE{$_[0]}
574 } 582 }
575 583
576 sub process_res { 584 sub process_res {
577 while (my $job = $c_res->get) {
578 my ($dir, $file, $type) = @$job; 585 my ($dir, $file, $type) = @_;
579 586
580 my $data; 587 my $data;
581 aio_load "$dir/$file", $data; 588 aio_load "$dir/$file", $data;
582 589
583 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) };
584 591
585 utf8::decode $dir; 592 utf8::decode $dir;
586 utf8::decode $file; 593 utf8::decode $file;
587 594
588 # a meta file for resources is now mandatory 595 # a meta file for resources is now mandatory
589 unless (exists $meta->{$file}) { 596 unless (exists $meta->{$file}) {
590 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 597 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
591 next; 598 return;
592 } 599 }
593 600
594 $meta = { 601 $meta = {
595 %{ $meta->{"" } || {} }, 602 %{ $meta->{"" } || {} },
596 %{ $meta->{$file} || {} }, 603 %{ $meta->{$file} || {} },
597 }; 604 };
598 605
599 if ($meta->{license} =~ s/^#//) { 606 if ($meta->{license} =~ s/^#//) {
600 $meta->{license} = ({ 607 $meta->{license} = ({
601 "pd" => "Public Domain", 608 "pd" => "Public Domain",
602 "gpl" => "GNU General Public License, version 3.0 or any later", 609 "gpl" => "GNU General Public License, version 3.0 or any later",
603 "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/",
604 "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/",
605 "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/",
606 "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/",
607 })->{$meta->{license}} 614 })->{$meta->{license}}
608 || warn "$dir/$file: license tag '$meta->{license}' not found."; 615 || warn "$dir/$file: license tag '$meta->{license}' not found.";
609 } 616 }
610 617
611 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/(.*)$%) {
612 ($meta->{author} = $1) =~ s/_/ /g; 619 ($meta->{author} = $1) =~ s/_/ /g;
613 } 620 }
614 621
615 $file =~ s/\.res$//; 622 $file =~ s/\.res$//;
616 $file =~ s/\.(ogg|wav|jpg|png)$//; 623 $file =~ s/\.(ogg|wav|jpg|png)$//;
617 624
618 substr $dir, 0, 1 + length $PATH, ""; 625 substr $dir, 0, 1 + length $PATH, "";
619 626
620 if (my $filter = $meta->{cfutil_filter}) { 627 if (my $filter = $meta->{cfutil_filter}) {
621 if ($filter eq "yaml2json") { 628 if ($filter eq "yaml2json") {
622 $data = JSON::XS::encode_json YAML::XS::Load $data; 629 $data = JSON::XS::encode_json YAML::XS::Load $data;
623 } elsif ($filter eq "json2json") { 630 } elsif ($filter eq "json2json") {
624 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 631 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
625 } elsif ($filter eq "perl2json") { 632 } elsif ($filter eq "perl2json") {
626 $data = eval $data; die if $@; 633 $data = eval $data; die if $@;
627 $data = JSON::XS::encode_json $data; 634 $data = JSON::XS::encode_json $data;
628 } else { 635 } else {
629 warn "$dir/$file: unknown filter $filter, skipping\n"; 636 warn "$dir/$file: unknown filter $filter, skipping\n";
630 } 637 }
631 } 638 }
632 639
633 $RESOURCE{"$dir/$file"} = { 640 $RESOURCE{"$dir/$file"} = {
634 type => (exists $meta->{type} ? delete $meta->{type} : $type), 641 type => (exists $meta->{type} ? delete $meta->{type} : $type),
635 data => $data, 642 data => $data,
636 %$meta ? (meta => $meta) : (), 643 %$meta ? (meta => $meta) : (),
637 }; 644 };
645 }
646
647 sub process_any {
648 while (my ($func, @args) = @{ $c_any->get }) {
649 $func->(@args);
638 } 650 }
639 } 651 }
640 652
641 sub find_files; 653 sub find_files;
642 sub find_files { 654 sub find_files {
643 my ($path) = @_; 655 my ($path) = @_;
644 656
657 my $grp = IO::AIO::aio_group;
658
659 my $scandir; $scandir = sub {
660 my ($path) = @_;
661
645 IO::AIO::aioreq_pri 4; 662 IO::AIO::aioreq_pri 4;
646 IO::AIO::aio_scandir $path, 4, sub { 663 add $grp IO::AIO::aio_scandir $path, 4, sub {
647 my ($dirs, $nondirs) = @_; 664 my ($dirs, $nondirs) = @_;
648 665
649 find_files "$path/$_" 666 $scandir->("$path/$_")
650 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; 667 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
651 668
652 my $dir = $path; 669 my $dir = $path;
653 substr $dir, 0, 1 + length $PATH, ""; 670 substr $dir, 0, 1 + length $PATH, "";
654 671
655 for my $file (@$nondirs) { 672 for my $file (@$nondirs) {
656 if ($dir =~ /^music(?:\/|$)/) { 673 if ($dir =~ /^music(?:\/|$)/) {
657 $c_res->put ([$path, $file, 3]) # FT_MUSIC 674 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
658 if $file =~ /\.(ogg)$/; 675 if $file =~ /\.(ogg)$/;
659 676
660 } elsif ($dir =~ /^sound(?:\/|$)/) { 677 } elsif ($dir =~ /^sound(?:\/|$)/) {
661 $c_res->put ([$path, $file, 5]) # FT_SOUND 678 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
662 if $file =~ /\.(wav|ogg)$/; 679 if $file =~ /\.(wav|ogg)$/;
663 680
664 } elsif ($dir =~ /^res(?:\/|$)/) { 681 } elsif ($dir =~ /^res(?:\/|$)/) {
665 if ($file =~ /\.(jpg|png)$/) { 682 if ($file =~ /\.(jpg|png)$/) {
666 $c_res->put ([$path, $file, 0]) # FT_FACE 683 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
667 } 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$/) {
668 $c_res->put ([$path, $file, 6]) # FT_RSRC 700 $c_arc->put ([$path, $file]);
701
669 } else { 702 } else {
670 $c_res->put ([$path, $file, undef]);
671 }
672
673 } elsif ($file =~ /\.png$/) {
674 push @c_png, ["$path/$file", 0];
675
676 } elsif ($file =~ /\.trs$/) {
677 $c_trs->put ([$path, $file]);
678
679 } elsif ($file =~ /\.arc$/) {
680 $c_arc->put ([$path, $file]);
681
682 } else {
683 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 703 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
684 } 704 }
705 }
685 } 706 };
686 }; 707 };
708
709 $scandir->($path);
710 aio_wait $grp;
687 } 711 }
688 712
689 sub generate_plurals { 713 sub generate_plurals {
690# use Lingua::EN::Inflect (); 714# use Lingua::EN::Inflect ();
691# Lingua::EN::Inflect::classical; 715# Lingua::EN::Inflect::classical;
… …
729 if (!-d "$path/treasures") { 753 if (!-d "$path/treasures") {
730 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";
731 exit 1 unless $FORCE; 755 exit 1 unless $FORCE;
732 } 756 }
733 757
734 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;
735 762
736 find_files $path; 763 find_files $path;
737 764
738 my @a_arc = map +(async \&process_arc), 1..2;
739 my @a_res = map +(async \&process_res), 1..2;
740 my @a_trs = map +(async \&process_trs), 1..2;
741
742 IO::AIO::flush;
743
744 $c_res->shutdown;
745 $c_arc->shutdown; 765 $c_arc->shutdown;
746 $c_trs->shutdown; 766 $c_any->shutdown;
747
748 print "start file scan, arc, res processing...\n" if $VERBOSE;
749 767
750 $_->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
751 769
752 print "end arc, start png processing...\n" if $VERBOSE; 770 print "end arc, start png processing...\n" if $VERBOSE;
753 771
754 # eight png crunchers work fine for my 4x smp machine 772 # eight png crunchers work fine for my 4x smp machine
755 my @a_png = map +(async \&process_png), 1..8; 773 my @a_png = map +(async \&process_png), 1..8;
756 774
757 $_->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;
758 780
759 print "scanning done, processing results...\n" if $VERBOSE; 781 print "scanning done, processing results...\n" if $VERBOSE;
760 { 782 {
761 # remove path prefix from editor_folder 783 # remove path prefix from editor_folder
762 $_->{editor_folder} =~ /^\x00/ 784 $_->{editor_folder} =~ /^\x00/
… …
780 delete @s{qw(_name more name name_pl)}; 802 delete @s{qw(_name more name name_pl)};
781 %$o = ( %s, %$o ); 803 %$o = ( %s, %$o );
782 ++$progress; 804 ++$progress;
783 } 805 }
784 } else { 806 } else {
785 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";
786 delete $ARC{$o->{_name}}; 808 delete $ARC{$o->{_name}};
787 } 809 }
788 } 810 }
789 } 811 }
790 812
… …
797 } 819 }
798 820
799 # 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
800 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 822 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
801 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
802 print "generating plurals...\n" if $VERBOSE; 835 #print "generating plurals...\n" if $VERBOSE;
803 generate_plurals; 836 #generate_plurals;
804 837
805 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; 838 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
806 open my $fh, ">:utf8", "$DATADIR/archetypes~" 839 open my $fh, ">:utf8", "$DATADIR/archetypes~"
807 or die "$DATADIR/archetypes~: $!"; 840 or die "$DATADIR/archetypes~: $!";
808 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];
… …
816 } 849 }
817 850
818 { 851 {
819 print "processing facedata...\n" if $VERBOSE; 852 print "processing facedata...\n" if $VERBOSE;
820 while (my ($k, $v) = each %FACEINFO) { 853 while (my ($k, $v) = each %FACEINFO) {
821 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";
822 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";
823 856
824 make_hash $k, $v->{data32}, $v->{hash32}; 857 make_hash $k, $v->{data32}, $v->{hash32};
825 make_hash $k, $v->{data64}, $v->{hash64}; 858 make_hash $k, $v->{data64}, $v->{hash64};
826 859
827 #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";
828 #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";
829 862
830 if (my $magicmap = $v->{magicmap}) { 863 $v->{glyph} // warn "WARNING: face '$k' has glyph.";
831 $magicmap =~ y/A-Z_\-/a-z/d; 864 $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
832 $v->{magicmap} = $COLOR{$magicmap}; 865 $v->{magicmap} // warn "WARNING: face '$k' has foreground colour.";
833 }
834 866
835 my $stem = delete $v->{stem}; 867 delete @$v{qw(arc stem)}; # not used by the server
836 $v->{glyph} //= autoglyph $stem, $v;
837 utf8::encode $v->{glyph};
838 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
839
840 delete $v->{arc};
841 } 868 }
842 869
843 print "processing resources...\n" if $VERBOSE; 870 print "processing resources...\n" if $VERBOSE;
844 my $enc = JSON::XS->new->utf8->canonical->relaxed; 871 my $enc = JSON::XS->new->utf8->canonical->relaxed;
845 while (my ($k, $v) = each %RESOURCE) { 872 while (my ($k, $v) = each %RESOURCE) {

Diff Legend

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