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.62 by root, Tue Mar 28 14:44:52 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.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(
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
… …
130sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
131 145
132sub load_ref($) { 146sub load_ref($) {
133 my ($path) = @_; 147 my ($path) = @_;
134 148
135 open my $fh, "<", $path 149 open my $fh, "<:raw:perlio", $path
136 or die "$path: $!"; 150 or die "$path: $!";
137 binmode $fh;
138 local $/; 151 local $/;
139 152
140 thaw <$fh> 153 thaw <$fh>
141} 154}
142 155
143sub save_ref($$) { 156sub save_ref($$) {
144 my ($ref, $path) = @_; 157 my ($ref, $path) = @_;
145 158
146 open my $fh, ">", "$path~" 159 open my $fh, ">:raw:perlio", "$path~"
147 or die "$path~: $!"; 160 or die "$path~: $!";
148 binmode $fh;
149 print $fh freeze $ref; 161 print $fh freeze $ref;
150 close $fh; 162 close $fh;
151 rename "$path~", $path 163 rename "$path~", $path
152 or die "$path: $!"; 164 or die "$path: $!";
153} 165}
154 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
155# object as in "Object xxx", i.e. archetypes 233# object as in "Object xxx", i.e. archetypes
156sub normalize_object($) { 234sub normalize_object($) {
157 my ($ob) = @_; 235 my ($ob) = @_;
158 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
159 # nuke outdated or never supported fields 256 # nuke outdated or never supported fields
160 delete $ob->{$_} for qw( 257 delete @$ob{qw(
161 can_knockback can_parry can_impale can_cut can_dam_armour 258 can_knockback can_parry can_impale can_cut can_dam_armour
162 can_apply pass_thru can_pass_thru 259 can_apply pass_thru can_pass_thru
163 ); 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; }
164 265
165 # convert movement strings to bitsets 266 # convert movement strings to bitsets
166 for my $attr (keys %FIELD_MOVEMENT) { 267 for my $attr (keys %FIELD_MOVEMENT) {
167 next unless exists $ob->{$attr}; 268 next unless exists $ob->{$attr};
168 269
… …
201 if (defined (my $v = delete $ob->{slow_move})) { 302 if (defined (my $v = delete $ob->{slow_move})) {
202 $ob->{move_slow} |= MOVE_WALK; 303 $ob->{move_slow} |= MOVE_WALK;
203 $ob->{move_slow_penalty} = $v; 304 $ob->{move_slow_penalty} = $v;
204 } 305 }
205 if (defined (my $v = delete $ob->{walk_on})) { 306 if (defined (my $v = delete $ob->{walk_on})) {
307 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
206 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 308 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
207 : $ob->{move_on} & ~MOVE_WALK; 309 : $ob->{move_on} & ~MOVE_WALK;
208 } 310 }
209 if (defined (my $v = delete $ob->{walk_off})) { 311 if (defined (my $v = delete $ob->{walk_off})) {
312 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
210 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 313 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
211 : $ob->{move_off} & ~MOVE_WALK; 314 : $ob->{move_off} & ~MOVE_WALK;
212 } 315 }
213 if (defined (my $v = delete $ob->{fly_on})) { 316 if (defined (my $v = delete $ob->{fly_on})) {
317 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
214 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 318 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
215 : $ob->{move_on} & ~MOVE_FLY_LOW; 319 : $ob->{move_on} & ~MOVE_FLY_LOW;
216 } 320 }
217 if (defined (my $v = delete $ob->{fly_off})) { 321 if (defined (my $v = delete $ob->{fly_off})) {
322 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
218 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 323 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
219 : $ob->{move_off} & ~MOVE_FLY_LOW; 324 : $ob->{move_off} & ~MOVE_FLY_LOW;
220 } 325 }
221 if (defined (my $v = delete $ob->{flying})) { 326 if (defined (my $v = delete $ob->{flying})) {
327 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
222 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 328 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
223 : $ob->{move_type} & ~MOVE_FLY_LOW; 329 : $ob->{move_type} & ~MOVE_FLY_LOW;
224 } 330 }
225 331
226 # convert idiotic event_xxx things into objects 332 # convert idiotic event_xxx things into objects
… …
232 slaying => delete $ob->{"event_${event}"}, 338 slaying => delete $ob->{"event_${event}"},
233 name => delete $ob->{"event_${event}_options"}, 339 name => delete $ob->{"event_${event}_options"},
234 }; 340 };
235 } 341 }
236 } 342 }
343
344 # some archetypes had "+3" instead of the canonical "3", so fix
345 $ob->{dam} *= 1 if exists $ob->{dam};
237 346
238 $ob 347 $ob
239} 348}
240 349
241# arch as in "arch xxx", ie.. objects 350# arch as in "arch xxx", ie.. objects
… …
283 } 392 }
284 393
285 $ob 394 $ob
286} 395}
287 396
397sub attr_thaw($) {
398 my ($ob) = @_;
399
400 $ob->{attach} = from_json $ob->{attach}
401 if exists $ob->{attach};
402
403 $ob
404}
405
406sub attr_freeze($) {
407 my ($ob) = @_;
408
409 $ob->{attach} = Crossfire::to_json $ob->{attach}
410 if exists $ob->{attach};
411
412 $ob
413}
414
288sub read_pak($) { 415sub read_pak($) {
289 my ($path) = @_; 416 my ($path) = @_;
290 417
291 my %pak; 418 my %pak;
292 419
293 open my $fh, "<", $path 420 open my $fh, "<:raw:perlio", $path
294 or Carp::croak "$_[0]: $!"; 421 or Carp::croak "$_[0]: $!";
295 binmode $fh; 422 binmode $fh;
296 while (<$fh>) { 423 while (<$fh>) {
297 my ($type, $id, $len, $path) = split; 424 my ($type, $id, $len, $path) = split;
298 $path =~ s/.*\///; 425 $path =~ s/.*\///;
… …
300 } 427 }
301 428
302 \%pak 429 \%pak
303} 430}
304 431
305sub read_arch($) { 432sub read_arch($;$) {
306 my ($path) = @_; 433 my ($path, $toplevel) = @_;
307 434
308 my %arc; 435 my %arc;
309 my ($more, $prev); 436 my ($more, $prev);
437 my $comment;
310 438
311 open my $fh, "<", $path 439 open my $fh, "<:raw:perlio:utf8", $path
312 or Carp::croak "$path: $!"; 440 or Carp::croak "$path: $!";
313 441
314 binmode $fh; 442# binmode $fh;
315 443
316 my $parse_block; $parse_block = sub { 444 my $parse_block; $parse_block = sub {
317 my %arc = @_; 445 my %arc = @_;
318 446
319 while (<$fh>) { 447 while (<$fh>) {
320 s/\s+$//; 448 s/\s+$//;
321 if (/^end$/i) { 449 if (/^end$/i) {
322 last; 450 last;
451
323 } elsif (/^arch (\S+)$/i) { 452 } elsif (/^arch (\S+)$/i) {
324 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 453 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
454
325 } elsif (/^lore$/i) { 455 } elsif (/^lore$/i) {
326 while (<$fh>) { 456 while (<$fh>) {
327 last if /^endlore\s*$/i; 457 last if /^endlore\s*$/i;
328 $arc{lore} .= $_; 458 $arc{lore} .= $_;
329 } 459 }
330 } elsif (/^msg$/i) { 460 } elsif (/^msg$/i) {
331 while (<$fh>) { 461 while (<$fh>) {
332 last if /^endmsg\s*$/i; 462 last if /^endmsg\s*$/i;
333 $arc{msg} .= $_; 463 $arc{msg} .= $_;
334 } 464 }
465 } elsif (/^anim$/i) {
466 while (<$fh>) {
467 last if /^mina\s*$/i;
468 chomp;
469 push @{ $arc{anim} }, $_;
470 }
335 } elsif (/^(\S+)\s*(.*)$/) { 471 } elsif (/^(\S+)\s*(.*)$/) {
336 $arc{lc $1} = $2; 472 $arc{lc $1} = $2;
337 } elsif (/^\s*($|#)/) { 473 } elsif (/^\s*#/) {
474 $arc{_comment} .= "$_\n";
475
476 } elsif (/^\s*$/) {
338 # 477 #
339 } else { 478 } else {
340 warn "$path: unparsable line '$_' in arch $arc{_name}"; 479 warn "$path: unparsable line '$_' in arch $arc{_name}";
341 } 480 }
342 } 481 }
… …
348 s/\s+$//; 487 s/\s+$//;
349 if (/^more$/i) { 488 if (/^more$/i) {
350 $more = $prev; 489 $more = $prev;
351 } elsif (/^object (\S+)$/i) { 490 } elsif (/^object (\S+)$/i) {
352 my $name = $1; 491 my $name = $1;
353 my $arc = 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';
354 496
355 if ($more) { 497 if ($more) {
356 $more->{more} = $arc; 498 $more->{more} = $arc;
357 } else { 499 } else {
358 $arc{$name} = $arc; 500 $arc{$name} = $arc;
359 } 501 }
360 $prev = $arc; 502 $prev = $arc;
361 $more = undef; 503 $more = undef;
362 } elsif (/^arch (\S+)$/i) { 504 } elsif (/^arch (\S+)$/i) {
363 my $name = $1; 505 my $name = $1;
364 my $arc = 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';
365 510
366 if ($more) { 511 if ($more) {
367 $more->{more} = $arc; 512 $more->{more} = $arc;
368 } else { 513 } else {
369 push @{ $arc{arch} }, $arc; 514 push @{ $arc{arch} }, $arc;
370 } 515 }
371 $prev = $arc; 516 $prev = $arc;
372 $more = undef; 517 $more = undef;
518 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
519 if ($1 eq "lev_array") {
520 while (<$fh>) {
521 last if /^endplst\s*$/;
522 push @{$toplevel->{lev_array}}, $_+0;
523 }
524 } else {
525 $toplevel->{$1} = $2;
526 }
527 } elsif (/^\s*#/) {
528 $comment .= "$_\n";
373 } elsif (/^\s*($|#)/) { 529 } elsif (/^\s*($|#)/) {
374 # 530 #
375 } else { 531 } else {
376 warn "$path: unparseable top-level line '$_'"; 532 die "$path: unparseable top-level line '$_'";
377 } 533 }
378 } 534 }
379 535
380 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.
381 537
382 \%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
383} 647}
384 648
385# 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
386# NOTE: the arrays in the hash values are references to 650# NOTE: the arrays in the hash values are references to
387# the archs from $ARCH 651# the archs from $ARCH
… …
408 my ($a) = @_; 672 my ($a) = @_;
409 673
410 my $o = $ARCH{$a->{_name}} 674 my $o = $ARCH{$a->{_name}}
411 or return; 675 or return;
412 676
413 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"}
414 or (warn "no face data found for arch '$a->{_name}'"), return; 680 or (warn "no face data found for arch '$a->{_name}'"), return;
681 }
415 682
416 if ($face->{w} > 1 || $face->{h} > 1) { 683 if ($face->{w} > 1 || $face->{h} > 1) {
417 # bigface 684 # bigface
418 return (0, 0, $face->{w} - 1, $face->{h} - 1); 685 return (0, 0, $face->{w} - 1, $face->{h} - 1);
419 686

Diff Legend

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