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.65 by root, Wed May 3 19:34:31 2006 UTC vs.
Revision 1.76 by root, Wed Oct 18 12:58:53 2006 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.92';
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
… …
307 my ($more, $prev); 388 my ($more, $prev);
308 389
309 open my $fh, "<:raw:perlio:utf8", $path 390 open my $fh, "<:raw:perlio:utf8", $path
310 or Carp::croak "$path: $!"; 391 or Carp::croak "$path: $!";
311 392
312 binmode $fh; 393# binmode $fh;
313 394
314 my $parse_block; $parse_block = sub { 395 my $parse_block; $parse_block = sub {
315 my %arc = @_; 396 my %arc = @_;
316 397
317 while (<$fh>) { 398 while (<$fh>) {
318 s/\s+$//; 399 s/\s+$//;
319 if (/^end$/i) { 400 if (/^end$/i) {
320 last; 401 last;
321 } elsif (/^arch (\S+)$/i) { 402 } elsif (/^arch (\S+)$/i) {
322 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 403 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
323 } elsif (/^lore$/i) { 404 } elsif (/^lore$/i) {
324 while (<$fh>) { 405 while (<$fh>) {
325 last if /^endlore\s*$/i; 406 last if /^endlore\s*$/i;
326 $arc{lore} .= $_; 407 $arc{lore} .= $_;
327 } 408 }
… …
352 s/\s+$//; 433 s/\s+$//;
353 if (/^more$/i) { 434 if (/^more$/i) {
354 $more = $prev; 435 $more = $prev;
355 } elsif (/^object (\S+)$/i) { 436 } elsif (/^object (\S+)$/i) {
356 my $name = $1; 437 my $name = $1;
357 my $arc = normalize_object $parse_block->(_name => $name); 438 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
439 $arc->{_atype} = 'object';
358 440
359 if ($more) { 441 if ($more) {
360 $more->{more} = $arc; 442 $more->{more} = $arc;
361 } else { 443 } else {
362 $arc{$name} = $arc; 444 $arc{$name} = $arc;
363 } 445 }
364 $prev = $arc; 446 $prev = $arc;
365 $more = undef; 447 $more = undef;
366 } elsif (/^arch (\S+)$/i) { 448 } elsif (/^arch (\S+)$/i) {
367 my $name = $1; 449 my $name = $1;
368 my $arc = normalize_arch $parse_block->(_name => $name); 450 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
451 $arc->{_atype} = 'arch';
369 452
370 if ($more) { 453 if ($more) {
371 $more->{more} = $arc; 454 $more->{more} = $arc;
372 } else { 455 } else {
373 push @{ $arc{arch} }, $arc; 456 push @{ $arc{arch} }, $arc;
… …
391 } 474 }
392 475
393 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.
394 477
395 \%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
396} 577}
397 578
398# 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
399# NOTE: the arrays in the hash values are references to 580# NOTE: the arrays in the hash values are references to
400# the archs from $ARCH 581# the archs from $ARCH

Diff Legend

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