| … | |
… | |
| 84 | } |
84 | } |
| 85 | |
85 | |
| 86 | { |
86 | { |
| 87 | our %ANIMINFO; |
87 | our %ANIMINFO; |
| 88 | our %FACEINFO; |
88 | our %FACEINFO; |
| 89 | our @ARC; |
89 | our %ARC; |
| 90 | our $TRS; |
90 | our $TRS; |
| 91 | our $NFILE; |
91 | our $NFILE; |
| 92 | |
92 | |
| 93 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
93 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
| 94 | |
94 | |
| … | |
… | |
| 255 | my $arc; |
255 | my $arc; |
| 256 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
256 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
| 257 | |
257 | |
| 258 | my $arc = read_arch "$dir/$file"; |
258 | my $arc = read_arch "$dir/$file"; |
| 259 | for my $o (values %$arc) { |
259 | for my $o (values %$arc) { |
| 260 | push @ARC, $o; |
260 | $ARC{$o->{_name}} = $o; |
| 261 | |
261 | |
| 262 | $o->{editor_folder} = $dir; |
262 | $o->{editor_folder} = $dir; |
| 263 | |
263 | |
| 264 | my $visibility = delete $o->{visibility}; |
264 | my $visibility = delete $o->{visibility}; |
| 265 | my $magicmap = delete $o->{magicmap}; |
265 | my $magicmap = delete $o->{magicmap}; |
| … | |
… | |
| 276 | my $x = $o->{x} - $dx; |
276 | my $x = $o->{x} - $dx; |
| 277 | my $y = $o->{y} - $dy; |
277 | my $y = $o->{y} - $dy; |
| 278 | |
278 | |
| 279 | my $ext = $x|$y ? "+$x+$y" : ""; |
279 | my $ext = $x|$y ? "+$x+$y" : ""; |
| 280 | |
280 | |
| 281 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/; |
281 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
| 282 | |
282 | |
| 283 | my $visibility = delete $o->{visibility} if exists $o->{visibility}; |
283 | my $visibility = delete $o->{visibility} if exists $o->{visibility}; |
| 284 | my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
284 | my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
| 285 | |
285 | |
| 286 | my $anim = delete $o->{anim}; |
286 | my $anim = delete $o->{anim}; |
| … | |
… | |
| 372 | } |
372 | } |
| 373 | |
373 | |
| 374 | sub inst_arch($) { |
374 | sub inst_arch($) { |
| 375 | my (undef, $path) = @_; |
375 | my (undef, $path) = @_; |
| 376 | |
376 | |
| 377 | print "installing '$path' to '$DATADIR'\n", |
377 | print "Installing '$path' to '$DATADIR'\n", |
|
|
378 | "\n", |
| 378 | "(this can take a long time if you run this\n", |
379 | "This can take a long time if you run this\n", |
| 379 | "for the first time or do not use --cache).\n"; |
380 | "for the first time or do not use --cache.\n", |
|
|
381 | "\n", |
|
|
382 | "Unless you run verbosely, all following warning\n", |
|
|
383 | "or error messages indicate serious problems.\n", |
|
|
384 | "\n"; |
| 380 | |
385 | |
| 381 | if (!-d "$path/treasures") { |
386 | if (!-d "$path/treasures") { |
| 382 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
387 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
| 383 | exit 1 unless $FORCE; |
388 | exit 1 unless $FORCE; |
| 384 | } |
389 | } |
| … | |
… | |
| 392 | (async \&process_trs), (async \&process_trs), |
397 | (async \&process_trs), (async \&process_trs), |
| 393 | (async \&process_arc), (async \&process_arc), |
398 | (async \&process_arc), (async \&process_arc), |
| 394 | ); |
399 | ); |
| 395 | |
400 | |
| 396 | { |
401 | { |
|
|
402 | # remove path prefix from editor_folder |
|
|
403 | substr $_->{editor_folder}, 0, 1 + length $path, "" |
|
|
404 | for values %ARC; |
|
|
405 | |
|
|
406 | # resolve inherit |
|
|
407 | while () { |
|
|
408 | my $progress; |
|
|
409 | my $loop; |
|
|
410 | |
|
|
411 | for my $o (values %ARC) { |
|
|
412 | if (my $other = $o->{inherit}) { |
|
|
413 | if (my $s = $ARC{$other}) { |
|
|
414 | if ($s->{inherit}) { |
|
|
415 | $loop = $s; |
|
|
416 | } else { |
|
|
417 | delete $o->{inherit}; |
|
|
418 | %$o = ( %$s, %$o ); |
|
|
419 | ++$progress; |
|
|
420 | } |
|
|
421 | } else { |
|
|
422 | warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
|
|
423 | delete $ARC{$o->{_name}}; |
|
|
424 | } |
|
|
425 | } |
|
|
426 | } |
|
|
427 | |
|
|
428 | unless ($progress) { |
|
|
429 | die "inheritance loop detected starting at archetype '$loop->{_name}', aborting.\n" |
|
|
430 | if $loop; |
|
|
431 | |
|
|
432 | last; |
|
|
433 | } |
|
|
434 | } |
|
|
435 | |
| 397 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
436 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
| 398 | or die "$DATADIR/archetypes~: $!"; |
437 | or die "$DATADIR/archetypes~: $!"; |
| 399 | substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC; |
438 | print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } values %ARC]; |
| 400 | print $fh Crossfire::archlist_to_string \@ARC; |
|
|
| 401 | } |
439 | } |
| 402 | |
440 | |
| 403 | { |
441 | { |
| 404 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
442 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
| 405 | or die "$DATADIR/treasures~: $!"; |
443 | or die "$DATADIR/treasures~: $!"; |
