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.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
… …
148 close $fh; 160 close $fh;
149 rename "$path~", $path 161 rename "$path~", $path
150 or die "$path: $!"; 162 or die "$path: $!";
151} 163}
152 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
153# object as in "Object xxx", i.e. archetypes 202# object as in "Object xxx", i.e. archetypes
154sub normalize_object($) { 203sub normalize_object($) {
155 my ($ob) = @_; 204 my ($ob) = @_;
156 205
157 # nuke outdated or never supported fields 206 # nuke outdated or never supported fields
158 delete $ob->{$_} for qw( 207 delete @$ob{qw(
159 can_knockback can_parry can_impale can_cut can_dam_armour 208 can_knockback can_parry can_impale can_cut can_dam_armour
160 can_apply pass_thru can_pass_thru 209 can_apply pass_thru can_pass_thru
161 ); 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; }
162 215
163 # convert movement strings to bitsets 216 # convert movement strings to bitsets
164 for my $attr (keys %FIELD_MOVEMENT) { 217 for my $attr (keys %FIELD_MOVEMENT) {
165 next unless exists $ob->{$attr}; 218 next unless exists $ob->{$attr};
166 219
… …
199 if (defined (my $v = delete $ob->{slow_move})) { 252 if (defined (my $v = delete $ob->{slow_move})) {
200 $ob->{move_slow} |= MOVE_WALK; 253 $ob->{move_slow} |= MOVE_WALK;
201 $ob->{move_slow_penalty} = $v; 254 $ob->{move_slow_penalty} = $v;
202 } 255 }
203 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};
204 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 258 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
205 : $ob->{move_on} & ~MOVE_WALK; 259 : $ob->{move_on} & ~MOVE_WALK;
206 } 260 }
207 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};
208 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 263 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
209 : $ob->{move_off} & ~MOVE_WALK; 264 : $ob->{move_off} & ~MOVE_WALK;
210 } 265 }
211 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};
212 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 268 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
213 : $ob->{move_on} & ~MOVE_FLY_LOW; 269 : $ob->{move_on} & ~MOVE_FLY_LOW;
214 } 270 }
215 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};
216 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 273 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
217 : $ob->{move_off} & ~MOVE_FLY_LOW; 274 : $ob->{move_off} & ~MOVE_FLY_LOW;
218 } 275 }
219 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};
220 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 278 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
221 : $ob->{move_type} & ~MOVE_FLY_LOW; 279 : $ob->{move_type} & ~MOVE_FLY_LOW;
222 } 280 }
223 281
224 # convert idiotic event_xxx things into objects 282 # convert idiotic event_xxx things into objects
… …
230 slaying => delete $ob->{"event_${event}"}, 288 slaying => delete $ob->{"event_${event}"},
231 name => delete $ob->{"event_${event}_options"}, 289 name => delete $ob->{"event_${event}_options"},
232 }; 290 };
233 } 291 }
234 } 292 }
293
294 # some archetypes had "+3" instead of the canonical "3", so fix
295 $ob->{dam} *= 1 if exists $ob->{dam};
235 296
236 $ob 297 $ob
237} 298}
238 299
239# arch as in "arch xxx", ie.. objects 300# arch as in "arch xxx", ie.. objects
… …
281 } 342 }
282 343
283 $ob 344 $ob
284} 345}
285 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
286sub read_pak($) { 365sub read_pak($) {
287 my ($path) = @_; 366 my ($path) = @_;
288 367
289 my %pak; 368 my %pak;
290 369
… …
307 my ($more, $prev); 386 my ($more, $prev);
308 387
309 open my $fh, "<:raw:perlio:utf8", $path 388 open my $fh, "<:raw:perlio:utf8", $path
310 or Carp::croak "$path: $!"; 389 or Carp::croak "$path: $!";
311 390
312 binmode $fh; 391# binmode $fh;
313 392
314 my $parse_block; $parse_block = sub { 393 my $parse_block; $parse_block = sub {
315 my %arc = @_; 394 my %arc = @_;
316 395
317 while (<$fh>) { 396 while (<$fh>) {
318 s/\s+$//; 397 s/\s+$//;
319 if (/^end$/i) { 398 if (/^end$/i) {
320 last; 399 last;
321 } elsif (/^arch (\S+)$/i) { 400 } elsif (/^arch (\S+)$/i) {
322 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 401 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
323 } elsif (/^lore$/i) { 402 } elsif (/^lore$/i) {
324 while (<$fh>) { 403 while (<$fh>) {
325 last if /^endlore\s*$/i; 404 last if /^endlore\s*$/i;
326 $arc{lore} .= $_; 405 $arc{lore} .= $_;
327 } 406 }
… …
352 s/\s+$//; 431 s/\s+$//;
353 if (/^more$/i) { 432 if (/^more$/i) {
354 $more = $prev; 433 $more = $prev;
355 } elsif (/^object (\S+)$/i) { 434 } elsif (/^object (\S+)$/i) {
356 my $name = $1; 435 my $name = $1;
357 my $arc = normalize_object $parse_block->(_name => $name); 436 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
437 $arc->{_atype} = 'object';
358 438
359 if ($more) { 439 if ($more) {
360 $more->{more} = $arc; 440 $more->{more} = $arc;
361 } else { 441 } else {
362 $arc{$name} = $arc; 442 $arc{$name} = $arc;
363 } 443 }
364 $prev = $arc; 444 $prev = $arc;
365 $more = undef; 445 $more = undef;
366 } elsif (/^arch (\S+)$/i) { 446 } elsif (/^arch (\S+)$/i) {
367 my $name = $1; 447 my $name = $1;
368 my $arc = normalize_arch $parse_block->(_name => $name); 448 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
449 $arc->{_atype} = 'arch';
369 450
370 if ($more) { 451 if ($more) {
371 $more->{more} = $arc; 452 $more->{more} = $arc;
372 } else { 453 } else {
373 push @{ $arc{arch} }, $arc; 454 push @{ $arc{arch} }, $arc;
… …
391 } 472 }
392 473
393 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.
394 475
395 \%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
396} 575}
397 576
398# 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
399# NOTE: the arrays in the hash values are references to 578# NOTE: the arrays in the hash values are references to
400# the archs from $ARCH 579# the archs from $ARCH

Diff Legend

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