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.93 by root, Tue Oct 5 23:59:47 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 = (
162 "_0" => "⬤",
163 "_1_3" => "╸",
164 "_1_4" => "╺",
165 "_2_1_2" => "━",
166
167 "_1_2" => "╹",
168 "_2_2_4" => "┛",
169 "_2_2_1" => "┗",
170 "_3_1" => "┻",
171
172 "_1_1" => "╻",
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 {
184 my ($stem, $face) = @_;
185
186 if ($stem =~ /^wall\/|Nimwall/) {
187 if ($stem =~ /((?:_[0-4])+).x11/) {
188 return $WALL_SUFFIX{$1} if exists $WALL_SUFFIX{$1};
189 }
190
191 "+"
192
193 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
194 "."
195
196 } elsif ($stem =~ /^player\//) {
197 "\@"
198
199 } else {
200 substr $stem, 0, 1
201 }
202}
203
204{ 171{
205 our %ANIMINFO; 172 our %ANIMINFO;
206 our %FACEINFO; 173 our %FACEINFO;
207 our %RESOURCE; 174 our %RESOURCE;
208 our @ARC; 175 our @ARC;
… …
212 our $PATH; 179 our $PATH;
213 180
214 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 181 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
215 182
216 our $c_arc = new Coro::Channel; 183 our $c_arc = new Coro::Channel;
217 our $c_trs = new Coro::Channel; 184 our $c_any = new Coro::Channel;
218 our $c_res = new Coro::Channel;
219 185
220 our @c_png; 186 our @c_png;
221 187
222 sub commit_png($$$$) { 188 sub commit_png($$$$) {
223 my ($stem, $name, $data, $T) = @_; 189 my ($stem, $name, $data, $T) = @_;
… …
459 425
460 aio_unlink $path if $delete; 426 aio_unlink $path if $delete;
461 } 427 }
462 } 428 }
463 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
464 sub process_arc { 470 sub process_arc {
465 while (my $job = $c_arc->get) { 471 while (my ($dir, $file) = @{ $c_arc->get }) {
466 my ($dir, $file) = @$job;
467
468 my $arc; 472 my $arc;
469 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 :/
470 474
471 my $arc = read_arch "$dir/$file"; 475 my $arc = read_arch "$dir/$file";
472 for my $o (values %$arc) { 476 for my $o (values %$arc) {
… …
474 for (my $m = $o; $m; $m = $m->{more}) { 478 for (my $m = $o; $m; $m = $m->{more}) {
475 $ARC{$m->{_name}} = $m; 479 $ARC{$m->{_name}} = $m;
476 } 480 }
477 481
478 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 482 $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 483
484 # find upper left corner :/ 484 # find upper left corner :/
485 # omg, this is sooo broken 485 # omg, this is sooo broken
486 my ($dx, $dy); 486 my ($dx, $dy);
487 for (my $o = $o; $o; $o = $o->{more}) { 487 for (my $o = $o; $o; $o = $o->{more}) {
… …
494 my $y = $o->{y} - $dy; 494 my $y = $o->{y} - $dy;
495 495
496 my $ext = $x|$y ? "+$x+$y" : ""; 496 my $ext = $x|$y ? "+$x+$y" : "";
497 497
498 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 498 $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 499
504 my $anim = delete $o->{anim}; 500 my $anim = delete $o->{anim};
505 501
506 if ($anim) { 502 if ($anim) {
507 # possibly add $ext to the animation name to avoid 503 # possibly add $ext to the animation name to avoid
… …
535 531
536 my $info = $FACEINFO{$face} ||= { }; 532 my $info = $FACEINFO{$face} ||= { };
537 $info->{arc} = $o; 533 $info->{arc} = $o;
538 534
539 next if $face =~ /^blank.x11$|^empty.x11$/; 535 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 } 536 }
545 537
546 if (my $smooth = delete $o->{smoothface}) { 538 if (my $smooth = delete $o->{smoothface}) {
547 my %kv = split /\s+/, $smooth; 539 my %kv = split /\s+/, $smooth;
548 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 540 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
557 } 549 }
558 } 550 }
559 } 551 }
560 552
561 sub process_trs { 553 sub process_trs {
562 while (my $job = $c_trs->get) {
563 my ($dir, $file) = @$job; 554 my ($dir, $file) = @_;
564 my $path = "$dir/$file"; 555 my $path = "$dir/$file";
565 556
566 my $trs; 557 my $trs;
567 if (0 > aio_load $path, $trs) { 558 if (0 > aio_load $path, $trs) {
568 warn "$path: $!, skipping.\n"; 559 warn "$path: $!, skipping.\n";
569 next; 560 return;
570 } 561 }
571 562
572 $TRS .= $trs; 563 $TRS .= $trs;
573 }
574 } 564 }
575 565
576 my %FILECACHE; 566 my %FILECACHE;
577 567
578 sub load_cached($;$) { 568 sub load_cached($;$) {
… …
590 580
591 $FILECACHE{$_[0]} 581 $FILECACHE{$_[0]}
592 } 582 }
593 583
594 sub process_res { 584 sub process_res {
595 while (my $job = $c_res->get) {
596 my ($dir, $file, $type) = @$job; 585 my ($dir, $file, $type) = @_;
597 586
598 my $data; 587 my $data;
599 aio_load "$dir/$file", $data; 588 aio_load "$dir/$file", $data;
600 589
601 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) };
602 591
603 utf8::decode $dir; 592 utf8::decode $dir;
604 utf8::decode $file; 593 utf8::decode $file;
605 594
606 # a meta file for resources is now mandatory 595 # a meta file for resources is now mandatory
607 unless (exists $meta->{$file}) { 596 unless (exists $meta->{$file}) {
608 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 597 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
609 next; 598 return;
610 } 599 }
611 600
612 $meta = { 601 $meta = {
613 %{ $meta->{"" } || {} }, 602 %{ $meta->{"" } || {} },
614 %{ $meta->{$file} || {} }, 603 %{ $meta->{$file} || {} },
615 }; 604 };
616 605
617 if ($meta->{license} =~ s/^#//) { 606 if ($meta->{license} =~ s/^#//) {
618 $meta->{license} = ({ 607 $meta->{license} = ({
619 "pd" => "Public Domain", 608 "pd" => "Public Domain",
620 "gpl" => "GNU General Public License, version 3.0 or any later", 609 "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/", 610 "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/", 611 "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/", 612 "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/", 613 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
625 })->{$meta->{license}} 614 })->{$meta->{license}}
626 || warn "$dir/$file: license tag '$meta->{license}' not found."; 615 || warn "$dir/$file: license tag '$meta->{license}' not found.";
627 } 616 }
628 617
629 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/(.*)$%) {
630 ($meta->{author} = $1) =~ s/_/ /g; 619 ($meta->{author} = $1) =~ s/_/ /g;
631 } 620 }
632 621
633 $file =~ s/\.res$//; 622 $file =~ s/\.res$//;
634 $file =~ s/\.(ogg|wav|jpg|png)$//; 623 $file =~ s/\.(ogg|wav|jpg|png)$//;
635 624
636 substr $dir, 0, 1 + length $PATH, ""; 625 substr $dir, 0, 1 + length $PATH, "";
637 626
638 if (my $filter = $meta->{cfutil_filter}) { 627 if (my $filter = $meta->{cfutil_filter}) {
639 if ($filter eq "yaml2json") { 628 if ($filter eq "yaml2json") {
640 $data = JSON::XS::encode_json YAML::XS::Load $data; 629 $data = JSON::XS::encode_json YAML::XS::Load $data;
641 } elsif ($filter eq "json2json") { 630 } elsif ($filter eq "json2json") {
642 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 631 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
643 } elsif ($filter eq "perl2json") { 632 } elsif ($filter eq "perl2json") {
644 $data = eval $data; die if $@; 633 $data = eval $data; die if $@;
645 $data = JSON::XS::encode_json $data; 634 $data = JSON::XS::encode_json $data;
646 } else { 635 } else {
647 warn "$dir/$file: unknown filter $filter, skipping\n"; 636 warn "$dir/$file: unknown filter $filter, skipping\n";
648 } 637 }
649 } 638 }
650 639
651 $RESOURCE{"$dir/$file"} = { 640 $RESOURCE{"$dir/$file"} = {
652 type => (exists $meta->{type} ? delete $meta->{type} : $type), 641 type => (exists $meta->{type} ? delete $meta->{type} : $type),
653 data => $data, 642 data => $data,
654 %$meta ? (meta => $meta) : (), 643 %$meta ? (meta => $meta) : (),
655 }; 644 };
645 }
646
647 sub process_any {
648 while (my ($func, @args) = @{ $c_any->get }) {
649 $func->(@args);
656 } 650 }
657 } 651 }
658 652
659 sub find_files; 653 sub find_files;
660 sub find_files { 654 sub find_files {
661 my ($path) = @_; 655 my ($path) = @_;
662 656
657 my $grp = IO::AIO::aio_group;
658
659 my $scandir; $scandir = sub {
660 my ($path) = @_;
661
663 IO::AIO::aioreq_pri 4; 662 IO::AIO::aioreq_pri 4;
664 IO::AIO::aio_scandir $path, 4, sub { 663 add $grp IO::AIO::aio_scandir $path, 4, sub {
665 my ($dirs, $nondirs) = @_; 664 my ($dirs, $nondirs) = @_;
666 665
667 find_files "$path/$_" 666 $scandir->("$path/$_")
668 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; 667 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
669 668
670 my $dir = $path; 669 my $dir = $path;
671 substr $dir, 0, 1 + length $PATH, ""; 670 substr $dir, 0, 1 + length $PATH, "";
672 671
673 for my $file (@$nondirs) { 672 for my $file (@$nondirs) {
674 if ($dir =~ /^music(?:\/|$)/) { 673 if ($dir =~ /^music(?:\/|$)/) {
675 $c_res->put ([$path, $file, 3]) # FT_MUSIC 674 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
676 if $file =~ /\.(ogg)$/; 675 if $file =~ /\.(ogg)$/;
677 676
678 } elsif ($dir =~ /^sound(?:\/|$)/) { 677 } elsif ($dir =~ /^sound(?:\/|$)/) {
679 $c_res->put ([$path, $file, 5]) # FT_SOUND 678 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
680 if $file =~ /\.(wav|ogg)$/; 679 if $file =~ /\.(wav|ogg)$/;
681 680
682 } elsif ($dir =~ /^res(?:\/|$)/) { 681 } elsif ($dir =~ /^res(?:\/|$)/) {
683 if ($file =~ /\.(jpg|png)$/) { 682 if ($file =~ /\.(jpg|png)$/) {
684 $c_res->put ([$path, $file, 0]) # FT_FACE 683 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
685 } 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$/) {
686 $c_res->put ([$path, $file, 6]) # FT_RSRC 700 $c_arc->put ([$path, $file]);
701
687 } else { 702 } else {
688 $c_res->put ([$path, $file, undef]);
689 }
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 {
701 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 703 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
702 } 704 }
705 }
703 } 706 };
704 }; 707 };
708
709 $scandir->($path);
710 aio_wait $grp;
705 } 711 }
706 712
707 sub generate_plurals { 713 sub generate_plurals {
708# use Lingua::EN::Inflect (); 714# use Lingua::EN::Inflect ();
709# Lingua::EN::Inflect::classical; 715# Lingua::EN::Inflect::classical;
… …
747 if (!-d "$path/treasures") { 753 if (!-d "$path/treasures") {
748 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";
749 exit 1 unless $FORCE; 755 exit 1 unless $FORCE;
750 } 756 }
751 757
752 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;
753 762
754 find_files $path; 763 find_files $path;
755 764
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; 765 $c_arc->shutdown;
764 $c_trs->shutdown; 766 $c_any->shutdown;
765
766 print "start file scan, arc, res processing...\n" if $VERBOSE;
767 767
768 $_->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
769 769
770 print "end arc, start png processing...\n" if $VERBOSE; 770 print "end arc, start png processing...\n" if $VERBOSE;
771 771
772 # eight png crunchers work fine for my 4x smp machine 772 # eight png crunchers work fine for my 4x smp machine
773 my @a_png = map +(async \&process_png), 1..8; 773 my @a_png = map +(async \&process_png), 1..8;
774 774
775 $_->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;
776 780
777 print "scanning done, processing results...\n" if $VERBOSE; 781 print "scanning done, processing results...\n" if $VERBOSE;
778 { 782 {
779 # remove path prefix from editor_folder 783 # remove path prefix from editor_folder
780 $_->{editor_folder} =~ /^\x00/ 784 $_->{editor_folder} =~ /^\x00/
… …
798 delete @s{qw(_name more name name_pl)}; 802 delete @s{qw(_name more name name_pl)};
799 %$o = ( %s, %$o ); 803 %$o = ( %s, %$o );
800 ++$progress; 804 ++$progress;
801 } 805 }
802 } else { 806 } else {
803 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";
804 delete $ARC{$o->{_name}}; 808 delete $ARC{$o->{_name}};
805 } 809 }
806 } 810 }
807 } 811 }
808 812
… …
815 } 819 }
816 820
817 # 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
818 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 822 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
819 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
820 print "generating plurals...\n" if $VERBOSE; 835 #print "generating plurals...\n" if $VERBOSE;
821 generate_plurals; 836 #generate_plurals;
822 837
823 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; 838 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
824 open my $fh, ">:utf8", "$DATADIR/archetypes~" 839 open my $fh, ">:utf8", "$DATADIR/archetypes~"
825 or die "$DATADIR/archetypes~: $!"; 840 or die "$DATADIR/archetypes~: $!";
826 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];
… …
834 } 849 }
835 850
836 { 851 {
837 print "processing facedata...\n" if $VERBOSE; 852 print "processing facedata...\n" if $VERBOSE;
838 while (my ($k, $v) = each %FACEINFO) { 853 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"; 854 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"; 855 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
841 856
842 make_hash $k, $v->{data32}, $v->{hash32}; 857 make_hash $k, $v->{data32}, $v->{hash32};
843 make_hash $k, $v->{data64}, $v->{hash64}; 858 make_hash $k, $v->{data64}, $v->{hash64};
844 859
845 #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";
846 #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";
847 862
848 if (my $magicmap = $v->{magicmap}) { 863 $v->{glyph} // warn "WARNING: face '$k' has glyph.";
849 $magicmap =~ y/A-Z_\-/a-z/d; 864 $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
850 $v->{magicmap} = $COLOR{$magicmap}; 865 $v->{magicmap} // warn "WARNING: face '$k' has foreground colour.";
851 }
852 866
853 my $stem = delete $v->{stem}; 867 delete @$v{qw(arc stem)}; # not used by the server
854 $v->{glyph} //= autoglyph $stem, $v;
855 utf8::encode $v->{glyph};
856 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
857
858 delete $v->{arc};
859 } 868 }
860 869
861 print "processing resources...\n" if $VERBOSE; 870 print "processing resources...\n" if $VERBOSE;
862 my $enc = JSON::XS->new->utf8->canonical->relaxed; 871 my $enc = JSON::XS->new->utf8->canonical->relaxed;
863 while (my ($k, $v) = each %RESOURCE) { 872 while (my ($k, $v) = each %RESOURCE) {

Diff Legend

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