… | |
… | |
77 | my $TMPDIR = "/tmp/cfutil$$~"; |
77 | my $TMPDIR = "/tmp/cfutil$$~"; |
78 | my $TMPFILE = "aaaa0"; |
78 | my $TMPFILE = "aaaa0"; |
79 | my @COMMIT; |
79 | my @COMMIT; |
80 | |
80 | |
81 | our %COLOR = ( |
81 | our %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 | |
97 | END { system "rm", "-rf", $TMPDIR } |
107 | END { system "rm", "-rf", $TMPDIR } |
98 | |
108 | |
99 | my $s_INT = EV::signal INT => sub { exit 1 }; |
109 | my $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 | |
161 | our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋); |
|
|
162 | |
|
|
163 | sub autoglyph { |
|
|
164 | my ($stem, $face) = @_; |
|
|
165 | |
|
|
166 | if ($stem =~ /^wall\/|Nimwall/) { |
|
|
167 | return $WALL_SUFFIX[hex $1] |
|
|
168 | if $stem =~ /(_[0-9A-F]).x11/; |
|
|
169 | |
|
|
170 | "+" |
|
|
171 | |
|
|
172 | } elsif ($stem =~ /^monster.*\/(.)/) { |
|
|
173 | $1 |
|
|
174 | |
|
|
175 | } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) { |
|
|
176 | "." |
|
|
177 | |
|
|
178 | } elsif ($stem =~ /^player\//) { |
|
|
179 | "\@" |
|
|
180 | |
|
|
181 | } else { |
|
|
182 | substr $stem, 0, 1 |
|
|
183 | } |
|
|
184 | } |
|
|
185 | |
|
|
186 | { |
171 | { |
187 | our %ANIMINFO; |
172 | our %ANIMINFO; |
188 | our %FACEINFO; |
173 | our %FACEINFO; |
189 | our %RESOURCE; |
174 | our %RESOURCE; |
190 | our @ARC; |
175 | our @ARC; |
… | |
… | |
194 | our $PATH; |
179 | our $PATH; |
195 | |
180 | |
196 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
181 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
197 | |
182 | |
198 | our $c_arc = new Coro::Channel; |
183 | our $c_arc = new Coro::Channel; |
199 | our $c_trs = new Coro::Channel; |
184 | our $c_any = new Coro::Channel; |
200 | our $c_res = new Coro::Channel; |
|
|
201 | |
185 | |
202 | our @c_png; |
186 | our @c_png; |
203 | |
187 | |
204 | sub commit_png($$$$) { |
188 | sub commit_png($$$$) { |
205 | my ($stem, $name, $data, $T) = @_; |
189 | my ($stem, $name, $data, $T) = @_; |
… | |
… | |
441 | |
425 | |
442 | aio_unlink $path if $delete; |
426 | aio_unlink $path if $delete; |
443 | } |
427 | } |
444 | } |
428 | } |
445 | |
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 | |
|
|
461 | $fi->{glyph} = ""; |
|
|
462 | for (split //, $glyph, -1) { |
|
|
463 | utf8::encode $_; |
|
|
464 | $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_; |
|
|
465 | } |
|
|
466 | } |
|
|
467 | } |
|
|
468 | |
446 | sub process_arc { |
469 | sub process_arc { |
447 | while (my $job = $c_arc->get) { |
470 | while (my ($dir, $file) = @{ $c_arc->get }) { |
448 | my ($dir, $file) = @$job; |
|
|
449 | |
|
|
450 | my $arc; |
471 | my $arc; |
451 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
472 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
452 | |
473 | |
453 | my $arc = read_arch "$dir/$file"; |
474 | my $arc = read_arch "$dir/$file"; |
454 | for my $o (values %$arc) { |
475 | for my $o (values %$arc) { |
… | |
… | |
456 | for (my $m = $o; $m; $m = $m->{more}) { |
477 | for (my $m = $o; $m; $m = $m->{more}) { |
457 | $ARC{$m->{_name}} = $m; |
478 | $ARC{$m->{_name}} = $m; |
458 | } |
479 | } |
459 | |
480 | |
460 | $o->{editor_folder} ||= "\x00$dir"; # horrible kludge |
481 | $o->{editor_folder} ||= "\x00$dir"; # horrible kludge |
461 | |
|
|
462 | my $visibility = delete $o->{visibility}; |
|
|
463 | my $magicmap = delete $o->{magicmap}; |
|
|
464 | my $glyph = delete $o->{glyph}; |
|
|
465 | |
482 | |
466 | # find upper left corner :/ |
483 | # find upper left corner :/ |
467 | # omg, this is sooo broken |
484 | # omg, this is sooo broken |
468 | my ($dx, $dy); |
485 | my ($dx, $dy); |
469 | for (my $o = $o; $o; $o = $o->{more}) { |
486 | for (my $o = $o; $o; $o = $o->{more}) { |
… | |
… | |
476 | my $y = $o->{y} - $dy; |
493 | my $y = $o->{y} - $dy; |
477 | |
494 | |
478 | my $ext = $x|$y ? "+$x+$y" : ""; |
495 | my $ext = $x|$y ? "+$x+$y" : ""; |
479 | |
496 | |
480 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
497 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
481 | |
|
|
482 | $visibility = delete $o->{visibility} if exists $o->{visibility}; |
|
|
483 | $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
|
|
484 | $glyph = delete $o->{glyph} if exists $o->{glyph}; |
|
|
485 | |
498 | |
486 | my $anim = delete $o->{anim}; |
499 | my $anim = delete $o->{anim}; |
487 | |
500 | |
488 | if ($anim) { |
501 | if ($anim) { |
489 | # possibly add $ext to the animation name to avoid |
502 | # possibly add $ext to the animation name to avoid |
… | |
… | |
517 | |
530 | |
518 | my $info = $FACEINFO{$face} ||= { }; |
531 | my $info = $FACEINFO{$face} ||= { }; |
519 | $info->{arc} = $o; |
532 | $info->{arc} = $o; |
520 | |
533 | |
521 | next if $face =~ /^blank.x11$|^empty.x11$/; |
534 | next if $face =~ /^blank.x11$|^empty.x11$/; |
522 | |
|
|
523 | $info->{visibility} = $visibility if defined $visibility; |
|
|
524 | $info->{magicmap} = $magicmap if defined $magicmap; |
|
|
525 | $info->{glyph} = $glyph if defined $glyph; |
|
|
526 | } |
535 | } |
527 | |
536 | |
528 | if (my $smooth = delete $o->{smoothface}) { |
537 | if (my $smooth = delete $o->{smoothface}) { |
529 | my %kv = split /\s+/, $smooth; |
538 | my %kv = split /\s+/, $smooth; |
530 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
539 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
… | |
… | |
539 | } |
548 | } |
540 | } |
549 | } |
541 | } |
550 | } |
542 | |
551 | |
543 | sub process_trs { |
552 | sub process_trs { |
544 | while (my $job = $c_trs->get) { |
|
|
545 | my ($dir, $file) = @$job; |
553 | my ($dir, $file) = @_; |
546 | my $path = "$dir/$file"; |
554 | my $path = "$dir/$file"; |
547 | |
555 | |
548 | my $trs; |
556 | my $trs; |
549 | if (0 > aio_load $path, $trs) { |
557 | if (0 > aio_load $path, $trs) { |
550 | warn "$path: $!, skipping.\n"; |
558 | warn "$path: $!, skipping.\n"; |
551 | next; |
559 | return; |
552 | } |
560 | } |
553 | |
561 | |
554 | $TRS .= $trs; |
562 | $TRS .= $trs; |
555 | } |
|
|
556 | } |
563 | } |
557 | |
564 | |
558 | my %FILECACHE; |
565 | my %FILECACHE; |
559 | |
566 | |
560 | sub load_cached($;$) { |
567 | sub load_cached($;$) { |
… | |
… | |
572 | |
579 | |
573 | $FILECACHE{$_[0]} |
580 | $FILECACHE{$_[0]} |
574 | } |
581 | } |
575 | |
582 | |
576 | sub process_res { |
583 | sub process_res { |
577 | while (my $job = $c_res->get) { |
|
|
578 | my ($dir, $file, $type) = @$job; |
584 | my ($dir, $file, $type) = @_; |
579 | |
585 | |
580 | my $data; |
586 | my $data; |
581 | aio_load "$dir/$file", $data; |
587 | aio_load "$dir/$file", $data; |
582 | |
588 | |
583 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
589 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
584 | |
590 | |
585 | utf8::decode $dir; |
591 | utf8::decode $dir; |
586 | utf8::decode $file; |
592 | utf8::decode $file; |
587 | |
593 | |
588 | # a meta file for resources is now mandatory |
594 | # a meta file for resources is now mandatory |
589 | unless (exists $meta->{$file}) { |
595 | unless (exists $meta->{$file}) { |
590 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
596 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
591 | next; |
597 | return; |
592 | } |
598 | } |
593 | |
599 | |
594 | $meta = { |
600 | $meta = { |
595 | %{ $meta->{"" } || {} }, |
601 | %{ $meta->{"" } || {} }, |
596 | %{ $meta->{$file} || {} }, |
602 | %{ $meta->{$file} || {} }, |
597 | }; |
603 | }; |
598 | |
604 | |
599 | if ($meta->{license} =~ s/^#//) { |
605 | if ($meta->{license} =~ s/^#//) { |
600 | $meta->{license} = ({ |
606 | $meta->{license} = ({ |
601 | "pd" => "Public Domain", |
607 | "pd" => "Public Domain", |
602 | "gpl" => "GNU General Public License, version 3.0 or any later", |
608 | "gpl" => "GNU General Public License, version 3.0 or any later", |
603 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
609 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
604 | "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", |
610 | "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", |
605 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
611 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
606 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
612 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
607 | })->{$meta->{license}} |
613 | })->{$meta->{license}} |
608 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
614 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
609 | } |
615 | } |
610 | |
616 | |
611 | if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { |
617 | if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { |
612 | ($meta->{author} = $1) =~ s/_/ /g; |
618 | ($meta->{author} = $1) =~ s/_/ /g; |
613 | } |
619 | } |
614 | |
620 | |
615 | $file =~ s/\.res$//; |
621 | $file =~ s/\.res$//; |
616 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
622 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
617 | |
623 | |
618 | substr $dir, 0, 1 + length $PATH, ""; |
624 | substr $dir, 0, 1 + length $PATH, ""; |
619 | |
625 | |
620 | if (my $filter = $meta->{cfutil_filter}) { |
626 | if (my $filter = $meta->{cfutil_filter}) { |
621 | if ($filter eq "yaml2json") { |
627 | if ($filter eq "yaml2json") { |
622 | $data = JSON::XS::encode_json YAML::XS::Load $data; |
628 | $data = JSON::XS::encode_json YAML::XS::Load $data; |
623 | } elsif ($filter eq "json2json") { |
629 | } elsif ($filter eq "json2json") { |
624 | $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); |
630 | $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); |
625 | } elsif ($filter eq "perl2json") { |
631 | } elsif ($filter eq "perl2json") { |
626 | $data = eval $data; die if $@; |
632 | $data = eval $data; die if $@; |
627 | $data = JSON::XS::encode_json $data; |
633 | $data = JSON::XS::encode_json $data; |
628 | } else { |
634 | } else { |
629 | warn "$dir/$file: unknown filter $filter, skipping\n"; |
635 | warn "$dir/$file: unknown filter $filter, skipping\n"; |
630 | } |
636 | } |
631 | } |
637 | } |
632 | |
638 | |
633 | $RESOURCE{"$dir/$file"} = { |
639 | $RESOURCE{"$dir/$file"} = { |
634 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
640 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
635 | data => $data, |
641 | data => $data, |
636 | %$meta ? (meta => $meta) : (), |
642 | %$meta ? (meta => $meta) : (), |
637 | }; |
643 | }; |
|
|
644 | } |
|
|
645 | |
|
|
646 | sub process_any { |
|
|
647 | while (my ($func, @args) = @{ $c_any->get }) { |
|
|
648 | $func->(@args); |
638 | } |
649 | } |
639 | } |
650 | } |
640 | |
651 | |
641 | sub find_files; |
652 | sub find_files; |
642 | sub find_files { |
653 | sub find_files { |
643 | my ($path) = @_; |
654 | my ($path) = @_; |
644 | |
655 | |
|
|
656 | my $grp = IO::AIO::aio_group; |
|
|
657 | |
|
|
658 | my $scandir; $scandir = sub { |
|
|
659 | my ($path) = @_; |
|
|
660 | |
645 | IO::AIO::aioreq_pri 4; |
661 | IO::AIO::aioreq_pri 4; |
646 | IO::AIO::aio_scandir $path, 4, sub { |
662 | add $grp IO::AIO::aio_scandir $path, 4, sub { |
647 | my ($dirs, $nondirs) = @_; |
663 | my ($dirs, $nondirs) = @_; |
648 | |
664 | |
649 | find_files "$path/$_" |
665 | $scandir->("$path/$_") |
650 | for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; |
666 | for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; |
651 | |
667 | |
652 | my $dir = $path; |
668 | my $dir = $path; |
653 | substr $dir, 0, 1 + length $PATH, ""; |
669 | substr $dir, 0, 1 + length $PATH, ""; |
654 | |
670 | |
655 | for my $file (@$nondirs) { |
671 | for my $file (@$nondirs) { |
656 | if ($dir =~ /^music(?:\/|$)/) { |
672 | if ($dir =~ /^music(?:\/|$)/) { |
657 | $c_res->put ([$path, $file, 3]) # FT_MUSIC |
673 | $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC |
658 | if $file =~ /\.(ogg)$/; |
674 | if $file =~ /\.(ogg)$/; |
659 | |
675 | |
660 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
676 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
661 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
677 | $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND |
662 | if $file =~ /\.(wav|ogg)$/; |
678 | if $file =~ /\.(wav|ogg)$/; |
663 | |
679 | |
664 | } elsif ($dir =~ /^res(?:\/|$)/) { |
680 | } elsif ($dir =~ /^res(?:\/|$)/) { |
665 | if ($file =~ /\.(jpg|png)$/) { |
681 | if ($file =~ /\.(jpg|png)$/) { |
666 | $c_res->put ([$path, $file, 0]) # FT_FACE |
682 | $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE |
667 | } elsif ($file =~ /\.(res)$/) { |
683 | } elsif ($file =~ /\.(res)$/) { |
|
|
684 | $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC |
|
|
685 | } else { |
|
|
686 | $c_any->put ([\&process_res, $path, $file, undef]); |
|
|
687 | } |
|
|
688 | |
|
|
689 | } elsif ($file =~ /\.png$/) { |
|
|
690 | push @c_png, ["$path/$file", 0]; |
|
|
691 | |
|
|
692 | } elsif ($file =~ /\.faceinfo$/) { |
|
|
693 | $c_any->put ([\&process_faceinfo, $path, $file]); |
|
|
694 | |
|
|
695 | } elsif ($file =~ /\.trs$/) { |
|
|
696 | $c_any->put ([\&process_trs, $path, $file]); |
|
|
697 | |
|
|
698 | } elsif ($file =~ /\.arc$/) { |
668 | $c_res->put ([$path, $file, 6]) # FT_RSRC |
699 | $c_arc->put ([$path, $file]); |
|
|
700 | |
669 | } else { |
701 | } else { |
670 | $c_res->put ([$path, $file, undef]); |
|
|
671 | } |
|
|
672 | |
|
|
673 | } elsif ($file =~ /\.png$/) { |
|
|
674 | push @c_png, ["$path/$file", 0]; |
|
|
675 | |
|
|
676 | } elsif ($file =~ /\.trs$/) { |
|
|
677 | $c_trs->put ([$path, $file]); |
|
|
678 | |
|
|
679 | } elsif ($file =~ /\.arc$/) { |
|
|
680 | $c_arc->put ([$path, $file]); |
|
|
681 | |
|
|
682 | } else { |
|
|
683 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
702 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
684 | } |
703 | } |
|
|
704 | } |
685 | } |
705 | }; |
686 | }; |
706 | }; |
|
|
707 | |
|
|
708 | $scandir->($path); |
|
|
709 | aio_wait $grp; |
687 | } |
710 | } |
688 | |
711 | |
689 | sub generate_plurals { |
712 | sub generate_plurals { |
690 | # use Lingua::EN::Inflect (); |
713 | # use Lingua::EN::Inflect (); |
691 | # Lingua::EN::Inflect::classical; |
714 | # Lingua::EN::Inflect::classical; |
… | |
… | |
729 | if (!-d "$path/treasures") { |
752 | if (!-d "$path/treasures") { |
730 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
753 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
731 | exit 1 unless $FORCE; |
754 | exit 1 unless $FORCE; |
732 | } |
755 | } |
733 | |
756 | |
734 | print "scanning files...\n" if $VERBOSE; |
757 | print "start file scan, arc, any processing...\n" if $VERBOSE; |
|
|
758 | |
|
|
759 | my @a_arc = map +(async \&process_arc), 1..2; |
|
|
760 | my @a_any = map +(async \&process_any), 1..4; |
735 | |
761 | |
736 | find_files $path; |
762 | find_files $path; |
737 | |
763 | |
738 | my @a_arc = map +(async \&process_arc), 1..2; |
|
|
739 | my @a_res = map +(async \&process_res), 1..2; |
|
|
740 | my @a_trs = map +(async \&process_trs), 1..2; |
|
|
741 | |
|
|
742 | IO::AIO::flush; |
|
|
743 | |
|
|
744 | $c_res->shutdown; |
|
|
745 | $c_arc->shutdown; |
764 | $c_arc->shutdown; |
746 | $c_trs->shutdown; |
765 | $c_any->shutdown; |
747 | |
|
|
748 | print "start file scan, arc, res processing...\n" if $VERBOSE; |
|
|
749 | |
766 | |
750 | $_->join for @a_arc; # need to parse all archetypes before png processing |
767 | $_->join for @a_arc; # need to parse all archetypes before png processing |
751 | |
768 | |
752 | print "end arc, start png processing...\n" if $VERBOSE; |
769 | print "end arc, start png processing...\n" if $VERBOSE; |
753 | |
770 | |
754 | # eight png crunchers work fine for my 4x smp machine |
771 | # eight png crunchers work fine for my 4x smp machine |
755 | my @a_png = map +(async \&process_png), 1..8; |
772 | my @a_png = map +(async \&process_png), 1..8; |
756 | |
773 | |
757 | $_->join for (@a_trs, @a_res, @a_png); |
774 | print "end any processing...\n" if $VERBOSE; |
|
|
775 | $_->join for @a_any; |
|
|
776 | |
|
|
777 | print "end png processing...\n" if $VERBOSE; |
|
|
778 | $_->join for @a_png; |
758 | |
779 | |
759 | print "scanning done, processing results...\n" if $VERBOSE; |
780 | print "scanning done, processing results...\n" if $VERBOSE; |
760 | { |
781 | { |
761 | # remove path prefix from editor_folder |
782 | # remove path prefix from editor_folder |
762 | $_->{editor_folder} =~ /^\x00/ |
783 | $_->{editor_folder} =~ /^\x00/ |
… | |
… | |
780 | delete @s{qw(_name more name name_pl)}; |
801 | delete @s{qw(_name more name name_pl)}; |
781 | %$o = ( %s, %$o ); |
802 | %$o = ( %s, %$o ); |
782 | ++$progress; |
803 | ++$progress; |
783 | } |
804 | } |
784 | } else { |
805 | } else { |
785 | warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
806 | warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
786 | delete $ARC{$o->{_name}}; |
807 | delete $ARC{$o->{_name}}; |
787 | } |
808 | } |
788 | } |
809 | } |
789 | } |
810 | } |
790 | |
811 | |
… | |
… | |
797 | } |
818 | } |
798 | |
819 | |
799 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
820 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
800 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
821 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
801 | |
822 | |
|
|
823 | # fix up archetypes without names, where the archanme doesn't work at all |
|
|
824 | for (@ARC) { |
|
|
825 | if (!exists $_->{name} and $_->{_name} =~ /_/) { |
|
|
826 | for ($_->{name} = $_->{_name}) { |
|
|
827 | s/(?:_\d+)+$//; |
|
|
828 | s/_[nesw]+$//; |
|
|
829 | y/_/ /; |
|
|
830 | } |
|
|
831 | } |
|
|
832 | } |
|
|
833 | |
802 | print "generating plurals...\n" if $VERBOSE; |
834 | #print "generating plurals...\n" if $VERBOSE; |
803 | generate_plurals; |
835 | #generate_plurals; |
804 | |
836 | |
805 | printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; |
837 | printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; |
806 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
838 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
807 | or die "$DATADIR/archetypes~: $!"; |
839 | or die "$DATADIR/archetypes~: $!"; |
808 | print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
840 | print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
… | |
… | |
816 | } |
848 | } |
817 | |
849 | |
818 | { |
850 | { |
819 | print "processing facedata...\n" if $VERBOSE; |
851 | print "processing facedata...\n" if $VERBOSE; |
820 | while (my ($k, $v) = each %FACEINFO) { |
852 | while (my ($k, $v) = each %FACEINFO) { |
821 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
853 | length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
822 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
854 | length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n"; |
823 | |
855 | |
824 | make_hash $k, $v->{data32}, $v->{hash32}; |
856 | make_hash $k, $v->{data32}, $v->{hash32}; |
825 | make_hash $k, $v->{data64}, $v->{hash64}; |
857 | make_hash $k, $v->{data64}, $v->{hash64}; |
826 | |
858 | |
827 | #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
859 | #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
828 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
860 | #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n"; |
829 | |
861 | |
830 | if (my $magicmap = $v->{magicmap}) { |
862 | $v->{glyph} // warn "WARNING: face '$k' has glyph."; |
831 | $magicmap =~ y/A-Z_\-/a-z/d; |
863 | $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n"; |
832 | $v->{magicmap} = $COLOR{$magicmap}; |
864 | $v->{magicmap} // warn "WARNING: face '$k' has foreground colour."; |
833 | } |
|
|
834 | |
865 | |
835 | my $stem = delete $v->{stem}; |
866 | delete @$v{qw(arc stem)}; # not used by the server |
836 | $v->{glyph} //= autoglyph $stem, $v; |
|
|
837 | utf8::encode $v->{glyph}; |
|
|
838 | $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph}; |
|
|
839 | |
|
|
840 | delete $v->{arc}; |
|
|
841 | } |
867 | } |
842 | |
868 | |
843 | print "processing resources...\n" if $VERBOSE; |
869 | print "processing resources...\n" if $VERBOSE; |
844 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
870 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
845 | while (my ($k, $v) = each %RESOURCE) { |
871 | while (my ($k, $v) = each %RESOURCE) { |