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.86 by root, Tue Oct 5 22:33:10 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 };
… …
106 my ($id, $dataref, $hashref, $clen) = @_; 116 my ($id, $dataref, $hashref, $clen) = @_;
107 117
108 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; 118 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
109 119
110 if (exists $hash{$hash}) { 120 if (exists $hash{$hash}) {
111 # hahs collinion, but some files are simply identical 121 # hash collision, but some files are simply identical
112 if (${$hash{$hash}[1]} ne $$dataref) { 122 if (${$hash{$hash}[1]} ne $$dataref) {
113 warn "hash collision $hash{$hash}[0] vs. $id\n"; 123 warn "hash collision $hash{$hash}[0] vs. $id\n";
114 exit 1; 124 exit 1;
115 } else { 125 } else {
116 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; 126 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
… …
169 our $PATH; 179 our $PATH;
170 180
171 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 181 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
172 182
173 our $c_arc = new Coro::Channel; 183 our $c_arc = new Coro::Channel;
174 our $c_trs = new Coro::Channel; 184 our $c_any = new Coro::Channel;
175 our $c_res = new Coro::Channel;
176 185
177 our @c_png; 186 our @c_png;
178 187
179 sub commit_png($$$$) { 188 sub commit_png($$$$) {
180 my ($stem, $name, $data, $T) = @_; 189 my ($stem, $name, $data, $T) = @_;
… …
416 425
417 aio_unlink $path if $delete; 426 aio_unlink $path if $delete;
418 } 427 }
419 } 428 }
420 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
421 sub process_arc { 470 sub process_arc {
422 while (my $job = $c_arc->get) { 471 while (my ($dir, $file) = @{ $c_arc->get }) {
423 my ($dir, $file) = @$job;
424
425 my $arc; 472 my $arc;
426 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 :/
427 474
428 my $arc = read_arch "$dir/$file"; 475 my $arc = read_arch "$dir/$file";
429 for my $o (values %$arc) { 476 for my $o (values %$arc) {
… …
431 for (my $m = $o; $m; $m = $m->{more}) { 478 for (my $m = $o; $m; $m = $m->{more}) {
432 $ARC{$m->{_name}} = $m; 479 $ARC{$m->{_name}} = $m;
433 } 480 }
434 481
435 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 482 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
436
437 my $visibility = delete $o->{visibility};
438 my $magicmap = delete $o->{magicmap};
439 my $glyph = delete $o->{glyph};
440 483
441 # find upper left corner :/ 484 # find upper left corner :/
442 # omg, this is sooo broken 485 # omg, this is sooo broken
443 my ($dx, $dy); 486 my ($dx, $dy);
444 for (my $o = $o; $o; $o = $o->{more}) { 487 for (my $o = $o; $o; $o = $o->{more}) {
… …
451 my $y = $o->{y} - $dy; 494 my $y = $o->{y} - $dy;
452 495
453 my $ext = $x|$y ? "+$x+$y" : ""; 496 my $ext = $x|$y ? "+$x+$y" : "";
454 497
455 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 498 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
456
457 $visibility = delete $o->{visibility} if exists $o->{visibility};
458 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
459 $glyph = delete $o->{glyph} if exists $o->{glyph};
460 499
461 my $anim = delete $o->{anim}; 500 my $anim = delete $o->{anim};
462 501
463 if ($anim) { 502 if ($anim) {
464 # possibly add $ext to the animation name to avoid 503 # possibly add $ext to the animation name to avoid
… …
492 531
493 my $info = $FACEINFO{$face} ||= { }; 532 my $info = $FACEINFO{$face} ||= { };
494 $info->{arc} = $o; 533 $info->{arc} = $o;
495 534
496 next if $face =~ /^blank.x11$|^empty.x11$/; 535 next if $face =~ /^blank.x11$|^empty.x11$/;
497
498 $info->{visibility} = $visibility if defined $visibility;
499 $info->{magicmap} = $magicmap if defined $magicmap;
500 $info->{glyph} = $glyph if defined $glyph;
501 } 536 }
502 537
503 if (my $smooth = delete $o->{smoothface}) { 538 if (my $smooth = delete $o->{smoothface}) {
504 my %kv = split /\s+/, $smooth; 539 my %kv = split /\s+/, $smooth;
505 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 540 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
514 } 549 }
515 } 550 }
516 } 551 }
517 552
518 sub process_trs { 553 sub process_trs {
519 while (my $job = $c_trs->get) {
520 my ($dir, $file) = @$job; 554 my ($dir, $file) = @_;
521 my $path = "$dir/$file"; 555 my $path = "$dir/$file";
522 556
523 my $trs; 557 my $trs;
524 if (0 > aio_load $path, $trs) { 558 if (0 > aio_load $path, $trs) {
525 warn "$path: $!, skipping.\n"; 559 warn "$path: $!, skipping.\n";
526 next; 560 return;
527 } 561 }
528 562
529 $TRS .= $trs; 563 $TRS .= $trs;
530 }
531 } 564 }
532 565
533 my %FILECACHE; 566 my %FILECACHE;
534 567
535 sub load_cached($;$) { 568 sub load_cached($;$) {
… …
547 580
548 $FILECACHE{$_[0]} 581 $FILECACHE{$_[0]}
549 } 582 }
550 583
551 sub process_res { 584 sub process_res {
552 while (my $job = $c_res->get) {
553 my ($dir, $file, $type) = @$job; 585 my ($dir, $file, $type) = @_;
554 586
555 my $data; 587 my $data;
556 aio_load "$dir/$file", $data; 588 aio_load "$dir/$file", $data;
557 589
558 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) };
559 591
560 utf8::decode $dir; 592 utf8::decode $dir;
561 utf8::decode $file; 593 utf8::decode $file;
562 594
563 # a meta file for resources is now mandatory 595 # a meta file for resources is now mandatory
564 unless (exists $meta->{$file}) { 596 unless (exists $meta->{$file}) {
565 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 597 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
566 next; 598 return;
567 } 599 }
568 600
569 $meta = { 601 $meta = {
570 %{ $meta->{"" } || {} }, 602 %{ $meta->{"" } || {} },
571 %{ $meta->{$file} || {} }, 603 %{ $meta->{$file} || {} },
572 }; 604 };
573 605
574 if ($meta->{license} =~ s/^#//) { 606 if ($meta->{license} =~ s/^#//) {
575 $meta->{license} = ({ 607 $meta->{license} = ({
576 "pd" => "Public Domain", 608 "pd" => "Public Domain",
577 "gpl" => "GNU General Public License, version 3.0 or any later", 609 "gpl" => "GNU General Public License, version 3.0 or any later",
578 "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/",
579 "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/",
580 "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/",
581 "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/",
582 })->{$meta->{license}} 614 })->{$meta->{license}}
583 || warn "$dir/$file: license tag '$meta->{license}' not found."; 615 || warn "$dir/$file: license tag '$meta->{license}' not found.";
584 } 616 }
585 617
586 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/(.*)$%) {
587 ($meta->{author} = $1) =~ s/_/ /g; 619 ($meta->{author} = $1) =~ s/_/ /g;
588 } 620 }
589 621
590 $file =~ s/\.res$//; 622 $file =~ s/\.res$//;
591 $file =~ s/\.(ogg|wav|jpg|png)$//; 623 $file =~ s/\.(ogg|wav|jpg|png)$//;
592 624
593 substr $dir, 0, 1 + length $PATH, ""; 625 substr $dir, 0, 1 + length $PATH, "";
594 626
595 if (my $filter = $meta->{cfutil_filter}) { 627 if (my $filter = $meta->{cfutil_filter}) {
596 if ($filter eq "yaml2json") { 628 if ($filter eq "yaml2json") {
597 $data = JSON::XS::encode_json YAML::XS::Load $data; 629 $data = JSON::XS::encode_json YAML::XS::Load $data;
598 } elsif ($filter eq "json2json") { 630 } elsif ($filter eq "json2json") {
599 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 631 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
600 } elsif ($filter eq "perl2json") { 632 } elsif ($filter eq "perl2json") {
601 $data = eval $data; die if $@; 633 $data = eval $data; die if $@;
602 $data = JSON::XS::encode_json $data; 634 $data = JSON::XS::encode_json $data;
603 } else { 635 } else {
604 warn "$dir/$file: unknown filter $filter, skipping\n"; 636 warn "$dir/$file: unknown filter $filter, skipping\n";
605 } 637 }
606 } 638 }
607 639
608 $RESOURCE{"$dir/$file"} = { 640 $RESOURCE{"$dir/$file"} = {
609 type => (exists $meta->{type} ? delete $meta->{type} : $type), 641 type => (exists $meta->{type} ? delete $meta->{type} : $type),
610 data => $data, 642 data => $data,
611 %$meta ? (meta => $meta) : (), 643 %$meta ? (meta => $meta) : (),
612 }; 644 };
645 }
646
647 sub process_any {
648 while (my ($func, @args) = @{ $c_any->get }) {
649 $func->(@args);
613 } 650 }
614 } 651 }
615 652
616 sub find_files; 653 sub find_files;
617 sub find_files { 654 sub find_files {
618 my ($path) = @_; 655 my ($path) = @_;
619 656
657 my $grp = IO::AIO::aio_group;
658
659 my $scandir; $scandir = sub {
660 my ($path) = @_;
661
620 IO::AIO::aioreq_pri 4; 662 IO::AIO::aioreq_pri 4;
621 IO::AIO::aio_scandir $path, 4, sub { 663 add $grp IO::AIO::aio_scandir $path, 4, sub {
622 my ($dirs, $nondirs) = @_; 664 my ($dirs, $nondirs) = @_;
623 665
624 find_files "$path/$_" 666 $scandir->("$path/$_")
625 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; 667 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
626 668
627 my $dir = $path; 669 my $dir = $path;
628 substr $dir, 0, 1 + length $PATH, ""; 670 substr $dir, 0, 1 + length $PATH, "";
629 671
630 for my $file (@$nondirs) { 672 for my $file (@$nondirs) {
631 if ($dir =~ /^music(?:\/|$)/) { 673 if ($dir =~ /^music(?:\/|$)/) {
632 $c_res->put ([$path, $file, 3]) # FT_MUSIC 674 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
633 if $file =~ /\.(ogg)$/; 675 if $file =~ /\.(ogg)$/;
634 676
635 } elsif ($dir =~ /^sound(?:\/|$)/) { 677 } elsif ($dir =~ /^sound(?:\/|$)/) {
636 $c_res->put ([$path, $file, 5]) # FT_SOUND 678 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
637 if $file =~ /\.(wav|ogg)$/; 679 if $file =~ /\.(wav|ogg)$/;
638 680
639 } elsif ($dir =~ /^res(?:\/|$)/) { 681 } elsif ($dir =~ /^res(?:\/|$)/) {
640 if ($file =~ /\.(jpg|png)$/) { 682 if ($file =~ /\.(jpg|png)$/) {
641 $c_res->put ([$path, $file, 0]) # FT_FACE 683 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
642 } 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$/) {
643 $c_res->put ([$path, $file, 6]) # FT_RSRC 700 $c_arc->put ([$path, $file]);
701
644 } else { 702 } else {
645 $c_res->put ([$path, $file, undef]);
646 }
647
648 } elsif ($file =~ /\.png$/) {
649 push @c_png, ["$path/$file", 0];
650
651 } elsif ($file =~ /\.trs$/) {
652 $c_trs->put ([$path, $file]);
653
654 } elsif ($file =~ /\.arc$/) {
655 $c_arc->put ([$path, $file]);
656
657 } else {
658 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 703 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
659 } 704 }
705 }
660 } 706 };
661 }; 707 };
708
709 $scandir->($path);
710 aio_wait $grp;
662 } 711 }
663 712
664 sub generate_plurals { 713 sub generate_plurals {
665# use Lingua::EN::Inflect (); 714# use Lingua::EN::Inflect ();
666# Lingua::EN::Inflect::classical; 715# Lingua::EN::Inflect::classical;
… …
704 if (!-d "$path/treasures") { 753 if (!-d "$path/treasures") {
705 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";
706 exit 1 unless $FORCE; 755 exit 1 unless $FORCE;
707 } 756 }
708 757
709 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;
710 762
711 find_files $path; 763 find_files $path;
712 764
713 my @a_arc = map +(async \&process_arc), 1..2;
714 my @a_res = map +(async \&process_res), 1..2;
715 my @a_trs = map +(async \&process_trs), 1..2;
716
717 IO::AIO::flush;
718
719 $c_res->shutdown;
720 $c_arc->shutdown; 765 $c_arc->shutdown;
721 $c_trs->shutdown; 766 $c_any->shutdown;
722
723 print "start file scan, arc, res processing...\n" if $VERBOSE;
724 767
725 $_->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
726 769
727 print "end arc, start png processing...\n" if $VERBOSE; 770 print "end arc, start png processing...\n" if $VERBOSE;
728 771
729 # eight png crunchers work fine for my 4x smp machine 772 # eight png crunchers work fine for my 4x smp machine
730 my @a_png = map +(async \&process_png), 1..8; 773 my @a_png = map +(async \&process_png), 1..8;
731 774
732 $_->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;
733 780
734 print "scanning done, processing results...\n" if $VERBOSE; 781 print "scanning done, processing results...\n" if $VERBOSE;
735 { 782 {
736 # remove path prefix from editor_folder 783 # remove path prefix from editor_folder
737 $_->{editor_folder} =~ /^\x00/ 784 $_->{editor_folder} =~ /^\x00/
… …
755 delete @s{qw(_name more name name_pl)}; 802 delete @s{qw(_name more name name_pl)};
756 %$o = ( %s, %$o ); 803 %$o = ( %s, %$o );
757 ++$progress; 804 ++$progress;
758 } 805 }
759 } else { 806 } else {
760 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";
761 delete $ARC{$o->{_name}}; 808 delete $ARC{$o->{_name}};
762 } 809 }
763 } 810 }
764 } 811 }
765 812
… …
772 } 819 }
773 820
774 # 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
775 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 822 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
776 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
777 print "generating plurals...\n" if $VERBOSE; 835 #print "generating plurals...\n" if $VERBOSE;
778 generate_plurals; 836 #generate_plurals;
779 837
780 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; 838 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
781 open my $fh, ">:utf8", "$DATADIR/archetypes~" 839 open my $fh, ">:utf8", "$DATADIR/archetypes~"
782 or die "$DATADIR/archetypes~: $!"; 840 or die "$DATADIR/archetypes~: $!";
783 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];
… …
791 } 849 }
792 850
793 { 851 {
794 print "processing facedata...\n" if $VERBOSE; 852 print "processing facedata...\n" if $VERBOSE;
795 while (my ($k, $v) = each %FACEINFO) { 853 while (my ($k, $v) = each %FACEINFO) {
796 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";
797 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";
798 856
799 make_hash $k, $v->{data32}, $v->{hash32}; 857 make_hash $k, $v->{data32}, $v->{hash32};
800 make_hash $k, $v->{data64}, $v->{hash64}; 858 make_hash $k, $v->{data64}, $v->{hash64};
801 859
802 #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";
803 #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";
804 862
805 my $stem = delete $v->{stem}; 863 $v->{glyph} // warn "WARNING: face '$k' has glyph.";
806 $v->{glyph} //= substr $stem, 0, 1; 864 $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
865 $v->{magicmap} // warn "WARNING: face '$k' has foreground colour.";
807 866
808 if (my $magicmap = $v->{magicmap}) { 867 delete @$v{qw(arc stem)}; # not used by the server
809 $magicmap =~ y/A-Z_\-/a-z/d;
810 $v->{magicmap} = $COLOR{$magicmap};
811 }
812
813 delete $v->{arc};
814 } 868 }
815 869
816 print "processing resources...\n" if $VERBOSE; 870 print "processing resources...\n" if $VERBOSE;
817 my $enc = JSON::XS->new->utf8->canonical->relaxed; 871 my $enc = JSON::XS->new->utf8->canonical->relaxed;
818 while (my ($k, $v) = each %RESOURCE) { 872 while (my ($k, $v) = each %RESOURCE) {

Diff Legend

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