… | |
… | |
55 | |
55 | |
56 | use Deliantra; |
56 | use Deliantra; |
57 | |
57 | |
58 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
58 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
59 | |
59 | |
|
|
60 | sub WRITE_FACEINFO() { 0 } |
|
|
61 | |
60 | sub usage { |
62 | sub usage { |
61 | warn <<EOF; |
63 | warn <<EOF; |
62 | Usage: cfutil [-v] [-q] [--force] [--cache] |
64 | Usage: cfutil [-v] [-q] [--force] [--cache] |
63 | [--install-arch path] |
65 | [--install-arch path] |
64 | [--install-maps maps] |
66 | [--install-maps maps] |
… | |
… | |
77 | my $TMPDIR = "/tmp/cfutil$$~"; |
79 | my $TMPDIR = "/tmp/cfutil$$~"; |
78 | my $TMPFILE = "aaaa0"; |
80 | my $TMPFILE = "aaaa0"; |
79 | my @COMMIT; |
81 | my @COMMIT; |
80 | |
82 | |
81 | our %COLOR = ( |
83 | our %COLOR = ( |
|
|
84 | # original cf colours |
82 | black => 0, |
85 | black => 0, |
83 | white => 1, |
86 | white => 1, |
84 | navy => 2, |
87 | navy => 2, # "dark blue" |
85 | red => 3, |
88 | red => 3, |
86 | orange => 4, |
89 | orange => 4, |
87 | blue => 5, |
90 | blue => 5, # "light blue" |
88 | darkorange => 6, |
91 | darkorange => 6, |
89 | green => 7, |
92 | green => 7, |
90 | lightgreen => 8, |
93 | lightgreen => 8, |
91 | grey => 9, |
94 | grey => 9, |
|
|
95 | brown => 10, # "yellow" |
|
|
96 | gold => 11, # "light yellow" |
|
|
97 | tan => 12, # yellowish gray |
|
|
98 | |
|
|
99 | # new for deliantra |
92 | brown => 10, |
100 | none => 13, |
|
|
101 | |
|
|
102 | # compatibility to existing archetypes |
|
|
103 | lightblue => 5, |
93 | gold => 11, |
104 | gray => 9, |
|
|
105 | yellow => 11, |
94 | tan => 12, |
106 | khaki => 12, |
95 | ); |
107 | ); |
96 | |
108 | |
97 | END { system "rm", "-rf", $TMPDIR } |
109 | END { system "rm", "-rf", $TMPDIR } |
98 | |
110 | |
99 | my $s_INT = EV::signal INT => sub { exit 1 }; |
111 | my $s_INT = EV::signal INT => sub { exit 1 }; |
… | |
… | |
106 | my ($id, $dataref, $hashref, $clen) = @_; |
118 | my ($id, $dataref, $hashref, $clen) = @_; |
107 | |
119 | |
108 | my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; |
120 | my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; |
109 | |
121 | |
110 | if (exists $hash{$hash}) { |
122 | if (exists $hash{$hash}) { |
111 | # hahs collinion, but some files are simply identical |
123 | # hash collision, but some files are simply identical |
112 | if (${$hash{$hash}[1]} ne $$dataref) { |
124 | if (${$hash{$hash}[1]} ne $$dataref) { |
113 | warn "hash collision $hash{$hash}[0] vs. $id\n"; |
125 | warn "hash collision $hash{$hash}[0] vs. $id\n"; |
114 | exit 1; |
126 | exit 1; |
115 | } else { |
127 | } else { |
116 | print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; |
128 | print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; |
… | |
… | |
156 | and die "map installation failed.\n"; |
168 | and die "map installation failed.\n"; |
157 | |
169 | |
158 | print "maps installed successfully.\n"; |
170 | print "maps installed successfully.\n"; |
159 | } |
171 | } |
160 | |
172 | |
|
|
173 | { |
|
|
174 | no utf8; # == values are utf-8 encoded |
|
|
175 | |
|
|
176 | our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋); |
|
|
177 | |
|
|
178 | # used to create crude text glyphs for text-based clients |
161 | sub autoglyph { |
179 | sub autoglyph { |
162 | my ($stem, $face) = @_; |
180 | my ($stem, $face) = @_; |
163 | |
181 | |
164 | if ($stem =~ /^wall\/|Nimwall/) { |
182 | if ($stem =~ /^wall\/|Nimwall/) { |
165 | # warn $stem; |
183 | return $WALL_SUFFIX[hex $1] |
|
|
184 | if $stem =~ /(_[0-9A-F]).x11/; |
|
|
185 | |
|
|
186 | "█" |
|
|
187 | |
|
|
188 | } elsif ($stem =~ /^traps\//) { |
|
|
189 | "☠" |
|
|
190 | |
|
|
191 | } elsif ($stem =~ /^armour\/shield/) { |
|
|
192 | "Ø" |
|
|
193 | |
|
|
194 | } elsif ($stem =~ /^armour\//) { |
166 | "+" |
195 | "A" |
|
|
196 | |
|
|
197 | } elsif ($stem =~ /^weapon\//) { |
|
|
198 | "†" |
|
|
199 | |
|
|
200 | } elsif ($stem =~ /^readable\//) { |
|
|
201 | "✉" |
|
|
202 | |
|
|
203 | } elsif ($stem =~ /^river\//) { |
|
|
204 | "~" |
|
|
205 | |
167 | } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) { |
206 | } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) { |
|
|
207 | "·" |
|
|
208 | |
|
|
209 | } elsif ($stem =~ /^spells\//) { |
168 | "." |
210 | "!" |
|
|
211 | |
|
|
212 | } elsif ($stem =~ /^exit\//) { |
|
|
213 | "⎆" |
|
|
214 | |
|
|
215 | } elsif ($stem =~ /^construct\//) { |
|
|
216 | "⌂" |
|
|
217 | |
|
|
218 | } elsif ($stem =~ /^player\//) { |
|
|
219 | "\@" |
|
|
220 | |
|
|
221 | } elsif ($stem =~ /^(?:monster|misc|class|connect|gods|indoor|inorganic|mining|music|skills).*\/(.)/) { |
|
|
222 | $1 |
|
|
223 | |
169 | } else { |
224 | } else { |
170 | substr $stem, 0, 1 |
225 | substr $stem, 0, 1 |
|
|
226 | } |
171 | } |
227 | } |
172 | } |
228 | } |
173 | |
229 | |
174 | { |
230 | { |
175 | our %ANIMINFO; |
231 | our %ANIMINFO; |
… | |
… | |
182 | our $PATH; |
238 | our $PATH; |
183 | |
239 | |
184 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
240 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
185 | |
241 | |
186 | our $c_arc = new Coro::Channel; |
242 | our $c_arc = new Coro::Channel; |
187 | our $c_trs = new Coro::Channel; |
243 | our $c_any = new Coro::Channel; |
188 | our $c_res = new Coro::Channel; |
|
|
189 | |
244 | |
190 | our @c_png; |
245 | our @c_png; |
191 | |
246 | |
192 | sub commit_png($$$$) { |
247 | sub commit_png($$$$) { |
193 | my ($stem, $name, $data, $T) = @_; |
248 | my ($stem, $name, $data, $T) = @_; |
… | |
… | |
429 | |
484 | |
430 | aio_unlink $path if $delete; |
485 | aio_unlink $path if $delete; |
431 | } |
486 | } |
432 | } |
487 | } |
433 | |
488 | |
|
|
489 | sub process_faceinfo { |
|
|
490 | my ($dir, $file) = @_; |
|
|
491 | my $path = "$dir/$file"; |
|
|
492 | |
|
|
493 | my $data; |
|
|
494 | if (0 > aio_load $path, $data) { |
|
|
495 | warn "$path: $!, skipping.\n"; |
|
|
496 | return; |
|
|
497 | } |
|
|
498 | |
|
|
499 | for (split /\n/, $data) { |
|
|
500 | my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/; |
|
|
501 | |
|
|
502 | $glyph =~ s/^?(?=.)//; # remove "autoglyph" flag |
|
|
503 | |
|
|
504 | (my $fgi = $COLOR{$fg}) |
|
|
505 | // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n"; |
|
|
506 | (my $bgi = $COLOR{$bg}) |
|
|
507 | // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n"; |
|
|
508 | |
|
|
509 | my $fi = $FACEINFO{$face} ||= { }; |
|
|
510 | $fi->{visibility} = $visibility * 1; |
|
|
511 | $fi->{magicmap} = $fgi; # foreground colour becomes magicmap |
|
|
512 | $fi->{glyph} = (chr $fgi) . (chr $bgi) . $glyph; |
|
|
513 | # bg not used except for text clients |
|
|
514 | } |
|
|
515 | } |
|
|
516 | |
434 | sub process_arc { |
517 | sub process_arc { |
435 | while (my $job = $c_arc->get) { |
518 | while (my ($dir, $file) = @{ $c_arc->get }) { |
436 | my ($dir, $file) = @$job; |
|
|
437 | |
|
|
438 | my $arc; |
519 | my $arc; |
439 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
520 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
440 | |
521 | |
441 | my $arc = read_arch "$dir/$file"; |
522 | my $arc = read_arch "$dir/$file"; |
442 | for my $o (values %$arc) { |
523 | for my $o (values %$arc) { |
… | |
… | |
444 | for (my $m = $o; $m; $m = $m->{more}) { |
525 | for (my $m = $o; $m; $m = $m->{more}) { |
445 | $ARC{$m->{_name}} = $m; |
526 | $ARC{$m->{_name}} = $m; |
446 | } |
527 | } |
447 | |
528 | |
448 | $o->{editor_folder} ||= "\x00$dir"; # horrible kludge |
529 | $o->{editor_folder} ||= "\x00$dir"; # horrible kludge |
449 | |
|
|
450 | my $visibility = delete $o->{visibility}; |
|
|
451 | my $magicmap = delete $o->{magicmap}; |
|
|
452 | my $glyph = delete $o->{glyph}; |
|
|
453 | |
530 | |
454 | # find upper left corner :/ |
531 | # find upper left corner :/ |
455 | # omg, this is sooo broken |
532 | # omg, this is sooo broken |
456 | my ($dx, $dy); |
533 | my ($dx, $dy); |
457 | for (my $o = $o; $o; $o = $o->{more}) { |
534 | for (my $o = $o; $o; $o = $o->{more}) { |
… | |
… | |
464 | my $y = $o->{y} - $dy; |
541 | my $y = $o->{y} - $dy; |
465 | |
542 | |
466 | my $ext = $x|$y ? "+$x+$y" : ""; |
543 | my $ext = $x|$y ? "+$x+$y" : ""; |
467 | |
544 | |
468 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
545 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
469 | |
|
|
470 | $visibility = delete $o->{visibility} if exists $o->{visibility}; |
|
|
471 | $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
|
|
472 | $glyph = delete $o->{glyph} if exists $o->{glyph}; |
|
|
473 | |
546 | |
474 | my $anim = delete $o->{anim}; |
547 | my $anim = delete $o->{anim}; |
475 | |
548 | |
476 | if ($anim) { |
549 | if ($anim) { |
477 | # possibly add $ext to the animation name to avoid |
550 | # possibly add $ext to the animation name to avoid |
… | |
… | |
505 | |
578 | |
506 | my $info = $FACEINFO{$face} ||= { }; |
579 | my $info = $FACEINFO{$face} ||= { }; |
507 | $info->{arc} = $o; |
580 | $info->{arc} = $o; |
508 | |
581 | |
509 | next if $face =~ /^blank.x11$|^empty.x11$/; |
582 | next if $face =~ /^blank.x11$|^empty.x11$/; |
510 | |
|
|
511 | $info->{visibility} = $visibility if defined $visibility; |
|
|
512 | $info->{magicmap} = $magicmap if defined $magicmap; |
|
|
513 | $info->{glyph} = $glyph if defined $glyph; |
|
|
514 | } |
583 | } |
515 | |
584 | |
516 | if (my $smooth = delete $o->{smoothface}) { |
585 | if (my $smooth = delete $o->{smoothface}) { |
517 | my %kv = split /\s+/, $smooth; |
586 | my %kv = split /\s+/, $smooth; |
518 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
587 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
… | |
… | |
527 | } |
596 | } |
528 | } |
597 | } |
529 | } |
598 | } |
530 | |
599 | |
531 | sub process_trs { |
600 | sub process_trs { |
532 | while (my $job = $c_trs->get) { |
|
|
533 | my ($dir, $file) = @$job; |
601 | my ($dir, $file) = @_; |
534 | my $path = "$dir/$file"; |
602 | my $path = "$dir/$file"; |
535 | |
603 | |
536 | my $trs; |
604 | my $trs; |
537 | if (0 > aio_load $path, $trs) { |
605 | if (0 > aio_load $path, $trs) { |
538 | warn "$path: $!, skipping.\n"; |
606 | warn "$path: $!, skipping.\n"; |
539 | next; |
607 | return; |
540 | } |
608 | } |
541 | |
609 | |
542 | $TRS .= $trs; |
610 | $TRS .= $trs; |
543 | } |
|
|
544 | } |
611 | } |
545 | |
612 | |
546 | my %FILECACHE; |
613 | my %FILECACHE; |
547 | |
614 | |
548 | sub load_cached($;$) { |
615 | sub load_cached($;$) { |
… | |
… | |
560 | |
627 | |
561 | $FILECACHE{$_[0]} |
628 | $FILECACHE{$_[0]} |
562 | } |
629 | } |
563 | |
630 | |
564 | sub process_res { |
631 | sub process_res { |
565 | while (my $job = $c_res->get) { |
|
|
566 | my ($dir, $file, $type) = @$job; |
632 | my ($dir, $file, $type) = @_; |
567 | |
633 | |
568 | my $data; |
634 | my $data; |
569 | aio_load "$dir/$file", $data; |
635 | aio_load "$dir/$file", $data; |
570 | |
636 | |
571 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
637 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
572 | |
638 | |
573 | utf8::decode $dir; |
639 | utf8::decode $dir; |
574 | utf8::decode $file; |
640 | utf8::decode $file; |
575 | |
641 | |
576 | # a meta file for resources is now mandatory |
642 | # a meta file for resources is now mandatory |
577 | unless (exists $meta->{$file}) { |
643 | unless (exists $meta->{$file}) { |
578 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
644 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
579 | next; |
645 | return; |
580 | } |
646 | } |
581 | |
647 | |
582 | $meta = { |
648 | $meta = { |
583 | %{ $meta->{"" } || {} }, |
649 | %{ $meta->{"" } || {} }, |
584 | %{ $meta->{$file} || {} }, |
650 | %{ $meta->{$file} || {} }, |
585 | }; |
651 | }; |
586 | |
652 | |
587 | if ($meta->{license} =~ s/^#//) { |
653 | if ($meta->{license} =~ s/^#//) { |
588 | $meta->{license} = ({ |
654 | $meta->{license} = ({ |
589 | "pd" => "Public Domain", |
655 | "pd" => "Public Domain", |
590 | "gpl" => "GNU General Public License, version 3.0 or any later", |
656 | "gpl" => "GNU General Public License, version 3.0 or any later", |
591 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
657 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
592 | "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", |
658 | "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", |
593 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
659 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
594 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
660 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
595 | })->{$meta->{license}} |
661 | })->{$meta->{license}} |
596 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
662 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
597 | } |
663 | } |
598 | |
664 | |
599 | if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { |
665 | if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { |
600 | ($meta->{author} = $1) =~ s/_/ /g; |
666 | ($meta->{author} = $1) =~ s/_/ /g; |
601 | } |
667 | } |
602 | |
668 | |
603 | $file =~ s/\.res$//; |
669 | $file =~ s/\.res$//; |
604 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
670 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
605 | |
671 | |
606 | substr $dir, 0, 1 + length $PATH, ""; |
672 | substr $dir, 0, 1 + length $PATH, ""; |
607 | |
673 | |
608 | if (my $filter = $meta->{cfutil_filter}) { |
674 | if (my $filter = $meta->{cfutil_filter}) { |
609 | if ($filter eq "yaml2json") { |
675 | if ($filter eq "yaml2json") { |
610 | $data = JSON::XS::encode_json YAML::XS::Load $data; |
676 | $data = JSON::XS::encode_json YAML::XS::Load $data; |
611 | } elsif ($filter eq "json2json") { |
677 | } elsif ($filter eq "json2json") { |
612 | $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); |
678 | $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); |
613 | } elsif ($filter eq "perl2json") { |
679 | } elsif ($filter eq "perl2json") { |
614 | $data = eval $data; die if $@; |
680 | $data = eval $data; die if $@; |
615 | $data = JSON::XS::encode_json $data; |
681 | $data = JSON::XS::encode_json $data; |
616 | } else { |
682 | } else { |
617 | warn "$dir/$file: unknown filter $filter, skipping\n"; |
683 | warn "$dir/$file: unknown filter $filter, skipping\n"; |
618 | } |
684 | } |
619 | } |
685 | } |
620 | |
686 | |
621 | $RESOURCE{"$dir/$file"} = { |
687 | $RESOURCE{"$dir/$file"} = { |
622 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
688 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
623 | data => $data, |
689 | data => $data, |
624 | %$meta ? (meta => $meta) : (), |
690 | %$meta ? (meta => $meta) : (), |
625 | }; |
691 | }; |
|
|
692 | } |
|
|
693 | |
|
|
694 | sub process_any { |
|
|
695 | while (my ($func, @args) = @{ $c_any->get }) { |
|
|
696 | $func->(@args); |
626 | } |
697 | } |
627 | } |
698 | } |
628 | |
699 | |
629 | sub find_files; |
700 | sub find_files; |
630 | sub find_files { |
701 | sub find_files { |
631 | my ($path) = @_; |
702 | my ($path) = @_; |
632 | |
703 | |
|
|
704 | my $grp = IO::AIO::aio_group; |
|
|
705 | |
|
|
706 | my $scandir; $scandir = sub { |
|
|
707 | my ($path) = @_; |
|
|
708 | |
633 | IO::AIO::aioreq_pri 4; |
709 | IO::AIO::aioreq_pri 4; |
634 | IO::AIO::aio_scandir $path, 4, sub { |
710 | add $grp IO::AIO::aio_scandir $path, 4, sub { |
635 | my ($dirs, $nondirs) = @_; |
711 | my ($dirs, $nondirs) = @_; |
636 | |
712 | |
637 | find_files "$path/$_" |
713 | $scandir->("$path/$_") |
638 | for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; |
714 | for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; |
639 | |
715 | |
640 | my $dir = $path; |
716 | my $dir = $path; |
641 | substr $dir, 0, 1 + length $PATH, ""; |
717 | substr $dir, 0, 1 + length $PATH, ""; |
642 | |
718 | |
643 | for my $file (@$nondirs) { |
719 | for my $file (@$nondirs) { |
644 | if ($dir =~ /^music(?:\/|$)/) { |
720 | if ($dir =~ /^music(?:\/|$)/) { |
645 | $c_res->put ([$path, $file, 3]) # FT_MUSIC |
721 | $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC |
646 | if $file =~ /\.(ogg)$/; |
722 | if $file =~ /\.(ogg)$/; |
647 | |
723 | |
648 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
724 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
649 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
725 | $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND |
650 | if $file =~ /\.(wav|ogg)$/; |
726 | if $file =~ /\.(wav|ogg)$/; |
651 | |
727 | |
652 | } elsif ($dir =~ /^res(?:\/|$)/) { |
728 | } elsif ($dir =~ /^res(?:\/|$)/) { |
653 | if ($file =~ /\.(jpg|png)$/) { |
729 | if ($file =~ /\.(jpg|png)$/) { |
654 | $c_res->put ([$path, $file, 0]) # FT_FACE |
730 | $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE |
655 | } elsif ($file =~ /\.(res)$/) { |
731 | } elsif ($file =~ /\.(res)$/) { |
|
|
732 | $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC |
|
|
733 | } else { |
|
|
734 | $c_any->put ([\&process_res, $path, $file, undef]); |
|
|
735 | } |
|
|
736 | |
|
|
737 | } elsif ($file =~ /\.png$/) { |
|
|
738 | push @c_png, ["$path/$file", 0]; |
|
|
739 | |
|
|
740 | } elsif ($file =~ /\.faceinfo$/) { |
|
|
741 | $c_any->put ([\&process_faceinfo, $path, $file]); |
|
|
742 | |
|
|
743 | } elsif ($file =~ /\.trs$/) { |
|
|
744 | $c_any->put ([\&process_trs, $path, $file]); |
|
|
745 | |
|
|
746 | } elsif ($file =~ /\.arc$/) { |
656 | $c_res->put ([$path, $file, 6]) # FT_RSRC |
747 | $c_arc->put ([$path, $file]); |
|
|
748 | |
657 | } else { |
749 | } else { |
658 | $c_res->put ([$path, $file, undef]); |
750 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
659 | } |
751 | } |
660 | |
|
|
661 | } elsif ($file =~ /\.png$/) { |
|
|
662 | push @c_png, ["$path/$file", 0]; |
|
|
663 | |
|
|
664 | } elsif ($file =~ /\.trs$/) { |
|
|
665 | $c_trs->put ([$path, $file]); |
|
|
666 | |
|
|
667 | } elsif ($file =~ /\.arc$/) { |
|
|
668 | $c_arc->put ([$path, $file]); |
|
|
669 | |
|
|
670 | } else { |
752 | } |
671 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
|
|
672 | } |
|
|
673 | } |
753 | }; |
674 | }; |
754 | }; |
|
|
755 | |
|
|
756 | $scandir->($path); |
|
|
757 | aio_wait $grp; |
675 | } |
758 | } |
676 | |
759 | |
677 | sub generate_plurals { |
760 | sub generate_plurals { |
678 | # use Lingua::EN::Inflect (); |
761 | # use Lingua::EN::Inflect (); |
679 | # Lingua::EN::Inflect::classical; |
762 | # Lingua::EN::Inflect::classical; |
… | |
… | |
717 | if (!-d "$path/treasures") { |
800 | if (!-d "$path/treasures") { |
718 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
801 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
719 | exit 1 unless $FORCE; |
802 | exit 1 unless $FORCE; |
720 | } |
803 | } |
721 | |
804 | |
722 | print "scanning files...\n" if $VERBOSE; |
805 | print "start file scan, arc, any processing...\n" if $VERBOSE; |
|
|
806 | |
|
|
807 | my @a_arc = map +(async \&process_arc), 1..2; |
|
|
808 | my @a_any = map +(async \&process_any), 1..4; |
723 | |
809 | |
724 | find_files $path; |
810 | find_files $path; |
725 | |
811 | |
726 | my @a_arc = map +(async \&process_arc), 1..2; |
|
|
727 | my @a_res = map +(async \&process_res), 1..2; |
|
|
728 | my @a_trs = map +(async \&process_trs), 1..2; |
|
|
729 | |
|
|
730 | IO::AIO::flush; |
|
|
731 | |
|
|
732 | $c_res->shutdown; |
|
|
733 | $c_arc->shutdown; |
812 | $c_arc->shutdown; |
734 | $c_trs->shutdown; |
813 | $c_any->shutdown; |
735 | |
|
|
736 | print "start file scan, arc, res processing...\n" if $VERBOSE; |
|
|
737 | |
814 | |
738 | $_->join for @a_arc; # need to parse all archetypes before png processing |
815 | $_->join for @a_arc; # need to parse all archetypes before png processing |
739 | |
816 | |
740 | print "end arc, start png processing...\n" if $VERBOSE; |
817 | print "end arc, start png processing...\n" if $VERBOSE; |
741 | |
818 | |
742 | # eight png crunchers work fine for my 4x smp machine |
819 | # eight png crunchers work fine for my 4x smp machine |
743 | my @a_png = map +(async \&process_png), 1..8; |
820 | my @a_png = map +(async \&process_png), 1..8; |
744 | |
821 | |
745 | $_->join for (@a_trs, @a_res, @a_png); |
822 | print "end any processing...\n" if $VERBOSE; |
|
|
823 | $_->join for @a_any; |
|
|
824 | |
|
|
825 | print "end png processing...\n" if $VERBOSE; |
|
|
826 | $_->join for @a_png; |
746 | |
827 | |
747 | print "scanning done, processing results...\n" if $VERBOSE; |
828 | print "scanning done, processing results...\n" if $VERBOSE; |
748 | { |
829 | { |
749 | # remove path prefix from editor_folder |
830 | # remove path prefix from editor_folder |
750 | $_->{editor_folder} =~ /^\x00/ |
831 | $_->{editor_folder} =~ /^\x00/ |
… | |
… | |
768 | delete @s{qw(_name more name name_pl)}; |
849 | delete @s{qw(_name more name name_pl)}; |
769 | %$o = ( %s, %$o ); |
850 | %$o = ( %s, %$o ); |
770 | ++$progress; |
851 | ++$progress; |
771 | } |
852 | } |
772 | } else { |
853 | } else { |
773 | warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
854 | warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
774 | delete $ARC{$o->{_name}}; |
855 | delete $ARC{$o->{_name}}; |
775 | } |
856 | } |
776 | } |
857 | } |
777 | } |
858 | } |
778 | |
859 | |
… | |
… | |
792 | |
873 | |
793 | printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; |
874 | printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; |
794 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
875 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
795 | or die "$DATADIR/archetypes~: $!"; |
876 | or die "$DATADIR/archetypes~: $!"; |
796 | print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
877 | print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
|
|
878 | } |
|
|
879 | |
|
|
880 | if (WRITE_FACEINFO) { |
|
|
881 | my @table; |
|
|
882 | for my $face (sort keys %FACEINFO) { |
|
|
883 | my $v = $FACEINFO{$face}; |
|
|
884 | (my $xf = $face) =~ s/\+\d+\+\d+$//; |
|
|
885 | |
|
|
886 | $v->{magicmap} //= $FACEINFO{$xf}{magicmap}; |
|
|
887 | $v->{glyph} //= $FACEINFO{$xf}{glyph}; |
|
|
888 | |
|
|
889 | $v->{magicmap} =~ y/A-Z_\-/a-z/d; |
|
|
890 | |
|
|
891 | delete $v->{glyph} if $v->{glyph} =~ /^\?./; |
|
|
892 | |
|
|
893 | my $stem = $v->{stem}; |
|
|
894 | $v->{glyph} = $v->{glyph} // ("?" . (autoglyph $stem, $v)); |
|
|
895 | |
|
|
896 | push @table, [$face, $v->{visibility} || 0, $v->{magicmap} || "none", "none ", $v->{glyph}]; |
|
|
897 | } |
|
|
898 | use Text::Table; |
|
|
899 | my $tb = new Text::Table undef, { align => "num" }, undef, undef, undef; |
|
|
900 | $tb->load (@table); |
|
|
901 | open my $fh, ">:raw", "default.faceinfo"or die; |
|
|
902 | print $fh $tb; |
|
|
903 | print "default.faceinfo written, exiting.\n"; |
|
|
904 | exit 77; |
797 | } |
905 | } |
798 | |
906 | |
799 | { |
907 | { |
800 | printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE; |
908 | printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE; |
801 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
909 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
… | |
… | |
804 | } |
912 | } |
805 | |
913 | |
806 | { |
914 | { |
807 | print "processing facedata...\n" if $VERBOSE; |
915 | print "processing facedata...\n" if $VERBOSE; |
808 | while (my ($k, $v) = each %FACEINFO) { |
916 | while (my ($k, $v) = each %FACEINFO) { |
809 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
917 | length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
810 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
918 | length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n"; |
811 | |
919 | |
812 | make_hash $k, $v->{data32}, $v->{hash32}; |
920 | make_hash $k, $v->{data32}, $v->{hash32}; |
813 | make_hash $k, $v->{data64}, $v->{hash64}; |
921 | make_hash $k, $v->{data64}, $v->{hash64}; |
814 | |
922 | |
815 | #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
923 | #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
816 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
924 | #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n"; |
|
|
925 | |
|
|
926 | exists $v->{visibility} |
|
|
927 | or warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n"; |
817 | |
928 | |
818 | my $stem = delete $v->{stem}; |
929 | my $stem = delete $v->{stem}; |
|
|
930 | $v->{glyph} // warn "WARNING: face '$k' has glyph, cannot autoglyph at the moment."; |
819 | $v->{glyph} //= autoglyph $stem, $v; |
931 | #$v->{glyph} //= autoglyph $stem, $v; |
820 | |
|
|
821 | if (my $magicmap = $v->{magicmap}) { |
|
|
822 | $magicmap =~ y/A-Z_\-/a-z/d; |
|
|
823 | $v->{magicmap} = $COLOR{$magicmap}; |
|
|
824 | } |
|
|
825 | |
932 | |
826 | delete $v->{arc}; |
933 | delete $v->{arc}; |
827 | } |
934 | } |
828 | |
935 | |
829 | print "processing resources...\n" if $VERBOSE; |
936 | print "processing resources...\n" if $VERBOSE; |