| … | |
… | |
| 160 | close $fh; |
160 | close $fh; |
| 161 | rename "$path~", $path |
161 | rename "$path~", $path |
| 162 | or die "$path: $!"; |
162 | or die "$path: $!"; |
| 163 | } |
163 | } |
| 164 | |
164 | |
|
|
165 | my %attack_mask = ( |
|
|
166 | physical => 0x00000001, |
|
|
167 | magic => 0x00000002, |
|
|
168 | fire => 0x00000004, |
|
|
169 | electricity => 0x00000008, |
|
|
170 | cold => 0x00000010, |
|
|
171 | confusion => 0x00000020, |
|
|
172 | acid => 0x00000040, |
|
|
173 | drain => 0x00000080, |
|
|
174 | weaponmagic => 0x00000100, |
|
|
175 | ghosthit => 0x00000200, |
|
|
176 | poison => 0x00000400, |
|
|
177 | slow => 0x00000800, |
|
|
178 | paralyze => 0x00001000, |
|
|
179 | turn_undead => 0x00002000, |
|
|
180 | fear => 0x00004000, |
|
|
181 | cancellation => 0x00008000, |
|
|
182 | deplete => 0x00010000, |
|
|
183 | death => 0x00020000, |
|
|
184 | chaos => 0x00040000, |
|
|
185 | counterspell => 0x00080000, |
|
|
186 | godpower => 0x00100000, |
|
|
187 | holyword => 0x00200000, |
|
|
188 | blind => 0x00400000, |
|
|
189 | internal => 0x00800000, |
|
|
190 | life_stealing => 0x01000000, |
|
|
191 | disease => 0x02000000, |
|
|
192 | ); |
|
|
193 | |
|
|
194 | sub _add_resist($$$) { |
|
|
195 | my ($ob, $mask, $value) = @_; |
|
|
196 | |
|
|
197 | while (my ($k, $v) = each %attack_mask) { |
|
|
198 | $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; |
|
|
199 | } |
|
|
200 | } |
|
|
201 | |
| 165 | # object as in "Object xxx", i.e. archetypes |
202 | # object as in "Object xxx", i.e. archetypes |
| 166 | sub normalize_object($) { |
203 | sub normalize_object($) { |
| 167 | my ($ob) = @_; |
204 | my ($ob) = @_; |
| 168 | |
205 | |
| 169 | # nuke outdated or never supported fields |
206 | # nuke outdated or never supported fields |
| 170 | delete $ob->{$_} for qw( |
207 | delete @$ob{qw( |
| 171 | can_knockback can_parry can_impale can_cut can_dam_armour |
208 | can_knockback can_parry can_impale can_cut can_dam_armour |
| 172 | can_apply pass_thru can_pass_thru |
209 | can_apply pass_thru can_pass_thru |
| 173 | ); |
210 | )}; |
|
|
211 | |
|
|
212 | if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } |
|
|
213 | if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } |
|
|
214 | if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } |
| 174 | |
215 | |
| 175 | # convert movement strings to bitsets |
216 | # convert movement strings to bitsets |
| 176 | for my $attr (keys %FIELD_MOVEMENT) { |
217 | for my $attr (keys %FIELD_MOVEMENT) { |
| 177 | next unless exists $ob->{$attr}; |
218 | next unless exists $ob->{$attr}; |
| 178 | |
219 | |
| … | |
… | |
| 247 | slaying => delete $ob->{"event_${event}"}, |
288 | slaying => delete $ob->{"event_${event}"}, |
| 248 | name => delete $ob->{"event_${event}_options"}, |
289 | name => delete $ob->{"event_${event}_options"}, |
| 249 | }; |
290 | }; |
| 250 | } |
291 | } |
| 251 | } |
292 | } |
|
|
293 | |
|
|
294 | # some archetypes had "+3" instead of the canonical "3", so fix |
|
|
295 | $ob->{dam} *= 1 if exists $ob->{dam}; |
| 252 | |
296 | |
| 253 | $ob |
297 | $ob |
| 254 | } |
298 | } |
| 255 | |
299 | |
| 256 | # arch as in "arch xxx", ie.. objects |
300 | # arch as in "arch xxx", ie.. objects |
| … | |
… | |
| 388 | if (/^more$/i) { |
432 | if (/^more$/i) { |
| 389 | $more = $prev; |
433 | $more = $prev; |
| 390 | } elsif (/^object (\S+)$/i) { |
434 | } elsif (/^object (\S+)$/i) { |
| 391 | my $name = $1; |
435 | my $name = $1; |
| 392 | my $arc = attr_thaw normalize_object $parse_block->(_name => $name); |
436 | my $arc = attr_thaw normalize_object $parse_block->(_name => $name); |
|
|
437 | $arc->{_atype} = 'object'; |
| 393 | |
438 | |
| 394 | if ($more) { |
439 | if ($more) { |
| 395 | $more->{more} = $arc; |
440 | $more->{more} = $arc; |
| 396 | } else { |
441 | } else { |
| 397 | $arc{$name} = $arc; |
442 | $arc{$name} = $arc; |
| … | |
… | |
| 399 | $prev = $arc; |
444 | $prev = $arc; |
| 400 | $more = undef; |
445 | $more = undef; |
| 401 | } elsif (/^arch (\S+)$/i) { |
446 | } elsif (/^arch (\S+)$/i) { |
| 402 | my $name = $1; |
447 | my $name = $1; |
| 403 | my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); |
448 | my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); |
|
|
449 | $arc->{_atype} = 'arch'; |
| 404 | |
450 | |
| 405 | if ($more) { |
451 | if ($more) { |
| 406 | $more->{more} = $arc; |
452 | $more->{more} = $arc; |
| 407 | } else { |
453 | } else { |
| 408 | push @{ $arc{arch} }, $arc; |
454 | push @{ $arc{arch} }, $arc; |
| … | |
… | |
| 426 | } |
472 | } |
| 427 | |
473 | |
| 428 | undef $parse_block; # work around bug in perl not freeing $fh etc. |
474 | undef $parse_block; # work around bug in perl not freeing $fh etc. |
| 429 | |
475 | |
| 430 | \%arc |
476 | \%arc |
|
|
477 | } |
|
|
478 | |
|
|
479 | sub archlist_to_string { |
|
|
480 | my ($arch) = @_; |
|
|
481 | |
|
|
482 | my $str; |
|
|
483 | |
|
|
484 | my $append; $append = sub { |
|
|
485 | my %a = %{$_[0]}; |
|
|
486 | |
|
|
487 | Crossfire::attr_freeze \%a; |
|
|
488 | Crossfire::normalize_arch \%a; |
|
|
489 | |
|
|
490 | # undo the bit-split we did before |
|
|
491 | if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { |
|
|
492 | $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) |
|
|
493 | | (delete $a{attack_movement_bits_4_7}); |
|
|
494 | } |
|
|
495 | |
|
|
496 | $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; |
|
|
497 | |
|
|
498 | my $inv = delete $a{inventory}; |
|
|
499 | my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some |
|
|
500 | my $anim = delete $a{anim}; |
|
|
501 | |
|
|
502 | my @kv; |
|
|
503 | |
|
|
504 | for ($a{_name} eq "map" |
|
|
505 | ? @Crossfire::FIELD_ORDER_MAP |
|
|
506 | : @Crossfire::FIELD_ORDER) { |
|
|
507 | push @kv, [$_, delete $a{$_}] |
|
|
508 | if exists $a{$_}; |
|
|
509 | } |
|
|
510 | |
|
|
511 | for (sort keys %a) { |
|
|
512 | next if /^_/; # ignore our _-keys |
|
|
513 | push @kv, [$_, delete $a{$_}]; |
|
|
514 | } |
|
|
515 | |
|
|
516 | for (@kv) { |
|
|
517 | my ($k, $v) = @$_; |
|
|
518 | |
|
|
519 | if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { |
|
|
520 | $v =~ s/\n$//; |
|
|
521 | $str .= "$k\n$v\n$end\n"; |
|
|
522 | } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) { |
|
|
523 | if ($v & ~Crossfire::MOVE_ALL or !$v) { |
|
|
524 | $str .= "$k $v\n"; |
|
|
525 | |
|
|
526 | } elsif ($v & Crossfire::MOVE_ALLBIT) { |
|
|
527 | $str .= "$k all"; |
|
|
528 | |
|
|
529 | $str .= " -walk" unless $v & Crossfire::MOVE_WALK; |
|
|
530 | $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW; |
|
|
531 | $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH; |
|
|
532 | $str .= " -swim" unless $v & Crossfire::MOVE_SWIM; |
|
|
533 | $str .= " -boat" unless $v & Crossfire::MOVE_BOAT; |
|
|
534 | |
|
|
535 | $str .= "\n"; |
|
|
536 | |
|
|
537 | } else { |
|
|
538 | $str .= $k; |
|
|
539 | |
|
|
540 | $str .= " walk" if $v & Crossfire::MOVE_WALK; |
|
|
541 | $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW; |
|
|
542 | $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH; |
|
|
543 | $str .= " swim" if $v & Crossfire::MOVE_SWIM; |
|
|
544 | $str .= " boat" if $v & Crossfire::MOVE_BOAT; |
|
|
545 | |
|
|
546 | $str .= "\n"; |
|
|
547 | } |
|
|
548 | } else { |
|
|
549 | $str .= "$k $v\n"; |
|
|
550 | } |
|
|
551 | } |
|
|
552 | |
|
|
553 | if ($inv) { |
|
|
554 | $append->($_) for @$inv; |
|
|
555 | } |
|
|
556 | |
|
|
557 | if ($a{_atype} eq 'object') { |
|
|
558 | $str .= join "\n", "anim", @$anim, "mina\n" |
|
|
559 | if $anim; |
|
|
560 | } |
|
|
561 | |
|
|
562 | $str .= "end\n"; |
|
|
563 | |
|
|
564 | if (($a{_atype} eq 'object') && $more) { |
|
|
565 | $str .= "\nmore\n"; |
|
|
566 | $append->($more) if $more; |
|
|
567 | } |
|
|
568 | }; |
|
|
569 | |
|
|
570 | for (@$arch) { |
|
|
571 | $append->($_); |
|
|
572 | } |
|
|
573 | |
|
|
574 | $str |
| 431 | } |
575 | } |
| 432 | |
576 | |
| 433 | # put all archs into a hash with editor_face as it's key |
577 | # put all archs into a hash with editor_face as it's key |
| 434 | # NOTE: the arrays in the hash values are references to |
578 | # NOTE: the arrays in the hash values are references to |
| 435 | # the archs from $ARCH |
579 | # the archs from $ARCH |
