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

Diff Legend

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