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.80 by root, Tue Feb 6 22:08:14 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
… …
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
153# object as in "Object xxx", i.e. archetypes 204# object as in "Object xxx", i.e. archetypes
154sub normalize_object($) { 205sub normalize_object($) {
155 my ($ob) = @_; 206 my ($ob) = @_;
156 207
157 # nuke outdated or never supported fields 208 # nuke outdated or never supported fields
158 delete $ob->{$_} for qw( 209 delete @$ob{qw(
159 can_knockback can_parry can_impale can_cut can_dam_armour 210 can_knockback can_parry can_impale can_cut can_dam_armour
160 can_apply pass_thru can_pass_thru 211 can_apply pass_thru can_pass_thru
161 ); 212 )};
213
214 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
215 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
216 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
162 217
163 # convert movement strings to bitsets 218 # convert movement strings to bitsets
164 for my $attr (keys %FIELD_MOVEMENT) { 219 for my $attr (keys %FIELD_MOVEMENT) {
165 next unless exists $ob->{$attr}; 220 next unless exists $ob->{$attr};
166 221
… …
199 if (defined (my $v = delete $ob->{slow_move})) { 254 if (defined (my $v = delete $ob->{slow_move})) {
200 $ob->{move_slow} |= MOVE_WALK; 255 $ob->{move_slow} |= MOVE_WALK;
201 $ob->{move_slow_penalty} = $v; 256 $ob->{move_slow_penalty} = $v;
202 } 257 }
203 if (defined (my $v = delete $ob->{walk_on})) { 258 if (defined (my $v = delete $ob->{walk_on})) {
259 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
204 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
205 : $ob->{move_on} & ~MOVE_WALK; 261 : $ob->{move_on} & ~MOVE_WALK;
206 } 262 }
207 if (defined (my $v = delete $ob->{walk_off})) { 263 if (defined (my $v = delete $ob->{walk_off})) {
264 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
208 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
209 : $ob->{move_off} & ~MOVE_WALK; 266 : $ob->{move_off} & ~MOVE_WALK;
210 } 267 }
211 if (defined (my $v = delete $ob->{fly_on})) { 268 if (defined (my $v = delete $ob->{fly_on})) {
269 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
212 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
213 : $ob->{move_on} & ~MOVE_FLY_LOW; 271 : $ob->{move_on} & ~MOVE_FLY_LOW;
214 } 272 }
215 if (defined (my $v = delete $ob->{fly_off})) { 273 if (defined (my $v = delete $ob->{fly_off})) {
274 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
216 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
217 : $ob->{move_off} & ~MOVE_FLY_LOW; 276 : $ob->{move_off} & ~MOVE_FLY_LOW;
218 } 277 }
219 if (defined (my $v = delete $ob->{flying})) { 278 if (defined (my $v = delete $ob->{flying})) {
279 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
220 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
221 : $ob->{move_type} & ~MOVE_FLY_LOW; 281 : $ob->{move_type} & ~MOVE_FLY_LOW;
222 } 282 }
223 283
224 # convert idiotic event_xxx things into objects 284 # convert idiotic event_xxx things into objects
… …
230 slaying => delete $ob->{"event_${event}"}, 290 slaying => delete $ob->{"event_${event}"},
231 name => delete $ob->{"event_${event}_options"}, 291 name => delete $ob->{"event_${event}_options"},
232 }; 292 };
233 } 293 }
234 } 294 }
295
296 # some archetypes had "+3" instead of the canonical "3", so fix
297 $ob->{dam} *= 1 if exists $ob->{dam};
235 298
236 $ob 299 $ob
237} 300}
238 301
239# arch as in "arch xxx", ie.. objects 302# arch as in "arch xxx", ie.. objects
… …
281 } 344 }
282 345
283 $ob 346 $ob
284} 347}
285 348
349sub attr_thaw($) {
350 my ($ob) = @_;
351
352 $ob->{attach} = from_json $ob->{attach}
353 if exists $ob->{attach};
354
355 $ob
356}
357
358sub attr_freeze($) {
359 my ($ob) = @_;
360
361 $ob->{attach} = Crossfire::to_json $ob->{attach}
362 if exists $ob->{attach};
363
364 $ob
365}
366
286sub read_pak($) { 367sub read_pak($) {
287 my ($path) = @_; 368 my ($path) = @_;
288 369
289 my %pak; 370 my %pak;
290 371
… …
298 } 379 }
299 380
300 \%pak 381 \%pak
301} 382}
302 383
303sub read_arch($) { 384sub read_arch($;$) {
304 my ($path) = @_; 385 my ($path, $toplevel) = @_;
305 386
306 my %arc; 387 my %arc;
307 my ($more, $prev); 388 my ($more, $prev);
389 my $comment;
308 390
309 open my $fh, "<:raw:perlio:utf8", $path 391 open my $fh, "<:raw:perlio:utf8", $path
310 or Carp::croak "$path: $!"; 392 or Carp::croak "$path: $!";
311 393
312 binmode $fh; 394# binmode $fh;
313 395
314 my $parse_block; $parse_block = sub { 396 my $parse_block; $parse_block = sub {
315 my %arc = @_; 397 my %arc = @_;
316 398
317 while (<$fh>) { 399 while (<$fh>) {
318 s/\s+$//; 400 s/\s+$//;
319 if (/^end$/i) { 401 if (/^end$/i) {
320 last; 402 last;
403
321 } elsif (/^arch (\S+)$/i) { 404 } elsif (/^arch (\S+)$/i) {
322 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 405 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
406
323 } elsif (/^lore$/i) { 407 } elsif (/^lore$/i) {
324 while (<$fh>) { 408 while (<$fh>) {
325 last if /^endlore\s*$/i; 409 last if /^endlore\s*$/i;
326 $arc{lore} .= $_; 410 $arc{lore} .= $_;
327 } 411 }
328 } elsif (/^msg$/i) { 412 } elsif (/^msg$/i) {
329 while (<$fh>) { 413 while (<$fh>) {
330 last if /^endmsg\s*$/i; 414 last if /^endmsg\s*$/i;
331 $arc{msg} .= $_; 415 $arc{msg} .= $_;
332 } 416 }
417 } elsif (/^anim$/i) {
418 while (<$fh>) {
419 last if /^mina\s*$/i;
420 chomp;
421 push @{ $arc{anim} }, $_;
422 }
333 } elsif (/^(\S+)\s*(.*)$/) { 423 } elsif (/^(\S+)\s*(.*)$/) {
334 $arc{lc $1} = $2; 424 $arc{lc $1} = $2;
335 } elsif (/^\s*($|#)/) { 425 } elsif (/^\s*#/) {
426 $arc{_comment} .= $_;
427
428 } elsif (/^\s*$/) {
336 # 429 #
337 } else { 430 } else {
338 warn "$path: unparsable line '$_' in arch $arc{_name}"; 431 warn "$path: unparsable line '$_' in arch $arc{_name}";
339 } 432 }
340 } 433 }
… …
344 437
345 while (<$fh>) { 438 while (<$fh>) {
346 s/\s+$//; 439 s/\s+$//;
347 if (/^more$/i) { 440 if (/^more$/i) {
348 $more = $prev; 441 $more = $prev;
442 } elsif (/^\s*#/) {
443 $comment .= $_;
349 } elsif (/^object (\S+)$/i) { 444 } elsif (/^object (\S+)$/i) {
350 my $name = $1; 445 my $name = $1;
351 my $arc = normalize_object $parse_block->(_name => $name); 446 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
447 delete $arc{_comment} unless length $arc{_comment};
448 $arc->{_atype} = 'object';
352 449
353 if ($more) { 450 if ($more) {
354 $more->{more} = $arc; 451 $more->{more} = $arc;
355 } else { 452 } else {
356 $arc{$name} = $arc; 453 $arc{$name} = $arc;
357 } 454 }
358 $prev = $arc; 455 $prev = $arc;
359 $more = undef; 456 $more = undef;
360 } elsif (/^arch (\S+)$/i) { 457 } elsif (/^arch (\S+)$/i) {
361 my $name = $1; 458 my $name = $1;
362 my $arc = normalize_arch $parse_block->(_name => $name); 459 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
460 delete $arc{_comment} unless length $arc{_comment};
461 $arc->{_atype} = 'arch';
363 462
364 if ($more) { 463 if ($more) {
365 $more->{more} = $arc; 464 $more->{more} = $arc;
366 } else { 465 } else {
367 push @{ $arc{arch} }, $arc; 466 push @{ $arc{arch} }, $arc;
368 } 467 }
369 $prev = $arc; 468 $prev = $arc;
370 $more = undef; 469 $more = undef;
470 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
471 if ($1 eq "lev_array") {
472 while (<$fh>) {
473 last if /^endplst\s*$/;
474 push @{$toplevel->{lev_array}}, $_+0;
475 }
476 } else {
477 $toplevel->{$1} = $2;
478 }
371 } elsif (/^\s*($|#)/) { 479 } elsif (/^\s*($|#)/) {
372 # 480 #
373 } else { 481 } else {
374 warn "$path: unparseable top-level line '$_'"; 482 die "$path: unparseable top-level line '$_'";
375 } 483 }
376 } 484 }
377 485
378 undef $parse_block; # work around bug in perl not freeing $fh etc. 486 undef $parse_block; # work around bug in perl not freeing $fh etc.
379 487
380 \%arc 488 \%arc
489}
490
491sub archlist_to_string {
492 my ($arch) = @_;
493
494 my $str;
495
496 my $append; $append = sub {
497 my %a = %{$_[0]};
498
499 Crossfire::attr_freeze \%a;
500 Crossfire::normalize_arch \%a;
501
502 # undo the bit-split we did before
503 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
504 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
505 | (delete $a{attack_movement_bits_4_7});
506 }
507
508 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
509
510 my $inv = delete $a{inventory};
511 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
512 my $anim = delete $a{anim};
513
514 my @kv;
515
516 for ($a{_name} eq "map"
517 ? @Crossfire::FIELD_ORDER_MAP
518 : @Crossfire::FIELD_ORDER) {
519 push @kv, [$_, delete $a{$_}]
520 if exists $a{$_};
521 }
522
523 for (sort keys %a) {
524 next if /^_/; # ignore our _-keys
525 push @kv, [$_, delete $a{$_}];
526 }
527
528 for (@kv) {
529 my ($k, $v) = @$_;
530
531 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
532 $v =~ s/\n$//;
533 $str .= "$k\n$v\n$end\n";
534 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
535 if ($v & ~Crossfire::MOVE_ALL or !$v) {
536 $str .= "$k $v\n";
537
538 } elsif ($v & Crossfire::MOVE_ALLBIT) {
539 $str .= "$k all";
540
541 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
542 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
543 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
544 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
545 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
546
547 $str .= "\n";
548
549 } else {
550 $str .= $k;
551
552 $str .= " walk" if $v & Crossfire::MOVE_WALK;
553 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
554 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
555 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
556 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
557
558 $str .= "\n";
559 }
560 } else {
561 $str .= "$k $v\n";
562 }
563 }
564
565 if ($inv) {
566 $append->($_) for @$inv;
567 }
568
569 if ($a{_atype} eq 'object') {
570 $str .= join "\n", "anim", @$anim, "mina\n"
571 if $anim;
572 }
573
574 $str .= "end\n";
575
576 if (($a{_atype} eq 'object') && $more) {
577 $str .= "\nmore\n";
578 $append->($more) if $more;
579 }
580 };
581
582 for (@$arch) {
583 $append->($_);
584 }
585
586 $str
381} 587}
382 588
383# put all archs into a hash with editor_face as it's key 589# put all archs into a hash with editor_face as it's key
384# NOTE: the arrays in the hash values are references to 590# NOTE: the arrays in the hash values are references to
385# the archs from $ARCH 591# the archs from $ARCH
… …
406 my ($a) = @_; 612 my ($a) = @_;
407 613
408 my $o = $ARCH{$a->{_name}} 614 my $o = $ARCH{$a->{_name}}
409 or return; 615 or return;
410 616
411 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 617 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
618 unless ($face) {
619 $face = $FACE{"blank.x11"}
412 or (warn "no face data found for arch '$a->{_name}'"), return; 620 or (warn "no face data found for arch '$a->{_name}'"), return;
621 }
413 622
414 if ($face->{w} > 1 || $face->{h} > 1) { 623 if ($face->{w} > 1 || $face->{h} > 1) {
415 # bigface 624 # bigface
416 return (0, 0, $face->{w} - 1, $face->{h} - 1); 625 return (0, 0, $face->{w} - 1, $face->{h} - 1);
417 626

Diff Legend

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