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.70 by root, Sun Aug 27 16:33:19 2006 UTC vs.
Revision 1.80 by root, Tue Feb 6 22:08:14 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.9'; 9our $VERSION = '0.96';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
33 JSON::Syck::Dump $_[0] 33 JSON::Syck::Dump $_[0]
34} 34}
35 35
36our $LIB = $ENV{CROSSFIRE_LIBDIR}; 36our $LIB = $ENV{CROSSFIRE_LIBDIR};
37 37
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
40 : File::Spec->tmpdir . "/crossfire";
39 41
40mkdir $VARDIR, 0777; 42mkdir $VARDIR, 0777;
41 43
42sub TILESIZE (){ 32 } 44sub TILESIZE (){ 32 }
43 45
… …
160 close $fh; 162 close $fh;
161 rename "$path~", $path 163 rename "$path~", $path
162 or die "$path: $!"; 164 or die "$path: $!";
163} 165}
164 166
167my %attack_mask = (
168 physical => 0x00000001,
169 magic => 0x00000002,
170 fire => 0x00000004,
171 electricity => 0x00000008,
172 cold => 0x00000010,
173 confusion => 0x00000020,
174 acid => 0x00000040,
175 drain => 0x00000080,
176 weaponmagic => 0x00000100,
177 ghosthit => 0x00000200,
178 poison => 0x00000400,
179 slow => 0x00000800,
180 paralyze => 0x00001000,
181 turn_undead => 0x00002000,
182 fear => 0x00004000,
183 cancellation => 0x00008000,
184 deplete => 0x00010000,
185 death => 0x00020000,
186 chaos => 0x00040000,
187 counterspell => 0x00080000,
188 godpower => 0x00100000,
189 holyword => 0x00200000,
190 blind => 0x00400000,
191 internal => 0x00800000,
192 life_stealing => 0x01000000,
193 disease => 0x02000000,
194);
195
196sub _add_resist($$$) {
197 my ($ob, $mask, $value) = @_;
198
199 while (my ($k, $v) = each %attack_mask) {
200 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
201 }
202}
203
165# object as in "Object xxx", i.e. archetypes 204# object as in "Object xxx", i.e. archetypes
166sub normalize_object($) { 205sub normalize_object($) {
167 my ($ob) = @_; 206 my ($ob) = @_;
168 207
169 # nuke outdated or never supported fields 208 # nuke outdated or never supported fields
170 delete $ob->{$_} for qw( 209 delete @$ob{qw(
171 can_knockback can_parry can_impale can_cut can_dam_armour 210 can_knockback can_parry can_impale can_cut can_dam_armour
172 can_apply pass_thru can_pass_thru 211 can_apply pass_thru can_pass_thru
173 ); 212 )};
213
214 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
215 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
216 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
174 217
175 # convert movement strings to bitsets 218 # convert movement strings to bitsets
176 for my $attr (keys %FIELD_MOVEMENT) { 219 for my $attr (keys %FIELD_MOVEMENT) {
177 next unless exists $ob->{$attr}; 220 next unless exists $ob->{$attr};
178 221
… …
247 slaying => delete $ob->{"event_${event}"}, 290 slaying => delete $ob->{"event_${event}"},
248 name => delete $ob->{"event_${event}_options"}, 291 name => delete $ob->{"event_${event}_options"},
249 }; 292 };
250 } 293 }
251 } 294 }
295
296 # some archetypes had "+3" instead of the canonical "3", so fix
297 $ob->{dam} *= 1 if exists $ob->{dam};
252 298
253 $ob 299 $ob
254} 300}
255 301
256# arch as in "arch xxx", ie.. objects 302# arch as in "arch xxx", ie.. objects
… …
338sub read_arch($;$) { 384sub read_arch($;$) {
339 my ($path, $toplevel) = @_; 385 my ($path, $toplevel) = @_;
340 386
341 my %arc; 387 my %arc;
342 my ($more, $prev); 388 my ($more, $prev);
389 my $comment;
343 390
344 open my $fh, "<:raw:perlio:utf8", $path 391 open my $fh, "<:raw:perlio:utf8", $path
345 or Carp::croak "$path: $!"; 392 or Carp::croak "$path: $!";
346 393
347# binmode $fh; 394# binmode $fh;
… …
351 398
352 while (<$fh>) { 399 while (<$fh>) {
353 s/\s+$//; 400 s/\s+$//;
354 if (/^end$/i) { 401 if (/^end$/i) {
355 last; 402 last;
403
356 } elsif (/^arch (\S+)$/i) { 404 } elsif (/^arch (\S+)$/i) {
357 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 405 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
406
358 } elsif (/^lore$/i) { 407 } elsif (/^lore$/i) {
359 while (<$fh>) { 408 while (<$fh>) {
360 last if /^endlore\s*$/i; 409 last if /^endlore\s*$/i;
361 $arc{lore} .= $_; 410 $arc{lore} .= $_;
362 } 411 }
… …
371 chomp; 420 chomp;
372 push @{ $arc{anim} }, $_; 421 push @{ $arc{anim} }, $_;
373 } 422 }
374 } elsif (/^(\S+)\s*(.*)$/) { 423 } elsif (/^(\S+)\s*(.*)$/) {
375 $arc{lc $1} = $2; 424 $arc{lc $1} = $2;
376 } elsif (/^\s*($|#)/) { 425 } elsif (/^\s*#/) {
426 $arc{_comment} .= $_;
427
428 } elsif (/^\s*$/) {
377 # 429 #
378 } else { 430 } else {
379 warn "$path: unparsable line '$_' in arch $arc{_name}"; 431 warn "$path: unparsable line '$_' in arch $arc{_name}";
380 } 432 }
381 } 433 }
… …
385 437
386 while (<$fh>) { 438 while (<$fh>) {
387 s/\s+$//; 439 s/\s+$//;
388 if (/^more$/i) { 440 if (/^more$/i) {
389 $more = $prev; 441 $more = $prev;
442 } elsif (/^\s*#/) {
443 $comment .= $_;
390 } elsif (/^object (\S+)$/i) { 444 } elsif (/^object (\S+)$/i) {
391 my $name = $1; 445 my $name = $1;
392 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 446 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
447 delete $arc{_comment} unless length $arc{_comment};
448 $arc->{_atype} = 'object';
393 449
394 if ($more) { 450 if ($more) {
395 $more->{more} = $arc; 451 $more->{more} = $arc;
396 } else { 452 } else {
397 $arc{$name} = $arc; 453 $arc{$name} = $arc;
398 } 454 }
399 $prev = $arc; 455 $prev = $arc;
400 $more = undef; 456 $more = undef;
401 } elsif (/^arch (\S+)$/i) { 457 } elsif (/^arch (\S+)$/i) {
402 my $name = $1; 458 my $name = $1;
403 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 459 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
460 delete $arc{_comment} unless length $arc{_comment};
461 $arc->{_atype} = 'arch';
404 462
405 if ($more) { 463 if ($more) {
406 $more->{more} = $arc; 464 $more->{more} = $arc;
407 } else { 465 } else {
408 push @{ $arc{arch} }, $arc; 466 push @{ $arc{arch} }, $arc;
… …
428 undef $parse_block; # work around bug in perl not freeing $fh etc. 486 undef $parse_block; # work around bug in perl not freeing $fh etc.
429 487
430 \%arc 488 \%arc
431} 489}
432 490
491sub archlist_to_string {
492 my ($arch) = @_;
493
494 my $str;
495
496 my $append; $append = sub {
497 my %a = %{$_[0]};
498
499 Crossfire::attr_freeze \%a;
500 Crossfire::normalize_arch \%a;
501
502 # undo the bit-split we did before
503 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
504 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
505 | (delete $a{attack_movement_bits_4_7});
506 }
507
508 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
509
510 my $inv = delete $a{inventory};
511 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
512 my $anim = delete $a{anim};
513
514 my @kv;
515
516 for ($a{_name} eq "map"
517 ? @Crossfire::FIELD_ORDER_MAP
518 : @Crossfire::FIELD_ORDER) {
519 push @kv, [$_, delete $a{$_}]
520 if exists $a{$_};
521 }
522
523 for (sort keys %a) {
524 next if /^_/; # ignore our _-keys
525 push @kv, [$_, delete $a{$_}];
526 }
527
528 for (@kv) {
529 my ($k, $v) = @$_;
530
531 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
532 $v =~ s/\n$//;
533 $str .= "$k\n$v\n$end\n";
534 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
535 if ($v & ~Crossfire::MOVE_ALL or !$v) {
536 $str .= "$k $v\n";
537
538 } elsif ($v & Crossfire::MOVE_ALLBIT) {
539 $str .= "$k all";
540
541 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
542 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
543 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
544 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
545 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
546
547 $str .= "\n";
548
549 } else {
550 $str .= $k;
551
552 $str .= " walk" if $v & Crossfire::MOVE_WALK;
553 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
554 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
555 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
556 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
557
558 $str .= "\n";
559 }
560 } else {
561 $str .= "$k $v\n";
562 }
563 }
564
565 if ($inv) {
566 $append->($_) for @$inv;
567 }
568
569 if ($a{_atype} eq 'object') {
570 $str .= join "\n", "anim", @$anim, "mina\n"
571 if $anim;
572 }
573
574 $str .= "end\n";
575
576 if (($a{_atype} eq 'object') && $more) {
577 $str .= "\nmore\n";
578 $append->($more) if $more;
579 }
580 };
581
582 for (@$arch) {
583 $append->($_);
584 }
585
586 $str
587}
588
433# put all archs into a hash with editor_face as it's key 589# put all archs into a hash with editor_face as it's key
434# NOTE: the arrays in the hash values are references to 590# NOTE: the arrays in the hash values are references to
435# the archs from $ARCH 591# the archs from $ARCH
436sub editor_archs { 592sub editor_archs {
437 my %paths; 593 my %paths;
… …
456 my ($a) = @_; 612 my ($a) = @_;
457 613
458 my $o = $ARCH{$a->{_name}} 614 my $o = $ARCH{$a->{_name}}
459 or return; 615 or return;
460 616
461 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 617 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
618 unless ($face) {
619 $face = $FACE{"blank.x11"}
462 or (warn "no face data found for arch '$a->{_name}'"), return; 620 or (warn "no face data found for arch '$a->{_name}'"), return;
621 }
463 622
464 if ($face->{w} > 1 || $face->{h} > 1) { 623 if ($face->{w} > 1 || $face->{h} > 1) {
465 # bigface 624 # bigface
466 return (0, 0, $face->{w} - 1, $face->{h} - 1); 625 return (0, 0, $face->{w} - 1, $face->{h} - 1);
467 626

Diff Legend

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