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.60 by root, Mon Mar 27 17:23:35 2006 UTC vs.
Revision 1.73 by root, Tue Sep 12 02:18:06 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
… …
102 114
103 body_range body_arm body_torso body_head body_neck body_skill 115 body_range body_arm body_torso body_head body_neck body_skill
104 body_finger body_shoulder body_foot body_hand body_wrist body_waist 116 body_finger body_shoulder body_foot body_hand body_wrist body_waist
105)); 117));
106 118
119our %EVENT_TYPE = (
120 apply => 1,
121 attack => 2,
122 death => 3,
123 drop => 4,
124 pickup => 5,
125 say => 6,
126 stop => 7,
127 time => 8,
128 throw => 9,
129 trigger => 10,
130 close => 11,
131 timer => 12,
132);
133
107sub MOVE_WALK (){ 0x01 } 134sub MOVE_WALK (){ 0x01 }
108sub MOVE_FLY_LOW (){ 0x02 } 135sub MOVE_FLY_LOW (){ 0x02 }
109sub MOVE_FLY_HIGH (){ 0x04 } 136sub MOVE_FLY_HIGH (){ 0x04 }
110sub MOVE_FLYING (){ 0x06 } 137sub MOVE_FLYING (){ 0x06 }
111sub MOVE_SWIM (){ 0x08 } 138sub MOVE_SWIM (){ 0x08 }
… …
115sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
116 143
117sub load_ref($) { 144sub load_ref($) {
118 my ($path) = @_; 145 my ($path) = @_;
119 146
120 open my $fh, "<", $path 147 open my $fh, "<:raw:perlio", $path
121 or die "$path: $!"; 148 or die "$path: $!";
122 binmode $fh;
123 local $/; 149 local $/;
124 150
125 thaw <$fh> 151 thaw <$fh>
126} 152}
127 153
128sub save_ref($$) { 154sub save_ref($$) {
129 my ($ref, $path) = @_; 155 my ($ref, $path) = @_;
130 156
131 open my $fh, ">", "$path~" 157 open my $fh, ">:raw:perlio", "$path~"
132 or die "$path~: $!"; 158 or die "$path~: $!";
133 binmode $fh;
134 print $fh freeze $ref; 159 print $fh freeze $ref;
135 close $fh; 160 close $fh;
136 rename "$path~", $path 161 rename "$path~", $path
137 or die "$path: $!"; 162 or die "$path: $!";
138} 163}
139 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"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
199 }
200}
201
202# object as in "Object xxx", i.e. archetypes
140sub normalize_object($) { 203sub normalize_object($) {
141 my ($ob) = @_; 204 my ($ob) = @_;
142 205
206 # nuke outdated or never supported fields
143 delete $ob->{$_} for qw( 207 delete @$ob{qw(
144 can_knockback can_parry can_impale can_cut can_dam_armour 208 can_knockback can_parry can_impale can_cut can_dam_armour
145 can_apply pass_thru can_pass_thru 209 can_apply pass_thru can_pass_thru
146 ); 210 )};
147 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; }
215
216 # convert movement strings to bitsets
148 for my $attr (keys %FIELD_MOVEMENT) { 217 for my $attr (keys %FIELD_MOVEMENT) {
149 next unless exists $ob->{$attr}; 218 next unless exists $ob->{$attr};
150 219
151 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
152 221
… …
174 } 243 }
175 244
176 $ob->{$attr} = $flags; 245 $ob->{$attr} = $flags;
177 } 246 }
178 247
248 # convert outdated movement flags to new movement sets
179 if (defined (my $v = delete $ob->{no_pass})) { 249 if (defined (my $v = delete $ob->{no_pass})) {
180 $ob->{move_block} = $v ? MOVE_ALL : 0; 250 $ob->{move_block} = $v ? MOVE_ALL : 0;
181 } 251 }
182 if (defined (my $v = delete $ob->{slow_move})) { 252 if (defined (my $v = delete $ob->{slow_move})) {
183 $ob->{move_slow} |= MOVE_WALK; 253 $ob->{move_slow} |= MOVE_WALK;
184 $ob->{move_slow_penalty} = $v; 254 $ob->{move_slow_penalty} = $v;
185 } 255 }
186 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};
187 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 258 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
188 : $ob->{move_on} & ~MOVE_WALK; 259 : $ob->{move_on} & ~MOVE_WALK;
189 } 260 }
190 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};
191 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 263 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
192 : $ob->{move_off} & ~MOVE_WALK; 264 : $ob->{move_off} & ~MOVE_WALK;
193 } 265 }
194 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};
195 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 268 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
196 : $ob->{move_on} & ~MOVE_FLY_LOW; 269 : $ob->{move_on} & ~MOVE_FLY_LOW;
197 } 270 }
198 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};
199 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 273 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
200 : $ob->{move_off} & ~MOVE_FLY_LOW; 274 : $ob->{move_off} & ~MOVE_FLY_LOW;
201 } 275 }
202 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};
203 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 278 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
204 : $ob->{move_type} & ~MOVE_FLY_LOW; 279 : $ob->{move_type} & ~MOVE_FLY_LOW;
205 } 280 }
206 281
282 # convert idiotic event_xxx things into objects
283 while (my ($event, $subtype) = each %EVENT_TYPE) {
284 if (exists $ob->{"event_${event}_plugin"}) {
285 push @{$ob->{inventory}}, {
286 _name => "event_$event",
287 title => delete $ob->{"event_${event}_plugin"},
288 slaying => delete $ob->{"event_${event}"},
289 name => delete $ob->{"event_${event}_options"},
290 };
291 }
292 }
293
294 # some archetypes had "+3" instead of the canonical "3", so fix
295 $ob->{dam} *= 1 if exists $ob->{dam};
296
207 $ob 297 $ob
208} 298}
209 299
300# arch as in "arch xxx", ie.. objects
210sub normalize_arch($) { 301sub normalize_arch($) {
211 my ($ob) = @_; 302 my ($ob) = @_;
212 303
213 normalize_object $ob; 304 normalize_object $ob;
214 305
… …
251 } 342 }
252 343
253 $ob 344 $ob
254} 345}
255 346
347sub attr_thaw($) {
348 my ($ob) = @_;
349
350 $ob->{attach} = from_json $ob->{attach}
351 if exists $ob->{attach};
352
353 $ob
354}
355
356sub attr_freeze($) {
357 my ($ob) = @_;
358
359 $ob->{attach} = Crossfire::to_json $ob->{attach}
360 if exists $ob->{attach};
361
362 $ob
363}
364
256sub read_pak($) { 365sub read_pak($) {
257 my ($path) = @_; 366 my ($path) = @_;
258 367
259 my %pak; 368 my %pak;
260 369
261 open my $fh, "<", $path 370 open my $fh, "<:raw:perlio", $path
262 or Carp::croak "$_[0]: $!"; 371 or Carp::croak "$_[0]: $!";
263 binmode $fh; 372 binmode $fh;
264 while (<$fh>) { 373 while (<$fh>) {
265 my ($type, $id, $len, $path) = split; 374 my ($type, $id, $len, $path) = split;
266 $path =~ s/.*\///; 375 $path =~ s/.*\///;
… …
268 } 377 }
269 378
270 \%pak 379 \%pak
271} 380}
272 381
273sub read_arch($) { 382sub read_arch($;$) {
274 my ($path) = @_; 383 my ($path, $toplevel) = @_;
275 384
276 my %arc; 385 my %arc;
277 my ($more, $prev); 386 my ($more, $prev);
278 387
279 open my $fh, "<", $path 388 open my $fh, "<:raw:perlio:utf8", $path
280 or Carp::croak "$path: $!"; 389 or Carp::croak "$path: $!";
281 390
282 binmode $fh; 391# binmode $fh;
283 392
284 my $parse_block; $parse_block = sub { 393 my $parse_block; $parse_block = sub {
285 my %arc = @_; 394 my %arc = @_;
286 395
287 while (<$fh>) { 396 while (<$fh>) {
288 s/\s+$//; 397 s/\s+$//;
289 if (/^end$/i) { 398 if (/^end$/i) {
290 last; 399 last;
291 } elsif (/^arch (\S+)$/i) { 400 } elsif (/^arch (\S+)$/i) {
292 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 401 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
293 } elsif (/^lore$/i) { 402 } elsif (/^lore$/i) {
294 while (<$fh>) { 403 while (<$fh>) {
295 last if /^endlore\s*$/i; 404 last if /^endlore\s*$/i;
296 $arc{lore} .= $_; 405 $arc{lore} .= $_;
297 } 406 }
298 } elsif (/^msg$/i) { 407 } elsif (/^msg$/i) {
299 while (<$fh>) { 408 while (<$fh>) {
300 last if /^endmsg\s*$/i; 409 last if /^endmsg\s*$/i;
301 $arc{msg} .= $_; 410 $arc{msg} .= $_;
302 } 411 }
412 } elsif (/^anim$/i) {
413 while (<$fh>) {
414 last if /^mina\s*$/i;
415 chomp;
416 push @{ $arc{anim} }, $_;
417 }
303 } elsif (/^(\S+)\s*(.*)$/) { 418 } elsif (/^(\S+)\s*(.*)$/) {
304 $arc{lc $1} = $2; 419 $arc{lc $1} = $2;
305 } elsif (/^\s*($|#)/) { 420 } elsif (/^\s*($|#)/) {
306 # 421 #
307 } else { 422 } else {
… …
316 s/\s+$//; 431 s/\s+$//;
317 if (/^more$/i) { 432 if (/^more$/i) {
318 $more = $prev; 433 $more = $prev;
319 } elsif (/^object (\S+)$/i) { 434 } elsif (/^object (\S+)$/i) {
320 my $name = $1; 435 my $name = $1;
321 my $arc = normalize_object $parse_block->(_name => $name); 436 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
437 $arc->{_atype} = 'object';
322 438
323 if ($more) { 439 if ($more) {
324 $more->{more} = $arc; 440 $more->{more} = $arc;
325 } else { 441 } else {
326 $arc{$name} = $arc; 442 $arc{$name} = $arc;
327 } 443 }
328 $prev = $arc; 444 $prev = $arc;
329 $more = undef; 445 $more = undef;
330 } elsif (/^arch (\S+)$/i) { 446 } elsif (/^arch (\S+)$/i) {
331 my $name = $1; 447 my $name = $1;
332 my $arc = normalize_arch $parse_block->(_name => $name); 448 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
449 $arc->{_atype} = 'arch';
333 450
334 if ($more) { 451 if ($more) {
335 $more->{more} = $arc; 452 $more->{more} = $arc;
336 } else { 453 } else {
337 push @{ $arc{arch} }, $arc; 454 push @{ $arc{arch} }, $arc;
338 } 455 }
339 $prev = $arc; 456 $prev = $arc;
340 $more = undef; 457 $more = undef;
458 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
459 if ($1 eq "lev_array") {
460 while (<$fh>) {
461 last if /^endplst\s*$/;
462 push @{$toplevel->{lev_array}}, $_+0;
463 }
464 } else {
465 $toplevel->{$1} = $2;
466 }
341 } elsif (/^\s*($|#)/) { 467 } elsif (/^\s*($|#)/) {
342 # 468 #
343 } else { 469 } else {
344 warn "$path: unparseable top-level line '$_'"; 470 die "$path: unparseable top-level line '$_'";
345 } 471 }
346 } 472 }
347 473
348 undef $parse_block; # work around bug in perl not freeing $fh etc. 474 undef $parse_block; # work around bug in perl not freeing $fh etc.
349 475
350 \%arc 476 \%arc
477}
478
479sub archlist_to_string {
480 my ($arch) = @_;
481
482 my $str;
483
484 my $append; $append = sub {
485 my %a = %{$_[0]};
486
487 Crossfire::attr_freeze \%a;
488 Crossfire::normalize_arch \%a;
489
490 # undo the bit-split we did before
491 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
492 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
493 | (delete $a{attack_movement_bits_4_7});
494 }
495
496 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
497
498 my $inv = delete $a{inventory};
499 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
500 my $anim = delete $a{anim};
501
502 my @kv;
503
504 for ($a{_name} eq "map"
505 ? @Crossfire::FIELD_ORDER_MAP
506 : @Crossfire::FIELD_ORDER) {
507 push @kv, [$_, delete $a{$_}]
508 if exists $a{$_};
509 }
510
511 for (sort keys %a) {
512 next if /^_/; # ignore our _-keys
513 push @kv, [$_, delete $a{$_}];
514 }
515
516 for (@kv) {
517 my ($k, $v) = @$_;
518
519 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
520 $v =~ s/\n$//;
521 $str .= "$k\n$v\n$end\n";
522 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
523 if ($v & ~Crossfire::MOVE_ALL or !$v) {
524 $str .= "$k $v\n";
525
526 } elsif ($v & Crossfire::MOVE_ALLBIT) {
527 $str .= "$k all";
528
529 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
530 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
531 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
532 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
533 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
534
535 $str .= "\n";
536
537 } else {
538 $str .= $k;
539
540 $str .= " walk" if $v & Crossfire::MOVE_WALK;
541 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
542 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
543 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
544 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
545
546 $str .= "\n";
547 }
548 } else {
549 $str .= "$k $v\n";
550 }
551 }
552
553 if ($inv) {
554 $append->($_) for @$inv;
555 }
556
557 if ($a{_atype} eq 'object') {
558 $str .= join "\n", "anim", @$anim, "mina\n"
559 if $anim;
560 }
561
562 $str .= "end\n";
563
564 if (($a{_atype} eq 'object') && $more) {
565 $str .= "\nmore\n";
566 $append->($more) if $more;
567 }
568 };
569
570 for (@$arch) {
571 $append->($_);
572 }
573
574 $str
351} 575}
352 576
353# put all archs into a hash with editor_face as it's key 577# put all archs into a hash with editor_face as it's key
354# NOTE: the arrays in the hash values are references to 578# NOTE: the arrays in the hash values are references to
355# the archs from $ARCH 579# the archs from $ARCH
356sub editor_archs { 580sub editor_archs {
357 my %paths; 581 my %paths;
358 582
359 for (keys %ARCH) { 583 for (keys %ARCH) {
360 my $arch = $ARCH{$_}; 584 my $arch = $ARCH{$_};
361 push @{$paths{$arch->{editor_folder}}}, \$arch; 585 push @{$paths{$arch->{editor_folder}}}, $arch;
362 } 586 }
363 587
364 \%paths 588 \%paths
365} 589}
366 590
… …
431 my $type = $obj->{type} || $arch->{type}; 655 my $type = $obj->{type} || $arch->{type};
432 656
433 if ($type > 0) { 657 if ($type > 0) {
434 $root = $Crossfire::Data::ATTR{$type}; 658 $root = $Crossfire::Data::ATTR{$type};
435 } else { 659 } else {
660 my %a = (%$arch, %$obj);
661
662 if ($a{is_floor} && !$a{alive}) {
663 $root = $Crossfire::Data::TYPE{Floor};
664 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
665 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
666 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
667 $root = $Crossfire::Data::TYPE{Wall};
668 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
669 $root = $Crossfire::Data::TYPE{"Weak Wall"};
670 } else {
436 $root = $Crossfire::Data::TYPE{Misc}; 671 $root = $Crossfire::Data::TYPE{Misc};
437
438 type:
439 for (@Crossfire::Data::ATTR0) {
440 my $req = $_->{required}
441 or die "internal error: ATTR0 without 'required'";
442
443 keys %$req;
444 while (my ($k, $v) = each %$req) {
445 next type
446 unless $obj->{$k} == $v || $arch->{$k} == $v;
447 }
448
449 $root = $_;
450 } 672 }
451 } 673 }
452 674
453 my @import = ($root); 675 my @import = ($root);
454 676

Diff Legend

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