ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra/Deliantra.pm
(Generate patch)

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.76 by root, Wed Oct 18 12:58:53 2006 UTC vs.
Revision 1.82 by root, Tue Feb 6 23:53:26 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.92'; 9our $VERSION = '0.96';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
199 while (my ($k, $v) = each %attack_mask) { 199 while (my ($k, $v) = each %attack_mask) {
200 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; 200 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
201 } 201 }
202} 202}
203 203
204my %MATERIAL = reverse
205 paper => 1,
206 iron => 2,
207 glass => 4,
208 leather => 8,
209 wood => 16,
210 organic => 32,
211 stone => 64,
212 cloth => 128,
213 adamant => 256,
214 liquid => 512,
215 tin => 1024,
216 bone => 2048,
217 ice => 4096,
218;
219
204# object as in "Object xxx", i.e. archetypes 220# object as in "Object xxx", i.e. archetypes
205sub normalize_object($) { 221sub normalize_object($) {
206 my ($ob) = @_; 222 my ($ob) = @_;
223
224 # convert material bitset to materialname, if possible
225 if (exists $ob->{material}) {
226 if (!$ob->{material}) {
227 delete $ob->{material};
228 } elsif (exists $ob->{materialname}) {
229 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
230 delete $ob->{material};
231 } else {
232 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
233 delete $ob->{material}; # assume materilname is more specific and nuke material
234 }
235 } else {
236 if (my $name = $MATERIAL{$ob->{material}}) {
237 delete $ob->{material};
238 $ob->{materialname} = $name;
239 }
240 }
241 }
207 242
208 # nuke outdated or never supported fields 243 # nuke outdated or never supported fields
209 delete @$ob{qw( 244 delete @$ob{qw(
210 can_knockback can_parry can_impale can_cut can_dam_armour 245 can_knockback can_parry can_impale can_cut can_dam_armour
211 can_apply pass_thru can_pass_thru 246 can_apply pass_thru can_pass_thru
… …
384sub read_arch($;$) { 419sub read_arch($;$) {
385 my ($path, $toplevel) = @_; 420 my ($path, $toplevel) = @_;
386 421
387 my %arc; 422 my %arc;
388 my ($more, $prev); 423 my ($more, $prev);
424 my $comment;
389 425
390 open my $fh, "<:raw:perlio:utf8", $path 426 open my $fh, "<:raw:perlio:utf8", $path
391 or Carp::croak "$path: $!"; 427 or Carp::croak "$path: $!";
392 428
393# binmode $fh; 429# binmode $fh;
… …
397 433
398 while (<$fh>) { 434 while (<$fh>) {
399 s/\s+$//; 435 s/\s+$//;
400 if (/^end$/i) { 436 if (/^end$/i) {
401 last; 437 last;
438
402 } elsif (/^arch (\S+)$/i) { 439 } elsif (/^arch (\S+)$/i) {
403 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 440 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
441
404 } elsif (/^lore$/i) { 442 } elsif (/^lore$/i) {
405 while (<$fh>) { 443 while (<$fh>) {
406 last if /^endlore\s*$/i; 444 last if /^endlore\s*$/i;
407 $arc{lore} .= $_; 445 $arc{lore} .= $_;
408 } 446 }
… …
417 chomp; 455 chomp;
418 push @{ $arc{anim} }, $_; 456 push @{ $arc{anim} }, $_;
419 } 457 }
420 } elsif (/^(\S+)\s*(.*)$/) { 458 } elsif (/^(\S+)\s*(.*)$/) {
421 $arc{lc $1} = $2; 459 $arc{lc $1} = $2;
422 } elsif (/^\s*($|#)/) { 460 } elsif (/^\s*#/) {
461 $arc{_comment} .= "$_\n";
462
463 } elsif (/^\s*$/) {
423 # 464 #
424 } else { 465 } else {
425 warn "$path: unparsable line '$_' in arch $arc{_name}"; 466 warn "$path: unparsable line '$_' in arch $arc{_name}";
426 } 467 }
427 } 468 }
… …
433 s/\s+$//; 474 s/\s+$//;
434 if (/^more$/i) { 475 if (/^more$/i) {
435 $more = $prev; 476 $more = $prev;
436 } elsif (/^object (\S+)$/i) { 477 } elsif (/^object (\S+)$/i) {
437 my $name = $1; 478 my $name = $1;
438 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 479 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
480 undef $comment;
481 delete $arc{_comment} unless length $arc{_comment};
439 $arc->{_atype} = 'object'; 482 $arc->{_atype} = 'object';
440 483
441 if ($more) { 484 if ($more) {
442 $more->{more} = $arc; 485 $more->{more} = $arc;
443 } else { 486 } else {
… …
445 } 488 }
446 $prev = $arc; 489 $prev = $arc;
447 $more = undef; 490 $more = undef;
448 } elsif (/^arch (\S+)$/i) { 491 } elsif (/^arch (\S+)$/i) {
449 my $name = $1; 492 my $name = $1;
450 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 493 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
494 undef $comment;
495 delete $arc{_comment} unless length $arc{_comment};
451 $arc->{_atype} = 'arch'; 496 $arc->{_atype} = 'arch';
452 497
453 if ($more) { 498 if ($more) {
454 $more->{more} = $arc; 499 $more->{more} = $arc;
455 } else { 500 } else {
… …
464 push @{$toplevel->{lev_array}}, $_+0; 509 push @{$toplevel->{lev_array}}, $_+0;
465 } 510 }
466 } else { 511 } else {
467 $toplevel->{$1} = $2; 512 $toplevel->{$1} = $2;
468 } 513 }
514 } elsif (/^\s*#/) {
515 $comment .= "$_\n";
469 } elsif (/^\s*($|#)/) { 516 } elsif (/^\s*($|#)/) {
470 # 517 #
471 } else { 518 } else {
472 die "$path: unparseable top-level line '$_'"; 519 die "$path: unparseable top-level line '$_'";
473 } 520 }
… …
493 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 540 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
494 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 541 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
495 | (delete $a{attack_movement_bits_4_7}); 542 | (delete $a{attack_movement_bits_4_7});
496 } 543 }
497 544
545 if (my $comment = delete $a{_comment}) {
546 if ($comment =~ /[^\n\s#]/) {
547 $str .= $comment;
548 }
549 }
550
498 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 551 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
499 552
500 my $inv = delete $a{inventory}; 553 my $inv = delete $a{inventory};
501 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 554 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
502 my $anim = delete $a{anim}; 555 my $anim = delete $a{anim};
503 556
504 my @kv; 557 my @kv;
505 558
… …
561 if $anim; 614 if $anim;
562 } 615 }
563 616
564 $str .= "end\n"; 617 $str .= "end\n";
565 618
566 if (($a{_atype} eq 'object') && $more) { 619 if ($a{_atype} eq 'object') {
620 if ($more) {
567 $str .= "\nmore\n"; 621 $str .= "more\n";
568 $append->($more) if $more; 622 $append->($more) if $more;
623 } else {
624 $str .= "\n";
625 }
569 } 626 }
570 }; 627 };
571 628
572 for (@$arch) { 629 for (@$arch) {
573 $append->($_); 630 $append->($_);
… …
602 my ($a) = @_; 659 my ($a) = @_;
603 660
604 my $o = $ARCH{$a->{_name}} 661 my $o = $ARCH{$a->{_name}}
605 or return; 662 or return;
606 663
607 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 664 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
665 unless ($face) {
666 $face = $FACE{"blank.x11"}
608 or (warn "no face data found for arch '$a->{_name}'"), return; 667 or (warn "no face data found for arch '$a->{_name}'"), return;
668 }
609 669
610 if ($face->{w} > 1 || $face->{h} > 1) { 670 if ($face->{w} > 1 || $face->{h} > 1) {
611 # bigface 671 # bigface
612 return (0, 0, $face->{w} - 1, $face->{h} - 1); 672 return (0, 0, $face->{w} - 1, $face->{h} - 1);
613 673

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines