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

Diff Legend

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