| … | |
… | |
| 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 (); |
|
|
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 Deliantra; |
| 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 | |
| … | |
… | |
| 170 | if ($w % $T || $h % $T) { |
174 | if ($w % $T || $h % $T) { |
| 171 | warn "$path: weird png size ($w $h), skipping.\n"; |
175 | warn "$path: weird png size ($w $h), skipping.\n"; |
| 172 | next; |
176 | next; |
| 173 | } |
177 | } |
| 174 | |
178 | |
|
|
179 | (my $base = $stem) =~ s/^.*\///; |
|
|
180 | |
|
|
181 | my $fi = $FACEINFO{$base}; |
|
|
182 | unless ($fi) { |
|
|
183 | #warn "$path: <$base> not referenced by any archetype, skipping.\n"; |
|
|
184 | #next; |
|
|
185 | } |
|
|
186 | |
|
|
187 | my $arc = $fi->{arc} || { }; |
|
|
188 | |
| 175 | unless ($path =~ /~$/) { |
189 | unless ($path =~ /~$/) { |
| 176 | # possibly enlarge |
190 | # possibly enlarge |
| 177 | if (0 > aio_stat "$stem.64x64.png") { |
191 | if (0 > aio_stat "$stem.64x64.png") { |
| 178 | my $other = "$stem.64x64.png~"; |
192 | my $other = "$stem.64x64.png~"; |
| 179 | |
193 | |
| 180 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
194 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
| 181 | fork_sub { |
195 | fork_sub { |
| 182 | my $CROP; |
196 | my $CROP; |
| 183 | my $SRC = "png:\Q$path\E"; |
197 | my $SRC = "png:\Q$path\E"; |
| 184 | |
198 | |
| 185 | # check if this is a wall. ultra-ugly. ultra-ultra-ugly. |
199 | my $is_floor = $arc->{is_floor}; |
|
|
200 | my $is_wall = 0; |
|
|
201 | |
|
|
202 | my ($wall_pfx, $wall_dir, $wall_sfx); |
|
|
203 | |
|
|
204 | if ( |
|
|
205 | !$is_floor |
|
|
206 | && !$arc->{alive} |
|
|
207 | && $arc->{move_block} eq "all" |
| 186 | if ($path =~ /^(.*\/wall\/.*_)([0-9A-F])(\.x11.*\.png)$/) { |
208 | && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/ |
|
|
209 | ) { |
| 187 | my ($pfx, $dir, $sfx) = ($1, hex $2, $3); |
210 | ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3); |
| 188 | #check for 0..F images to be sure(?) this is a wall |
211 | |
| 189 | unless (grep { !-e sprintf "%s%X%s", $pfx, $_, $sfx } 0..15) { |
212 | unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) { |
|
|
213 | $is_wall = 1; |
|
|
214 | } |
|
|
215 | } |
|
|
216 | |
|
|
217 | if ($is_wall || $is_floor) { |
| 190 | # add a 4px border and add other images around it |
218 | # add a 4px border and add other images around it |
| 191 | $CROP = "-shave 8x8 +repage"; |
219 | $CROP = "-shave 8x8 +repage"; |
| 192 | |
220 | |
| 193 | $w += 8; |
221 | $w += 8; |
| 194 | $h += 8; |
222 | $h += 8; |
| 195 | |
223 | |
| 196 | $SRC = "-size ${w}x${h} xc:transparent"; |
224 | $SRC = "-size ${w}x${h} xc:transparent"; |
| 197 | $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; |
225 | $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; |
| 198 | |
226 | |
| 199 | # 8 surrounding images |
227 | # 8 surrounding images |
| 200 | for ( |
228 | for ( |
| 201 | # x y b r0 r1 |
229 | # x y b r0 r1 |
| 202 | [-1, -1, 0, 6], |
230 | [-1, -1, 0, 6], |
| 203 | [ 0, -1, 1, 10, 14], |
231 | [ 0, -1, 1, 10, 14], |
| 204 | [+1, -1, 0, 12], |
232 | [+1, -1, 0, 12], |
| 205 | |
233 | |
| 206 | [-1, 0, 8, 5, 7], |
234 | [-1, 0, 8, 5, 7], |
| 207 | # |
235 | # |
| 208 | [+1, 0, 2, 5, 13], |
236 | [+1, 0, 2, 5, 13], |
| 209 | |
237 | |
| 210 | [-1, +1, 0, 3], |
238 | [-1, +1, 0, 3], |
| 211 | [ 0, +1, 4, 10, 11], |
239 | [ 0, +1, 4, 10, 11], |
| 212 | [+1, +1, 0, 9], |
240 | [+1, +1, 0, 9], |
| 213 | ) { |
241 | ) { |
| 214 | my ($x, $y, $d, $r0, $r1) = @$_; |
242 | my ($x, $y, $d, $r0, $r1) = @$_; |
|
|
243 | |
|
|
244 | my $tile = $is_floor ? $path |
|
|
245 | : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx |
|
|
246 | : die; |
|
|
247 | |
| 215 | $SRC .= sprintf " png:%s%X%s -geometry %+d%+d -composite", |
248 | $SRC .= sprintf " png:%s -geometry %+d%+d -composite", |
| 216 | "\Q$pfx", |
249 | "\Q$tile", |
| 217 | ($dir & $d) ? $r1 : $r0, |
|
|
| 218 | "\Q$sfx", |
|
|
| 219 | $x * ($w - 8) + 4, |
250 | $x * ($w - 8) + 4, |
| 220 | $y * ($h - 8) + 4; |
251 | $y * ($h - 8) + 4; |
| 221 | } |
|
|
| 222 | } |
252 | } |
| 223 | } |
253 | } |
| 224 | |
254 | |
| 225 | system "convert -depth 8 $SRC rgba:-" |
255 | system "convert -depth 8 $SRC rgba:-" |
| 226 | . "| $exec_prefix/bin/cfhq2xa $w $h 0" |
256 | . "| $exec_prefix/bin/cfhq2xa $w $h 0" |
| … | |
… | |
| 399 | facings => $facings, |
429 | facings => $facings, |
| 400 | frames => \@frames, |
430 | frames => \@frames, |
| 401 | }; |
431 | }; |
| 402 | } |
432 | } |
| 403 | |
433 | |
| 404 | for my $face ($o->{face} || (), @{$anim || []}) { |
434 | for ($o->{face} || (), @{$anim || []}) { |
| 405 | next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; |
435 | next if /^facings\s/; |
| 406 | |
436 | |
|
|
437 | my $face = $_; |
|
|
438 | $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates |
|
|
439 | |
| 407 | my $info = $FACEINFO{$face} ||= {}; |
440 | my $info = $FACEINFO{$face} ||= { }; |
| 408 | |
|
|
| 409 | $info->{arc} = $o; |
441 | $info->{arc} = $o; |
|
|
442 | |
|
|
443 | next if $face =~ /^blank.x11$|^empty.x11$/; |
|
|
444 | |
| 410 | $info->{visibility} = $visibility if defined $visibility; |
445 | $info->{visibility} = $visibility if defined $visibility; |
| 411 | $info->{magicmap} = $magicmap if defined $magicmap; |
446 | $info->{magicmap} = $magicmap if defined $magicmap; |
| 412 | } |
447 | } |
| 413 | |
448 | |
| 414 | if (my $smooth = delete $o->{smoothface}) { |
449 | if (my $smooth = delete $o->{smoothface}) { |
| 415 | my %kv =split /\s+/, $smooth; |
450 | my %kv = split /\s+/, $smooth; |
| 416 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
451 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
| 417 | while (my ($face, $smooth) = each %kv) { |
452 | while (my ($face, $smooth) = each %kv) { |
|
|
453 | $FACEINFO{$smooth}{arc} = $o; |
|
|
454 | |
| 418 | $FACEINFO{$face}{smooth} = $smooth; |
455 | $FACEINFO{$face}{smooth} = $smooth; |
| 419 | $FACEINFO{$face}{smoothlevel} = $level; |
456 | $FACEINFO{$face}{smoothlevel} = $level; |
| 420 | } |
457 | } |
| 421 | } |
458 | } |
| 422 | } |
459 | } |
| … | |
… | |
| 462 | my ($dir, $file, $type) = @$job; |
499 | my ($dir, $file, $type) = @$job; |
| 463 | |
500 | |
| 464 | my $data; |
501 | my $data; |
| 465 | aio_load "$dir/$file", $data; |
502 | aio_load "$dir/$file", $data; |
| 466 | |
503 | |
| 467 | 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) }; |
| 468 | |
505 | |
| 469 | 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 | } |
| 470 | |
514 | |
| 471 | $meta = { |
515 | $meta = { |
| 472 | %{ $meta->{"" } || {} }, |
516 | %{ $meta->{"" } || {} }, |
| 473 | %{ $meta->{$file} || {} }, |
517 | %{ $meta->{$file} || {} }, |
| 474 | }; |
518 | }; |
| … | |
… | |
| 487 | $file =~ s/\.res$//; |
531 | $file =~ s/\.res$//; |
| 488 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
532 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
| 489 | |
533 | |
| 490 | substr $dir, 0, 1 + length $PATH, ""; |
534 | substr $dir, 0, 1 + length $PATH, ""; |
| 491 | |
535 | |
|
|
536 | if (my $filter = $meta->{cfutil_filter}) { |
|
|
537 | if ($filter eq "yaml2json") { |
|
|
538 | $data = JSON::XS::encode_json YAML::Load $data; |
|
|
539 | } elsif ($filter eq "json2json") { |
|
|
540 | $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); |
|
|
541 | } elsif ($filter eq "perl2json") { |
|
|
542 | $data = eval $data; die if $@; |
|
|
543 | $data = JSON::XS::encode_json $data; |
|
|
544 | } else { |
|
|
545 | warn "$dir/$file: unknown filter $filter, skipping\n"; |
|
|
546 | } |
|
|
547 | } |
|
|
548 | |
| 492 | $RESOURCE{"$dir/$file"} = { |
549 | $RESOURCE{"$dir/$file"} = { |
| 493 | type => (delete $meta->{type}) || $type, |
550 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
| 494 | data => $data, |
551 | data => $data, |
| 495 | chksum => (Digest::MD5::md5 $data), |
|
|
| 496 | %$meta ? (meta => $meta) : (), |
552 | %$meta ? (meta => $meta) : (), |
| 497 | }; |
553 | }; |
| 498 | } |
554 | } |
| 499 | } |
555 | } |
| 500 | |
556 | |
| … | |
… | |
| 520 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
576 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
| 521 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
577 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
| 522 | if $file =~ /\.(wav|ogg)$/; |
578 | if $file =~ /\.(wav|ogg)$/; |
| 523 | |
579 | |
| 524 | } elsif ($dir =~ /^res(?:\/|$)/) { |
580 | } elsif ($dir =~ /^res(?:\/|$)/) { |
|
|
581 | if ($file =~ /\.(jpg|png)$/) { |
| 525 | $c_res->put ([$path, $file, 0]) # FT_FACE |
582 | $c_res->put ([$path, $file, 0]) # FT_FACE |
| 526 | if $file =~ /\.(jpg|png)$/; |
583 | } elsif ($file =~ /\.(res)$/) { |
| 527 | $c_res->put ([$path, $file, 7]) # FT_RSRC |
584 | $c_res->put ([$path, $file, 6]) # FT_RSRC |
| 528 | if $file =~ /\.(res)$/; |
585 | } else { |
|
|
586 | $c_res->put ([$path, $file, undef]); |
|
|
587 | } |
| 529 | |
588 | |
| 530 | } elsif ($file =~ /\.png$/) { |
589 | } elsif ($file =~ /\.png$/) { |
| 531 | push @c_png, ["$path/$file", 0]; |
590 | push @c_png, ["$path/$file", 0]; |
| 532 | |
591 | |
| 533 | } elsif ($file =~ /\.trs$/) { |
592 | } elsif ($file =~ /\.trs$/) { |
| … | |
… | |
| 631 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
690 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
| 632 | |
691 | |
| 633 | print "writing archetypes...\n" if $VERBOSE; |
692 | print "writing archetypes...\n" if $VERBOSE; |
| 634 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
693 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
| 635 | or die "$DATADIR/archetypes~: $!"; |
694 | or die "$DATADIR/archetypes~: $!"; |
| 636 | print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
695 | print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
| 637 | } |
696 | } |
| 638 | |
697 | |
| 639 | { |
698 | { |
| 640 | print "writing treasures...\n" if $VERBOSE; |
699 | print "writing treasures...\n" if $VERBOSE; |
| 641 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
700 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
| … | |
… | |
| 649 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
708 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
| 650 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
709 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
| 651 | |
710 | |
| 652 | length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
711 | length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
| 653 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
712 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
| 654 | |
|
|
| 655 | $v->{chksum32} = Digest::MD5::md5 $v->{data32}; |
|
|
| 656 | $v->{chksum64} = Digest::MD5::md5 $v->{data64}; |
|
|
| 657 | |
713 | |
| 658 | if (my $magicmap = $v->{magicmap}) { |
714 | if (my $magicmap = $v->{magicmap}) { |
| 659 | $magicmap =~ y/A-Z_\-/a-z/d; |
715 | $magicmap =~ y/A-Z_\-/a-z/d; |
| 660 | $v->{magicmap} = $COLOR{$magicmap}; |
716 | $v->{magicmap} = $COLOR{$magicmap}; |
| 661 | } |
717 | } |
