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

Diff Legend

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