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.69 by root, Thu Aug 3 10:51:26 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.9'; 9our $VERSION = '0.96';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
19 19
20our @EXPORT = qw( 20our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents
22); 22);
23 23
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working
25
26sub from_json($) {
27 $JSON::Syck::ImplicitUnicode = 1;
28 JSON::Syck::Load $_[0]
29}
30
31sub to_json($) {
32 $JSON::Syck::ImplicitUnicode = 0;
33 JSON::Syck::Dump $_[0]
34}
35
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 36our $LIB = $ENV{CROSSFIRE_LIBDIR};
25 37
26our $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";
27 41
28mkdir $VARDIR, 0777; 42mkdir $VARDIR, 0777;
29 43
30sub TILESIZE (){ 32 } 44sub TILESIZE (){ 32 }
31 45
… …
44 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);
45 59
46# same as in server save routine, to (hopefully) be compatible 60# same as in server save routine, to (hopefully) be compatible
47# to the other editors. 61# to the other editors.
48our @FIELD_ORDER_MAP = (qw( 62our @FIELD_ORDER_MAP = (qw(
49 name swap_time reset_timeout fixed_resettime difficulty region 63 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 64 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 65 darkness width height enter_x enter_y msg maplore
52 unique template 66 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 67 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4 68 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55)); 69));
56 70
57our @FIELD_ORDER = (qw( 71our @FIELD_ORDER = (qw(
58 elevation 72 elevation
59 73
60 name name_pl custom_name title race 74 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch face
62 #todo-events 76 #todo-events
63 animation is_animated 77 animation is_animated
64 str dex con wis pow cha int 78 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
… …
148 close $fh; 162 close $fh;
149 rename "$path~", $path 163 rename "$path~", $path
150 or die "$path: $!"; 164 or die "$path: $!";
151} 165}
152 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
153# object as in "Object xxx", i.e. archetypes 220# object as in "Object xxx", i.e. archetypes
154sub normalize_object($) { 221sub normalize_object($) {
155 my ($ob) = @_; 222 my ($ob) = @_;
156 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 }
242
157 # nuke outdated or never supported fields 243 # nuke outdated or never supported fields
158 delete $ob->{$_} for qw( 244 delete @$ob{qw(
159 can_knockback can_parry can_impale can_cut can_dam_armour 245 can_knockback can_parry can_impale can_cut can_dam_armour
160 can_apply pass_thru can_pass_thru 246 can_apply pass_thru can_pass_thru
161 ); 247 )};
248
249 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
250 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
251 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
162 252
163 # convert movement strings to bitsets 253 # convert movement strings to bitsets
164 for my $attr (keys %FIELD_MOVEMENT) { 254 for my $attr (keys %FIELD_MOVEMENT) {
165 next unless exists $ob->{$attr}; 255 next unless exists $ob->{$attr};
166 256
… …
235 slaying => delete $ob->{"event_${event}"}, 325 slaying => delete $ob->{"event_${event}"},
236 name => delete $ob->{"event_${event}_options"}, 326 name => delete $ob->{"event_${event}_options"},
237 }; 327 };
238 } 328 }
239 } 329 }
330
331 # some archetypes had "+3" instead of the canonical "3", so fix
332 $ob->{dam} *= 1 if exists $ob->{dam};
240 333
241 $ob 334 $ob
242} 335}
243 336
244# arch as in "arch xxx", ie.. objects 337# arch as in "arch xxx", ie.. objects
… …
286 } 379 }
287 380
288 $ob 381 $ob
289} 382}
290 383
384sub attr_thaw($) {
385 my ($ob) = @_;
386
387 $ob->{attach} = from_json $ob->{attach}
388 if exists $ob->{attach};
389
390 $ob
391}
392
393sub attr_freeze($) {
394 my ($ob) = @_;
395
396 $ob->{attach} = Crossfire::to_json $ob->{attach}
397 if exists $ob->{attach};
398
399 $ob
400}
401
291sub read_pak($) { 402sub read_pak($) {
292 my ($path) = @_; 403 my ($path) = @_;
293 404
294 my %pak; 405 my %pak;
295 406
… …
308sub read_arch($;$) { 419sub read_arch($;$) {
309 my ($path, $toplevel) = @_; 420 my ($path, $toplevel) = @_;
310 421
311 my %arc; 422 my %arc;
312 my ($more, $prev); 423 my ($more, $prev);
424 my $comment;
313 425
314 open my $fh, "<:raw:perlio:utf8", $path 426 open my $fh, "<:raw:perlio:utf8", $path
315 or Carp::croak "$path: $!"; 427 or Carp::croak "$path: $!";
316 428
317# binmode $fh; 429# binmode $fh;
… …
321 433
322 while (<$fh>) { 434 while (<$fh>) {
323 s/\s+$//; 435 s/\s+$//;
324 if (/^end$/i) { 436 if (/^end$/i) {
325 last; 437 last;
438
326 } elsif (/^arch (\S+)$/i) { 439 } elsif (/^arch (\S+)$/i) {
327 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 440 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
441
328 } elsif (/^lore$/i) { 442 } elsif (/^lore$/i) {
329 while (<$fh>) { 443 while (<$fh>) {
330 last if /^endlore\s*$/i; 444 last if /^endlore\s*$/i;
331 $arc{lore} .= $_; 445 $arc{lore} .= $_;
332 } 446 }
… …
341 chomp; 455 chomp;
342 push @{ $arc{anim} }, $_; 456 push @{ $arc{anim} }, $_;
343 } 457 }
344 } elsif (/^(\S+)\s*(.*)$/) { 458 } elsif (/^(\S+)\s*(.*)$/) {
345 $arc{lc $1} = $2; 459 $arc{lc $1} = $2;
346 } elsif (/^\s*($|#)/) { 460 } elsif (/^\s*#/) {
461 $arc{_comment} .= "$_\n";
462
463 } elsif (/^\s*$/) {
347 # 464 #
348 } else { 465 } else {
349 warn "$path: unparsable line '$_' in arch $arc{_name}"; 466 warn "$path: unparsable line '$_' in arch $arc{_name}";
350 } 467 }
351 } 468 }
… …
357 s/\s+$//; 474 s/\s+$//;
358 if (/^more$/i) { 475 if (/^more$/i) {
359 $more = $prev; 476 $more = $prev;
360 } elsif (/^object (\S+)$/i) { 477 } elsif (/^object (\S+)$/i) {
361 my $name = $1; 478 my $name = $1;
362 my $arc = 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};
482 $arc->{_atype} = 'object';
363 483
364 if ($more) { 484 if ($more) {
365 $more->{more} = $arc; 485 $more->{more} = $arc;
366 } else { 486 } else {
367 $arc{$name} = $arc; 487 $arc{$name} = $arc;
368 } 488 }
369 $prev = $arc; 489 $prev = $arc;
370 $more = undef; 490 $more = undef;
371 } elsif (/^arch (\S+)$/i) { 491 } elsif (/^arch (\S+)$/i) {
372 my $name = $1; 492 my $name = $1;
373 my $arc = 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};
496 $arc->{_atype} = 'arch';
374 497
375 if ($more) { 498 if ($more) {
376 $more->{more} = $arc; 499 $more->{more} = $arc;
377 } else { 500 } else {
378 push @{ $arc{arch} }, $arc; 501 push @{ $arc{arch} }, $arc;
… …
386 push @{$toplevel->{lev_array}}, $_+0; 509 push @{$toplevel->{lev_array}}, $_+0;
387 } 510 }
388 } else { 511 } else {
389 $toplevel->{$1} = $2; 512 $toplevel->{$1} = $2;
390 } 513 }
514 } elsif (/^\s*#/) {
515 $comment .= "$_\n";
391 } elsif (/^\s*($|#)/) { 516 } elsif (/^\s*($|#)/) {
392 # 517 #
393 } else { 518 } else {
394 die "$path: unparseable top-level line '$_'"; 519 die "$path: unparseable top-level line '$_'";
395 } 520 }
396 } 521 }
397 522
398 undef $parse_block; # work around bug in perl not freeing $fh etc. 523 undef $parse_block; # work around bug in perl not freeing $fh etc.
399 524
400 \%arc 525 \%arc
526}
527
528sub archlist_to_string {
529 my ($arch) = @_;
530
531 my $str;
532
533 my $append; $append = sub {
534 my %a = %{$_[0]};
535
536 Crossfire::attr_freeze \%a;
537 Crossfire::normalize_arch \%a;
538
539 # undo the bit-split we did before
540 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
541 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
542 | (delete $a{attack_movement_bits_4_7});
543 }
544
545 if (my $comment = delete $a{_comment}) {
546 if ($comment =~ /[^\n\s#]/) {
547 $str .= $comment;
548 }
549 }
550
551 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
552
553 my $inv = delete $a{inventory};
554 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
555 my $anim = delete $a{anim};
556
557 my @kv;
558
559 for ($a{_name} eq "map"
560 ? @Crossfire::FIELD_ORDER_MAP
561 : @Crossfire::FIELD_ORDER) {
562 push @kv, [$_, delete $a{$_}]
563 if exists $a{$_};
564 }
565
566 for (sort keys %a) {
567 next if /^_/; # ignore our _-keys
568 push @kv, [$_, delete $a{$_}];
569 }
570
571 for (@kv) {
572 my ($k, $v) = @$_;
573
574 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
575 $v =~ s/\n$//;
576 $str .= "$k\n$v\n$end\n";
577 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
578 if ($v & ~Crossfire::MOVE_ALL or !$v) {
579 $str .= "$k $v\n";
580
581 } elsif ($v & Crossfire::MOVE_ALLBIT) {
582 $str .= "$k all";
583
584 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
585 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
586 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
587 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
588 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
589
590 $str .= "\n";
591
592 } else {
593 $str .= $k;
594
595 $str .= " walk" if $v & Crossfire::MOVE_WALK;
596 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
597 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
598 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
599 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
600
601 $str .= "\n";
602 }
603 } else {
604 $str .= "$k $v\n";
605 }
606 }
607
608 if ($inv) {
609 $append->($_) for @$inv;
610 }
611
612 if ($a{_atype} eq 'object') {
613 $str .= join "\n", "anim", @$anim, "mina\n"
614 if $anim;
615 }
616
617 $str .= "end\n";
618
619 if ($a{_atype} eq 'object') {
620 if ($more) {
621 $str .= "more\n";
622 $append->($more) if $more;
623 } else {
624 $str .= "\n";
625 }
626 }
627 };
628
629 for (@$arch) {
630 $append->($_);
631 }
632
633 $str
401} 634}
402 635
403# put all archs into a hash with editor_face as it's key 636# put all archs into a hash with editor_face as it's key
404# NOTE: the arrays in the hash values are references to 637# NOTE: the arrays in the hash values are references to
405# the archs from $ARCH 638# the archs from $ARCH
… …
426 my ($a) = @_; 659 my ($a) = @_;
427 660
428 my $o = $ARCH{$a->{_name}} 661 my $o = $ARCH{$a->{_name}}
429 or return; 662 or return;
430 663
431 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"}
432 or (warn "no face data found for arch '$a->{_name}'"), return; 667 or (warn "no face data found for arch '$a->{_name}'"), return;
668 }
433 669
434 if ($face->{w} > 1 || $face->{h} > 1) { 670 if ($face->{w} > 1 || $face->{h} > 1) {
435 # bigface 671 # bigface
436 return (0, 0, $face->{w} - 1, $face->{h} - 1); 672 return (0, 0, $face->{w} - 1, $face->{h} - 1);
437 673

Diff Legend

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