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.71 by elmex, Thu Aug 31 21:09:32 2006 UTC vs.
Revision 1.89 by root, Tue Feb 27 23:29:59 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
… …
56 qw(move_type move_block move_allow move_on move_off move_slow); 58 qw(move_type move_block move_allow move_on move_off move_slow);
57 59
58# same as in server save routine, to (hopefully) be compatible 60# same as in server save routine, to (hopefully) be compatible
59# to the other editors. 61# to the other editors.
60our @FIELD_ORDER_MAP = (qw( 62our @FIELD_ORDER_MAP = (qw(
63 file_format_version
61 name attach swap_time reset_timeout fixed_resettime difficulty region 64 name attach swap_time reset_timeout fixed_resettime difficulty region
62 shopitems shopgreed shopmin shopmax shoprace 65 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore 66 darkness width height enter_x enter_y msg maplore
64 unique template 67 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth 68 outdoor temp pressure humid windspeed winddir sky nosmooth
… …
160 close $fh; 163 close $fh;
161 rename "$path~", $path 164 rename "$path~", $path
162 or die "$path: $!"; 165 or die "$path: $!";
163} 166}
164 167
168my %attack_mask = (
169 physical => 0x00000001,
170 magic => 0x00000002,
171 fire => 0x00000004,
172 electricity => 0x00000008,
173 cold => 0x00000010,
174 confusion => 0x00000020,
175 acid => 0x00000040,
176 drain => 0x00000080,
177 weaponmagic => 0x00000100,
178 ghosthit => 0x00000200,
179 poison => 0x00000400,
180 slow => 0x00000800,
181 paralyze => 0x00001000,
182 turn_undead => 0x00002000,
183 fear => 0x00004000,
184 cancellation => 0x00008000,
185 deplete => 0x00010000,
186 death => 0x00020000,
187 chaos => 0x00040000,
188 counterspell => 0x00080000,
189 godpower => 0x00100000,
190 holyword => 0x00200000,
191 blind => 0x00400000,
192 internal => 0x00800000,
193 life_stealing => 0x01000000,
194 disease => 0x02000000,
195);
196
197sub _add_resist($$$) {
198 my ($ob, $mask, $value) = @_;
199
200 while (my ($k, $v) = each %attack_mask) {
201 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
202 }
203}
204
205my %MATERIAL = reverse
206 paper => 1,
207 iron => 2,
208 glass => 4,
209 leather => 8,
210 wood => 16,
211 organic => 32,
212 stone => 64,
213 cloth => 128,
214 adamant => 256,
215 liquid => 512,
216 tin => 1024,
217 bone => 2048,
218 ice => 4096,
219
220 # guesses
221 runestone => 12,
222 bronze => 18,
223 "ancient wood" => 20,
224 glass => 36,
225 marble => 66,
226 ice => 68,
227 stone => 70,
228 stone => 80,
229 cloth => 136,
230 ironwood => 144,
231 adamantium => 258,
232 glacium => 260,
233 blood => 544,
234;
235
165# object as in "Object xxx", i.e. archetypes 236# object as in "Object xxx", i.e. archetypes
166sub normalize_object($) { 237sub normalize_object($) {
167 my ($ob) = @_; 238 my ($ob) = @_;
168 239
240 # convert material bitset to materialname, if possible
241 if (exists $ob->{material}) {
242 if (!$ob->{material}) {
243 delete $ob->{material};
244 } elsif (exists $ob->{materialname}) {
245 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
246 delete $ob->{material};
247 } else {
248 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
249 delete $ob->{material}; # assume materilname is more specific and nuke material
250 }
251 } elsif (my $name = $MATERIAL{$ob->{material}}) {
252 delete $ob->{material};
253 $ob->{materialname} = $name;
254 } else {
255 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
256 }
257 }
258
169 # nuke outdated or never supported fields 259 # nuke outdated or never supported fields
170 delete $ob->{$_} for qw( 260 delete @$ob{qw(
171 can_knockback can_parry can_impale can_cut can_dam_armour 261 can_knockback can_parry can_impale can_cut can_dam_armour
172 can_apply pass_thru can_pass_thru 262 can_apply pass_thru can_pass_thru
173 ); 263 )};
264
265 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
266 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
267 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
174 268
175 # convert movement strings to bitsets 269 # convert movement strings to bitsets
176 for my $attr (keys %FIELD_MOVEMENT) { 270 for my $attr (keys %FIELD_MOVEMENT) {
177 next unless exists $ob->{$attr}; 271 next unless exists $ob->{$attr};
178 272
… …
211 if (defined (my $v = delete $ob->{slow_move})) { 305 if (defined (my $v = delete $ob->{slow_move})) {
212 $ob->{move_slow} |= MOVE_WALK; 306 $ob->{move_slow} |= MOVE_WALK;
213 $ob->{move_slow_penalty} = $v; 307 $ob->{move_slow_penalty} = $v;
214 } 308 }
215 if (defined (my $v = delete $ob->{walk_on})) { 309 if (defined (my $v = delete $ob->{walk_on})) {
216 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 310 $ob->{move_on} = 0 unless exists $ob->{move_on};
217 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 311 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
218 : $ob->{move_on} & ~MOVE_WALK; 312 : $ob->{move_on} & ~MOVE_WALK;
219 } 313 }
220 if (defined (my $v = delete $ob->{walk_off})) { 314 if (defined (my $v = delete $ob->{walk_off})) {
221 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 315 $ob->{move_off} = 0 unless exists $ob->{move_off};
222 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 316 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
223 : $ob->{move_off} & ~MOVE_WALK; 317 : $ob->{move_off} & ~MOVE_WALK;
224 } 318 }
225 if (defined (my $v = delete $ob->{fly_on})) { 319 if (defined (my $v = delete $ob->{fly_on})) {
226 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 320 $ob->{move_on} = 0 unless exists $ob->{move_on};
227 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 321 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
228 : $ob->{move_on} & ~MOVE_FLY_LOW; 322 : $ob->{move_on} & ~MOVE_FLY_LOW;
229 } 323 }
230 if (defined (my $v = delete $ob->{fly_off})) { 324 if (defined (my $v = delete $ob->{fly_off})) {
231 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 325 $ob->{move_off} = 0 unless exists $ob->{move_off};
232 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 326 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
233 : $ob->{move_off} & ~MOVE_FLY_LOW; 327 : $ob->{move_off} & ~MOVE_FLY_LOW;
234 } 328 }
235 if (defined (my $v = delete $ob->{flying})) { 329 if (defined (my $v = delete $ob->{flying})) {
236 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 330 $ob->{move_type} = 0 unless exists $ob->{move_type};
237 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 331 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
238 : $ob->{move_type} & ~MOVE_FLY_LOW; 332 : $ob->{move_type} & ~MOVE_FLY_LOW;
239 } 333 }
240 334
241 # convert idiotic event_xxx things into objects 335 # convert idiotic event_xxx things into objects
… …
247 slaying => delete $ob->{"event_${event}"}, 341 slaying => delete $ob->{"event_${event}"},
248 name => delete $ob->{"event_${event}_options"}, 342 name => delete $ob->{"event_${event}_options"},
249 }; 343 };
250 } 344 }
251 } 345 }
346
347 # some archetypes had "+3" instead of the canonical "3", so fix
348 $ob->{dam} *= 1 if exists $ob->{dam};
252 349
253 $ob 350 $ob
254} 351}
255 352
256# arch as in "arch xxx", ie.. objects 353# arch as in "arch xxx", ie.. objects
… …
338sub read_arch($;$) { 435sub read_arch($;$) {
339 my ($path, $toplevel) = @_; 436 my ($path, $toplevel) = @_;
340 437
341 my %arc; 438 my %arc;
342 my ($more, $prev); 439 my ($more, $prev);
440 my $comment;
343 441
344 open my $fh, "<:raw:perlio:utf8", $path 442 open my $fh, "<:raw:perlio:utf8", $path
345 or Carp::croak "$path: $!"; 443 or Carp::croak "$path: $!";
346 444
347# binmode $fh; 445# binmode $fh;
… …
351 449
352 while (<$fh>) { 450 while (<$fh>) {
353 s/\s+$//; 451 s/\s+$//;
354 if (/^end$/i) { 452 if (/^end$/i) {
355 last; 453 last;
454
356 } elsif (/^arch (\S+)$/i) { 455 } elsif (/^arch (\S+)$/i) {
357 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 456 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
457
358 } elsif (/^lore$/i) { 458 } elsif (/^lore$/i) {
359 while (<$fh>) { 459 while (<$fh>) {
360 last if /^endlore\s*$/i; 460 last if /^endlore\s*$/i;
361 $arc{lore} .= $_; 461 $arc{lore} .= $_;
362 } 462 }
… …
371 chomp; 471 chomp;
372 push @{ $arc{anim} }, $_; 472 push @{ $arc{anim} }, $_;
373 } 473 }
374 } elsif (/^(\S+)\s*(.*)$/) { 474 } elsif (/^(\S+)\s*(.*)$/) {
375 $arc{lc $1} = $2; 475 $arc{lc $1} = $2;
376 } elsif (/^\s*($|#)/) { 476 } elsif (/^\s*#/) {
477 $arc{_comment} .= "$_\n";
478
479 } elsif (/^\s*$/) {
377 # 480 #
378 } else { 481 } else {
379 warn "$path: unparsable line '$_' in arch $arc{_name}"; 482 warn "$path: unparsable line '$_' in arch $arc{_name}";
380 } 483 }
381 } 484 }
… …
387 s/\s+$//; 490 s/\s+$//;
388 if (/^more$/i) { 491 if (/^more$/i) {
389 $more = $prev; 492 $more = $prev;
390 } elsif (/^object (\S+)$/i) { 493 } elsif (/^object (\S+)$/i) {
391 my $name = $1; 494 my $name = $1;
392 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 495 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
496 undef $comment;
497 delete $arc{_comment} unless length $arc{_comment};
393 $arc->{_atype} = 'object'; 498 $arc->{_atype} = 'object';
394 499
395 if ($more) { 500 if ($more) {
396 $more->{more} = $arc; 501 $more->{more} = $arc;
397 } else { 502 } else {
… …
399 } 504 }
400 $prev = $arc; 505 $prev = $arc;
401 $more = undef; 506 $more = undef;
402 } elsif (/^arch (\S+)$/i) { 507 } elsif (/^arch (\S+)$/i) {
403 my $name = $1; 508 my $name = $1;
404 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 509 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
510 undef $comment;
511 delete $arc{_comment} unless length $arc{_comment};
405 $arc->{_atype} = 'arch'; 512 $arc->{_atype} = 'arch';
406 513
407 if ($more) { 514 if ($more) {
408 $more->{more} = $arc; 515 $more->{more} = $arc;
409 } else { 516 } else {
… …
418 push @{$toplevel->{lev_array}}, $_+0; 525 push @{$toplevel->{lev_array}}, $_+0;
419 } 526 }
420 } else { 527 } else {
421 $toplevel->{$1} = $2; 528 $toplevel->{$1} = $2;
422 } 529 }
530 } elsif (/^\s*#/) {
531 $comment .= "$_\n";
423 } elsif (/^\s*($|#)/) { 532 } elsif (/^\s*($|#)/) {
424 # 533 #
425 } else { 534 } else {
426 die "$path: unparseable top-level line '$_'"; 535 die "$path: unparseable top-level line '$_'";
427 } 536 }
… …
447 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 556 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
448 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 557 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
449 | (delete $a{attack_movement_bits_4_7}); 558 | (delete $a{attack_movement_bits_4_7});
450 } 559 }
451 560
561 if (my $comment = delete $a{_comment}) {
562 if ($comment =~ /[^\n\s#]/) {
563 $str .= $comment;
564 }
565 }
566
452 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 567 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
453 568
454 my $inv = delete $a{inventory}; 569 my $inv = delete $a{inventory};
455 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 570 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
456 my $anim = delete $a{anim}; 571 my $anim = delete $a{anim};
572
573 if ($a{_atype} eq 'object') {
574 $str .= join "\n", "anim", @$anim, "mina\n"
575 if $anim;
576 }
457 577
458 my @kv; 578 my @kv;
459 579
460 for ($a{_name} eq "map" 580 for ($a{_name} eq "map"
461 ? @Crossfire::FIELD_ORDER_MAP 581 ? @Crossfire::FIELD_ORDER_MAP
… …
508 628
509 if ($inv) { 629 if ($inv) {
510 $append->($_) for @$inv; 630 $append->($_) for @$inv;
511 } 631 }
512 632
633 $str .= "end\n";
634
513 if ($a{_atype} eq 'object') { 635 if ($a{_atype} eq 'object') {
514 $str .= join "\n", "anim", @$anim, "mina\n" 636 if ($more) {
515 if $anim;
516 }
517
518 $str .= "end\n";
519
520 if (($a{_atype} eq 'object') && $more) {
521 $str .= "\nmore\n"; 637 $str .= "more\n";
522 $append->($more) if $more; 638 $append->($more) if $more;
639 } else {
640 $str .= "\n";
641 }
523 } 642 }
524 }; 643 };
525 644
526 for (@$arch) { 645 for (@$arch) {
527 $append->($_); 646 $append->($_);
… …
556 my ($a) = @_; 675 my ($a) = @_;
557 676
558 my $o = $ARCH{$a->{_name}} 677 my $o = $ARCH{$a->{_name}}
559 or return; 678 or return;
560 679
561 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 680 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
681 unless ($face) {
682 $face = $FACE{"blank.x11"}
562 or (warn "no face data found for arch '$a->{_name}'"), return; 683 or (warn "no face data found for arch '$a->{_name}'"), return;
684 }
563 685
564 if ($face->{w} > 1 || $face->{h} > 1) { 686 if ($face->{w} > 1 || $face->{h} > 1) {
565 # bigface 687 # bigface
566 return (0, 0, $face->{w} - 1, $face->{h} - 1); 688 return (0, 0, $face->{w} - 1, $face->{h} - 1);
567 689
… …
674 ]; 796 ];
675 797
676 $attr 798 $attr
677} 799}
678 800
679sub arch_edit_sections {
680# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
681# edit_type = 0;
682# else if (edit_type != 0) {
683# // all flags from 'check_type' must be unset in this arch because they get recalculated now
684# edit_type &= ~check_type;
685# }
686#
687# }
688# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
689# getAttributeValue("alive", defarch) == 1 &&
690# (getAttributeValue("monster", defarch) == 1 ||
691# getAttributeValue("generator", defarch) == 1)) {
692# // Monster: monsters/npcs/generators
693# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
694# }
695# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
696# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
697# // Walls
698# edit_type |= IGUIConstants.TILE_EDIT_WALL;
699# }
700# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
701# getAttributeValue("connected", defarch) != 0) {
702# // Connected Objects
703# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
704# }
705# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
706# arch_type == 66 || arch_type == 41 || arch_type == 95) {
707# // Exit: teleporter/exit/trapdoors
708# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
709# }
710# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
711# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
712# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
713# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
714# arch_type == 124 || arch_type == 130)) {
715# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
716# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
717# }
718# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
719# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
720# arch_type == 91 || arch_type == 21 || arch_type == 24) {
721# // Door: door/special door/gates + keys
722# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
723# }
724# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
725# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
726# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
727# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
728# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
729# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
730# arch_type == 122 || arch_type == 3)) {
731# // Equipment: weapons/armour/wands/rods
732# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
733# }
734#
735# return(edit_type);
736#
737#
738}
739
740sub cache_file($$&&) { 801sub cache_file($$&&) {
741 my ($src, $cache, $load, $create) = @_; 802 my ($src, $cache, $load, $create) = @_;
742 803
743 my ($size, $mtime) = (stat $src)[7,9] 804 my ($size, $mtime) = (stat $src)[7,9]
744 or Carp::croak "$src: $!"; 805 or Carp::croak "$src: $!";

Diff Legend

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