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

Diff Legend

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