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.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.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
155# object as in "Object xxx", i.e. archetypes 220# object as in "Object xxx", i.e. archetypes
156sub normalize_object($) { 221sub normalize_object($) {
157 my ($ob) = @_; 222 my ($ob) = @_;
158 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
159 # nuke outdated or never supported fields 243 # nuke outdated or never supported fields
160 delete $ob->{$_} for qw( 244 delete @$ob{qw(
161 can_knockback can_parry can_impale can_cut can_dam_armour 245 can_knockback can_parry can_impale can_cut can_dam_armour
162 can_apply pass_thru can_pass_thru 246 can_apply pass_thru can_pass_thru
163 ); 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; }
164 252
165 # convert movement strings to bitsets 253 # convert movement strings to bitsets
166 for my $attr (keys %FIELD_MOVEMENT) { 254 for my $attr (keys %FIELD_MOVEMENT) {
167 next unless exists $ob->{$attr}; 255 next unless exists $ob->{$attr};
168 256
… …
201 if (defined (my $v = delete $ob->{slow_move})) { 289 if (defined (my $v = delete $ob->{slow_move})) {
202 $ob->{move_slow} |= MOVE_WALK; 290 $ob->{move_slow} |= MOVE_WALK;
203 $ob->{move_slow_penalty} = $v; 291 $ob->{move_slow_penalty} = $v;
204 } 292 }
205 if (defined (my $v = delete $ob->{walk_on})) { 293 if (defined (my $v = delete $ob->{walk_on})) {
294 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
206 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 295 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
207 : $ob->{move_on} & ~MOVE_WALK; 296 : $ob->{move_on} & ~MOVE_WALK;
208 } 297 }
209 if (defined (my $v = delete $ob->{walk_off})) { 298 if (defined (my $v = delete $ob->{walk_off})) {
299 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
210 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 300 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
211 : $ob->{move_off} & ~MOVE_WALK; 301 : $ob->{move_off} & ~MOVE_WALK;
212 } 302 }
213 if (defined (my $v = delete $ob->{fly_on})) { 303 if (defined (my $v = delete $ob->{fly_on})) {
304 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
214 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 305 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
215 : $ob->{move_on} & ~MOVE_FLY_LOW; 306 : $ob->{move_on} & ~MOVE_FLY_LOW;
216 } 307 }
217 if (defined (my $v = delete $ob->{fly_off})) { 308 if (defined (my $v = delete $ob->{fly_off})) {
309 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
218 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 310 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
219 : $ob->{move_off} & ~MOVE_FLY_LOW; 311 : $ob->{move_off} & ~MOVE_FLY_LOW;
220 } 312 }
221 if (defined (my $v = delete $ob->{flying})) { 313 if (defined (my $v = delete $ob->{flying})) {
314 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
222 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 315 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
223 : $ob->{move_type} & ~MOVE_FLY_LOW; 316 : $ob->{move_type} & ~MOVE_FLY_LOW;
224 } 317 }
225 318
226 # convert idiotic event_xxx things into objects 319 # convert idiotic event_xxx things into objects
… …
232 slaying => delete $ob->{"event_${event}"}, 325 slaying => delete $ob->{"event_${event}"},
233 name => delete $ob->{"event_${event}_options"}, 326 name => delete $ob->{"event_${event}_options"},
234 }; 327 };
235 } 328 }
236 } 329 }
330
331 # some archetypes had "+3" instead of the canonical "3", so fix
332 $ob->{dam} *= 1 if exists $ob->{dam};
237 333
238 $ob 334 $ob
239} 335}
240 336
241# arch as in "arch xxx", ie.. objects 337# arch as in "arch xxx", ie.. objects
… …
283 } 379 }
284 380
285 $ob 381 $ob
286} 382}
287 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
288sub read_pak($) { 402sub read_pak($) {
289 my ($path) = @_; 403 my ($path) = @_;
290 404
291 my %pak; 405 my %pak;
292 406
293 open my $fh, "<", $path 407 open my $fh, "<:raw:perlio", $path
294 or Carp::croak "$_[0]: $!"; 408 or Carp::croak "$_[0]: $!";
295 binmode $fh; 409 binmode $fh;
296 while (<$fh>) { 410 while (<$fh>) {
297 my ($type, $id, $len, $path) = split; 411 my ($type, $id, $len, $path) = split;
298 $path =~ s/.*\///; 412 $path =~ s/.*\///;
… …
300 } 414 }
301 415
302 \%pak 416 \%pak
303} 417}
304 418
305sub read_arch($) { 419sub read_arch($;$) {
306 my ($path) = @_; 420 my ($path, $toplevel) = @_;
307 421
308 my %arc; 422 my %arc;
309 my ($more, $prev); 423 my ($more, $prev);
424 my $comment;
310 425
311 open my $fh, "<", $path 426 open my $fh, "<:raw:perlio:utf8", $path
312 or Carp::croak "$path: $!"; 427 or Carp::croak "$path: $!";
313 428
314 binmode $fh; 429# binmode $fh;
315 430
316 my $parse_block; $parse_block = sub { 431 my $parse_block; $parse_block = sub {
317 my %arc = @_; 432 my %arc = @_;
318 433
319 while (<$fh>) { 434 while (<$fh>) {
320 s/\s+$//; 435 s/\s+$//;
321 if (/^end$/i) { 436 if (/^end$/i) {
322 last; 437 last;
438
323 } elsif (/^arch (\S+)$/i) { 439 } elsif (/^arch (\S+)$/i) {
324 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 440 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
441
325 } elsif (/^lore$/i) { 442 } elsif (/^lore$/i) {
326 while (<$fh>) { 443 while (<$fh>) {
327 last if /^endlore\s*$/i; 444 last if /^endlore\s*$/i;
328 $arc{lore} .= $_; 445 $arc{lore} .= $_;
329 } 446 }
330 } elsif (/^msg$/i) { 447 } elsif (/^msg$/i) {
331 while (<$fh>) { 448 while (<$fh>) {
332 last if /^endmsg\s*$/i; 449 last if /^endmsg\s*$/i;
333 $arc{msg} .= $_; 450 $arc{msg} .= $_;
334 } 451 }
452 } elsif (/^anim$/i) {
453 while (<$fh>) {
454 last if /^mina\s*$/i;
455 chomp;
456 push @{ $arc{anim} }, $_;
457 }
335 } elsif (/^(\S+)\s*(.*)$/) { 458 } elsif (/^(\S+)\s*(.*)$/) {
336 $arc{lc $1} = $2; 459 $arc{lc $1} = $2;
337 } elsif (/^\s*($|#)/) { 460 } elsif (/^\s*#/) {
461 $arc{_comment} .= "$_\n";
462
463 } elsif (/^\s*$/) {
338 # 464 #
339 } else { 465 } else {
340 warn "$path: unparsable line '$_' in arch $arc{_name}"; 466 warn "$path: unparsable line '$_' in arch $arc{_name}";
341 } 467 }
342 } 468 }
… …
348 s/\s+$//; 474 s/\s+$//;
349 if (/^more$/i) { 475 if (/^more$/i) {
350 $more = $prev; 476 $more = $prev;
351 } elsif (/^object (\S+)$/i) { 477 } elsif (/^object (\S+)$/i) {
352 my $name = $1; 478 my $name = $1;
353 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';
354 483
355 if ($more) { 484 if ($more) {
356 $more->{more} = $arc; 485 $more->{more} = $arc;
357 } else { 486 } else {
358 $arc{$name} = $arc; 487 $arc{$name} = $arc;
359 } 488 }
360 $prev = $arc; 489 $prev = $arc;
361 $more = undef; 490 $more = undef;
362 } elsif (/^arch (\S+)$/i) { 491 } elsif (/^arch (\S+)$/i) {
363 my $name = $1; 492 my $name = $1;
364 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';
365 497
366 if ($more) { 498 if ($more) {
367 $more->{more} = $arc; 499 $more->{more} = $arc;
368 } else { 500 } else {
369 push @{ $arc{arch} }, $arc; 501 push @{ $arc{arch} }, $arc;
370 } 502 }
371 $prev = $arc; 503 $prev = $arc;
372 $more = undef; 504 $more = undef;
505 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
506 if ($1 eq "lev_array") {
507 while (<$fh>) {
508 last if /^endplst\s*$/;
509 push @{$toplevel->{lev_array}}, $_+0;
510 }
511 } else {
512 $toplevel->{$1} = $2;
513 }
514 } elsif (/^\s*#/) {
515 $comment .= "$_\n";
373 } elsif (/^\s*($|#)/) { 516 } elsif (/^\s*($|#)/) {
374 # 517 #
375 } else { 518 } else {
376 warn "$path: unparseable top-level line '$_'"; 519 die "$path: unparseable top-level line '$_'";
377 } 520 }
378 } 521 }
379 522
380 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.
381 524
382 \%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
383} 634}
384 635
385# 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
386# NOTE: the arrays in the hash values are references to 637# NOTE: the arrays in the hash values are references to
387# the archs from $ARCH 638# the archs from $ARCH
… …
408 my ($a) = @_; 659 my ($a) = @_;
409 660
410 my $o = $ARCH{$a->{_name}} 661 my $o = $ARCH{$a->{_name}}
411 or return; 662 or return;
412 663
413 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"}
414 or (warn "no face data found for arch '$a->{_name}'"), return; 667 or (warn "no face data found for arch '$a->{_name}'"), return;
668 }
415 669
416 if ($face->{w} > 1 || $face->{h} > 1) { 670 if ($face->{w} > 1 || $face->{h} > 1) {
417 # bigface 671 # bigface
418 return (0, 0, $face->{w} - 1, $face->{h} - 1); 672 return (0, 0, $face->{w} - 1, $face->{h} - 1);
419 673

Diff Legend

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