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.72 by root, Mon Sep 4 17:58:51 2006 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.9';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
18use Storable qw(freeze thaw); 18use Storable qw(freeze thaw);
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
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}
23 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" : File::Spec->tmpdir . "/crossfire";
27 39
… …
44 qw(move_type move_block move_allow move_on move_off move_slow); 56 qw(move_type move_block move_allow move_on move_off move_slow);
45 57
46# same as in server save routine, to (hopefully) be compatible 58# same as in server save routine, to (hopefully) be compatible
47# to the other editors. 59# to the other editors.
48our @FIELD_ORDER_MAP = (qw( 60our @FIELD_ORDER_MAP = (qw(
49 name swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 62 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 63 darkness width height enter_x enter_y msg maplore
52 unique template 64 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4 66 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55)); 67));
56 68
57our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
58 elevation 70 elevation
59 71
60 name name_pl custom_name title race 72 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch face
62 #todo-events 74 #todo-events
63 animation is_animated 75 animation is_animated
64 str dex con wis pow cha int 76 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
… …
130sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
131 143
132sub load_ref($) { 144sub load_ref($) {
133 my ($path) = @_; 145 my ($path) = @_;
134 146
135 open my $fh, "<", $path 147 open my $fh, "<:raw:perlio", $path
136 or die "$path: $!"; 148 or die "$path: $!";
137 binmode $fh;
138 local $/; 149 local $/;
139 150
140 thaw <$fh> 151 thaw <$fh>
141} 152}
142 153
143sub save_ref($$) { 154sub save_ref($$) {
144 my ($ref, $path) = @_; 155 my ($ref, $path) = @_;
145 156
146 open my $fh, ">", "$path~" 157 open my $fh, ">:raw:perlio", "$path~"
147 or die "$path~: $!"; 158 or die "$path~: $!";
148 binmode $fh;
149 print $fh freeze $ref; 159 print $fh freeze $ref;
150 close $fh; 160 close $fh;
151 rename "$path~", $path 161 rename "$path~", $path
152 or die "$path: $!"; 162 or die "$path: $!";
153} 163}
154 164
165my %attack_mask = (
166 physical => 0x00000001,
167 magic => 0x00000002,
168 fire => 0x00000004,
169 electricity => 0x00000008,
170 cold => 0x00000010,
171 confusion => 0x00000020,
172 acid => 0x00000040,
173 drain => 0x00000080,
174 weaponmagic => 0x00000100,
175 ghosthit => 0x00000200,
176 poison => 0x00000400,
177 slow => 0x00000800,
178 paralyze => 0x00001000,
179 turn_undead => 0x00002000,
180 fear => 0x00004000,
181 cancellation => 0x00008000,
182 deplete => 0x00010000,
183 death => 0x00020000,
184 chaos => 0x00040000,
185 counterspell => 0x00080000,
186 godpower => 0x00100000,
187 holyword => 0x00200000,
188 blind => 0x00400000,
189 internal => 0x00800000,
190 life_stealing => 0x01000000,
191 disease => 0x02000000,
192);
193
194sub _add_resist($$$) {
195 my ($ob, $mask, $value) = @_;
196
197 while (my ($k, $v) = each %attack_mask) {
198 $ob->{"resist_$k"} += $value if $mask & $v;
199 }
200}
201
155# object as in "Object xxx", i.e. archetypes 202# object as in "Object xxx", i.e. archetypes
156sub normalize_object($) { 203sub normalize_object($) {
157 my ($ob) = @_; 204 my ($ob) = @_;
158 205
159 # nuke outdated or never supported fields 206 # nuke outdated or never supported fields
160 delete $ob->{$_} for qw( 207 delete @$ob{qw(
161 can_knockback can_parry can_impale can_cut can_dam_armour 208 can_knockback can_parry can_impale can_cut can_dam_armour
162 can_apply pass_thru can_pass_thru 209 can_apply pass_thru can_pass_thru
163 ); 210 )};
211
212 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
213 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
214 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
164 215
165 # convert movement strings to bitsets 216 # convert movement strings to bitsets
166 for my $attr (keys %FIELD_MOVEMENT) { 217 for my $attr (keys %FIELD_MOVEMENT) {
167 next unless exists $ob->{$attr}; 218 next unless exists $ob->{$attr};
168 219
… …
201 if (defined (my $v = delete $ob->{slow_move})) { 252 if (defined (my $v = delete $ob->{slow_move})) {
202 $ob->{move_slow} |= MOVE_WALK; 253 $ob->{move_slow} |= MOVE_WALK;
203 $ob->{move_slow_penalty} = $v; 254 $ob->{move_slow_penalty} = $v;
204 } 255 }
205 if (defined (my $v = delete $ob->{walk_on})) { 256 if (defined (my $v = delete $ob->{walk_on})) {
257 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
206 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 258 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
207 : $ob->{move_on} & ~MOVE_WALK; 259 : $ob->{move_on} & ~MOVE_WALK;
208 } 260 }
209 if (defined (my $v = delete $ob->{walk_off})) { 261 if (defined (my $v = delete $ob->{walk_off})) {
262 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
210 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 263 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
211 : $ob->{move_off} & ~MOVE_WALK; 264 : $ob->{move_off} & ~MOVE_WALK;
212 } 265 }
213 if (defined (my $v = delete $ob->{fly_on})) { 266 if (defined (my $v = delete $ob->{fly_on})) {
267 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
214 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 268 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
215 : $ob->{move_on} & ~MOVE_FLY_LOW; 269 : $ob->{move_on} & ~MOVE_FLY_LOW;
216 } 270 }
217 if (defined (my $v = delete $ob->{fly_off})) { 271 if (defined (my $v = delete $ob->{fly_off})) {
272 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
218 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 273 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
219 : $ob->{move_off} & ~MOVE_FLY_LOW; 274 : $ob->{move_off} & ~MOVE_FLY_LOW;
220 } 275 }
221 if (defined (my $v = delete $ob->{flying})) { 276 if (defined (my $v = delete $ob->{flying})) {
277 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
222 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 278 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
223 : $ob->{move_type} & ~MOVE_FLY_LOW; 279 : $ob->{move_type} & ~MOVE_FLY_LOW;
224 } 280 }
225 281
226 # convert idiotic event_xxx things into objects 282 # convert idiotic event_xxx things into objects
… …
283 } 339 }
284 340
285 $ob 341 $ob
286} 342}
287 343
344sub attr_thaw($) {
345 my ($ob) = @_;
346
347 $ob->{attach} = from_json $ob->{attach}
348 if exists $ob->{attach};
349
350 $ob
351}
352
353sub attr_freeze($) {
354 my ($ob) = @_;
355
356 $ob->{attach} = Crossfire::to_json $ob->{attach}
357 if exists $ob->{attach};
358
359 $ob
360}
361
288sub read_pak($) { 362sub read_pak($) {
289 my ($path) = @_; 363 my ($path) = @_;
290 364
291 my %pak; 365 my %pak;
292 366
293 open my $fh, "<", $path 367 open my $fh, "<:raw:perlio", $path
294 or Carp::croak "$_[0]: $!"; 368 or Carp::croak "$_[0]: $!";
295 binmode $fh; 369 binmode $fh;
296 while (<$fh>) { 370 while (<$fh>) {
297 my ($type, $id, $len, $path) = split; 371 my ($type, $id, $len, $path) = split;
298 $path =~ s/.*\///; 372 $path =~ s/.*\///;
… …
300 } 374 }
301 375
302 \%pak 376 \%pak
303} 377}
304 378
305sub read_arch($) { 379sub read_arch($;$) {
306 my ($path) = @_; 380 my ($path, $toplevel) = @_;
307 381
308 my %arc; 382 my %arc;
309 my ($more, $prev); 383 my ($more, $prev);
310 384
311 open my $fh, "<", $path 385 open my $fh, "<:raw:perlio:utf8", $path
312 or Carp::croak "$path: $!"; 386 or Carp::croak "$path: $!";
313 387
314 binmode $fh; 388# binmode $fh;
315 389
316 my $parse_block; $parse_block = sub { 390 my $parse_block; $parse_block = sub {
317 my %arc = @_; 391 my %arc = @_;
318 392
319 while (<$fh>) { 393 while (<$fh>) {
320 s/\s+$//; 394 s/\s+$//;
321 if (/^end$/i) { 395 if (/^end$/i) {
322 last; 396 last;
323 } elsif (/^arch (\S+)$/i) { 397 } elsif (/^arch (\S+)$/i) {
324 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 398 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
325 } elsif (/^lore$/i) { 399 } elsif (/^lore$/i) {
326 while (<$fh>) { 400 while (<$fh>) {
327 last if /^endlore\s*$/i; 401 last if /^endlore\s*$/i;
328 $arc{lore} .= $_; 402 $arc{lore} .= $_;
329 } 403 }
330 } elsif (/^msg$/i) { 404 } elsif (/^msg$/i) {
331 while (<$fh>) { 405 while (<$fh>) {
332 last if /^endmsg\s*$/i; 406 last if /^endmsg\s*$/i;
333 $arc{msg} .= $_; 407 $arc{msg} .= $_;
334 } 408 }
409 } elsif (/^anim$/i) {
410 while (<$fh>) {
411 last if /^mina\s*$/i;
412 chomp;
413 push @{ $arc{anim} }, $_;
414 }
335 } elsif (/^(\S+)\s*(.*)$/) { 415 } elsif (/^(\S+)\s*(.*)$/) {
336 $arc{lc $1} = $2; 416 $arc{lc $1} = $2;
337 } elsif (/^\s*($|#)/) { 417 } elsif (/^\s*($|#)/) {
338 # 418 #
339 } else { 419 } else {
… …
348 s/\s+$//; 428 s/\s+$//;
349 if (/^more$/i) { 429 if (/^more$/i) {
350 $more = $prev; 430 $more = $prev;
351 } elsif (/^object (\S+)$/i) { 431 } elsif (/^object (\S+)$/i) {
352 my $name = $1; 432 my $name = $1;
353 my $arc = normalize_object $parse_block->(_name => $name); 433 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
434 $arc->{_atype} = 'object';
354 435
355 if ($more) { 436 if ($more) {
356 $more->{more} = $arc; 437 $more->{more} = $arc;
357 } else { 438 } else {
358 $arc{$name} = $arc; 439 $arc{$name} = $arc;
359 } 440 }
360 $prev = $arc; 441 $prev = $arc;
361 $more = undef; 442 $more = undef;
362 } elsif (/^arch (\S+)$/i) { 443 } elsif (/^arch (\S+)$/i) {
363 my $name = $1; 444 my $name = $1;
364 my $arc = normalize_arch $parse_block->(_name => $name); 445 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
446 $arc->{_atype} = 'arch';
365 447
366 if ($more) { 448 if ($more) {
367 $more->{more} = $arc; 449 $more->{more} = $arc;
368 } else { 450 } else {
369 push @{ $arc{arch} }, $arc; 451 push @{ $arc{arch} }, $arc;
370 } 452 }
371 $prev = $arc; 453 $prev = $arc;
372 $more = undef; 454 $more = undef;
455 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
456 if ($1 eq "lev_array") {
457 while (<$fh>) {
458 last if /^endplst\s*$/;
459 push @{$toplevel->{lev_array}}, $_+0;
460 }
461 } else {
462 $toplevel->{$1} = $2;
463 }
373 } elsif (/^\s*($|#)/) { 464 } elsif (/^\s*($|#)/) {
374 # 465 #
375 } else { 466 } else {
376 warn "$path: unparseable top-level line '$_'"; 467 die "$path: unparseable top-level line '$_'";
377 } 468 }
378 } 469 }
379 470
380 undef $parse_block; # work around bug in perl not freeing $fh etc. 471 undef $parse_block; # work around bug in perl not freeing $fh etc.
381 472
382 \%arc 473 \%arc
474}
475
476sub archlist_to_string {
477 my ($arch) = @_;
478
479 my $str;
480
481 my $append; $append = sub {
482 my %a = %{$_[0]};
483
484 Crossfire::attr_freeze \%a;
485 Crossfire::normalize_arch \%a;
486
487 # undo the bit-split we did before
488 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
489 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
490 | (delete $a{attack_movement_bits_4_7});
491 }
492
493 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
494
495 my $inv = delete $a{inventory};
496 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
497 my $anim = delete $a{anim};
498
499 my @kv;
500
501 for ($a{_name} eq "map"
502 ? @Crossfire::FIELD_ORDER_MAP
503 : @Crossfire::FIELD_ORDER) {
504 push @kv, [$_, delete $a{$_}]
505 if exists $a{$_};
506 }
507
508 for (sort keys %a) {
509 next if /^_/; # ignore our _-keys
510 push @kv, [$_, delete $a{$_}];
511 }
512
513 for (@kv) {
514 my ($k, $v) = @$_;
515
516 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
517 $v =~ s/\n$//;
518 $str .= "$k\n$v\n$end\n";
519 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
520 if ($v & ~Crossfire::MOVE_ALL or !$v) {
521 $str .= "$k $v\n";
522
523 } elsif ($v & Crossfire::MOVE_ALLBIT) {
524 $str .= "$k all";
525
526 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
527 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
528 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
529 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
530 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
531
532 $str .= "\n";
533
534 } else {
535 $str .= $k;
536
537 $str .= " walk" if $v & Crossfire::MOVE_WALK;
538 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
539 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
540 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
541 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
542
543 $str .= "\n";
544 }
545 } else {
546 $str .= "$k $v\n";
547 }
548 }
549
550 if ($inv) {
551 $append->($_) for @$inv;
552 }
553
554 if ($a{_atype} eq 'object') {
555 $str .= join "\n", "anim", @$anim, "mina\n"
556 if $anim;
557 }
558
559 $str .= "end\n";
560
561 if (($a{_atype} eq 'object') && $more) {
562 $str .= "\nmore\n";
563 $append->($more) if $more;
564 }
565 };
566
567 for (@$arch) {
568 $append->($_);
569 }
570
571 $str
383} 572}
384 573
385# put all archs into a hash with editor_face as it's key 574# put all archs into a hash with editor_face as it's key
386# NOTE: the arrays in the hash values are references to 575# NOTE: the arrays in the hash values are references to
387# the archs from $ARCH 576# the archs from $ARCH

Diff Legend

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