… | |
… | |
12 | my $OPTIPNG = "@OPTIPNG@"; |
12 | my $OPTIPNG = "@OPTIPNG@"; |
13 | my $RSYNC = "@RSYNC@"; |
13 | my $RSYNC = "@RSYNC@"; |
14 | my $PNGNQ = "@PNGNQ@"; |
14 | my $PNGNQ = "@PNGNQ@"; |
15 | |
15 | |
16 | use Getopt::Long; |
16 | use Getopt::Long; |
|
|
17 | use File::Temp; |
|
|
18 | use POSIX (); |
|
|
19 | use Carp; |
|
|
20 | |
17 | use Coro::Event; |
21 | use Coro::EV; |
18 | use AnyEvent; |
22 | use AnyEvent; |
|
|
23 | use YAML::XS (); |
|
|
24 | use JSON::XS (); |
19 | use IO::AIO (); |
25 | use IO::AIO (); |
20 | use File::Temp; |
26 | |
21 | use Crossfire; |
|
|
22 | use Coro; |
27 | use Coro 5.12; |
23 | use Coro::AIO; |
28 | use Coro::AIO; |
24 | use Coro::Util; |
29 | use Coro::Util; |
25 | use POSIX (); |
|
|
26 | use Digest::MD5; |
|
|
27 | use Carp; |
|
|
28 | use Coro::Channel; |
30 | use Coro::Channel; |
29 | use Coro::Storable; $Storable::canonical = 1; |
31 | use Coro::Storable; $Storable::canonical = 1; |
|
|
32 | |
|
|
33 | use Deliantra; |
30 | |
34 | |
31 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
35 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
32 | |
36 | |
33 | sub usage { |
37 | sub usage { |
34 | warn <<EOF; |
38 | warn <<EOF; |
… | |
… | |
66 | tan => 12, |
70 | tan => 12, |
67 | ); |
71 | ); |
68 | |
72 | |
69 | END { system "rm", "-rf", $TMPDIR } |
73 | END { system "rm", "-rf", $TMPDIR } |
70 | |
74 | |
71 | Event->signal (signal => "INT", cb => sub { exit 1 }); |
75 | my $s_INT = EV::signal INT => sub { exit 1 }; |
72 | Event->signal (signal => "TERM", cb => sub { exit 1 }); |
76 | my $s_TERM = EV::signal TERM => sub { exit 1 }; |
73 | |
77 | |
74 | mkdir $TMPDIR, 0700 |
78 | mkdir $TMPDIR, 0700 |
75 | or die "$TMPDIR: $!"; |
79 | or die "$TMPDIR: $!"; |
76 | |
80 | |
77 | sub fork_sub(&) { |
81 | sub fork_sub(&) { |
… | |
… | |
97 | if (!-f "$path/regions") { |
101 | if (!-f "$path/regions") { |
98 | warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; |
102 | warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; |
99 | exit 1 unless $FORCE; |
103 | exit 1 unless $FORCE; |
100 | } |
104 | } |
101 | |
105 | |
102 | system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" |
106 | system $RSYNC, "-av", "--chmod=u=rwX,go=rX", |
|
|
107 | "$path/.", "$DATADIR/maps/.", |
|
|
108 | "--exclude", "CVS", "--exclude", "/world-precomposed", |
|
|
109 | "--delete", "--delete-excluded" |
103 | and die "map installation failed.\n"; |
110 | and die "map installation failed.\n"; |
104 | |
111 | |
105 | print "maps installed successfully.\n"; |
112 | print "maps installed successfully.\n"; |
106 | } |
113 | } |
107 | |
114 | |
… | |
… | |
174 | |
181 | |
175 | (my $base = $stem) =~ s/^.*\///; |
182 | (my $base = $stem) =~ s/^.*\///; |
176 | |
183 | |
177 | my $fi = $FACEINFO{$base}; |
184 | my $fi = $FACEINFO{$base}; |
178 | unless ($fi) { |
185 | unless ($fi) { |
179 | warn "$path: <$base> not referenced by any archetype, skipping.\n"; |
186 | #warn "$path: <$base> not referenced by any archetype, skipping.\n"; |
180 | next; |
187 | #next; |
181 | } |
188 | } |
182 | |
189 | |
183 | my $arc = $FACEINFO{$base}{arc} |
190 | my $arc = $fi->{arc} || { }; |
184 | or die "FATAL: internal error, cannot continue"; |
|
|
185 | |
191 | |
186 | unless ($path =~ /~$/) { |
192 | unless ($path =~ /~$/) { |
187 | # possibly enlarge |
193 | # possibly enlarge |
188 | if (0 > aio_stat "$stem.64x64.png") { |
194 | if (0 > aio_stat "$stem.64x64.png") { |
189 | my $other = "$stem.64x64.png~"; |
195 | my $other = "$stem.64x64.png~"; |
… | |
… | |
199 | my ($wall_pfx, $wall_dir, $wall_sfx); |
205 | my ($wall_pfx, $wall_dir, $wall_sfx); |
200 | |
206 | |
201 | if ( |
207 | if ( |
202 | !$is_floor |
208 | !$is_floor |
203 | && !$arc->{alive} |
209 | && !$arc->{alive} |
204 | && $arc->{no_pass} |
210 | && $arc->{move_block} eq "all" |
205 | && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/ |
211 | && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/ |
206 | ) { |
212 | ) { |
207 | ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3); |
213 | ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3); |
208 | |
214 | |
209 | unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) { |
215 | unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) { |
… | |
… | |
270 | fork_sub { |
276 | fork_sub { |
271 | system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; |
277 | system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; |
272 | system $OPTIPNG, "-i0", "-q", "$other~"; |
278 | system $OPTIPNG, "-i0", "-q", "$other~"; |
273 | |
279 | |
274 | # reduce smoothfaces >10000 bytes |
280 | # reduce smoothfaces >10000 bytes |
|
|
281 | # obsolete, no longer required |
275 | if ($stem =~ /_S\./ && (-s "$other~") > 10000) { |
282 | if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { |
276 | my $ncolor = 256; |
283 | my $ncolor = 256; |
277 | while () { |
284 | while () { |
278 | system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; |
285 | system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; |
279 | system $OPTIPNG, "-i0", "-q", "$other~~"; |
286 | system $OPTIPNG, "-i0", "-q", "$other~~"; |
280 | last if 10000 > -s "$other~~"; |
287 | last if 10000 > -s "$other~~"; |
… | |
… | |
426 | facings => $facings, |
433 | facings => $facings, |
427 | frames => \@frames, |
434 | frames => \@frames, |
428 | }; |
435 | }; |
429 | } |
436 | } |
430 | |
437 | |
431 | for my $face ($o->{face} || (), @{$anim || []}) { |
438 | for ($o->{face} || (), @{$anim || []}) { |
432 | next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; |
439 | next if /^facings\s/; |
433 | |
440 | |
|
|
441 | my $face = $_; |
|
|
442 | $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates |
|
|
443 | |
434 | my $info = $FACEINFO{$face} ||= {}; |
444 | my $info = $FACEINFO{$face} ||= { }; |
435 | |
|
|
436 | $info->{arc} = $o; |
445 | $info->{arc} = $o; |
|
|
446 | |
|
|
447 | next if $face =~ /^blank.x11$|^empty.x11$/; |
|
|
448 | |
437 | $info->{visibility} = $visibility if defined $visibility; |
449 | $info->{visibility} = $visibility if defined $visibility; |
438 | $info->{magicmap} = $magicmap if defined $magicmap; |
450 | $info->{magicmap} = $magicmap if defined $magicmap; |
439 | } |
451 | } |
440 | |
452 | |
441 | if (my $smooth = delete $o->{smoothface}) { |
453 | if (my $smooth = delete $o->{smoothface}) { |
… | |
… | |
491 | my ($dir, $file, $type) = @$job; |
503 | my ($dir, $file, $type) = @$job; |
492 | |
504 | |
493 | my $data; |
505 | my $data; |
494 | aio_load "$dir/$file", $data; |
506 | aio_load "$dir/$file", $data; |
495 | |
507 | |
496 | my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; |
508 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
497 | |
509 | |
498 | next if $meta && !exists $meta->{$file}; |
510 | utf8::decode $dir; |
|
|
511 | utf8::decode $file; |
|
|
512 | |
|
|
513 | # a meta file for resources is now mandatory |
|
|
514 | unless (exists $meta->{$file}) { |
|
|
515 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
|
|
516 | next; |
|
|
517 | } |
499 | |
518 | |
500 | $meta = { |
519 | $meta = { |
501 | %{ $meta->{"" } || {} }, |
520 | %{ $meta->{"" } || {} }, |
502 | %{ $meta->{$file} || {} }, |
521 | %{ $meta->{$file} || {} }, |
503 | }; |
522 | }; |
… | |
… | |
516 | $file =~ s/\.res$//; |
535 | $file =~ s/\.res$//; |
517 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
536 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
518 | |
537 | |
519 | substr $dir, 0, 1 + length $PATH, ""; |
538 | substr $dir, 0, 1 + length $PATH, ""; |
520 | |
539 | |
|
|
540 | if (my $filter = $meta->{cfutil_filter}) { |
|
|
541 | if ($filter eq "yaml2json") { |
|
|
542 | $data = JSON::XS::encode_json YAML::XS::Load $data; |
|
|
543 | } elsif ($filter eq "json2json") { |
|
|
544 | $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); |
|
|
545 | } elsif ($filter eq "perl2json") { |
|
|
546 | $data = eval $data; die if $@; |
|
|
547 | $data = JSON::XS::encode_json $data; |
|
|
548 | } else { |
|
|
549 | warn "$dir/$file: unknown filter $filter, skipping\n"; |
|
|
550 | } |
|
|
551 | } |
|
|
552 | |
521 | $RESOURCE{"$dir/$file"} = { |
553 | $RESOURCE{"$dir/$file"} = { |
522 | type => (delete $meta->{type}) || $type, |
554 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
523 | data => $data, |
555 | data => $data, |
524 | chksum => (Digest::MD5::md5 $data), |
|
|
525 | %$meta ? (meta => $meta) : (), |
556 | %$meta ? (meta => $meta) : (), |
526 | }; |
557 | }; |
527 | } |
558 | } |
528 | } |
559 | } |
529 | |
560 | |
… | |
… | |
549 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
580 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
550 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
581 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
551 | if $file =~ /\.(wav|ogg)$/; |
582 | if $file =~ /\.(wav|ogg)$/; |
552 | |
583 | |
553 | } elsif ($dir =~ /^res(?:\/|$)/) { |
584 | } elsif ($dir =~ /^res(?:\/|$)/) { |
|
|
585 | if ($file =~ /\.(jpg|png)$/) { |
554 | $c_res->put ([$path, $file, 0]) # FT_FACE |
586 | $c_res->put ([$path, $file, 0]) # FT_FACE |
555 | if $file =~ /\.(jpg|png)$/; |
587 | } elsif ($file =~ /\.(res)$/) { |
556 | $c_res->put ([$path, $file, 7]) # FT_RSRC |
588 | $c_res->put ([$path, $file, 6]) # FT_RSRC |
557 | if $file =~ /\.(res)$/; |
589 | } else { |
|
|
590 | $c_res->put ([$path, $file, undef]); |
|
|
591 | } |
558 | |
592 | |
559 | } elsif ($file =~ /\.png$/) { |
593 | } elsif ($file =~ /\.png$/) { |
560 | push @c_png, ["$path/$file", 0]; |
594 | push @c_png, ["$path/$file", 0]; |
561 | |
595 | |
562 | } elsif ($file =~ /\.trs$/) { |
596 | } elsif ($file =~ /\.trs$/) { |
… | |
… | |
568 | } else { |
602 | } else { |
569 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
603 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
570 | } |
604 | } |
571 | } |
605 | } |
572 | }; |
606 | }; |
|
|
607 | } |
|
|
608 | |
|
|
609 | sub generate_plurals { |
|
|
610 | # use Lingua::EN::Inflect (); |
|
|
611 | # Lingua::EN::Inflect::classical; |
|
|
612 | # Lingua::EN::Inflect::def_noun 'talisman' => 'talismans'; |
|
|
613 | # Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack |
|
|
614 | # |
|
|
615 | # for my $a (@ARC) { |
|
|
616 | # my $name = $a->{name} || $a->{_name}; |
|
|
617 | # |
|
|
618 | # next unless $a->{name_pl}; |
|
|
619 | # |
|
|
620 | # |
|
|
621 | # my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name; |
|
|
622 | # my $pl = $test =~ /^(?:eq|p:.)$/ |
|
|
623 | # ? $name |
|
|
624 | # : Lingua::EN::Inflect::PL $name; |
|
|
625 | # die "$test $pl" if $pl =~ /bootss/;#d# |
|
|
626 | # |
|
|
627 | # if ($pl ne $a->{name_pl}) { |
|
|
628 | # warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n"; |
|
|
629 | # } |
|
|
630 | # } |
573 | } |
631 | } |
574 | |
632 | |
575 | sub inst_arch($) { |
633 | sub inst_arch($) { |
576 | my (undef, $path) = @_; |
634 | my (undef, $path) = @_; |
577 | |
635 | |
… | |
… | |
600 | my @a_res = map +(async \&process_res), 1..2; |
658 | my @a_res = map +(async \&process_res), 1..2; |
601 | my @a_trs = map +(async \&process_trs), 1..2; |
659 | my @a_trs = map +(async \&process_trs), 1..2; |
602 | |
660 | |
603 | IO::AIO::flush; |
661 | IO::AIO::flush; |
604 | |
662 | |
605 | $c_res->put (undef) for @a_res; |
663 | $c_res->shutdown; |
606 | $c_arc->put (undef) for @a_arc; |
664 | $c_arc->shutdown; |
607 | $c_trs->put (undef) for @a_trs; |
665 | $c_trs->shutdown; |
608 | |
666 | |
609 | print "start file scan, arc, res processing...\n" if $VERBOSE; |
667 | print "start file scan, arc, res processing...\n" if $VERBOSE; |
610 | |
668 | |
611 | $_->join for @a_arc; # need to parse all archetypes before png processing |
669 | $_->join for @a_arc; # need to parse all archetypes before png processing |
612 | |
670 | |
613 | print "end arc, start png processing...\n" if $VERBOSE; |
671 | print "end arc, start png processing...\n" if $VERBOSE; |
614 | |
672 | |
615 | # four png crunchers work fine for my 2x smp machine |
673 | # eight png crunchers work fine for my 4x smp machine |
616 | my @a_png = map +(async \&process_png), 1..4; |
674 | my @a_png = map +(async \&process_png), 1..8; |
617 | |
675 | |
618 | $_->join for (@a_trs, @a_res, @a_png); |
676 | $_->join for (@a_trs, @a_res, @a_png); |
619 | |
677 | |
620 | print "scanning done, processing results...\n" if $VERBOSE; |
678 | print "scanning done, processing results...\n" if $VERBOSE; |
621 | { |
679 | { |
… | |
… | |
657 | } |
715 | } |
658 | |
716 | |
659 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
717 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
660 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
718 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
661 | |
719 | |
|
|
720 | print "generating plurals...\n" if $VERBOSE; |
|
|
721 | generate_plurals; |
|
|
722 | |
662 | print "writing archetypes...\n" if $VERBOSE; |
723 | print "writing archetypes...\n" if $VERBOSE; |
663 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
724 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
664 | or die "$DATADIR/archetypes~: $!"; |
725 | or die "$DATADIR/archetypes~: $!"; |
665 | print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
726 | print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
666 | } |
727 | } |
667 | |
728 | |
668 | { |
729 | { |
669 | print "writing treasures...\n" if $VERBOSE; |
730 | print "writing treasures...\n" if $VERBOSE; |
670 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
731 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
… | |
… | |
676 | print "processing facedata...\n" if $VERBOSE; |
737 | print "processing facedata...\n" if $VERBOSE; |
677 | while (my ($k, $v) = each %FACEINFO) { |
738 | while (my ($k, $v) = each %FACEINFO) { |
678 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
739 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
679 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
740 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
680 | |
741 | |
681 | length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
742 | #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
682 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
743 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
683 | |
|
|
684 | $v->{chksum32} = Digest::MD5::md5 $v->{data32}; |
|
|
685 | $v->{chksum64} = Digest::MD5::md5 $v->{data64}; |
|
|
686 | |
744 | |
687 | if (my $magicmap = $v->{magicmap}) { |
745 | if (my $magicmap = $v->{magicmap}) { |
688 | $magicmap =~ y/A-Z_\-/a-z/d; |
746 | $magicmap =~ y/A-Z_\-/a-z/d; |
689 | $v->{magicmap} = $COLOR{$magicmap}; |
747 | $v->{magicmap} = $COLOR{$magicmap}; |
690 | } |
748 | } |