| … | |
… | |
| 19 | |
19 | |
| 20 | our @EXPORT = qw( |
20 | our @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 | |
| 24 | use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working |
24 | use JSON::XS qw(from_json to_json); |
| 25 | |
|
|
| 26 | sub from_json($) { |
|
|
| 27 | $JSON::Syck::ImplicitUnicode = 1; |
|
|
| 28 | JSON::Syck::Load $_[0] |
|
|
| 29 | } |
|
|
| 30 | |
|
|
| 31 | sub to_json($) { |
|
|
| 32 | $JSON::Syck::ImplicitUnicode = 0; |
|
|
| 33 | JSON::Syck::Dump $_[0] |
|
|
| 34 | } |
|
|
| 35 | |
25 | |
| 36 | our $LIB = $ENV{CROSSFIRE_LIBDIR}; |
26 | our $LIB = $ENV{CROSSFIRE_LIBDIR}; |
| 37 | |
27 | |
| 38 | our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" |
28 | our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" |
| 39 | : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" |
29 | : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" |
| … | |
… | |
| 352 | } else { |
342 | } else { |
| 353 | warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; |
343 | warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; |
| 354 | } |
344 | } |
| 355 | } |
345 | } |
| 356 | |
346 | |
|
|
347 | # color_fg is used as default for magicmap if magicmap does not exist |
|
|
348 | $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; |
|
|
349 | |
| 357 | # nuke outdated or never supported fields |
350 | # nuke outdated or never supported fields |
| 358 | delete @$ob{qw( |
351 | delete @$ob{qw( |
| 359 | can_knockback can_parry can_impale can_cut can_dam_armour |
352 | can_knockback can_parry can_impale can_cut can_dam_armour |
| 360 | can_apply pass_thru can_pass_thru |
353 | can_apply pass_thru can_pass_thru color_bg color_fg |
| 361 | )}; |
354 | )}; |
| 362 | |
355 | |
| 363 | if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } |
356 | if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } |
| 364 | if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } |
357 | if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } |
| 365 | if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } |
358 | if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } |
