… | |
… | |
14 | my $PNGNQ = "@PNGNQ@"; |
14 | my $PNGNQ = "@PNGNQ@"; |
15 | |
15 | |
16 | use Getopt::Long; |
16 | use Getopt::Long; |
17 | use Coro::Event; |
17 | use Coro::Event; |
18 | use AnyEvent; |
18 | use AnyEvent; |
|
|
19 | use YAML::Syck (); |
|
|
20 | use JSON::XS (); |
19 | use IO::AIO (); |
21 | use IO::AIO (); |
20 | use File::Temp; |
22 | use File::Temp; |
21 | use Crossfire; |
23 | use Crossfire; |
22 | use Coro; |
24 | use Coro; |
23 | use Coro::AIO; |
25 | use Coro::AIO; |
24 | use Coro::Util; |
26 | use Coro::Util; |
25 | use POSIX (); |
27 | use POSIX (); |
26 | use Digest::MD5; |
|
|
27 | use Carp; |
28 | use Carp; |
28 | use Coro::Channel; |
29 | use Coro::Channel; |
29 | use Coro::Storable; $Storable::canonical = 1; |
30 | use Coro::Storable; $Storable::canonical = 1; |
30 | |
31 | |
31 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
32 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
… | |
… | |
97 | if (!-f "$path/regions") { |
98 | if (!-f "$path/regions") { |
98 | warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; |
99 | warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; |
99 | exit 1 unless $FORCE; |
100 | exit 1 unless $FORCE; |
100 | } |
101 | } |
101 | |
102 | |
102 | system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" |
103 | system $RSYNC, "-av", "--chmod=u=rwX,go=rX", |
|
|
104 | "$path/.", "$DATADIR/maps/.", |
|
|
105 | "--exclude", "CVS", "--exclude", "/world-precomposed", |
|
|
106 | "--delete", "--delete-excluded" |
103 | and die "map installation failed.\n"; |
107 | and die "map installation failed.\n"; |
104 | |
108 | |
105 | print "maps installed successfully.\n"; |
109 | print "maps installed successfully.\n"; |
106 | } |
110 | } |
107 | |
111 | |
… | |
… | |
174 | |
178 | |
175 | (my $base = $stem) =~ s/^.*\///; |
179 | (my $base = $stem) =~ s/^.*\///; |
176 | |
180 | |
177 | my $fi = $FACEINFO{$base}; |
181 | my $fi = $FACEINFO{$base}; |
178 | unless ($fi) { |
182 | unless ($fi) { |
179 | warn "$path: <$base> not referenced by any archetype, skipping.\n"; |
183 | #warn "$path: <$base> not referenced by any archetype, skipping.\n"; |
180 | next; |
184 | #next; |
181 | } |
185 | } |
182 | |
186 | |
183 | my $arc = $FACEINFO{$base}{arc} |
187 | my $arc = $fi->{arc} || { }; |
184 | or die "FATAL: internal error, cannot continue"; |
|
|
185 | |
188 | |
186 | unless ($path =~ /~$/) { |
189 | unless ($path =~ /~$/) { |
187 | # possibly enlarge |
190 | # possibly enlarge |
188 | if (0 > aio_stat "$stem.64x64.png") { |
191 | if (0 > aio_stat "$stem.64x64.png") { |
189 | my $other = "$stem.64x64.png~"; |
192 | my $other = "$stem.64x64.png~"; |
… | |
… | |
426 | facings => $facings, |
429 | facings => $facings, |
427 | frames => \@frames, |
430 | frames => \@frames, |
428 | }; |
431 | }; |
429 | } |
432 | } |
430 | |
433 | |
431 | for my $face ($o->{face} || (), @{$anim || []}) { |
434 | for ($o->{face} || (), @{$anim || []}) { |
432 | next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; |
435 | next if /^facings\s/; |
433 | |
436 | |
|
|
437 | my $face = $_; |
|
|
438 | $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates |
|
|
439 | |
434 | my $info = $FACEINFO{$face} ||= {}; |
440 | my $info = $FACEINFO{$face} ||= { }; |
435 | |
|
|
436 | $info->{arc} = $o; |
441 | $info->{arc} = $o; |
|
|
442 | |
|
|
443 | next if $face =~ /^blank.x11$|^empty.x11$/; |
|
|
444 | |
437 | $info->{visibility} = $visibility if defined $visibility; |
445 | $info->{visibility} = $visibility if defined $visibility; |
438 | $info->{magicmap} = $magicmap if defined $magicmap; |
446 | $info->{magicmap} = $magicmap if defined $magicmap; |
439 | } |
447 | } |
440 | |
448 | |
441 | if (my $smooth = delete $o->{smoothface}) { |
449 | if (my $smooth = delete $o->{smoothface}) { |
… | |
… | |
491 | my ($dir, $file, $type) = @$job; |
499 | my ($dir, $file, $type) = @$job; |
492 | |
500 | |
493 | my $data; |
501 | my $data; |
494 | aio_load "$dir/$file", $data; |
502 | aio_load "$dir/$file", $data; |
495 | |
503 | |
496 | my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; |
504 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
497 | |
505 | |
498 | next if $meta && !exists $meta->{$file}; |
506 | utf8::decode $dir; |
|
|
507 | utf8::decode $file; |
|
|
508 | |
|
|
509 | # a meta file for resources is now mandatory |
|
|
510 | unless (exists $meta->{$file}) { |
|
|
511 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
|
|
512 | next; |
|
|
513 | } |
499 | |
514 | |
500 | $meta = { |
515 | $meta = { |
501 | %{ $meta->{"" } || {} }, |
516 | %{ $meta->{"" } || {} }, |
502 | %{ $meta->{$file} || {} }, |
517 | %{ $meta->{$file} || {} }, |
503 | }; |
518 | }; |
… | |
… | |
516 | $file =~ s/\.res$//; |
531 | $file =~ s/\.res$//; |
517 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
532 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
518 | |
533 | |
519 | substr $dir, 0, 1 + length $PATH, ""; |
534 | substr $dir, 0, 1 + length $PATH, ""; |
520 | |
535 | |
|
|
536 | if (my $filter = $meta->{cfutil_filter}) { |
|
|
537 | if ($filter eq "yaml2json") { |
|
|
538 | $data = JSON::XS::encode_json YAML::Syck::Load $data; |
|
|
539 | } else { |
|
|
540 | warn "$dir/$file: unknown filter $filter, skipping\n"; |
|
|
541 | } |
|
|
542 | } |
|
|
543 | |
521 | $RESOURCE{"$dir/$file"} = { |
544 | $RESOURCE{"$dir/$file"} = { |
522 | type => (delete $meta->{type}) || $type, |
545 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
523 | data => $data, |
546 | data => $data, |
524 | chksum => (Digest::MD5::md5 $data), |
|
|
525 | %$meta ? (meta => $meta) : (), |
547 | %$meta ? (meta => $meta) : (), |
526 | }; |
548 | }; |
527 | } |
549 | } |
528 | } |
550 | } |
529 | |
551 | |
… | |
… | |
549 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
571 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
550 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
572 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
551 | if $file =~ /\.(wav|ogg)$/; |
573 | if $file =~ /\.(wav|ogg)$/; |
552 | |
574 | |
553 | } elsif ($dir =~ /^res(?:\/|$)/) { |
575 | } elsif ($dir =~ /^res(?:\/|$)/) { |
|
|
576 | if ($file =~ /\.(jpg|png)$/) { |
554 | $c_res->put ([$path, $file, 0]) # FT_FACE |
577 | $c_res->put ([$path, $file, 0]) # FT_FACE |
555 | if $file =~ /\.(jpg|png)$/; |
578 | } elsif ($file =~ /\.(res)$/) { |
556 | $c_res->put ([$path, $file, 7]) # FT_RSRC |
579 | $c_res->put ([$path, $file, 7]) # FT_RSRC |
557 | if $file =~ /\.(res)$/; |
580 | } else { |
|
|
581 | $c_res->put ([$path, $file, undef]); |
|
|
582 | } |
558 | |
583 | |
559 | } elsif ($file =~ /\.png$/) { |
584 | } elsif ($file =~ /\.png$/) { |
560 | push @c_png, ["$path/$file", 0]; |
585 | push @c_png, ["$path/$file", 0]; |
561 | |
586 | |
562 | } elsif ($file =~ /\.trs$/) { |
587 | } elsif ($file =~ /\.trs$/) { |
… | |
… | |
679 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
704 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
680 | |
705 | |
681 | length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
706 | 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"; |
707 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
683 | |
708 | |
684 | $v->{chksum32} = Digest::MD5::md5 $v->{data32}; |
|
|
685 | $v->{chksum64} = Digest::MD5::md5 $v->{data64}; |
|
|
686 | |
|
|
687 | if (my $magicmap = $v->{magicmap}) { |
709 | if (my $magicmap = $v->{magicmap}) { |
688 | $magicmap =~ y/A-Z_\-/a-z/d; |
710 | $magicmap =~ y/A-Z_\-/a-z/d; |
689 | $v->{magicmap} = $COLOR{$magicmap}; |
711 | $v->{magicmap} = $COLOR{$magicmap}; |
690 | } |
712 | } |
691 | |
713 | |