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.63 by root, Fri Mar 31 21:06:47 2006 UTC vs.
Revision 1.87 by root, Fri Feb 9 01:49:35 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 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(
63 file_format_version
49 name swap_time reset_timeout fixed_resettime difficulty region 64 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 65 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 66 darkness width height enter_x enter_y msg maplore
52 unique template 67 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 68 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4 69 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55)); 70));
56 71
57our @FIELD_ORDER = (qw( 72our @FIELD_ORDER = (qw(
58 elevation 73 elevation
59 74
60 name name_pl custom_name title race 75 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch face
62 #todo-events 77 #todo-events
63 animation is_animated 78 animation is_animated
64 str dex con wis pow cha int 79 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
… …
148 close $fh; 163 close $fh;
149 rename "$path~", $path 164 rename "$path~", $path
150 or die "$path: $!"; 165 or die "$path: $!";
151} 166}
152 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
153# object as in "Object xxx", i.e. archetypes 236# object as in "Object xxx", i.e. archetypes
154sub normalize_object($) { 237sub normalize_object($) {
155 my ($ob) = @_; 238 my ($ob) = @_;
156 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
157 # nuke outdated or never supported fields 259 # nuke outdated or never supported fields
158 delete $ob->{$_} for qw( 260 delete @$ob{qw(
159 can_knockback can_parry can_impale can_cut can_dam_armour 261 can_knockback can_parry can_impale can_cut can_dam_armour
160 can_apply pass_thru can_pass_thru 262 can_apply pass_thru can_pass_thru
161 ); 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; }
162 268
163 # convert movement strings to bitsets 269 # convert movement strings to bitsets
164 for my $attr (keys %FIELD_MOVEMENT) { 270 for my $attr (keys %FIELD_MOVEMENT) {
165 next unless exists $ob->{$attr}; 271 next unless exists $ob->{$attr};
166 272
… …
199 if (defined (my $v = delete $ob->{slow_move})) { 305 if (defined (my $v = delete $ob->{slow_move})) {
200 $ob->{move_slow} |= MOVE_WALK; 306 $ob->{move_slow} |= MOVE_WALK;
201 $ob->{move_slow_penalty} = $v; 307 $ob->{move_slow_penalty} = $v;
202 } 308 }
203 if (defined (my $v = delete $ob->{walk_on})) { 309 if (defined (my $v = delete $ob->{walk_on})) {
310 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
204 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 311 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
205 : $ob->{move_on} & ~MOVE_WALK; 312 : $ob->{move_on} & ~MOVE_WALK;
206 } 313 }
207 if (defined (my $v = delete $ob->{walk_off})) { 314 if (defined (my $v = delete $ob->{walk_off})) {
315 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
208 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 316 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
209 : $ob->{move_off} & ~MOVE_WALK; 317 : $ob->{move_off} & ~MOVE_WALK;
210 } 318 }
211 if (defined (my $v = delete $ob->{fly_on})) { 319 if (defined (my $v = delete $ob->{fly_on})) {
320 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
212 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 321 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
213 : $ob->{move_on} & ~MOVE_FLY_LOW; 322 : $ob->{move_on} & ~MOVE_FLY_LOW;
214 } 323 }
215 if (defined (my $v = delete $ob->{fly_off})) { 324 if (defined (my $v = delete $ob->{fly_off})) {
325 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
216 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 326 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
217 : $ob->{move_off} & ~MOVE_FLY_LOW; 327 : $ob->{move_off} & ~MOVE_FLY_LOW;
218 } 328 }
219 if (defined (my $v = delete $ob->{flying})) { 329 if (defined (my $v = delete $ob->{flying})) {
330 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
220 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 331 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
221 : $ob->{move_type} & ~MOVE_FLY_LOW; 332 : $ob->{move_type} & ~MOVE_FLY_LOW;
222 } 333 }
223 334
224 # convert idiotic event_xxx things into objects 335 # convert idiotic event_xxx things into objects
… …
230 slaying => delete $ob->{"event_${event}"}, 341 slaying => delete $ob->{"event_${event}"},
231 name => delete $ob->{"event_${event}_options"}, 342 name => delete $ob->{"event_${event}_options"},
232 }; 343 };
233 } 344 }
234 } 345 }
346
347 # some archetypes had "+3" instead of the canonical "3", so fix
348 $ob->{dam} *= 1 if exists $ob->{dam};
235 349
236 $ob 350 $ob
237} 351}
238 352
239# arch as in "arch xxx", ie.. objects 353# arch as in "arch xxx", ie.. objects
… …
281 } 395 }
282 396
283 $ob 397 $ob
284} 398}
285 399
400sub attr_thaw($) {
401 my ($ob) = @_;
402
403 $ob->{attach} = from_json $ob->{attach}
404 if exists $ob->{attach};
405
406 $ob
407}
408
409sub attr_freeze($) {
410 my ($ob) = @_;
411
412 $ob->{attach} = Crossfire::to_json $ob->{attach}
413 if exists $ob->{attach};
414
415 $ob
416}
417
286sub read_pak($) { 418sub read_pak($) {
287 my ($path) = @_; 419 my ($path) = @_;
288 420
289 my %pak; 421 my %pak;
290 422
… …
298 } 430 }
299 431
300 \%pak 432 \%pak
301} 433}
302 434
303sub read_arch($) { 435sub read_arch($;$) {
304 my ($path) = @_; 436 my ($path, $toplevel) = @_;
305 437
306 my %arc; 438 my %arc;
307 my ($more, $prev); 439 my ($more, $prev);
440 my $comment;
308 441
309 open my $fh, "<:raw:perlio:utf8", $path 442 open my $fh, "<:raw:perlio:utf8", $path
310 or Carp::croak "$path: $!"; 443 or Carp::croak "$path: $!";
311 444
312 binmode $fh; 445# binmode $fh;
313 446
314 my $parse_block; $parse_block = sub { 447 my $parse_block; $parse_block = sub {
315 my %arc = @_; 448 my %arc = @_;
316 449
317 while (<$fh>) { 450 while (<$fh>) {
318 s/\s+$//; 451 s/\s+$//;
319 if (/^end$/i) { 452 if (/^end$/i) {
320 last; 453 last;
454
321 } elsif (/^arch (\S+)$/i) { 455 } elsif (/^arch (\S+)$/i) {
322 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 456 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
457
323 } elsif (/^lore$/i) { 458 } elsif (/^lore$/i) {
324 while (<$fh>) { 459 while (<$fh>) {
325 last if /^endlore\s*$/i; 460 last if /^endlore\s*$/i;
326 $arc{lore} .= $_; 461 $arc{lore} .= $_;
327 } 462 }
328 } elsif (/^msg$/i) { 463 } elsif (/^msg$/i) {
329 while (<$fh>) { 464 while (<$fh>) {
330 last if /^endmsg\s*$/i; 465 last if /^endmsg\s*$/i;
331 $arc{msg} .= $_; 466 $arc{msg} .= $_;
332 } 467 }
468 } elsif (/^anim$/i) {
469 while (<$fh>) {
470 last if /^mina\s*$/i;
471 chomp;
472 push @{ $arc{anim} }, $_;
473 }
333 } elsif (/^(\S+)\s*(.*)$/) { 474 } elsif (/^(\S+)\s*(.*)$/) {
334 $arc{lc $1} = $2; 475 $arc{lc $1} = $2;
335 } elsif (/^\s*($|#)/) { 476 } elsif (/^\s*#/) {
477 $arc{_comment} .= "$_\n";
478
479 } elsif (/^\s*$/) {
336 # 480 #
337 } else { 481 } else {
338 warn "$path: unparsable line '$_' in arch $arc{_name}"; 482 warn "$path: unparsable line '$_' in arch $arc{_name}";
339 } 483 }
340 } 484 }
… …
346 s/\s+$//; 490 s/\s+$//;
347 if (/^more$/i) { 491 if (/^more$/i) {
348 $more = $prev; 492 $more = $prev;
349 } elsif (/^object (\S+)$/i) { 493 } elsif (/^object (\S+)$/i) {
350 my $name = $1; 494 my $name = $1;
351 my $arc = 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};
498 $arc->{_atype} = 'object';
352 499
353 if ($more) { 500 if ($more) {
354 $more->{more} = $arc; 501 $more->{more} = $arc;
355 } else { 502 } else {
356 $arc{$name} = $arc; 503 $arc{$name} = $arc;
357 } 504 }
358 $prev = $arc; 505 $prev = $arc;
359 $more = undef; 506 $more = undef;
360 } elsif (/^arch (\S+)$/i) { 507 } elsif (/^arch (\S+)$/i) {
361 my $name = $1; 508 my $name = $1;
362 my $arc = 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};
512 $arc->{_atype} = 'arch';
363 513
364 if ($more) { 514 if ($more) {
365 $more->{more} = $arc; 515 $more->{more} = $arc;
366 } else { 516 } else {
367 push @{ $arc{arch} }, $arc; 517 push @{ $arc{arch} }, $arc;
368 } 518 }
369 $prev = $arc; 519 $prev = $arc;
370 $more = undef; 520 $more = undef;
521 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
522 if ($1 eq "lev_array") {
523 while (<$fh>) {
524 last if /^endplst\s*$/;
525 push @{$toplevel->{lev_array}}, $_+0;
526 }
527 } else {
528 $toplevel->{$1} = $2;
529 }
530 } elsif (/^\s*#/) {
531 $comment .= "$_\n";
371 } elsif (/^\s*($|#)/) { 532 } elsif (/^\s*($|#)/) {
372 # 533 #
373 } else { 534 } else {
374 warn "$path: unparseable top-level line '$_'"; 535 die "$path: unparseable top-level line '$_'";
375 } 536 }
376 } 537 }
377 538
378 undef $parse_block; # work around bug in perl not freeing $fh etc. 539 undef $parse_block; # work around bug in perl not freeing $fh etc.
379 540
380 \%arc 541 \%arc
542}
543
544sub archlist_to_string {
545 my ($arch) = @_;
546
547 my $str;
548
549 my $append; $append = sub {
550 my %a = %{$_[0]};
551
552 Crossfire::attr_freeze \%a;
553 Crossfire::normalize_arch \%a;
554
555 # undo the bit-split we did before
556 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
557 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
558 | (delete $a{attack_movement_bits_4_7});
559 }
560
561 if (my $comment = delete $a{_comment}) {
562 if ($comment =~ /[^\n\s#]/) {
563 $str .= $comment;
564 }
565 }
566
567 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
568
569 my $inv = delete $a{inventory};
570 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
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 }
577
578 my @kv;
579
580 for ($a{_name} eq "map"
581 ? @Crossfire::FIELD_ORDER_MAP
582 : @Crossfire::FIELD_ORDER) {
583 push @kv, [$_, delete $a{$_}]
584 if exists $a{$_};
585 }
586
587 for (sort keys %a) {
588 next if /^_/; # ignore our _-keys
589 push @kv, [$_, delete $a{$_}];
590 }
591
592 for (@kv) {
593 my ($k, $v) = @$_;
594
595 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
596 $v =~ s/\n$//;
597 $str .= "$k\n$v\n$end\n";
598 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
599 if ($v & ~Crossfire::MOVE_ALL or !$v) {
600 $str .= "$k $v\n";
601
602 } elsif ($v & Crossfire::MOVE_ALLBIT) {
603 $str .= "$k all";
604
605 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
606 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
607 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
608 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
609 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
610
611 $str .= "\n";
612
613 } else {
614 $str .= $k;
615
616 $str .= " walk" if $v & Crossfire::MOVE_WALK;
617 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
618 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
619 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
620 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
621
622 $str .= "\n";
623 }
624 } else {
625 $str .= "$k $v\n";
626 }
627 }
628
629 if ($inv) {
630 $append->($_) for @$inv;
631 }
632
633 $str .= "end\n";
634
635 if ($a{_atype} eq 'object') {
636 if ($more) {
637 $str .= "more\n";
638 $append->($more) if $more;
639 } else {
640 $str .= "\n";
641 }
642 }
643 };
644
645 for (@$arch) {
646 $append->($_);
647 }
648
649 $str
381} 650}
382 651
383# put all archs into a hash with editor_face as it's key 652# put all archs into a hash with editor_face as it's key
384# NOTE: the arrays in the hash values are references to 653# NOTE: the arrays in the hash values are references to
385# the archs from $ARCH 654# the archs from $ARCH
… …
406 my ($a) = @_; 675 my ($a) = @_;
407 676
408 my $o = $ARCH{$a->{_name}} 677 my $o = $ARCH{$a->{_name}}
409 or return; 678 or return;
410 679
411 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"}
412 or (warn "no face data found for arch '$a->{_name}'"), return; 683 or (warn "no face data found for arch '$a->{_name}'"), return;
684 }
413 685
414 if ($face->{w} > 1 || $face->{h} > 1) { 686 if ($face->{w} > 1 || $face->{h} > 1) {
415 # bigface 687 # bigface
416 return (0, 0, $face->{w} - 1, $face->{h} - 1); 688 return (0, 0, $face->{w} - 1, $face->{h} - 1);
417 689

Diff Legend

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