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.83 by root, Wed Feb 7 00:14:48 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
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 # guesses
220 runestone => 12,
221 bronze => 18,
222 "ancient wood" => 20,
223 glass => 36,
224 marble => 66,
225 ice => 68,
226 stone => 70,
227 stone => 80,
228 cloth => 136,
229 ironwood => 144,
230 blood => 544,
231;
232
165# object as in "Object xxx", i.e. archetypes 233# object as in "Object xxx", i.e. archetypes
166sub normalize_object($) { 234sub normalize_object($) {
167 my ($ob) = @_; 235 my ($ob) = @_;
168 236
237 # convert material bitset to materialname, if possible
238 if (exists $ob->{material}) {
239 if (!$ob->{material}) {
240 delete $ob->{material};
241 } elsif (exists $ob->{materialname}) {
242 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
243 delete $ob->{material};
244 } else {
245 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
246 delete $ob->{material}; # assume materilname is more specific and nuke material
247 }
248 } elsif (my $name = $MATERIAL{$ob->{material}}) {
249 delete $ob->{material};
250 $ob->{materialname} = $name;
251 } else {
252 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
253 }
254 }
255
169 # nuke outdated or never supported fields 256 # nuke outdated or never supported fields
170 delete $ob->{$_} for qw( 257 delete @$ob{qw(
171 can_knockback can_parry can_impale can_cut can_dam_armour 258 can_knockback can_parry can_impale can_cut can_dam_armour
172 can_apply pass_thru can_pass_thru 259 can_apply pass_thru can_pass_thru
173 ); 260 )};
261
262 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
263 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
264 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
174 265
175 # convert movement strings to bitsets 266 # convert movement strings to bitsets
176 for my $attr (keys %FIELD_MOVEMENT) { 267 for my $attr (keys %FIELD_MOVEMENT) {
177 next unless exists $ob->{$attr}; 268 next unless exists $ob->{$attr};
178 269
… …
247 slaying => delete $ob->{"event_${event}"}, 338 slaying => delete $ob->{"event_${event}"},
248 name => delete $ob->{"event_${event}_options"}, 339 name => delete $ob->{"event_${event}_options"},
249 }; 340 };
250 } 341 }
251 } 342 }
343
344 # some archetypes had "+3" instead of the canonical "3", so fix
345 $ob->{dam} *= 1 if exists $ob->{dam};
252 346
253 $ob 347 $ob
254} 348}
255 349
256# arch as in "arch xxx", ie.. objects 350# arch as in "arch xxx", ie.. objects
… …
338sub read_arch($;$) { 432sub read_arch($;$) {
339 my ($path, $toplevel) = @_; 433 my ($path, $toplevel) = @_;
340 434
341 my %arc; 435 my %arc;
342 my ($more, $prev); 436 my ($more, $prev);
437 my $comment;
343 438
344 open my $fh, "<:raw:perlio:utf8", $path 439 open my $fh, "<:raw:perlio:utf8", $path
345 or Carp::croak "$path: $!"; 440 or Carp::croak "$path: $!";
346 441
347# binmode $fh; 442# binmode $fh;
… …
351 446
352 while (<$fh>) { 447 while (<$fh>) {
353 s/\s+$//; 448 s/\s+$//;
354 if (/^end$/i) { 449 if (/^end$/i) {
355 last; 450 last;
451
356 } elsif (/^arch (\S+)$/i) { 452 } elsif (/^arch (\S+)$/i) {
357 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 453 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
454
358 } elsif (/^lore$/i) { 455 } elsif (/^lore$/i) {
359 while (<$fh>) { 456 while (<$fh>) {
360 last if /^endlore\s*$/i; 457 last if /^endlore\s*$/i;
361 $arc{lore} .= $_; 458 $arc{lore} .= $_;
362 } 459 }
… …
371 chomp; 468 chomp;
372 push @{ $arc{anim} }, $_; 469 push @{ $arc{anim} }, $_;
373 } 470 }
374 } elsif (/^(\S+)\s*(.*)$/) { 471 } elsif (/^(\S+)\s*(.*)$/) {
375 $arc{lc $1} = $2; 472 $arc{lc $1} = $2;
376 } elsif (/^\s*($|#)/) { 473 } elsif (/^\s*#/) {
474 $arc{_comment} .= "$_\n";
475
476 } elsif (/^\s*$/) {
377 # 477 #
378 } else { 478 } else {
379 warn "$path: unparsable line '$_' in arch $arc{_name}"; 479 warn "$path: unparsable line '$_' in arch $arc{_name}";
380 } 480 }
381 } 481 }
… …
387 s/\s+$//; 487 s/\s+$//;
388 if (/^more$/i) { 488 if (/^more$/i) {
389 $more = $prev; 489 $more = $prev;
390 } elsif (/^object (\S+)$/i) { 490 } elsif (/^object (\S+)$/i) {
391 my $name = $1; 491 my $name = $1;
392 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 492 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
493 undef $comment;
494 delete $arc{_comment} unless length $arc{_comment};
495 $arc->{_atype} = 'object';
393 496
394 if ($more) { 497 if ($more) {
395 $more->{more} = $arc; 498 $more->{more} = $arc;
396 } else { 499 } else {
397 $arc{$name} = $arc; 500 $arc{$name} = $arc;
398 } 501 }
399 $prev = $arc; 502 $prev = $arc;
400 $more = undef; 503 $more = undef;
401 } elsif (/^arch (\S+)$/i) { 504 } elsif (/^arch (\S+)$/i) {
402 my $name = $1; 505 my $name = $1;
403 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 506 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
507 undef $comment;
508 delete $arc{_comment} unless length $arc{_comment};
509 $arc->{_atype} = 'arch';
404 510
405 if ($more) { 511 if ($more) {
406 $more->{more} = $arc; 512 $more->{more} = $arc;
407 } else { 513 } else {
408 push @{ $arc{arch} }, $arc; 514 push @{ $arc{arch} }, $arc;
… …
416 push @{$toplevel->{lev_array}}, $_+0; 522 push @{$toplevel->{lev_array}}, $_+0;
417 } 523 }
418 } else { 524 } else {
419 $toplevel->{$1} = $2; 525 $toplevel->{$1} = $2;
420 } 526 }
527 } elsif (/^\s*#/) {
528 $comment .= "$_\n";
421 } elsif (/^\s*($|#)/) { 529 } elsif (/^\s*($|#)/) {
422 # 530 #
423 } else { 531 } else {
424 die "$path: unparseable top-level line '$_'"; 532 die "$path: unparseable top-level line '$_'";
425 } 533 }
426 } 534 }
427 535
428 undef $parse_block; # work around bug in perl not freeing $fh etc. 536 undef $parse_block; # work around bug in perl not freeing $fh etc.
429 537
430 \%arc 538 \%arc
539}
540
541sub archlist_to_string {
542 my ($arch) = @_;
543
544 my $str;
545
546 my $append; $append = sub {
547 my %a = %{$_[0]};
548
549 Crossfire::attr_freeze \%a;
550 Crossfire::normalize_arch \%a;
551
552 # undo the bit-split we did before
553 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
554 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
555 | (delete $a{attack_movement_bits_4_7});
556 }
557
558 if (my $comment = delete $a{_comment}) {
559 if ($comment =~ /[^\n\s#]/) {
560 $str .= $comment;
561 }
562 }
563
564 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
565
566 my $inv = delete $a{inventory};
567 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
568 my $anim = delete $a{anim};
569
570 my @kv;
571
572 for ($a{_name} eq "map"
573 ? @Crossfire::FIELD_ORDER_MAP
574 : @Crossfire::FIELD_ORDER) {
575 push @kv, [$_, delete $a{$_}]
576 if exists $a{$_};
577 }
578
579 for (sort keys %a) {
580 next if /^_/; # ignore our _-keys
581 push @kv, [$_, delete $a{$_}];
582 }
583
584 for (@kv) {
585 my ($k, $v) = @$_;
586
587 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
588 $v =~ s/\n$//;
589 $str .= "$k\n$v\n$end\n";
590 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
591 if ($v & ~Crossfire::MOVE_ALL or !$v) {
592 $str .= "$k $v\n";
593
594 } elsif ($v & Crossfire::MOVE_ALLBIT) {
595 $str .= "$k all";
596
597 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
598 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
599 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
600 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
601 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
602
603 $str .= "\n";
604
605 } else {
606 $str .= $k;
607
608 $str .= " walk" if $v & Crossfire::MOVE_WALK;
609 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
610 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
611 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
612 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
613
614 $str .= "\n";
615 }
616 } else {
617 $str .= "$k $v\n";
618 }
619 }
620
621 if ($inv) {
622 $append->($_) for @$inv;
623 }
624
625 if ($a{_atype} eq 'object') {
626 $str .= join "\n", "anim", @$anim, "mina\n"
627 if $anim;
628 }
629
630 $str .= "end\n";
631
632 if ($a{_atype} eq 'object') {
633 if ($more) {
634 $str .= "more\n";
635 $append->($more) if $more;
636 } else {
637 $str .= "\n";
638 }
639 }
640 };
641
642 for (@$arch) {
643 $append->($_);
644 }
645
646 $str
431} 647}
432 648
433# put all archs into a hash with editor_face as it's key 649# put all archs into a hash with editor_face as it's key
434# NOTE: the arrays in the hash values are references to 650# NOTE: the arrays in the hash values are references to
435# the archs from $ARCH 651# the archs from $ARCH
… …
456 my ($a) = @_; 672 my ($a) = @_;
457 673
458 my $o = $ARCH{$a->{_name}} 674 my $o = $ARCH{$a->{_name}}
459 or return; 675 or return;
460 676
461 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 677 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
678 unless ($face) {
679 $face = $FACE{"blank.x11"}
462 or (warn "no face data found for arch '$a->{_name}'"), return; 680 or (warn "no face data found for arch '$a->{_name}'"), return;
681 }
463 682
464 if ($face->{w} > 1 || $face->{h} > 1) { 683 if ($face->{w} > 1 || $face->{h} > 1) {
465 # bigface 684 # bigface
466 return (0, 0, $face->{w} - 1, $face->{h} - 1); 685 return (0, 0, $face->{w} - 1, $face->{h} - 1);
467 686

Diff Legend

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