| … | |
… | |
| 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 %ARC; |
| 90 | our $TRS; |
91 | our $TRS; |
| 91 | our $NFILE; |
92 | our $NFILE; |
| 92 | |
93 | |
| 93 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
94 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
| … | |
… | |
| 255 | my $arc; |
256 | my $arc; |
| 256 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
257 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
| 257 | |
258 | |
| 258 | my $arc = read_arch "$dir/$file"; |
259 | my $arc = read_arch "$dir/$file"; |
| 259 | for my $o (values %$arc) { |
260 | for my $o (values %$arc) { |
|
|
261 | push @ARC, $o; |
|
|
262 | for (my $m = $o; $m; $m = $m->{more}) { |
| 260 | $ARC{$o->{_name}} = $o; |
263 | $ARC{$m->{_name}} = $m; |
|
|
264 | } |
| 261 | |
265 | |
| 262 | $o->{editor_folder} = $dir; |
266 | $o->{editor_folder} = $dir; |
| 263 | |
267 | |
| 264 | my $visibility = delete $o->{visibility}; |
268 | my $visibility = delete $o->{visibility}; |
| 265 | my $magicmap = delete $o->{magicmap}; |
269 | my $magicmap = delete $o->{magicmap}; |
| … | |
… | |
| 414 | if (my $s = $ARC{$other}) { |
418 | if (my $s = $ARC{$other}) { |
| 415 | if ($s->{inherit}) { |
419 | if ($s->{inherit}) { |
| 416 | $loop = $s; |
420 | $loop = $s; |
| 417 | } else { |
421 | } else { |
| 418 | delete $o->{inherit}; |
422 | delete $o->{inherit}; |
|
|
423 | my %s = %$s; |
|
|
424 | delete @s{qw(_name more name name_pl)}; |
| 419 | %$o = ( %$s, %$o ); |
425 | %$o = ( %s, %$o ); |
| 420 | ++$progress; |
426 | ++$progress; |
| 421 | } |
427 | } |
| 422 | } else { |
428 | } else { |
| 423 | warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
429 | warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
| 424 | delete $ARC{$o->{_name}}; |
430 | delete $ARC{$o->{_name}}; |
| … | |
… | |
| 434 | } |
440 | } |
| 435 | } |
441 | } |
| 436 | |
442 | |
| 437 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
443 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
| 438 | or die "$DATADIR/archetypes~: $!"; |
444 | or die "$DATADIR/archetypes~: $!"; |
| 439 | print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } values %ARC]; |
445 | print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
| 440 | } |
446 | } |
| 441 | |
447 | |
| 442 | { |
448 | { |
| 443 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
449 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
| 444 | or die "$DATADIR/treasures~: $!"; |
450 | or die "$DATADIR/treasures~: $!"; |
